2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

Don't rely on qsqr_question table as not necessary

This commit is contained in:
Adam Zammit
2014-02-19 15:06:21 +11:00
parent 03c34c12ce
commit ed6b89f1d9

View File

@@ -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 "<p class='error'>" . T_("POSSIBLE ERROR: Row quota reached for this question") . " - " . $r['lime_sgqa'];
print "<p class='error'>" . T_("POSSIBLE ERROR: Row quota reached for this quota") . " - " . $r['description'];
}
}
}