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

Merged selected fixes from Alex (thanks!)

Browse Source
This commit is contained in:
Adam Zammit
2015-09-07 12:24:00 +10:00
parent 4ebb11e3a8 a2744f39fe
commit 009c111d69
16 changed files with 213 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
admin/supervisor.php
View File

@@ -136,9 +136,14 @@ xhtml_head(T_("Assign outcomes to cases"),true,$css,$js_head);//array("../css/ta
<?php
$sql = "SELECT c.case_id as value, c.case_id as description, CASE WHEN c.case_id = '$case_id' THEN 'selected=\'selected\'' ELSE '' END AS selected
FROM `case` as c, `outcome` as o
FROM `case` AS c, `outcome` AS o, `questionnaire` AS q, `sample` AS s, `sample_import` AS si
WHERE c.current_outcome_id = o.outcome_id
AND o.outcome_type_id = 2";
AND q.questionnaire_id = c.questionnaire_id
AND s.sample_id = c.sample_id
AND s.import_id = si.sample_import_id
AND q.enabled = 1
AND si.enabled =1
AND o.outcome_type_id =2";
$rs = $db->GetAll($sql);
@@ -158,14 +163,14 @@ if (!empty($rs))
</div><form method="get" action="?" class="form-inline ">
<div class="modal-body">
<?php
$call_id = bigintval($_GET['call_id']);
if (isset($_GET['call_id'])){ $call_id = bigintval($_GET['call_id']);
$sql = "SELECT o.outcome_id as value,description, CASE WHEN o.outcome_id = c.outcome_id THEN 'selected=\'selected\'' ELSE '' END AS selected
FROM outcome as o, `call` as c
WHERE c.call_id = '$call_id'";
$rs2 = $db->GetAll($sql);
translate_array($rs2,array("description"));
display_chooser($rs2, "set_outcome_id", "set_outcome_id",true,false,false,false); ?>
<input type="hidden" name="call_id" value="<?php echo $call_id;?>"/><input type="hidden" name="case_id" value="<?php echo $case_id;?>"/>
<input type="hidden" name="call_id" value="<?php echo $call_id;?>"/><input type="hidden" name="case_id" value="<?php echo $case_id;?>"/> <?php } ?>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo T_("Cancel"); ?></button>
@@ -506,15 +511,15 @@ if ($case_id != false)
//Display all availability groups as checkboxes
print "<form action='?' method='get' class='form-horizontal '>";
print "<h5 class=''>" . T_("Select groups to limit availability (Selecting none means always available)") . "</h5><div class='col-sm-6'>";
foreach ($rs as $r)
foreach ($rs as $g)
{
$checked = "";
//if ($allselected || $r['availability_group_id'] == $r['selected_group_id'])
if ($r['availability_group_id'] == $r['selected_group_id'])
//if ($allselected || $g['availability_group_id'] == $g['selected_group_id'])
if ($g['availability_group_id'] == $g['selected_group_id'])
$checked = "checked='checked'";
print "&ensp;<input type='checkbox' name='ag{$r['availability_group_id']}' id='ag{$r['availability_group_id']}' value='{$r['availability_group_id']}' $checked />&ensp; <label class='control-label' for='ag{$r['availability_group_id']}'>{$r['description']}</label></br>";
print "&ensp;<input type='checkbox' name='ag{$g['availability_group_id']}' id='ag{$g['availability_group_id']}' value='{$g['availability_group_id']}' $checked />&ensp; <label class='control-label' for='ag{$g['availability_group_id']}'>{$g['description']}</label></br>";
}
?> </div>
<input type="hidden" name="case_id" value="<?php echo $case_id;?>"/>