From 697a9ee04e363899982b5b4e821414086220b5fc Mon Sep 17 00:00:00 2001 From: azammitdcarf Date: Wed, 9 Feb 2011 03:41:02 +0000 Subject: [PATCH] Bug:System sort process was not limiting by questionnaire_sample --- admin/systemsortprocess.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/systemsortprocess.php b/admin/systemsortprocess.php index b00f70c8..e093f8d2 100644 --- a/admin/systemsortprocess.php +++ b/admin/systemsortprocess.php @@ -113,7 +113,7 @@ while (!is_process_killed($process_id)) //check if process killed every $sleepin FROM `case` as c LEFT JOIN `call` as a on (a.call_id = c.last_call_id) JOIN (sample as s, sample_import as si) on (s.sample_id = c.sample_id and si.sample_import_id = s.import_id) - JOIN (questionnaire_sample as qs, questionnaire as q, outcome as ou) on (c.questionnaire_id = q.questionnaire_id and qs.sample_import_id = s.import_id and ou.outcome_id = c.current_outcome_id and q.enabled = 1) + JOIN (questionnaire_sample as qs, questionnaire as q, outcome as ou) on (c.questionnaire_id = q.questionnaire_id and qs.sample_import_id = s.import_id and ou.outcome_id = c.current_outcome_id and q.enabled = 1 and qs.questionnaire_id = c.questionnaire_id) LEFT JOIN shift as sh on (sh.questionnaire_id = q.questionnaire_id and (CONVERT_TZ(NOW(),'System','UTC') >= sh.start) AND (CONVERT_TZ(NOW(),'System','UTC') <= sh.end)) LEFT JOIN appointment as ap on (ap.case_id = c.case_id AND ap.completed_call_id is NULL AND (ap.start > CONVERT_TZ(NOW(),'System','UTC'))) LEFT JOIN appointment as apn on (apn.case_id = c.case_id AND apn.completed_call_id is NULL AND (CONVERT_TZ(NOW(),'System','UTC') >= apn.start) AND (CONVERT_TZ(NOW(),'System','UTC') <= apn.end))