diff --git a/admin/assigntimeslots.php b/admin/assigntimeslots.php index a0d8a877..64a4196f 100644 --- a/admin/assigntimeslots.php +++ b/admin/assigntimeslots.php @@ -105,9 +105,10 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['ca_availability_group'])) //need to add availability_group to questionnaire $questionnaire_id = bigintval($_GET['questionnaire_id']); $availability_group = bigintval($_GET['ca_availability_group']); + $weight = bigintval($_GET['weight']); - $sql = "INSERT INTO questionnaire_timeslot(questionnaire_id,availability_group_id) - VALUES('$questionnaire_id','$availability_group')"; + $sql = "INSERT INTO questionnaire_timeslot(questionnaire_id,availability_group_id,weight) + VALUES('$questionnaire_id','$availability_group','$weight')"; $db->Execute($sql); } @@ -131,9 +132,10 @@ if (isset($_GET['questionnaire_id']) && isset($_GET['sample_import_id']) && isse $questionnaire_id = bigintval($_GET['questionnaire_id']); $sample_import_id = bigintval($_GET['sample_import_id']); $availability_group = bigintval($_GET['qs_availability_group']); + $weight = bigintval($_GET['weights']); - $sql = "INSERT INTO questionnaire_sample_timeslot (questionnaire_id,sample_import_id,availability_group_id) - VALUES('$questionnaire_id','$sample_import_id','$availability_group')"; + $sql = "INSERT INTO questionnaire_sample_timeslot (questionnaire_id,sample_import_id,availability_group_id,weight) + VALUES('$questionnaire_id','$sample_import_id','$availability_group','$weight')"; $db->Execute($sql); } @@ -216,11 +218,12 @@ print ""; print "

" . T_("Call attempt time slots") . "

"; print "
" . T_("Assigning call attempt time slots to questionnaires will only allow cases to be attempted in a time slot for the n + 1th time where it has been attempted at least n times in all assigned timeslots. Please note timeslots must cover all possible time periods otherwise no cases will be available during missing timeslots.") ."
"; - $sql = "SELECT q.availability_group_id,a.description as description, CONCAT('" . T_("Click to unassign") . "') as link - - FROM questionnaire_timeslot as q, availability_group as a - WHERE q.availability_group_id = a.availability_group_id - AND q.questionnaire_id = '$questionnaire_id'"; +$sql = "SELECT q.availability_group_id,a.description as description, + CONCAT('" . T_("Click to unassign") . "') as link, + q.weight + FROM questionnaire_timeslot as q, availability_group as a + WHERE q.availability_group_id = a.availability_group_id + AND q.questionnaire_id = '$questionnaire_id'"; $qs = $db->GetAll($sql); print "
"; @@ -231,7 +234,7 @@ print "
" . T_("Assigning call attempt time slots to questionna else { print "

" . T_("Call attempt time slots selected for this questionnaire") . "

"; - xhtml_table ($qs,array("availability_group_id","description","link"),false,"table table-hover"); + xhtml_table ($qs,array("description","weight","link"),array(T_("Availability group"),T_("Weight"),T_("Unassign")),"table table-hover"); } print "
"; @@ -251,9 +254,15 @@ print "
" . T_("Assigning call attempt time slots to questionna { print ""; } - print "
- -   + print "
"; +?> +
+ +
+
+ +  
"; } print ""; @@ -270,7 +279,9 @@ print "
" . T_("Assigning call attempt time slots to questionna if ($sample_import_id !== false) { - $sql = "SELECT q.availability_group_id,a.description as description, CONCAT('" . T_("Click to unassign") . "') as link + $sql = "SELECT q.availability_group_id,a.description as description, + CONCAT('" . T_("Click to unassign") . "') as link, + q.weight FROM questionnaire_sample_timeslot as q, availability_group as a WHERE q.availability_group_id = a.availability_group_id AND q.questionnaire_id = '$questionnaire_id' @@ -285,7 +296,7 @@ print "
" . T_("Assigning call attempt time slots to questionna else { print "

" . T_("Call attempt time slots selected for this sample") . ":

"; - xhtml_table ($qs,array("availability_group_id","description","link"),false,"table table-hover"); + xhtml_table ($qs,array("description","weight","link"),array(T_("Availability group"),T_("Weight"),T_("Unassign")),"table table-hover"); } $sql = "SELECT si.availability_group_id,si.description @@ -304,8 +315,14 @@ print "
" . T_("Assigning call attempt time slots to questionna { print ""; } - print "
- + print "
"; +?> +
+ +
+
+
";