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 'quotes' issue,

Browse Source 
cosmetics to call_interface2.php
This commit is contained in:
Alex
2015-09-10 13:38:05 +03:00
parent c1e2b4d1f0
commit 83d3b8e2e3
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.bzrignore
View File

@@ -1,5 +1,2 @@
no vars no vars
./config.inc.local.php ./config.inc.local.php
./.htaccess
./admin/.htaccess
./include/limesurvey/admin/.htaccess

6
call.php
View File

@@ -116,7 +116,7 @@ function display_outcomes($contacted,$ca,$case_id)
$sql = "SELECT outcome_id,description $sql = "SELECT outcome_id,description
FROM outcome FROM outcome
WHERE outcome_type_id = '5' WHERE outcome_type_id = '5'
AND outcome_id IN ('$outcomes')"; AND outcome_id IN ($outcomes)";
} }
else else
{ {
@@ -125,7 +125,7 @@ function display_outcomes($contacted,$ca,$case_id)
$sql = "SELECT outcome_id,description $sql = "SELECT outcome_id,description
FROM outcome FROM outcome
WHERE outcome_id != 10 WHERE outcome_id != 10
AND outcome_id IN ('$outcomes')"; //don't show completed if not AND outcome_id IN ($outcomes)"; //don't show completed if not
} }
else else
{ {
@@ -135,7 +135,7 @@ function display_outcomes($contacted,$ca,$case_id)
FROM outcome FROM outcome
WHERE contacted = '$contacted' WHERE contacted = '$contacted'
AND outcome_id != 10 AND outcome_id != 10
AND outcome_id IN ('$outcomes')"; //don't show completed if not AND outcome_id IN ($outcomes)"; //don't show completed if not
} }
} }

12
call_interface2.php
View File

@@ -130,7 +130,7 @@ function display_outcomes($contacted,$ca,$case_id)
$sql = "SELECT outcome_id,description,contacted $sql = "SELECT outcome_id,description,contacted
FROM outcome FROM outcome
WHERE contacted = '$contacted' WHERE contacted = '$contacted'
AND outcome_id IN ('$outcomes') AND outcome_id IN ($outcomes)
AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)"; AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)";
} }
} }
@@ -141,14 +141,14 @@ function display_outcomes($contacted,$ca,$case_id)
$sql = "SELECT outcome_id,description,contacted $sql = "SELECT outcome_id,description,contacted
FROM outcome FROM outcome
WHERE contacted = '$contacted' WHERE contacted = '$contacted'
AND outcome_id IN ('$outcomes') AND outcome_id IN ($outcomes)
AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)"; AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)";
} }
} }
} }
$rs = $db->GetAll($sql); $rs = $db->GetAll($sql);
print "<div>"; print "<div class=\"panel-body\">";
if (!empty($rs)) if (!empty($rs))
{ {
$do = false; $do = false;
@@ -158,7 +158,7 @@ function display_outcomes($contacted,$ca,$case_id)
{ {
if ($do == $r['outcome_id']) $selected = "checked='checked'"; else $selected = ""; if ($do == $r['outcome_id']) $selected = "checked='checked'"; else $selected = "";
if (isset($r['contacted']) && $r['contacted'] == 1) $highlight = "text-primary"; else $highlight = "text-default"; if (isset($r['contacted']) && $r['contacted'] == 1) $highlight = "text-primary"; else $highlight = "text-default";
print "<li><label class='$highlight'><input type='radio' class='radio' name='outcome' id='outcome-{$r['outcome_id']}' value='{$r['outcome_id']}' $selected style='float:left'/>&emsp;" . T_($r['description']) . "</label></li>"; print "<p><label class='$highlight'><input type='radio' class='radio' name='outcome' id='outcome-{$r['outcome_id']}' value='{$r['outcome_id']}' $selected style='float:left'/>&emsp;" . T_($r['description']) . "</label></p>";
} }
$_POST['confirm'] = true; $_POST['confirm'] = true;
@@ -312,7 +312,7 @@ if (isset($_GET['newstate']))
if (browser_ie()) $js = "js/window_ie6_interface2.js"; else $js = "js/window_interface2.js"; if (browser_ie()) $js = "js/window_ie6_interface2.js"; else $js = "js/window_interface2.js";
xhtml_head(T_("Set outcome"),true,array("include/bootstrap/css/bootstrap.min.css"/* ,"css/call.css" */),array($js,"include/jquery/jquery-1.4.2.min.js")); xhtml_head(T_("Set outcome"),true,array("include/bootstrap/css/bootstrap.min.css"/* ,"css/call.css" */),array($js,"include/jquery/jquery.min.js"));
$state = is_on_call($operator_id); $state = is_on_call($operator_id);
switch($state) switch($state)
@@ -488,7 +488,7 @@ switch($state)
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);
if (isset($_POST['confirm'])){ if (isset($_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 btn-lg\" style=\"margin-left: 15px; margin-right: 30px; min-width: 150px;\" value=\"" . T_("Assign outcome") . "\" name='submit' id='submit'/></form>";
} }
break; break;
case 5: //done -- shouldn't come here as should be coded + done case 5: //done -- shouldn't come here as should be coded + done