Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

revert to prev version in questionnairelist.php with changed merged from rev.448

Browse Source
This commit is contained in:
Alex
2015-07-06 18:37:18 +03:00
parent 0cb965bb64
commit bb6943d386
2 changed files with 483 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1315
admin/questionnairelist.php
View File

File diff suppressed because it is too large Load Diff

3
admin/samplecallattempts.php
View File

@@ -90,7 +90,7 @@ function sample_call_attempt_report($questionnaire_id = false, $sample_id = fals
$x = 1; $x = 1;
foreach($rev as $ev) foreach($rev as $ev)
{ {
$qs .= " JOIN sample_var_id as sv$x ON (sv$x.sample_id = c.sample_id AND sv$x.var_id = '{$ev['exclude_var_id']}' AND sv$x.val {$ev['comparison']} '{$ev['exclude_val']}') "; $qs .= " JOIN sample_var as sv$x ON (sv$x.sample_id = c.sample_id AND sv$x.var_id = '{$ev['exclude_var_id']}' AND sv$x.val {$ev['comparison']} '{$ev['exclude_val']}') ";
$x++; $x++;
} }
} }
@@ -213,7 +213,6 @@ if ($questionnaire_id || $questionnaire_id == -1)
{ {
if (!sample_call_attempt_report($questionnaire_id,$sample_import_id,$questionnaire_sample_quota_row_id)) if (!sample_call_attempt_report($questionnaire_id,$sample_import_id,$questionnaire_sample_quota_row_id))
print "<p class='well text-danger'>" . T_("No calls for this quota") . "</p>"; print "<p class='well text-danger'>" . T_("No calls for this quota") . "</p>";
} }
} }
else else