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

Fixed dialog box not appearing with new version of jquery / jquery ui

Browse Source 
Fixed case not completing due to quotas with exclude_var_id of 0
Fixed notice on interface2 where $appointment  variable not specified
This commit is contained in:
Adam Zammit
2015-08-03 16:00:05 +10:00
parent a3ed3f47ef
commit 78714121ec
5 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
call_interface2.php
View File

@@ -478,8 +478,7 @@ switch($state)
// print "<div class='status'>" . T_("Requires coding") . "</div>"; // print "<div class='status'>" . T_("Requires coding") . "</div>";
print "<form action='?' method='post'><div class=\"form-group\">"; print "<form action='?' method='post'><div class=\"form-group\">";
display_outcomes(false,$call_attempt_id,$case_id); display_outcomes(false,$call_attempt_id,$case_id);
print_r($rs); if (isset($_POST['confirm'])){
if ($_POST['confirm']){
print "</div><input type='submit' class=\"btn btn-primary\" value=\"" . T_("Assign outcome") . "\" name='submit' id='submit'/></form>"; print "</div><input type='submit' class=\"btn btn-primary\" value=\"" . T_("Assign outcome") . "\" name='submit' id='submit'/></form>";
} }
break; break;

9
functions/functions.operator.php
View File

@@ -1519,7 +1519,8 @@ function close_row_quota($questionnaire_sample_quota_row_id,$update = true)
{ {
$sql2 = "SELECT exclude_val,exclude_var,exclude_var_id,comparison $sql2 = "SELECT exclude_val,exclude_var,exclude_var_id,comparison
FROM qsqr_sample FROM qsqr_sample
WHERE questionnaire_sample_quota_row_id = $questionnaire_sample_quota_row_id"; WHERE questionnaire_sample_quota_row_id = $questionnaire_sample_quota_row_id
AND exclude_var_id > 0";
$rev = $db->GetAll($sql2); $rev = $db->GetAll($sql2);
@@ -1699,7 +1700,8 @@ function update_single_row_quota($qsqri,$case_id = false)
//all variables to exclude for this row quota //all variables to exclude for this row quota
$sql2 = "SELECT exclude_val,exclude_var,exclude_var_id,comparison $sql2 = "SELECT exclude_val,exclude_var,exclude_var_id,comparison
FROM qsqr_sample FROM qsqr_sample
WHERE questionnaire_sample_quota_row_id = $qsqri"; WHERE questionnaire_sample_quota_row_id = $qsqri
AND exclude_var_id > 0";
$rev = $db->GetAll($sql2); $rev = $db->GetAll($sql2);
@@ -1953,7 +1955,8 @@ function update_quota_priorities($questionnaire_id)
$sql2 = "SELECT exclude_val,exclude_var,exclude_var_id,comparison $sql2 = "SELECT exclude_val,exclude_var,exclude_var_id,comparison
FROM qsqr_sample FROM qsqr_sample
WHERE questionnaire_sample_quota_row_id = $qsqri"; WHERE questionnaire_sample_quota_row_id = $qsqri
AND exclude_var_id > 0";
$rev = $db->GetAll($sql2); $rev = $db->GetAll($sql2);

2
index.php
View File

@@ -112,7 +112,7 @@ if (isset($_GET['endcase']))
//if ($db->HasFailedTrans()) {print "<p>FAILED AT ENDCASE</p>"; exit();} //if ($db->HasFailedTrans()) {print "<p>FAILED AT ENDCASE</p>"; exit();}
} }
$js = array("js/popup.js","js/tabber.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); $js = array("js/popup.js","js/tabber.js","include/jquery/jquery.min.js","include/jquery-ui/jquery-ui.min.js");
$body = true; $body = true;
$script = ""; $script = "";
if (AUTO_LOGOUT_MINUTES !== false) if (AUTO_LOGOUT_MINUTES !== false)

4
index_interface2.php
View File

@@ -159,7 +159,7 @@ if (isset($_GET['endcase']))
} }
$js = array("js/popup.js","js/tabber.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); $js = array("js/popup.js","js/tabber.js","include/jquery/jquery.min.js","include/jquery-ui/jquery-ui.min.js");
$body = true; $body = true;
$script = ""; $script = "";
if (AUTO_LOGOUT_MINUTES !== false) if (AUTO_LOGOUT_MINUTES !== false)
@@ -209,6 +209,7 @@ $sc = $scr['self_complete'];
$ref = $scr['referral']; $ref = $scr['referral'];
$availability = is_using_availability($case_id);
?> ?>
<div id="casefunctions" class="col-sm-2"> <div id="casefunctions" class="col-sm-2">
<ul id="casefunctions" class="header "> <ul id="casefunctions" class="header ">
@@ -334,7 +335,6 @@ $ref = $scr['referral'];
$ca = get_call_attempt($operator_id,true); $ca = get_call_attempt($operator_id,true);
$call_id = get_call($operator_id); $call_id = get_call($operator_id);
$appointment = false; $appointment = false;
$availability = is_using_availability($case_id);
if ($ca) if ($ca)
{ {
$appointment = is_on_appointment($ca); $appointment = is_on_appointment($ca);

9
js/popup.js
View File

@@ -3,14 +3,7 @@ function poptastic(url, title)
var elem = jQuery("#inpage"); var elem = jQuery("#inpage");
if (elem.length > 0) { if (elem.length > 0) {
elem = jQuery(elem[0]); elem = jQuery(elem[0]);
if (elem.dialog("option", "title") == title) { elem.dialog("close").dialog("destroy").remove();
if (! elem.dialog("isOpen")) {
elem.dialog("open");
}
return;
} else {
elem.dialog("close").dialog("destroy").remove();
}
} }
jQuery('<iframe id="inpage" src="'+ url +'" />').dialog({ jQuery('<iframe id="inpage" src="'+ url +'" />').dialog({
autoOpen: true, autoOpen: true,