From 93be3d84a3d8407c3b7b7abb93da5251d091efa7 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 12 Oct 2015 19:21:22 +0300 Subject: [PATCH] added parameter to filter quota_reached samples only, false by default --- functions/functions.display.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/functions/functions.display.php b/functions/functions.display.php index 51ae666e..ea9b2292 100644 --- a/functions/functions.display.php +++ b/functions/functions.display.php @@ -111,19 +111,24 @@ function display_shift_chooser($questionnaire_id, $shift_id = false, $divclass=f * @param int|bool $sample_import_id The sample import id or false if none selected * @param bool $disabled Display disabled samples? (default is true) */ -function display_sample_chooser($questionnaire_id, $sample_import_id = false, $disabled = true, $divclass=false, $selectclass=false) +function display_sample_chooser($questionnaire_id, $sample_import_id = false, $disabled = true, $divclass=false, $selectclass=false, $quota_reached=false) { global $db; - $s = ""; + if (!$disabled) $s = " AND si.enabled = 1 "; else $s = ""; - if (!$disabled) - $s = " AND si.enabled = 1 "; + if ($quota_reached){ + $qr = " 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)"; + $qrq = " AND (qsq.quota_reached IS NULL OR qsq.quota_reached != 1 ) + AND (qsqr.quota_reached IS NULL OR qsqr.quota_reached != 1)"; + } + else { $qr = ""; $qrq = ""; } $sql = "SELECT s.sample_import_id,si.description,CASE WHEN s.sample_import_id = '$sample_import_id' THEN 'selected=\'selected\'' ELSE '' END AS selected - FROM questionnaire_sample as s, sample_import as si + FROM questionnaire_sample as s, sample_import as si $qr WHERE s.questionnaire_id = '$questionnaire_id' - AND s.sample_import_id = si.sample_import_id $s"; + AND s.sample_import_id = si.sample_import_id $s $qrq"; $rs = $db->GetAll($sql);