From ed6b89f1d9bfae4a81e3b928070219447c94deb2 Mon Sep 17 00:00:00 2001 From: Adam Zammit Date: Wed, 19 Feb 2014 15:06:21 +1100 Subject: [PATCH] Don't rely on qsqr_question table as not necessary --- nocaseavailable.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nocaseavailable.php b/nocaseavailable.php index 01d14a2c..8f574094 100644 --- a/nocaseavailable.php +++ b/nocaseavailable.php @@ -224,12 +224,10 @@ if (isset($rs) && !empty($rs)) } //quota row's full -$sql = "SELECT questionnaire_sample_quota_row_id,q.questionnaire_id,sample_import_id,qq.lime_sgqa,completions,quota_reached,q.lime_sid - FROM questionnaire_sample_quota_row as qsq, questionnaire as q, operator_questionnaire as oq, qsqr_question as qq +$sql = "SELECT qsq.questionnaire_sample_quota_row_id,qsq.quota_reached,qsq.description + FROM questionnaire_sample_quota_row as qsq, operator_questionnaire as oq WHERE oq.operator_id = '$operator_id' - AND qsq.questionnaire_id = oq.questionnaire_id - AND q.questionnaire_id = oq.questionnaire_id - AND qq.questionnaire_sample_quota_row_id = qsq.questionnaire_sample_quota_row_id"; + AND qsq.questionnaire_id = oq.questionnaire_id"; $rs = $db->GetAll($sql); @@ -239,7 +237,7 @@ if (isset($rs) && !empty($rs)) { if ($r['quota_reached'] == 1) { - print "

" . T_("POSSIBLE ERROR: Row quota reached for this question") . " - " . $r['lime_sgqa']; + print "

" . T_("POSSIBLE ERROR: Row quota reached for this quota") . " - " . $r['description']; } } }