From 2889678fe1c4500a066c6320cde49578e80ffb46 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 17 May 2015 17:04:04 +0300 Subject: [PATCH] admin panel querries adjusted for sample_import_var_restrict table --- admin/questionnaireprefill.php | 8 +++----- admin/quota.php | 9 +++++---- admin/samplecallattempts.php | 4 ++-- admin/samplesearch.php | 12 ++++++------ admin/supervisor.php | 23 +++++++++++++---------- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/admin/questionnaireprefill.php b/admin/questionnaireprefill.php index 758cb109..50562740 100644 --- a/admin/questionnaireprefill.php +++ b/admin/questionnaireprefill.php @@ -171,12 +171,10 @@ if ($questionnaire_id != false) print "
  • " . T_("{Sample:var} A record from the sample where the column name is 'var'") . "
    • "; print ""; - $sql = "SELECT sv.var as description, CONCAT('{Sample:', sv.var, '}') as value - FROM `sample` AS s, sample_var AS sv, questionnaire_sample as qs + $sql = "SELECT sivr.var as description, CONCAT('{Sample:', sivr.var, '}') as value + FROM `sample_import_var_restrict` as sivr, questionnaire_sample as qs WHERE qs.questionnaire_id = '$questionnaire_id' - AND s.import_id = qs.sample_import_id - AND s.sample_id = sv.sample_id - GROUP BY sv.var"; + AND sivr.sample_import_id = qs.sample_import_id"; ?>
    diff --git a/admin/quota.php b/admin/quota.php index b4effab3..54614f16 100755 --- a/admin/quota.php +++ b/admin/quota.php @@ -186,14 +186,15 @@ if ($questionnaire_id != false) $sgqa = false; if (isset($_GET['sgqa'])) $sgqa = $_GET['sgqa']; - $sql = "SELECT CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END) as value, CASE WHEN lq.parent_qid = 0 THEN lq.question ELSE CONCAT(lq2.question, ': ', lq.question) END as description, CASE WHEN CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END) = '$sgqa' THEN 'selected=\'selected\'' ELSE '' END AS selected + $sql = "SELECT CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END) as value, + CASE WHEN lq.parent_qid = 0 THEN lq.question ELSE CONCAT(lq2.question, ': ', lq.question) END as description, + CASE WHEN CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END) = '$sgqa' THEN 'selected=\'selected\'' ELSE '' END AS selected FROM `" . LIME_PREFIX . "questions` AS lq LEFT JOIN `" . LIME_PREFIX . "questions` AS lq2 ON ( lq2.qid = lq.parent_qid ) JOIN `" . LIME_PREFIX . "groups` as g ON (g.gid = lq.gid) WHERE lq.sid = '$lime_sid' - ORDER BY lq.parent_qid ASC, lq.question_order ASC";//, lq.parent_qid ASC lq.qid ASC, - - + ORDER BY CASE WHEN lq2.question_order IS NULL THEN lq.question_order ELSE lq2.question_order + (lq.question_order / 1000) END ASC"; + display_chooser($db->GetAll($sql),"sgqa","sgqa",true,"questionnaire_id=$questionnaire_id&sample_import_id=$sample_import_id",true,true,false,true,"form-group"); print "
    "; diff --git a/admin/samplecallattempts.php b/admin/samplecallattempts.php index a103d2c2..2928e425 100644 --- a/admin/samplecallattempts.php +++ b/admin/samplecallattempts.php @@ -79,7 +79,7 @@ function sample_call_attempt_report($questionnaire_id = false, $sample_id = fals $qs = ""; if ($qsqri !== false) $qs = "JOIN questionnaire_sample_quota_row as q ON (q.questionnaire_sample_quota_row_id = '$qsqri') - JOIN sample_var ON (sample_var.sample_id = c.sample_id AND sample_var.var LIKE q.exclude_var AND sample_var.val LIKE q.exclude_val)"; + JOIN sample_var ON (sample_var.sample_id = c.sample_id AND sample_var.var_id = q.exclude_var_id AND sample_var.val LIKE q.exclude_val)"; $sql = "SELECT ca1 AS callattempts, COUNT( ca1 ) AS sample FROM ( SELECT count( ca.call_attempt_id ) AS ca1 @@ -211,6 +211,6 @@ if ($questionnaire_id || $questionnaire_id == -1) print "

    " . T_("No calls for this questionnaire") . "

    "; } -xhtml_foot(); +xhtml_foot("../js/custom.js"); ?> diff --git a/admin/samplesearch.php b/admin/samplesearch.php index f18a807e..fee180a3 100644 --- a/admin/samplesearch.php +++ b/admin/samplesearch.php @@ -156,25 +156,25 @@ if ($sample_import_id != false) $fnames[] = "link"; $fdesc[] = T_("Case ID"); - $sql = "SELECT var - FROM sample_var - WHERE sample_id = {$r[0]['sample_id']} + $sql = "SELECT var,var_id + FROM sample_import_var_restrict + WHERE sample_import_id = $sample_import_id ORDER by var ASC"; $rs = $db->GetAll($sql); foreach($rs as $rsw) { - $fnames[] = $rsw['var']; + $fnames[] = $rsw['var_id']; $fdesc[] = $rsw['var']; } foreach($r as &$rw) { - $sql = "SELECT var,val + $sql = "SELECT var_id,val FROM sample_var WHERE sample_id = {$rw['sample_id']}"; $rs = $db->GetAll($sql); foreach($rs as $rsw){ - $rw[$rsw['var']] = $rsw['val']; + $rw[$rsw['var_id']] = $rsw['val']; } } diff --git a/admin/supervisor.php b/admin/supervisor.php index 5165673c..3518e05e 100644 --- a/admin/supervisor.php +++ b/admin/supervisor.php @@ -281,7 +281,7 @@ if ($case_id != false) $db->CompleteTrans(); } - $sql = "SELECT o.description,o.outcome_id, q.description as qd, si.description as sd + $sql = "SELECT o.description,o.outcome_id, q.description as qd, si.description as sd, s.import_id as sid FROM `case` as c, `outcome` as o, questionnaire as q, sample as s, sample_import as si WHERE c.case_id = '$case_id' AND q.questionnaire_id = c.questionnaire_id @@ -299,11 +299,12 @@ if ($case_id != false)

    ". T_("Current outcome:") ." " . T_($rs['description']) . "

    "; $current_outcome_id = $rs['outcome_id']; + $sid = $rs['sid']; // view sample details print "

     " . T_("Sample details")."

    "; - $sql = "SELECT sv.sample_id, c.case_id , s.Time_zone_name, + $sql = "SELECT sv.sample_id, c.case_id , s.Time_zone_name, TIME_FORMAT(CONVERT_TZ(NOW(),@@session.time_zone,s.Time_zone_name),'". TIME_FORMAT ."') as time FROM sample_var AS sv LEFT JOIN (`case` AS c , sample as s) ON ( c.sample_id = sv.sample_id AND s.sample_id = c.sample_id ) WHERE c.case_id = '$case_id' @@ -312,26 +313,28 @@ if ($case_id != false) if ($r){ $fnames = array("sample_id", "Time_zone_name", "time"); $fdesc = array(T_("Sample id"),T_("Timezone"),T_("Time NOW")); - - $sql = "SELECT var - FROM sample_var - WHERE sample_id = {$r[0]['sample_id']} AND type IN (2,3,6,7) + $varr= array(); + $sql = "SELECT var,var_id + FROM sample_import_var_restrict + WHERE sample_import_id = $sid AND type IN (2,3,6,7) ORDER by var DESC"; $rs = $db->GetAll($sql); foreach($rs as $rsw) { - $fnames[] = $rsw['var']; + $fnames[] = $rsw['var_id']; $fdesc[] = $rsw['var']; + $varr[] = $rsw['var_id']; //array for valid var_id's } + $varr= implode(",",$varr); foreach($r as &$rw) { - $sql = "SELECT var,val + $sql = "SELECT var_id,val FROM sample_var - WHERE sample_id = {$rw['sample_id']} AND type IN (2,3,6,7)"; + WHERE sample_id = {$rw['sample_id']} AND var_id IN ($varr)"; $rs = $db->GetAll($sql); foreach($rs as $rsw){ - $rw[$rsw['var']] = $rsw['val']; + $rw[$rsw['var_id']] = $rsw['val']; } }