Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

Updated question quota selections to work properly with Limesurvey 1.91+ database structure

Browse Source
This commit is contained in:
azammitdcarf
2012-04-30 05:23:43 +00:00
parent 1539137038
commit 45755f6485
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
admin/quota.php
View File

@@ -177,10 +177,12 @@ if ($questionnaire_id != false)
$sgqa = false; $sgqa = false;
if (isset($_GET['sgqa'])) $sgqa = $_GET['sgqa']; if (isset($_GET['sgqa'])) $sgqa = $_GET['sgqa'];
$sql = "SELECT CONCAT( q.sid, 'X', q.gid, 'X', q.qid, IFNULL( a.code, '' ) ) AS value, CONCAT(q.question, ': ', IFNULL(a.answer,'')) as description, CASE WHEN CONCAT( q.sid, 'X', q.gid, 'X', q.qid, IFNULL( a.code, '' ) ) = '$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 q FROM `" . LIME_PREFIX . "questions` AS lq
LEFT JOIN `" . LIME_PREFIX . "answers` AS a ON ( a.qid = q.qid ) LEFT JOIN `" . LIME_PREFIX . "questions` AS lq2 ON ( lq2.qid = lq.parent_qid )
WHERE q.sid = '$lime_sid'"; JOIN `" . LIME_PREFIX . "groups` as g ON (g.gid = lq.gid)
WHERE lq.sid = '$lime_sid'
ORDER BY g.group_order ASC, lq.question_order ASC";
display_chooser($db->GetAll($sql),"sgqa","sgqa",true,"questionnaire_id=$questionnaire_id&sample_import_id=$sample_import_id"); display_chooser($db->GetAll($sql),"sgqa","sgqa",true,"questionnaire_id=$questionnaire_id&sample_import_id=$sample_import_id");
@@ -193,10 +195,9 @@ if ($questionnaire_id != false)
$qid = explode("X", $sgqa); $qid = explode("X", $sgqa);
$qid = $qid[2]; $qid = $qid[2];
$sql = "SELECT l.code,l.title $sql = "SELECT l.code,l.answer as title
FROM `" . LIME_PREFIX . "labels` as l, `" . LIME_PREFIX . "questions` as q FROM `" . LIME_PREFIX . "answers` as l
WHERE q.qid = '$qid' WHERE l.qid = '$qid'";
AND l.lid = q.lid";
$rs = $db->GetAll($sql); $rs = $db->GetAll($sql);

17
admin/quotarow.php
View File

@@ -224,10 +224,12 @@ if ($questionnaire_id != false)
$sgqa = false; $sgqa = false;
if (isset($_GET['sgqa'])) $sgqa = $_GET['sgqa']; if (isset($_GET['sgqa'])) $sgqa = $_GET['sgqa'];
$sql = "SELECT CONCAT( q.sid, 'X', q.gid, 'X', q.qid, IFNULL( a.code, '' ) ) AS value, CONCAT(q.question, ': ', IFNULL(a.answer,'')) as description, CASE WHEN CONCAT( q.sid, 'X', q.gid, 'X', q.qid, IFNULL( a.code, '' ) ) = '$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 q FROM `" . LIME_PREFIX . "questions` AS lq
LEFT JOIN `" . LIME_PREFIX . "answers` AS a ON ( a.qid = q.qid ) LEFT JOIN `" . LIME_PREFIX . "questions` AS lq2 ON ( lq2.qid = lq.parent_qid )
WHERE q.sid = '$lime_sid'"; JOIN `" . LIME_PREFIX . "groups` as g ON (g.gid = lq.gid)
WHERE lq.sid = '$lime_sid'
ORDER BY g.group_order ASC, lq.question_order ASC";
$rs = $db->GetAll($sql); $rs = $db->GetAll($sql);
@@ -261,10 +263,9 @@ if ($questionnaire_id != false)
$qid = explode("X", $sgqa); $qid = explode("X", $sgqa);
$qid = $qid[2]; $qid = $qid[2];
$sql = "SELECT l.code,l.title $sql = "SELECT l.code,l.answer as title
FROM `" . LIME_PREFIX . "labels` as l, `" . LIME_PREFIX . "questions` as q FROM `" . LIME_PREFIX . "answers` as l
WHERE q.qid = '$qid' WHERE l.qid = '$qid'";
AND l.lid = q.lid";
$rs = $db->GetAll($sql); $rs = $db->GetAll($sql);