" . T_("You must be an operator (as well as have administrator access) to add/edit shifts") . "
"; - xhtml_foot(); - exit(); -} - - -if (isset($_POST['submit'])) -{ - //process - //update or delete existing shifts - foreach($_POST as $key => $val) - { - if (substr($key,0,5) == "start") - { - $num = bigintval(substr($key,6)); - if (isset($_POST["use_$num"])) - { - $sql = "UPDATE shift as s, operator as o - SET s.start = CONVERT_TZ(CONCAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ', {$_POST["dow_$num"]}),'%x %v %w'),' ','" . $_POST["start_$num"] . "'), o.Time_zone_name, 'UTC'), - s.end = CONVERT_TZ(CONCAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ', {$_POST["dow_$num"]}),'%x %v %w'),' ','" . $_POST["end_$num"] . "'), o.Time_zone_name, 'UTC') - WHERE o.operator_id = '$operator_id' - AND shift_id = '$num'"; - - $db->Execute($sql); - } - else - { - $sql = "DELETE FROM shift - WHERE shift_id = '$num'"; - $db->Execute($sql); - } - } - } - //insert new shifts - foreach($_POST as $key => $val) - { - if (substr($key,0,7) == "NEW_use") - { - if ($val == "on") - { - $num = bigintval(substr($key,8)); - $sql = "INSERT INTO shift (shift_id,questionnaire_id,start,end) - SELECT NULL,'$questionnaire_id', CONVERT_TZ(CONCAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ', {$_POST["NEW_dow_$num"]}),'%x %v %w'),' ','" . $_POST["NEW_start_$num"] . "'), Time_zone_name, 'UTC') , CONVERT_TZ(CONCAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ', {$_POST["NEW_dow_$num"]}),'%x %v %w'),' ','" . $_POST["NEW_end_$num"] . "'), Time_zone_name, 'UTC') - FROM operator - WHERE operator_id = '$operator_id'"; - $db->Execute($sql); - } - } - } -} - - -xhtml_head(T_("Shift management"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../include/clockpicker/dist/bootstrap-clockpicker.min.css","../include/bootstrap-toggle/css/bootstrap-toggle.min.css","../css/custom.css"),array("../js/jquery-2.1.3.min.js","../include/bootstrap-3.3.2/js/bootstrap.min.js","../include/clockpicker/dist/bootstrap-clockpicker.js","../include/bootstrap-toggle/js/bootstrap-toggle.min.js","../js/window.js")); -//"../css/shifts.css", -/** - * Display warning if timezone data not installed - * - */ - -$sql = "SELECT CONVERT_TZ(NOW(),'SYSTEM','UTC') as t"; -$rs = $db->GetRow($sql); - -if (empty($rs) || !$rs || empty($rs['t'])) - print ""; - - -/** - * display years including current selected year - * display weeks of year including current selected week of year - * find if there are already shifts defined for this week of year / year and display them as selected, else show from template - * when submitted, add checked shifts, and delete unchecked shifts if they exist - * - * @todo Use javascript to add shifts if necessarry outside the template - */ - -print "" . T_("Shifts allow you to restrict appointments being made, and interviewers to working on a particlar project at defined times.") . "
"; - -print "" . T_("You must be an operator (as well as have administrator access) to add/edit shifts") . "
"; + xhtml_foot(); + exit(); +} + + +if (isset($_POST['submit'])) +{ + //process + //update or delete existing shifts + foreach($_POST as $key => $val) + { + if (substr($key,0,5) == "start") + { + $num = bigintval(substr($key,6)); + if (isset($_POST["use_$num"])) + { + $sql = "UPDATE shift as s, operator as o + SET s.start = CONVERT_TZ(CONCAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ', {$_POST["dow_$num"]}),'%x %v %w'),' ','" . $_POST["start_$num"] . "'), o.Time_zone_name, 'UTC'), + s.end = CONVERT_TZ(CONCAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ', {$_POST["dow_$num"]}),'%x %v %w'),' ','" . $_POST["end_$num"] . "'), o.Time_zone_name, 'UTC') + WHERE o.operator_id = '$operator_id' + AND shift_id = '$num'"; + + $db->Execute($sql); + } + else + { + $sql = "DELETE FROM shift + WHERE shift_id = '$num'"; + $db->Execute($sql); + } + } + } + //insert new shifts + foreach($_POST as $key => $val) + { + if (substr($key,0,7) == "NEW_use") + { + if ($val == "on") + { + $num = bigintval(substr($key,8)); + $sql = "INSERT INTO shift (shift_id,questionnaire_id,start,end) + SELECT NULL,'$questionnaire_id', CONVERT_TZ(CONCAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ', {$_POST["NEW_dow_$num"]}),'%x %v %w'),' ','" . $_POST["NEW_start_$num"] . "'), Time_zone_name, 'UTC') , CONVERT_TZ(CONCAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ', {$_POST["NEW_dow_$num"]}),'%x %v %w'),' ','" . $_POST["NEW_end_$num"] . "'), Time_zone_name, 'UTC') + FROM operator + WHERE operator_id = '$operator_id'"; + $db->Execute($sql); + } + } + } +} + + +xhtml_head(T_("Shift management"),true,array("../include/bootstrap/css/bootstrap.min.css","../include/clockpicker/dist/bootstrap-clockpicker.min.css","../include/bootstrap-toggle/css/bootstrap-toggle.min.css","../css/custom.css"),array("../include/jquery/jquery.min.js","../include/bootstrap/js/bootstrap.min.js","../include/clockpicker/dist/bootstrap-clockpicker.js","../include/bootstrap-toggle/js/bootstrap-toggle.min.js","../js/window.js")); +//"../css/shifts.css", +/** + * Display warning if timezone data not installed + * + */ + +$sql = "SELECT CONVERT_TZ(NOW(),'SYSTEM','UTC') as t"; +$rs = $db->GetRow($sql); + +if (empty($rs) || !$rs || empty($rs['t'])) + print ""; + + +/** + * display years including current selected year + * display weeks of year including current selected week of year + * find if there are already shifts defined for this week of year / year and display them as selected, else show from template + * when submitted, add checked shifts, and delete unchecked shifts if they exist + * + * @todo Use javascript to add shifts if necessarry outside the template + */ + +print "" . T_("Shifts allow you to restrict appointments being made, and interviewers to working on a particlar project at defined times.") . "
"; + +print "Optionally you can include a note column to attach a note to the case in addition to setting an appointment. Only cases that have temporary (non final) outcomes will have appointments generated, and the outcome of the case will be updated to an appointment outcome."); ?>
- -
| caseid | starttime | endtime | note |
|---|---|---|---|
| 1 | 2012-08-15 11:00:00 | 2012-08-15 13:00:00 | Appointment automatically generated |
| 2 | 2012-08-15 12:00:00 | 2012-08-15 14:00:00 | Appointment automatically generated |
| 3 | 2012-08-15 13:00:00 | 2012-08-15 15:00:00 | Appointment automatically generated |
Optionally you can include a note column to attach a note to the case in addition to setting an appointment. Only cases that have temporary (non final) outcomes will have appointments generated, and the outcome of the case will be updated to an appointment outcome."); ?>
+ +
| caseid | starttime | endtime | note |
|---|---|---|---|
| 1 | 2012-08-15 11:00:00 | 2012-08-15 13:00:00 | Appointment automatically generated |
| 2 | 2012-08-15 12:00:00 | 2012-08-15 14:00:00 | Appointment automatically generated |
| 3 | 2012-08-15 13:00:00 | 2012-08-15 15:00:00 | Appointment automatically generated |
" . T_("No calls ever made") . "
" . T_("No calls ever made") . "
" . T_("No cases with this outcome") . "
"; - else - { - xhtml_table($rs,array("case_id"),array(T_("Case ID"))); - } - } - else - print "" . T_("Error with input") . "
"; -} -else - print "" . T_("No operator") . "
"; -print "" . T_("No cases with this outcome") . "
"; + else + { + xhtml_table($rs,array("case_id"),array(T_("Case ID"))); + } + } + else + print "" . T_("Error with input") . "
"; +} +else + print "" . T_("No operator") . "
"; +print "| " . T_("Username") . " | " . T_("Client") . " | "; -foreach($questionnaires as $q) -{ - print "{$q['description']} | "; -} -print "
|---|---|---|
| {$v['username']} | -{$v['description']} | "; - foreach($questionnaires as $q) - { - $checked = ""; - if (vq($v['client_id'],$q['questionnaire_id'])) $checked="checked=\"checked\""; - print ""; - } - - print " |
| " . T_("Username") . " | " . T_("Client") . " | "; +foreach($questionnaires as $q) +{ + print "{$q['description']} | "; +} +print "
|---|---|---|
| {$v['username']} | +{$v['description']} | "; + foreach($questionnaires as $q) + { + $checked = ""; + if (vq($v['client_id'],$q['questionnaire_id'])) $checked="checked=\"checked\""; + print ""; + } + + print " |
" . T_("The appointment has been deleted. Now you must modify the case outcome") . "
- " . T_("Modify case outcome") . "" . T_("The appointment has been deleted. Now you must modify the case outcome") . "
+ " . T_("Modify case outcome") . "$msg
"; - - if (!empty($rs)) - { - $sql = "SELECT o.operator_id as value, o.firstName as description - FROM `operator` as o - LEFT JOIN `extension` as e ON (e.current_operator_id = o.operator_id) - WHERE e.extension_id IS NULL"; - - $ers = $db->GetAll($sql); - - for ($i = 0; $i < count($rs); $i++) - { - if ($rs[$i]['assignment'] == "list") - $rs[$i]['assignment'] = display_chooser($ers,"operator_id_" . $rs[$i]["extension_id"],"operator_id_" . $rs[$i]["extension_id"],true,"extension_id=".$rs[$i]["extension_id"],true,false,false,false); - } - print "" . T_("No extensions") . "
"; - - print ""; - -} - -xhtml_foot(); - -?> \ No newline at end of file + + * @copyright Australian Consortium for Social and Political Research Incorporated (ACSPRI) 2010 + * @package queXS + * @subpackage admin + * @link http://www.acspri.org.au/software/ queXS was writen for ACSPRI + * @license http://opensource.org/licenses/gpl-2.0.php The GNU General Public License (GPL) Version 2 + * + */ + +/** + * Configuration file + */ +include_once(dirname(__FILE__).'/../config.inc.php'); + +/** + * Database file + */ +include ("../db.inc.php"); + +/** + * XHTML functions + */ +include ("../functions/functions.xhtml.php"); + +$msg = ""; + +if (isset($_GET)) +{ + foreach($_GET as $key=>$val) + { + if (substr($key,0,12) == "operator_id_") + { + if (isset($_GET['extension_id'])) + { + $ex = intval($_GET['extension_id']); + $op = intval($val); + + $sql = "UPDATE `extension` + SET current_operator_id = $op + WHERE extension_id = $ex + AND current_operator_id IS NULL"; + + $db->Execute($sql); + } + } + } +} + +if (isset($_POST['extension'])) +{ + $extension = $db->qstr($_POST['extension']); + $password = $db->qstr($_POST['password']); + $extension_id = "NULL"; + + if (isset($_POST['extensionid'])) + $extension_id = intval($_POST['extensionid']); + + if (isset($_POST['delete'])) + { + $sql = "DELETE FROM `extension` + WHERE current_operator_id IS NULL + AND extension_id = $extension_id"; + + $rs = $db->Execute($sql); + + if (!$rs) + $msg = ("Failed to delete extension. There may be an operator currently assigned to it"); + } + else + { + if (!empty($_POST['extension'])) + { + $sql = "INSERT INTO `extension` (extension_id,extension,password) + VALUES ($extension_id,$extension,$password) + ON DUPLICATE KEY UPDATE extension=$extension,password=$password"; + + $rs = $db->Execute($sql); + + if (!$rs) + $msg = T_("Failed to add extension. There already may be an extension of this name"); + } + } +} + +if (isset($_GET['unassign'])) +{ + $e = intval($_GET['unassign']); + + $db->StartTrans(); + + $sql = "SELECT e.current_operator_id + FROM `extension` as e + LEFT JOIN `case` as c ON (c.current_operator_id = e.current_operator_id) + WHERE e.extension_id = $e + AND c.case_id IS NULL"; + + $cid = $db->GetOne($sql); + + if (!empty($cid)) + { + $sql = "UPDATE `extension` as e + SET current_operator_id = NULL + WHERE extension_id = $e + AND current_operator_id = $cid"; + + $db->Execute($sql); + } + + $db->CompleteTrans(); +} + +xhtml_head(T_("Extensions & status"),true,array("../include/bootstrap/css/bootstrap.min.css","../css/custom.css"),array("../js/window.js")); +?> + + +GetRow($sql); + } + + print "" . T_("Go back") . ""; +?> +$msg
"; + + if (!empty($rs)) + { + $sql = "SELECT o.operator_id as value, o.firstName as description + FROM `operator` as o + LEFT JOIN `extension` as e ON (e.current_operator_id = o.operator_id) + WHERE e.extension_id IS NULL"; + + $ers = $db->GetAll($sql); + + for ($i = 0; $i < count($rs); $i++) + { + if ($rs[$i]['assignment'] == "list") + $rs[$i]['assignment'] = display_chooser($ers,"operator_id_" . $rs[$i]["extension_id"],"operator_id_" . $rs[$i]["extension_id"],true,"extension_id=".$rs[$i]["extension_id"],true,false,false,false); + } + print "" . T_("No extensions") . "
"; + + print ""; + +} + +xhtml_foot(); + +?> diff --git a/admin/import.php b/admin/import.php index 1ac79e58..b247cb0e 100644 --- a/admin/import.php +++ b/admin/import.php @@ -1,155 +1,155 @@ - " . T_("Go back") . ""; - - - //verify each GET field is unique (except import_form) - $sfields = array(); - foreach($_POST as $getv => $val) - //clean up? - $sfields[$getv] = $val; - - $error = verify_fields($sfields); - - $description = $_POST['description']; - - if ($error == "") - { //verified so upload - if (import_file($_POST['filename'],$description,$sfields)) - { - print "" . T_("Successfully imported sample") . "
" . T_("Error importing file. Please try again") . "
" . T_("Error:") . " $error
" . T_("Please check imported file, go back in your browser and fix the problem") . "
" . T_("Successfully imported sample") . "
" . T_("Error importing file. Please try again") . "
" . T_("Error:") . " $error
" . T_("Please check imported file, go back in your browser and fix the problem") . "
| " . T_("Username") . " | " . T_("Operator") . " | "; -foreach($questionnaires as $q) -{ - print "{$q['description']} | "; -} -print "
|---|---|---|
| {$v['username']} | -{$v['opname']} | "; - foreach($questionnaires as $q) - { - $checked = ""; - if (vq($v['operator_id'],$q['questionnaire_id'])) $checked="checked=\"checked\""; - print ""; - } - - print " |
| " . T_("Username") . " | " . T_("Operator") . " | "; +foreach($questionnaires as $q) +{ + print "{$q['description']} | "; +} +print "
|---|---|---|
| {$v['username']} | +{$v['opname']} | "; + foreach($questionnaires as $q) + { + $checked = ""; + if (vq($v['operator_id'],$q['questionnaire_id'])) $checked="checked=\"checked\""; + print ""; + } + + print " |
" . T_("Adding an operator here will give the user the ability to call cases") . "" . T_("Assign Operator to Questionnaire") . "" . T_("tool") . ".
"; - echo "" . T_("Use this form to enter the username of a user based on your directory security system. For example, if you have secured the base directory of queXS using Apache file based security, enter the usernames of the users here.") . "
"; - echo "" . T_("The username and extension must be unique for each operator.") . "
"; - echo "" . T_("Adding an operator here will give the user the ability to call cases") . "" . T_("Assign Operator to Questionnaire") . "" . T_("tool") . ".
"; + echo "" . T_("Use this form to enter the username of a user based on your directory security system. For example, if you have secured the base directory of queXS using Apache file based security, enter the usernames of the users here.") . "
"; + echo "" . T_("The username and extension must be unique for each operator.") . "
"; + echo "| " . T_("Username") . " | " . T_("Operator") . " | "; -foreach($outcome_types as $q) -{ - print "" . T_($q['description']) . " | "; -} -print "
|---|---|---|
| {$v['username']} | -{$v['description']} | "; - foreach($outcome_types as $q) - { - $checked = ""; - if (vq($v['operator_id'],$q['outcome_type_id'])) $checked="checked=\"checked\""; - print ""; - } - - print " |
| " . T_("Username") . " | " . T_("Operator") . " | "; +foreach($outcome_types as $q) +{ + print "" . T_($q['description']) . " | "; +} +print "
|---|---|---|
| {$v['username']} | +{$v['description']} | "; + foreach($outcome_types as $q) + { + $checked = ""; + if (vq($v['operator_id'],$q['outcome_type_id'])) $checked="checked=\"checked\""; + print ""; + } + + print " |
| " . T_("Outcome") . " | " . T_("Rate") . " |
|---|---|
| " . T_("Response Rate 1") . " | " . round(aapor_rr1($a),2) . " |
| " . T_("Refusal Rate 1") . " | " . round(aapor_ref1($a),2) . " |
| " . T_("Cooperation Rate 1") . " | " . round(aapor_coop1($a),2) . " |
| " . T_("Contact Rate 1") . " | " . round(aapor_con1($a),2) . " |
" . T_("Sample status") . "
"; - - $sql = "SELECT CASE WHEN (c.sample_id is not null) = 1 THEN '" . TQ_("Drawn from sample") . "' ELSE '" . TQ_("Remain in sample") . "' END as drawn, - count(*) as count - FROM sample as s - JOIN questionnaire_sample as qs ON (qs.questionnaire_id = '$questionnaire_id' and qs.sample_import_id = s.import_id) - LEFT JOIN `case` as c ON (c.questionnaire_id = qs.questionnaire_id and c.sample_id = s.sample_id) - WHERE s.import_id = '$sample_import_id' - GROUP BY (c.sample_id is not null)"; - - xhtml_table($db->GetAll($sql),array("drawn","count"),array(T_("Status"),T_("Number")), "tclass", false, array("count")); - print "" . T_("Outcomes") . "
"; - - - $sql = "SELECT CONCAT('', o.description, '') as des, o.outcome_id, count( c.case_id ) as count,ROUND(count(c.case_id) / (SELECT count(case_id) FROM `case` JOIN sample ON (`case`.sample_id = sample.sample_id AND sample.import_id = '$sample_import_id') WHERE questionnaire_id = '$questionnaire_id' ) * 100,2) as perc - - FROM `case` AS c, `outcome` AS o, sample as s - WHERE c.questionnaire_id = '$questionnaire_id' - AND c.sample_id = s.sample_id - AND s.import_id = '$sample_import_id' - AND c.current_outcome_id = o.outcome_id - GROUP BY o.outcome_id"; - - $rs = $db->GetAll($sql); - - if (!empty($rs)) - { - translate_array($rs,array("des")); - xhtml_table($rs,array("des","count","perc"),array(T_("Outcome"),T_("Count"),T_("%")),"tclass",array("des" => "Complete"),array("count","perc")); - } - else - print "" . T_("No outcomes recorded for this sample") . "
"; - - print "" . T_("Operator call outcomes") . "
"; - - $sql = "SELECT o.description as des, o.outcome_id, count( c.call_id ) as count, ROUND((count(c.call_id) / (SELECT count(call.call_id) FROM `call` JOIN `case` ON (call.case_id = `case`.case_id AND `case`.questionnaire_id = $questionnaire_id ) WHERE call.operator_id = '$operator_id')) * 100,2) as perc - FROM `call` AS c, `case` as ca, `outcome` AS o - WHERE ca.questionnaire_id = '$questionnaire_id' - AND ca.case_id = c.case_id - AND c.operator_id = '$operator_id' - AND c.outcome_id = o.outcome_id - GROUP BY o.outcome_id"; - - $rs = $db->GetAll($sql); - - if (!empty($rs)) - { - translate_array($rs,array("des")); - xhtml_table($rs,array("des","count","perc"),array(T_("Outcome"),T_("Count"),T_("%")),"tclass",array("des" => "Complete"),array("count","perc")); - } - print "" . T_("No outcomes recorded for this questionnaire") . "
"; - - - //display a list of shifts with completions and a link to either add a report or view reports - print ""; - print "| " . T_("Outcome") . " | " . T_("Rate") . " |
|---|---|
| " . T_("Response Rate 1") . " | " . round(aapor_rr1($a),2) . " |
| " . T_("Refusal Rate 1") . " | " . round(aapor_ref1($a),2) . " |
| " . T_("Cooperation Rate 1") . " | " . round(aapor_coop1($a),2) . " |
| " . T_("Contact Rate 1") . " | " . round(aapor_con1($a),2) . " |
" . T_("Sample status") . "
"; + + $sql = "SELECT CASE WHEN (c.sample_id is not null) = 1 THEN '" . TQ_("Drawn from sample") . "' ELSE '" . TQ_("Remain in sample") . "' END as drawn, + count(*) as count + FROM sample as s + JOIN questionnaire_sample as qs ON (qs.questionnaire_id = '$questionnaire_id' and qs.sample_import_id = s.import_id) + LEFT JOIN `case` as c ON (c.questionnaire_id = qs.questionnaire_id and c.sample_id = s.sample_id) + WHERE s.import_id = '$sample_import_id' + GROUP BY (c.sample_id is not null)"; + + xhtml_table($db->GetAll($sql),array("drawn","count"),array(T_("Status"),T_("Number")), "tclass", false, array("count")); + print "" . T_("Outcomes") . "
"; + + + $sql = "SELECT CONCAT('', o.description, '') as des, o.outcome_id, count( c.case_id ) as count,ROUND(count(c.case_id) / (SELECT count(case_id) FROM `case` JOIN sample ON (`case`.sample_id = sample.sample_id AND sample.import_id = '$sample_import_id') WHERE questionnaire_id = '$questionnaire_id' ) * 100,2) as perc + + FROM `case` AS c, `outcome` AS o, sample as s + WHERE c.questionnaire_id = '$questionnaire_id' + AND c.sample_id = s.sample_id + AND s.import_id = '$sample_import_id' + AND c.current_outcome_id = o.outcome_id + GROUP BY o.outcome_id"; + + $rs = $db->GetAll($sql); + + if (!empty($rs)) + { + translate_array($rs,array("des")); + xhtml_table($rs,array("des","count","perc"),array(T_("Outcome"),T_("Count"),T_("%")),"tclass",array("des" => "Complete"),array("count","perc")); + } + else + print "" . T_("No outcomes recorded for this sample") . "
"; + + print "" . T_("Operator call outcomes") . "
"; + + $sql = "SELECT o.description as des, o.outcome_id, count( c.call_id ) as count, ROUND((count(c.call_id) / (SELECT count(call.call_id) FROM `call` JOIN `case` ON (call.case_id = `case`.case_id AND `case`.questionnaire_id = $questionnaire_id ) WHERE call.operator_id = '$operator_id')) * 100,2) as perc + FROM `call` AS c, `case` as ca, `outcome` AS o + WHERE ca.questionnaire_id = '$questionnaire_id' + AND ca.case_id = c.case_id + AND c.operator_id = '$operator_id' + AND c.outcome_id = o.outcome_id + GROUP BY o.outcome_id"; + + $rs = $db->GetAll($sql); + + if (!empty($rs)) + { + translate_array($rs,array("des")); + xhtml_table($rs,array("des","count","perc"),array(T_("Outcome"),T_("Count"),T_("%")),"tclass",array("des" => "Complete"),array("count","perc")); + } + print "" . T_("No outcomes recorded for this questionnaire") . "
"; + + + //display a list of shifts with completions and a link to either add a report or view reports + print ""; + print "" . T_("Currently no pre fills") . "
"; - } - else - { - foreach($r as $v) - { - print "" . T_("SGQA code") . ": {$v['lime_sgqa']}
" . T_("Sample variable") . ": {$v['value']}
" . T_("Delete") . ""; - print T_("Possible uses:"); - print "
" . T_("Currently no pre fills") . "
"; + } + else + { + foreach($r as $v) + { + print "" . T_("SGQA code") . ": {$v['lime_sgqa']}
" . T_("Sample variable") . ": {$v['value']}
" . T_("Delete") . ""; + print T_("Possible uses:"); + print "
" . T_("Currently no quotas") . "
"; - } - else - { - foreach($r as $v) - { - print "" . T_("No labels defined for this question") ."
"; - else - xhtml_table($rs,array('code','title'),array(T_("Code value"), T_("Description"))); - - - print "" . T_("Currently no quotas") . "
"; + } + else + { + foreach($r as $v) + { + print "" . T_("No labels defined for this question") ."
"; + else + xhtml_table($rs,array('code','title'),array(T_("Code value"), T_("Description"))); + + + print "type before unset->>"; foreach($_POST['type'] as $key => $val) { echo ' | ', $key,' => ',$val,' | '; }; print "
"; - - foreach($_POST['del'] as $p) { - unset ($_POST['type'][$p]); - $deleted[] = $p; - } - $b = $_POST['type']; $cert = array_diff_assoc($a, $b); - - foreach($cert as $key => $val ) { - - if ($val == 3 || $val==4 || $val == 5 || $val == 6 || $val == 7){ - echo "del ->>"; foreach($_POST['del'] as $key => $val) { echo ' | ', $key,' => ',$val,' | '; }; print "
"; - } - - if (isset($_POST['type'])){ - - //check that we have correct var types and quantity - $prph = 0; $pcd = 0; $st = 0; $fn = 0; $eml =0; - foreach($_POST['type'] as $key => $val) { - if ($val == 3) $prph++; - else if ($val == 5) $pcd++; - else if ($val == 4) $st++; - else if ($val == 6) $fn++; - else if ($val == 7) $ln++; - else if ($val == 8) $eml++; - } - /* if($prph == 1) {$ch1 = true;} - else { echo "" . T_("Select which fields from this sample to deidentify.
Deidentified fields will be permanently deleted from the sample.") . "" . T_("There're still $num records for `Time_zone_name` and `phone` values for deidentified records") . "
"; - - print "" . T_("Fix this sample ") . "
"; - print "" . $count . " var id's not match
"; - -/* print ""; */ - print "type before unset->>"; foreach($_POST['type'] as $key => $val) { echo ' | ', $key,' => ',$val,' | '; }; print "
"; + + foreach($_POST['del'] as $p) { + unset ($_POST['type'][$p]); + $deleted[] = $p; + } + $b = $_POST['type']; $cert = array_diff_assoc($a, $b); + + foreach($cert as $key => $val ) { + + if ($val == 3 || $val==4 || $val == 5 || $val == 6 || $val == 7){ + echo "del ->>"; foreach($_POST['del'] as $key => $val) { echo ' | ', $key,' => ',$val,' | '; }; print "
"; + } + + if (isset($_POST['type'])){ + + //check that we have correct var types and quantity + $prph = 0; $pcd = 0; $st = 0; $fn = 0; $eml =0; + foreach($_POST['type'] as $key => $val) { + if ($val == 3) $prph++; + else if ($val == 5) $pcd++; + else if ($val == 4) $st++; + else if ($val == 6) $fn++; + else if ($val == 7) $ln++; + else if ($val == 8) $eml++; + } + /* if($prph == 1) {$ch1 = true;} + else { echo "" . T_("Select which fields from this sample to deidentify.
Deidentified fields will be permanently deleted from the sample.") . "" . T_("There're still $num records for `Time_zone_name` and `phone` values for deidentified records") . "
"; + + print "" . T_("Fix this sample ") . "
"; + print "" . $count . " var id's not match
"; + +/* print ""; */ + print "" . T_("Sample ID") . " " . $sample_id . " " . T_("Deleted") . ".
" . T_("Sample ID") . " " . $sample_id . " " . T_("Deleted") . ".
" . T_("Create new report for this shift") . "
"; - - - if (isset($_GET['createnewreport'])) - { - //create a new report - print "" . T_("Create new report for this shift") . "
"; + + + if (isset($_GET['createnewreport'])) + { + //create a new report + print "" . T_("No sample data for this case") . "
"; - } - print "" . T_("No notes") . "
"; - else { - xhtml_table($rs,array("time","firstName","note","link"),array(T_("Date/Time"),T_("Operator"),T_("Note")," ")); - print "" . T_("No sample data for this case") . "
"; + } + print "" . T_("No notes") . "
"; + else { + xhtml_table($rs,array("time","firstName","note","link"),array(T_("Date/Time"),T_("Operator"),T_("Note")," ")); + print "" . T_("Allow interviewers to chat with the supervisor over XMPP (Jabber). Required is a BOSH enabled XMPP/Jabber server. The operators and the supervisor will need XMPP/Jabber accounts.") . "
"; - - $e = get_setting("chat_enabled"); - $checked = "checked='checked'"; - if (empty($e)) - $checked = ""; -?> - - - \ No newline at end of file + + * @copyright Australian Consortium for Social and Political Research Incorporated (ACSPRI) 2013 + * @package queXS + * @subpackage admin + * @link http://www.acspri.org.au/ queXS was writen for ACSPRI + * @license http://opensource.org/licenses/gpl-2.0.php The GNU General Public License (GPL) Version 2 + * + * + */ + +/** + * Configuration file + */ +include("../config.inc.php"); + +/** + * Database file + */ +include ("../db.inc.php"); + +/** + * XHTML functions + */ +include("../functions/functions.xhtml.php"); + + +if (isset($_POST['update'])) +{ + set_setting("bosh_service",$_POST['bosh']); + set_setting("supervisor_xmpp",$_POST['supervisor']); + $enable = false; + + if (isset($_POST['enable'])) + $enable = true; + + set_setting("chat_enabled",$enable); +} + +xhtml_head(T_("Supervisor chat"),true,array("../include/bootstrap/css/bootstrap.min.css","../include/bootstrap-toggle/css/bootstrap-toggle.min.css","../css/custom.css"),array("../include/jquery/jquery.min.js", "../include/bootstrap/js/bootstrap.min.js","../include/bootstrap-toggle/js/bootstrap-toggle.min.js","../js/window.js")); + +print "" . T_("Allow interviewers to chat with the supervisor over XMPP (Jabber). Required is a BOSH enabled XMPP/Jabber server. The operators and the supervisor will need XMPP/Jabber accounts.") . "
"; + + $e = get_setting("chat_enabled"); + $checked = "checked='checked'"; + if (empty($e)) + $checked = ""; +?> + + + diff --git a/admin/systemsort.php b/admin/systemsort.php index b7f68e7b..49c6b960 100644 --- a/admin/systemsort.php +++ b/admin/systemsort.php @@ -1,110 +1,110 @@ - - * @copyright Australian Consortium for Social and Political Research Incorporated (ACSPRI) 2011 - * @package queXS - * @subpackage admin - * @link http://www.acspri.org.au/ queXS was writen for ACSPRI - * @license http://opensource.org/licenses/gpl-2.0.php The GNU General Public License (GPL) Version 2 - * - */ - -/** - * Configuration file - */ -include ("../config.inc.php"); - -/** - * Database file - */ -include ("../db.inc.php"); - -/** - * Process - */ -include ("../functions/functions.process.php"); - -/** - * XHTML functions - */ -include("../functions/functions.xhtml.php"); - - - -if (isset($_GET['watch'])) -{ - //start watching process - start_process(realpath(dirname(__FILE__) . "/systemsortprocess.php"),2); -} - -$p = is_process_running(2); - - -if ($p) -{ - if (isset($_GET['kill'])) - { - if ($_GET['kill'] == "force") - end_process($p); - else - kill_process($p); - - set_setting('systemsort',false); - } - - xhtml_head(T_("Monitor system wide case sorting"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../css/custom.css"),false,false,false,true); - - print "" . T_("Process is already closed (eg. server was rebooted) - click here to confirm") . "
"; - } - else - { - print "" . T_("Kill the running process") . "
"; - } - - $d = process_get_data($p); - if ($d !== false) - { - xhtml_table($d,array('process_log_id','datetime','data'),array(T_("Log id"), T_("Date"), T_("Log entry"))); - } -} -else -{ - xhtml_head(T_("Monitor system wide case sorting"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../css/custom.css")); - //print "" . T_("Click here to enable and begin system wide case sorting") . "
"; - print "" . T_("System wide case sorting is periodically (via SYSTEM_SORT_MINUTES configuration directive) sorting cases on a system wide basis instead of finding the most appropriate case each time an operator requests a new case. This may increase performance where there are a large number of cases or complex quotas in place. If you are not experiencing any performance problems, it is not recommended to use this feature.") . "
" . T_("Process is already closed (eg. server was rebooted) - click here to confirm") . "
"; + } + else + { + print "" . T_("Kill the running process") . "
"; + } + + $d = process_get_data($p); + if ($d !== false) + { + xhtml_table($d,array('process_log_id','datetime','data'),array(T_("Log id"), T_("Date"), T_("Log entry"))); + } +} +else +{ + xhtml_head(T_("Monitor system wide case sorting"),true,array("../include/bootstrap/css/bootstrap.min.css","../css/custom.css")); + //print "" . T_("Click here to enable and begin system wide case sorting") . "
"; + print "" . T_("System wide case sorting is periodically (via SYSTEM_SORT_MINUTES configuration directive) sorting cases on a system wide basis instead of finding the most appropriate case each time an operator requests a new case. This may increase performance where there are a large number of cases or complex quotas in place. If you are not experiencing any performance problems, it is not recommended to use this feature.") . "
', TIME_FORMAT(TIMEDIFF( CONVERT_TZ(NOW(),'$dtz','$dtz'),CONVERT_TZ(NOW(), Time_zone_name,'$dtz')),' %H : %i'), '
') AS timediff, -CONCAT('" . T_("Remove") . "') as link - FROM timezone_template ORDER BY time ASC"; - -$qs = $db->GetAll($sql); - xhtml_table($qs, array("Time_zone_name","timediff","time","link"), array(T_("Timezone name"),T_("Time diff to Default Time zone"),T_("Current time"),T_("Remove"))); -print "', TIME_FORMAT(TIMEDIFF( CONVERT_TZ(NOW(),'$dtz','$dtz'),CONVERT_TZ(NOW(), Time_zone_name,'$dtz')),' %H : %i'), '
') AS timediff, +CONCAT('" . T_("Remove") . "') as link + FROM timezone_template ORDER BY time ASC"; + +$qs = $db->GetAll($sql); + xhtml_table($qs, array("Time_zone_name","timediff","time","link"), array(T_("Timezone name"),T_("Time diff to Default Time zone"),T_("Current time"),T_("Remove"))); +print "" . T_("Process is already closed (eg. server was rebooted)") . "" . T_("click here to confirm") . "
"; - } - else - { - print "" . T_("Kill the running process") . " ". T_("(requires activity on the VoIP Server to take effect)") . "
"; - } - - $d = process_get_data($p); - if ($d !== false) - { - xhtml_table($d,array('process_log_id','datetime','data'),array(T_("Log id"), T_("Date"), T_("Log entry"))); - } -} -else -{ - xhtml_head(T_("Monitor VoIP Process"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../css/custom.css")); - //print "" . T_("Click here to begin monitoring the VoIP Process") . "
"; - print "" . T_("Process is already closed (eg. server was rebooted)") . "" . T_("click here to confirm") . "
"; + } + else + { + print "" . T_("Kill the running process") . " ". T_("(requires activity on the VoIP Server to take effect)") . "
"; + } + + $d = process_get_data($p); + if ($d !== false) + { + xhtml_table($d,array('process_log_id','datetime','data'),array(T_("Log id"), T_("Date"), T_("Log entry"))); + } +} +else +{ + xhtml_head(T_("Monitor VoIP Process"),true,array("../include/bootstrap/css/bootstrap.min.css","../css/custom.css")); + //print "" . T_("Click here to begin monitoring the VoIP Process") . "
"; + print "FAILED AT ENDCASE
"; exit();} } -$js = array("js/popup.js","js/tabber.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","js/tabber.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); $body = true; $script = ""; if (AUTO_LOGOUT_MINUTES !== false) @@ -142,7 +142,7 @@ else if (HEADER_EXPANDER_MANUAL) $js[] = "js/headerexpandmanual.js"; } -xhtml_head(T_("queXS"), $body, array("css/index.css","css/tabber.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css") , $js); +xhtml_head(T_("queXS"), $body, array("css/index.css","css/tabber.css","include/jquery-ui/jquery-ui.min.css") , $js); print $script; $case_id = get_case_id($operator_id,true); diff --git a/index_interface2.php b/index_interface2.php index 7893036d..b7da752f 100644 --- a/index_interface2.php +++ b/index_interface2.php @@ -159,7 +159,7 @@ if (isset($_GET['endcase'])) } -$js = array("js/popup.js","js/tabber.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","js/tabber.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); $body = true; $script = ""; if (AUTO_LOGOUT_MINUTES !== false) @@ -194,7 +194,7 @@ else if (HEADER_EXPANDER_MANUAL) } -xhtml_head(T_("Case"), $body, array("css/index_interface2.css","css/tabber_interface2.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css") , $js); +xhtml_head(T_("Case"), $body, array("css/index_interface2.css","css/tabber_interface2.css","include/jquery-ui/jquery-ui.min.css") , $js); print $script; $case_id = get_case_id($operator_id,true); diff --git a/info.php b/info.php index 700e0e30..6f5be7f0 100644 --- a/info.php +++ b/info.php @@ -51,7 +51,7 @@ include ("db.inc.php"); $js = false; if (AUTO_LOGOUT_MINUTES !== false) - $js = array("include/jquery-ui/js/jquery-1.4.2.min.js","js/childnap.js"); + $js = array("include/jquery/jquery-1.4.2.min.js","js/childnap.js"); xhtml_head(T_("Information"),true,false,$js); diff --git a/nocallavailable.php b/nocallavailable.php index 36ab49fb..ae2b2ffc 100644 --- a/nocallavailable.php +++ b/nocallavailable.php @@ -70,7 +70,7 @@ if (isset($_GET['contact_phone'])) $js = array(); if (AUTO_LOGOUT_MINUTES !== false) - $js = array("include/jquery-ui/js/jquery-1.4.2.min.js","js/childnap.js"); + $js = array("include/jquery/jquery-1.4.2.min.js","js/childnap.js"); $jsw = "js/window.js"; if (browser_ie()) $jsw = "js/window_ie6.js"; diff --git a/nocaseavailable.php b/nocaseavailable.php index 2dfdbec8..bd9f74dc 100644 --- a/nocaseavailable.php +++ b/nocaseavailable.php @@ -58,7 +58,7 @@ include ("functions/functions.limesurvey.php"); $js = false; if (AUTO_LOGOUT_MINUTES !== false) - $js = array("include/jquery-ui/js/jquery-1.4.2.min.js","js/childnap.js"); + $js = array("include/jquery/jquery-1.4.2.min.js","js/childnap.js"); xhtml_head(T_("No case available"),true,array("css/table.css"),$js); diff --git a/performance.php b/performance.php index 29ae3b66..7675f979 100644 --- a/performance.php +++ b/performance.php @@ -56,7 +56,7 @@ include("functions/functions.performance.php"); $js = false; if (AUTO_LOGOUT_MINUTES !== false) - $js = array("include/jquery-ui/js/jquery-1.4.2.min.js","js/childnap.js"); + $js = array("include/jquery/jquery-1.4.2.min.js","js/childnap.js"); xhtml_head(T_("Performance"),true,array("css/table.css"),$js); diff --git a/project_info.php b/project_info.php index 66284935..5fe8ace0 100644 --- a/project_info.php +++ b/project_info.php @@ -56,7 +56,7 @@ include ("functions/functions.operator.php"); $js = false; if (AUTO_LOGOUT_MINUTES !== false) - $js = array("include/jquery-ui/js/jquery-1.4.2.min.js","js/childnap.js"); + $js = array("include/jquery/jquery-1.4.2.min.js","js/childnap.js"); xhtml_head(T_("Project information"),true,false,$js); diff --git a/respondent.php b/respondent.php index 35fadc5b..f55c228b 100644 --- a/respondent.php +++ b/respondent.php @@ -63,7 +63,7 @@ $js = array("js/window.js","js/showhide.js"); if (AUTO_LOGOUT_MINUTES !== false) { - $js[] = "include/jquery-ui/js/jquery-1.4.2.min.js"; + $js[] = "include/jquery/jquery-1.4.2.min.js"; $js[] = "js/childnap.js"; } diff --git a/rs_answeringmachine.php b/rs_answeringmachine.php index d282fe62..77e93164 100644 --- a/rs_answeringmachine.php +++ b/rs_answeringmachine.php @@ -54,14 +54,14 @@ $case_id = get_case_id($operator_id); $questionnaire_id = get_questionnaire_id($operator_id); $leavemessage = leave_message($case_id); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { $js[] = "js/childnap.js"; } -xhtml_head(T_("Respondent Selection - Answering machine"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"),$js); +xhtml_head(T_("Respondent Selection - Answering machine"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"),$js); if ($leavemessage) { diff --git a/rs_answeringmachine_interface2.php b/rs_answeringmachine_interface2.php index 7ab47cd2..a30d9ff3 100644 --- a/rs_answeringmachine_interface2.php +++ b/rs_answeringmachine_interface2.php @@ -54,14 +54,14 @@ $case_id = get_case_id($operator_id); $questionnaire_id = get_questionnaire_id($operator_id); $leavemessage = leave_message($case_id); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { $js[] = "js/childnap.js"; } -xhtml_head(T_("Respondent Selection - Answering machine"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"),$js); +xhtml_head(T_("Respondent Selection - Answering machine"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"),$js); if ($leavemessage) { diff --git a/rs_business.php b/rs_business.php index 8d226b15..f8e5bcda 100644 --- a/rs_business.php +++ b/rs_business.php @@ -44,7 +44,7 @@ include ("functions/functions.xhtml.php"); */ include ("lang.inc.php"); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { @@ -52,7 +52,7 @@ if (AUTO_LOGOUT_MINUTES !== false) } -xhtml_head(T_("Respondent Selection - Business answers"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"), $js); +xhtml_head(T_("Respondent Selection - Business answers"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"), $js); ?> diff --git a/rs_business_interface2.php b/rs_business_interface2.php index ad5c7a27..eaa309bb 100644 --- a/rs_business_interface2.php +++ b/rs_business_interface2.php @@ -44,7 +44,7 @@ include ("functions/functions.xhtml.php"); */ include ("lang.inc.php"); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { @@ -52,7 +52,7 @@ if (AUTO_LOGOUT_MINUTES !== false) } -xhtml_head(T_("Respondent Selection - Business answers"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"), $js); +xhtml_head(T_("Respondent Selection - Business answers"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"), $js); ?> diff --git a/rs_callback.php b/rs_callback.php index 8ae023bf..aa54b1cc 100644 --- a/rs_callback.php +++ b/rs_callback.php @@ -54,7 +54,7 @@ include ("functions/functions.operator.php"); */ include ("functions/functions.limesurvey.php"); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { @@ -63,7 +63,7 @@ if (AUTO_LOGOUT_MINUTES !== false) -xhtml_head(T_("Respondent Selection - Call back"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"), $js ); +xhtml_head(T_("Respondent Selection - Call back"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"), $js ); $operator_id = get_operator_id(); $case_id = get_case_id($operator_id); diff --git a/rs_callback_interface2.php b/rs_callback_interface2.php index d46b6559..c582af9d 100644 --- a/rs_callback_interface2.php +++ b/rs_callback_interface2.php @@ -54,7 +54,7 @@ include ("functions/functions.operator.php"); */ include ("functions/functions.limesurvey.php"); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { @@ -63,7 +63,7 @@ if (AUTO_LOGOUT_MINUTES !== false) -xhtml_head(T_("Respondent Selection - Call back"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"), $js ); +xhtml_head(T_("Respondent Selection - Call back"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"), $js ); $operator_id = get_operator_id(); $case_id = get_case_id($operator_id); diff --git a/rs_intro.php b/rs_intro.php index 38a41293..dc0a6f8e 100644 --- a/rs_intro.php +++ b/rs_intro.php @@ -54,7 +54,7 @@ include ("functions/functions.operator.php"); */ include ("functions/functions.limesurvey.php"); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { @@ -62,7 +62,7 @@ if (AUTO_LOGOUT_MINUTES !== false) } -xhtml_head(T_("Respondent Selection - Introduction"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"), $js); +xhtml_head(T_("Respondent Selection - Introduction"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"), $js); //display introduction text diff --git a/rs_intro_interface2.php b/rs_intro_interface2.php index ac4bd72d..5b0140c7 100644 --- a/rs_intro_interface2.php +++ b/rs_intro_interface2.php @@ -54,7 +54,7 @@ include ("functions/functions.operator.php"); */ include ("functions/functions.limesurvey.php"); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { @@ -62,7 +62,7 @@ if (AUTO_LOGOUT_MINUTES !== false) } -xhtml_head(T_("Respondent Selection - Introduction"),false,array("include/bootstrap-3.3.2/css/bootstrap.min.css","css/rs.css","css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"), $js); +xhtml_head(T_("Respondent Selection - Introduction"),false,array("include/bootstrap/css/bootstrap.min.css","css/rs.css","css/rs.css","include/jquery-ui/jquery-ui.min.css"), $js); $operator_id = get_operator_id(); $case_id = get_case_id($operator_id); diff --git a/rs_project_end.php b/rs_project_end.php index dc13621f..5bf150fd 100644 --- a/rs_project_end.php +++ b/rs_project_end.php @@ -59,7 +59,7 @@ if (ALTERNATE_INTERFACE && !is_voip_enabled($operator_id)) die(); } -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { @@ -68,7 +68,7 @@ if (AUTO_LOGOUT_MINUTES !== false) -xhtml_head(T_("Respondent Selection - Project end"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"), $js); +xhtml_head(T_("Respondent Selection - Project end"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"), $js); $case_id = get_case_id($operator_id); $questionnaire_id = get_questionnaire_id($operator_id); diff --git a/rs_project_end_interface2.php b/rs_project_end_interface2.php index 65ec4372..e2e10c72 100644 --- a/rs_project_end_interface2.php +++ b/rs_project_end_interface2.php @@ -50,7 +50,7 @@ include_once ("functions/functions.xhtml.php"); include_once ("functions/functions.operator.php"); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { @@ -59,7 +59,7 @@ if (AUTO_LOGOUT_MINUTES !== false) -xhtml_head(T_("Respondent Selection - Project end"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"), $js); +xhtml_head(T_("Respondent Selection - Project end"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"), $js); $operator_id = get_operator_id(); $case_id = get_case_id($operator_id); diff --git a/rs_project_intro.php b/rs_project_intro.php index 8b9c3fb5..92600f28 100644 --- a/rs_project_intro.php +++ b/rs_project_intro.php @@ -49,14 +49,14 @@ include ("functions/functions.xhtml.php"); */ include ("functions/functions.operator.php"); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { $js[] = "js/childnap.js"; } -xhtml_head(T_("Respondent Selection - Project Introduction"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"), $js); +xhtml_head(T_("Respondent Selection - Project Introduction"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"), $js); $operator_id = get_operator_id(); $case_id = get_case_id($operator_id); diff --git a/rs_project_intro_interface2.php b/rs_project_intro_interface2.php index 246f3be1..2f21a3a3 100644 --- a/rs_project_intro_interface2.php +++ b/rs_project_intro_interface2.php @@ -49,14 +49,14 @@ include ("functions/functions.xhtml.php"); */ include ("functions/functions.operator.php"); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { $js[] = "js/childnap.js"; } -xhtml_head(T_("Respondent Selection - Project Introduction"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"), $js); +xhtml_head(T_("Respondent Selection - Project Introduction"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"), $js); $operator_id = get_operator_id(); $case_id = get_case_id($operator_id); diff --git a/rs_quota_end.php b/rs_quota_end.php index b9943598..daf4afcf 100644 --- a/rs_quota_end.php +++ b/rs_quota_end.php @@ -49,7 +49,7 @@ include ("functions/functions.xhtml.php"); */ include ("functions/functions.operator.php"); -$js = array("js/popup.js","include/jquery-ui/js/jquery-1.4.2.min.js","include/jquery-ui/js/jquery-ui-1.8.2.custom.min.js"); +$js = array("js/popup.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js"); if (AUTO_LOGOUT_MINUTES !== false) { @@ -58,7 +58,7 @@ if (AUTO_LOGOUT_MINUTES !== false) -xhtml_head(T_("Respondent Selection - Project Quota End"),true,array("css/rs.css","include/jquery-ui/css/smoothness/jquery-ui-1.8.2.custom.css"), $js); +xhtml_head(T_("Respondent Selection - Project Quota End"),true,array("css/rs.css","include/jquery-ui/jquery-ui.min.css"), $js); $operator_id = get_operator_id(); $case_id = get_case_id($operator_id); diff --git a/shifts.php b/shifts.php index 8bbe6726..0bc76406 100644 --- a/shifts.php +++ b/shifts.php @@ -51,7 +51,7 @@ include("functions/functions.operator.php"); $js = false; if (AUTO_LOGOUT_MINUTES !== false) - $js = array("include/jquery-ui/js/jquery-1.4.2.min.js","js/childnap.js"); + $js = array("include/jquery/jquery-1.4.2.min.js","js/childnap.js"); xhtml_head(T_("Shift List"),false,array("css/table.css"),$js,false,600); diff --git a/status.php b/status.php index 30781bc7..b06b4fb1 100644 --- a/status.php +++ b/status.php @@ -70,7 +70,7 @@ if ($state == 4 && AUTO_POPUP) $js = array("js/popupkeep.js"); if (AUTO_LOGOUT_MINUTES !== false) { - $js[] = "include/jquery-ui/js/jquery-1.4.2.min.js"; + $js[] = "include/jquery/jquery-1.4.2.min.js"; $js[] = "js/childnap.js"; } diff --git a/status_interface2.php b/status_interface2.php index ebcd6a02..a8fdf644 100644 --- a/status_interface2.php +++ b/status_interface2.php @@ -63,11 +63,11 @@ else if (AUTO_LOGOUT_MINUTES !== false) { - $js[] = "include/jquery-ui/js/jquery-1.4.2.min.js"; + $js[] = "include/jquery/jquery-1.4.2.min.js"; $js[] = "js/childnap.js"; } -xhtml_head(T_("Status"),false,array("include/bootstrap-3.3.2/css/bootstrap.min.css","css/status_interface2.css"),$js); +xhtml_head(T_("Status"),false,array("include/bootstrap/css/bootstrap.min.css","css/status_interface2.css"),$js); $ca = get_call_attempt($operator_id,false); if ($ca) diff --git a/supervisorchat.php b/supervisorchat.php index ff26e583..57467d03 100644 --- a/supervisorchat.php +++ b/supervisorchat.php @@ -49,7 +49,7 @@ include ("functions/functions.xhtml.php"); */ include("functions/functions.operator.php"); -$js = array("include/jquery-ui/js/jquery-1.4.2.min.js","include/strophe/strophe.js","js/supervisorchat.js"); +$js = array("include/jquery/jquery-1.4.2.min.js","include/strophe/strophe.js","js/supervisorchat.js"); if (AUTO_LOGOUT_MINUTES !== false) $js[] = "js/childnap.js"; diff --git a/waitnextcase_interface2.php b/waitnextcase_interface2.php index a7d490c1..3f05625d 100644 --- a/waitnextcase_interface2.php +++ b/waitnextcase_interface2.php @@ -40,7 +40,7 @@ include_once("lang.inc.php"); */ include_once("functions/functions.xhtml.php"); -xhtml_head(T_("Standby"),false,array("include/bootstrap-3.3.2/css/bootstrap.min.css","css/index_interface2.css"), array(), false, 300); +xhtml_head(T_("Standby"),false,array("include/bootstrap/css/bootstrap.min.css","css/index_interface2.css"), array(), false, 300); if (isset($_GET['auto'])) { @@ -197,4 +197,4 @@ else xhtml_foot(); -?> \ No newline at end of file +?>