From 87a44c868f3bee57bb8bc289fabe62060974b2a1 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 30 Nov 2015 23:07:14 +0300 Subject: [PATCH] re-fix: list cases with "appointment" outcome only --- admin/displayappointments.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/displayappointments.php b/admin/displayappointments.php index 8880e71a..04164974 100644 --- a/admin/displayappointments.php +++ b/admin/displayappointments.php @@ -303,7 +303,7 @@ else { LEFT JOIN operator AS ao ON ao.operator_id = a.require_operator_id LEFT JOIN (questionnaire_sample_quota as qsq) on (s.import_id = qsq.sample_import_id and c.questionnaire_id = qsq.questionnaire_id) LEFT JOIN (questionnaire_sample_quota_row as qsqr) on (s.import_id = qsqr.sample_import_id and c.questionnaire_id = qsqr.questionnaire_id) - WHERE q.enabled=1 AND si.enabled=1 AND a.end >= CONVERT_TZ(NOW(),'System','UTC') AND c.current_outcome_id !=10 + WHERE q.enabled=1 AND si.enabled=1 AND a.end >= CONVERT_TZ(NOW(),'System','UTC') AND c.current_outcome_id IN (19,20,21,22) AND (qsq.quota_reached IS NULL OR qsq.quota_reached != 1) AND (qsqr.quota_reached IS NULL OR qsqr.quota_reached != 1) GROUP BY c.case_id ORDER BY a.start ASC"; @@ -326,7 +326,7 @@ else { LEFT JOIN (`call` as ca) ON (ca.call_id = a.completed_call_id) LEFT JOIN (questionnaire_sample_quota as qsq) on (s.import_id = qsq.sample_import_id and c.questionnaire_id = qsq.questionnaire_id) LEFT JOIN (questionnaire_sample_quota_row as qsqr) on (s.import_id = qsqr.sample_import_id and c.questionnaire_id = qsqr.questionnaire_id) - WHERE q.enabled=1 AND si.enabled=1 AND a.end < CONVERT_TZ(NOW(),'System','UTC') AND a.completed_call_id IS NULL AND c.current_outcome_id !=10 + WHERE q.enabled=1 AND si.enabled=1 AND a.end < CONVERT_TZ(NOW(),'System','UTC') AND a.completed_call_id IS NULL AND c.current_outcome_id IN (19,20,21,22) AND (qsq.quota_reached IS NULL OR qsq.quota_reached != 1 ) AND (qsqr.quota_reached IS NULL OR qsqr.quota_reached != 1) GROUP BY c.case_id