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

wrong fix -> revert changes from rev540 , added GROUP BY to avoid duplicated rows

Browse Source
This commit is contained in:
Alex
2015-12-04 18:55:58 +03:00
parent 1bb854bc4c
commit 3717615f74
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
admin/supervisor.php
View File

@@ -137,7 +137,8 @@ xhtml_head(T_("Assign outcomes to cases"),true,$css,$js_head);
<?php
$sql = "SELECT c.case_id as value, c.case_id as description, CASE WHEN c.case_id = '$case_id' THEN 'selected=\'selected\'' ELSE '' END AS selected
FROM `case` AS c, `outcome` AS o, `questionnaire` AS q, `sample` AS s, `sample_import` AS si
LEFT JOIN (questionnaire_sample_quota as qsq, questionnaire_sample_quota_row as qsqr) on (si.sample_import_id = qsq.sample_import_id and si.sample_import_id = qsqr.sample_import_id)
LEFT JOIN (questionnaire_sample_quota as qsq) on (si.sample_import_id = qsq.sample_import_id)
LEFT JOIN (questionnaire_sample_quota_row as qsqr) on (si.sample_import_id = qsqr.sample_import_id)
WHERE c.current_outcome_id = o.outcome_id
AND q.questionnaire_id = c.questionnaire_id
AND s.sample_id = c.sample_id
@@ -147,7 +148,7 @@ $sql = "SELECT c.case_id as value, c.case_id as description, CASE WHEN c.case_id
AND (qsq.quota_reached IS NULL OR qsq.quota_reached != 1 )
AND (qsqr.quota_reached IS NULL OR qsqr.quota_reached != 1)
AND o.outcome_type_id =2
ORDER BY c.case_id ASC";
GROUP BY c.case_id ORDER BY c.case_id ASC";
$rs = $db->GetAll($sql);