diff --git a/admin/exten_tab.php b/admin/exten_tab.php
deleted file mode 100644
index 6fddb1b0..00000000
--- a/admin/exten_tab.php
+++ /dev/null
@@ -1,164 +0,0 @@
-$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_("Display extension status"),true,array("../css/table.css"),array("../js/window.js"));
-
-if (isset($_GET['edit']))
-{
- $sql = "SELECT extension,password,current_operator_id
- FROM extension
- WHERE extension_id = " . intval($_GET['edit']);
-
- $rs = $db->GetRow($sql);
-
-
-}
-else
-{
- $sql= "SELECT CONCAT('',o.firstName,' ', o.lastname,'') as firstName,
- CONCAT('',e.extension,'') as extension,
- IF(c.case_id IS NULL,IF(e.current_operator_id IS NULL,'list'
- ,CONCAT('". TQ_("Unassign") ."')),'". TQ_("End case to change assignment")."') as assignment,
- CASE e.status WHEN 0 THEN '" . TQ_("VoIP Offline") . "' ELSE '" . TQ_("VoIP Online") . "' END as status,
- CASE ca.state WHEN 0 THEN '" . TQ_("Not called") . "' WHEN 1 THEN '" . TQ_("Requesting call") . "' WHEN 2 THEN '" . TQ_("Ringing") . "' WHEN 3 THEN '" . TQ_("Answered") . "' WHEN 4 THEN '" . TQ_("Requires coding") . "' ELSE '" . TQ_("Done") . "' END as state,
- CONCAT('' , c.case_id, '') as case_id, SEC_TO_TIME(TIMESTAMPDIFF(SECOND,cal.start,CONVERT_TZ(NOW(),'SYSTEM','UTC'))) as calltime,
- e.status as vs,
- e.extension_id
- FROM extension as e
- LEFT JOIN `operator` as o ON (o.operator_id = e.current_operator_id)
- LEFT JOIN `case` as c ON (c.current_operator_id = o.operator_id)
- LEFT JOIN `call_attempt` as cal ON (cal.operator_id = o.operator_id AND cal.end IS NULL and cal.case_id = c.case_id)
- LEFT JOIN `call` as ca ON (ca.case_id = c.case_id AND ca.operator_id = o.operator_id AND ca.outcome_id= 0 AND ca.call_attempt_id = cal.call_attempt_id)
- ORDER BY e.extension_id ASC";
-
- $rs = $db->GetAll($sql);
-
- if ($msg != "")
- print "
$msg
";
-
- if (!empty($rs))
- {
- $sql = "SELECT o.operator_id as value, CONCAT(o.firstName,' ', o.lastname) 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);
- }
- xhtml_table($rs,array("extension","firstName","assignment","status","case_id","state","calltime"),array(T_("Extension"),T_("Operator"),T_("Assignment"),T_("VoIP Status"),T_("Case ID"),T_("Call state"),T_("Time on call")),"tclass",array("vs" => "1"));
- }
- else
- print "
" . T_("No extensions") . "
";
-
-}
-
-xhtml_foot();
-
-?>
diff --git a/admin/extensionstatus.php b/admin/extensionstatus.php
index 94c2b621..be32f8f1 100644
--- a/admin/extensionstatus.php
+++ b/admin/extensionstatus.php
@@ -1,219 +1,269 @@
-
- * @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_("Display extension status"),true,array("../css/table.css"),array("../js/window.js"));
-
-if (isset($_GET['edit']))
-{
- $sql = "SELECT extension,password,current_operator_id
- FROM extension
- WHERE extension_id = " . intval($_GET['edit']);
-
- $rs = $db->GetRow($sql);
-
- print "
";
-?>
-
-" . T_("Unassign the operator from this extension to be able to delete it") . "";
-
-}
-else
-{
- $sql= "SELECT CONCAT('',o.firstName,'') as firstName,
- CONCAT('',e.extension,'') as extension,
- IF(c.case_id IS NULL,IF(e.current_operator_id IS NULL,'list'
- ,CONCAT('". TQ_("Unassign") ."')),'". TQ_("End case to change assignment")."') as assignment,
- CASE e.status WHEN 0 THEN '" . TQ_("VoIP Offline") . "' ELSE '" . TQ_("VoIP Online") . "' END as status,
- CASE ca.state WHEN 0 THEN '" . TQ_("Not called") . "' WHEN 1 THEN '" . TQ_("Requesting call") . "' WHEN 2 THEN '" . TQ_("Ringing") . "' WHEN 3 THEN '" . TQ_("Answered") . "' WHEN 4 THEN '" . TQ_("Requires coding") . "' ELSE '" . TQ_("Done") . "' END as state,
- CONCAT('' , c.case_id, '') as case_id, SEC_TO_TIME(TIMESTAMPDIFF(SECOND,cal.start,CONVERT_TZ(NOW(),'SYSTEM','UTC'))) as calltime,
- e.status as vs,
- e.extension_id
- FROM extension as e
- LEFT JOIN `operator` as o ON (o.operator_id = e.current_operator_id)
- LEFT JOIN `case` as c ON (c.current_operator_id = o.operator_id)
- LEFT JOIN `call_attempt` as cal ON (cal.operator_id = o.operator_id AND cal.end IS NULL and cal.case_id = c.case_id)
- LEFT JOIN `call` as ca ON (ca.case_id = c.case_id AND ca.operator_id = o.operator_id AND ca.outcome_id= 0 AND ca.call_attempt_id = cal.call_attempt_id)
- ORDER BY e.extension_id ASC";
-
- $rs = $db->GetAll($sql);
-
- if ($msg != "")
- print "
$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);
- }
- xhtml_table($rs,array("extension","firstName","assignment","status","case_id","state","calltime"),array(T_("Extension"),T_("Operator"),T_("Assignment"),T_("VoIP Status"),T_("Case ID"),T_("Call state"),T_("Time on call")),"tclass",array("vs" => "1"));
- }
- else
- print "
" . T_("No extensions") . "
";
-
- print "
" . T_("Add an extension") . "
";
- ?>
-
-
-
-
+
+ * @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-3.3.2/css/bootstrap.min.css","../css/custom.css"),array("../js/window.js"));
+?>
+
+
+GetRow($sql);
+ }
+
+ print "" . T_("Go back") . "";
+?>
+
+
+
";
+}
+else
+{
+ $sql= "SELECT CONCAT('',o.firstName,' ', o.lastname,'') as firstName,
+ CONCAT('',e.extension,'') as extension,
+ IF(c.case_id IS NULL,IF(e.current_operator_id IS NULL,'list'
+ ,CONCAT('". TQ_("Unassign") ."')),'". TQ_("End case to change assignment")."') as assignment,
+ CASE e.status WHEN 0 THEN '" . TQ_("VoIP Offline") . "' ELSE '" . TQ_("VoIP Online") . "' END as status,
+ CASE ca.state WHEN 0 THEN '" . TQ_("Not called") . "' WHEN 1 THEN '" . TQ_("Requesting call") . "' WHEN 2 THEN '" . TQ_("Ringing") . "' WHEN 3 THEN '" . TQ_("Answered") . "' WHEN 4 THEN '" . TQ_("Requires coding") . "' ELSE '" . TQ_("Done") . "' END as state,
+ CONCAT('' , c.case_id, '') as case_id, SEC_TO_TIME(TIMESTAMPDIFF(SECOND,cal.start,CONVERT_TZ(NOW(),'SYSTEM','UTC'))) as calltime,
+ e.status as vs,
+ e.extension_id
+ FROM extension as e
+ LEFT JOIN `operator` as o ON (o.operator_id = e.current_operator_id)
+ LEFT JOIN `case` as c ON (c.current_operator_id = o.operator_id)
+ LEFT JOIN `call_attempt` as cal ON (cal.operator_id = o.operator_id AND cal.end IS NULL and cal.case_id = c.case_id)
+ LEFT JOIN `call` as ca ON (ca.case_id = c.case_id AND ca.operator_id = o.operator_id AND ca.outcome_id= 0 AND ca.call_attempt_id = cal.call_attempt_id)
+ ORDER BY e.extension_id ASC";
+
+ $rs = $db->GetAll($sql);
+
+ if ($msg != "")
+ print "
$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 "
";
-
- $sql = "SELECT extension_id as value, extension as description,
- CASE WHEN current_operator_id = $operator_id THEN 'selected=\'selected\'' ELSE '' END AS selected
- FROM extension
- WHERE current_operator_id IS NULL
- OR current_operator_id = $operator_id";
-
- $ers = $db->GetAll($sql);
-
- ?>
-
- Execute($sql);
-}
-
-if (isset($_GET['voipenable']))
-{
- $operator_id = intval($_GET['voipenable']);
-
- $sql = "UPDATE operator
- SET voip = 1
- WHERE operator_id = '$operator_id'";
-
- $db->Execute($sql);
-}
-
-
-if (isset($_GET['disable']))
-{
- $operator_id = intval($_GET['disable']);
-
- $sql = "UPDATE operator
- SET enabled = 0
- WHERE operator_id = '$operator_id'";
-
- $db->Execute($sql);
-}
-
-if (isset($_GET['enable']))
-{
- $operator_id = intval($_GET['enable']);
-
- $sql = "UPDATE operator
- SET enabled = 1
- WHERE operator_id = '$operator_id'";
-
- $db->Execute($sql);
-}
-
-if (isset($_GET['operator_id']))
-{
- $operator_id = intval($_GET['operator_id']);
-
- $sql = "SELECT *,SUBSTRING_INDEX(e.extension, '/', -1) as ext
- FROM extension as e
- WHERE e.current_operator_id = $operator_id";
-
- $rs = $db->GetRow($sql);
-
- if (!empty($rs))
- {
- $display = false;
-
- if (isset($_GET['winbat']) || isset($_GET['sh']))
- {
- header("Content-Type: text/txt");
- if (isset($_GET['winbat']))
- header("Content-Disposition: attachment; filename=operator_$operator_id.bat");
- else
- header("Content-Disposition: attachment; filename=operator_$operator_id.sh");
- header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
- header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
- header("Pragma: public"); // HTTP/1.0
-
- if (isset($_GET['winbat']))
- echo "voipclient.exe -i -u {$rs['ext']} -p {$rs['password']} -h " . $_SERVER['SERVER_NAME'];
- else
- echo "./voipclient -i -u {$rs['ext']} -p {$rs['password']} -h " . $_SERVER['SERVER_NAME'];
- }
- }
-}
-
-if ($display)
-{
- $sql = "SELECT
- CONCAT(firstName, ' ', lastName) as name,
- e.extension,
- CONCAT('" . TQ_("Windows bat file") . "') as winbat,
- CONCAT('" . TQ_("*nix script file") . "') as sh,
- CASE WHEN enabled = 0 THEN
- CONCAT('" . TQ_("Enable") . "')
- ELSE
- CONCAT('" . TQ_("Disable") . "')
- END
- as enabledisable,
- CASE WHEN voip = 0 THEN
- CONCAT('" . TQ_("Enable VoIP") . "')
- ELSE
- CONCAT('" . TQ_("Disable VoIP") . "')
- END as voipenabledisable,
- CONCAT('" . TQ_("Edit") . "') as edit,
- username
- FROM operator
- LEFT JOIN `extension` as e ON (e.current_operator_id = operator_id)";
-
- $rs = $db->GetAll($sql);
-
- xhtml_head(T_("Operator list"),true,array("../css/table.css"));
-
- $columns = array("name","username","extension","enabledisable","edit");
- $titles = array(T_("Operator"),T_("Username"),T_("Extension"),T_("Enable/Disable"),T_("Edit"));
-
- if (VOIP_ENABLED)
- {
- print "
" . T_("Download the file for each user and save in the same folder as the voip.exe executable. When the file is executed, it will run the voip.exe program with the correct connection details to connect the operator to the VoIP server") . "
" . T_("Download the file for each user and save in the same folder as the voip.exe executable. When the file is executed, it will run the voip.exe program with the correct connection details to connect the operator to the VoIP server"). "";
+
+ print " " . T_("Download Win file") . "";
+ print " " . T_("Download Linux file") . "
";
+
+ }
+ print "
";
+
+ xhtml_foot();
+}
+?>
\ No newline at end of file
diff --git a/admin/operatorquestionnaire.php b/admin/operatorquestionnaire.php
index 36d99cb1..3b62f12f 100644
--- a/admin/operatorquestionnaire.php
+++ b/admin/operatorquestionnaire.php
@@ -1,284 +1,279 @@
-
- * @copyright Deakin University 2007,2008
- * @package queXS
- * @subpackage admin
- * @link http://www.deakin.edu.au/dcarf/ queXS was writen for DCARF - Deakin Computer Assisted Research Facility
- * @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");
-
-/**
- * Return if an operator has already been assigned to this questionnaire
- *
- * @param int $operator_id Operator id
- * @param int $questionnaire_id Questionnaire id
- * @return int 1 if assigned otherwise 0
- *
- */
-function vq($operator_id,$questionnaire_id)
-{
- global $db;
-
- $sql = "SELECT operator_id,questionnaire_id
- FROM operator_questionnaire
- WHERE operator_id = '$operator_id' and questionnaire_id = '$questionnaire_id'";
-
- $vq = $db->Execute($sql);
-
- if ($vq)
- return $vq->RecordCount();
- else
- return 0;
-}
-
-/**
- * Assign an operator to a questionnaire
- *
- * @param int $operator_id Operator id
- * @param int $questionnaire_id Questionnaire id
- *
- */
-function vqi($operator_id,$questionnaire_id)
-{
- global $db;
-
- $sql = "INSERT INTO
- operator_questionnaire (operator_id,questionnaire_id)
- VALUES('$operator_id','$questionnaire_id')";
-
- $db->Execute($sql);
-}
-
-
-/**
- * Unassign an operator from a questionnaire
- *
- * @param int $operator_id Operator id
- * @param int $questionnaire_id Questionnaire id
- *
- */
-function vqd($operator_id,$questionnaire_id)
-{
- global $db;
-
- $sql = "DELETE FROM
- operator_questionnaire
- WHERE operator_id = '$operator_id' and questionnaire_id = '$questionnaire_id'";
-
- $db->Execute($sql);
-}
-
-
-
-
-if (isset($_POST['submit']))
-{
- $db->StartTrans();
-
- $sql = "DELETE
- FROM operator_questionnaire
- WHERE questionnaire_id IN (
- SELECT questionnaire_id
- FROM questionnaire
- WHERE enabled = 1)
- AND operator_id IN (
- SELECT operator_id
- FROM operator
- WHERE enabled = 1)";
-
- $db->Execute($sql);
-
- foreach ($_POST as $g => $v)
- {
- $a = explode("_",$g);
- if ($a[0] == "cb")
- vqi($a[2],$a[1]);
- }
-
- $db->CompleteTrans();
-}
-
-
-
-$sql = "SELECT questionnaire_id,description
- FROM questionnaire
- WHERE enabled = 1
- ORDER by questionnaire_id DESC";
-
-$questionnaires = $db->GetAll($sql);
-
-$sql = "SELECT operator_id,firstname as description
- FROM operator
- WHERE enabled = 1
- ORDER by operator_id ASC";
-
-$operators = $db->GetAll($sql);
-
-
-xhtml_head(T_("Assign operators to questionnaires"),false,array("../css/table.css"));
-
-?>
-
-
-
-
-
-
-
" . 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 "
";
+}
+
+$sql = "SELECT Time_zone_name as value, Time_zone_name as description
+ FROM timezone_template";
+
+$rs = $db->GetAll($sql);
+
+$sql = "SELECT extension_id as value, extension as description
+ FROM extension
+ WHERE current_operator_id IS NULL";
+
+$ers = $db->GetAll($sql);
+?>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/operatorskill.php b/admin/operatorskill.php
index 2ce676a2..10dfa6fc 100644
--- a/admin/operatorskill.php
+++ b/admin/operatorskill.php
@@ -1,280 +1,279 @@
-
- * @copyright Deakin University 2007,2008
- * @package queXS
- * @subpackage admin
- * @link http://www.deakin.edu.au/dcarf/ queXS was writen for DCARF - Deakin Computer Assisted Research Facility
- * @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");
-
-/**
- * Determine if an operator has been assigned to a skill (outcome_type)
- *
- * @param int $operator_id Operator id
- * @param int $outcome_type_id Outcome type id (skill)
- * @return int 1 if assigned to that skill otherwise 0
- *
- */
-function vq($operator_id,$outcome_type_id)
-{
- global $db;
-
- $sql = "SELECT operator_id,outcome_type_id
- FROM operator_skill
- WHERE operator_id = '$operator_id' and outcome_type_id = '$outcome_type_id'";
-
- $vq = $db->Execute($sql);
-
- if ($vq)
- return $vq->RecordCount();
- else
- return 0;
-}
-
-/**
- * Assign an operator to a skill (outcome_type)
- *
- * @param int $operator_id Operator id
- * @param int $outcome_type_id Outcome type id (skill)
- *
- */
-function vqi($operator_id,$outcome_type_id)
-{
- global $db;
-
- $sql = "INSERT INTO
- operator_skill (operator_id,outcome_type_id)
- VALUES('$operator_id','$outcome_type_id')";
-
- $db->Execute($sql);
-}
-
-/**
- * Delete a skill (outcome_type) from an operator
- *
- * @param int $operator_id Operator id
- * @param int $outcome_type_id Outcome type id (skill)
- *
- */
-function vqd($operator_id,$outcome_type_id)
-{
- global $db;
-
- $sql = "DELETE FROM
- operator_skill
- WHERE operator_id = '$operator_id' and outcome_type_id = '$outcome_type_id'";
-
- $db->Execute($sql);
-}
-
-
-
-
-if (isset($_POST['submit']))
-{
- $db->StartTrans();
-
- $sql = "DELETE
- FROM operator_skill
- WHERE operator_id IN (
- SELECT operator_id
- FROM operator
- WHERE enabled = 1)";
-
- $db->Execute($sql);
-
- foreach ($_POST as $g => $v)
- {
- $a = explode("_",$g);
- if ($a[0] == "cb")
- vqi($a[2],$a[1]);
- }
-
- $db->CompleteTrans();
-}
-
-
-
-$sql = "SELECT outcome_type_id,description
- FROM outcome_type
- ORDER by outcome_type_id ASC";
-
-$outcome_types = $db->GetAll($sql);
-
-$sql = "SELECT operator_id,firstname as description
- FROM operator
- WHERE enabled = 1
- ORDER by operator_id ASC";
-
-$operators = $db->GetAll($sql);
-
-
-xhtml_head(T_("Assign operators to Skills"),false,array("../css/table.css"));
-
-print "
" . T_("Set which types of cases will be made available to each operator. Please note that all operators will be allowed to assign all possible outcomes to a case. This restricts which ones will be assigned to an operator.") . "
";
- foreach($outcome_types as $q)
- {
- $checked = "";
- if (vq($v['operator_id'],$q['outcome_type_id'])) $checked="checked=\"checked\"";
- print "
";
- }
-
- print "
";
-}
-
-
-print "
";
-
-
-xhtml_foot();
-
-?>
-
-
-
+
+ * @copyright Deakin University 2007,2008
+ * @package queXS
+ * @subpackage admin
+ * @link http://www.deakin.edu.au/dcarf/ queXS was writen for DCARF - Deakin Computer Assisted Research Facility
+ * @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");
+
+/**
+ * Determine if an operator has been assigned to a skill (outcome_type)
+ *
+ * @param int $operator_id Operator id
+ * @param int $outcome_type_id Outcome type id (skill)
+ * @return int 1 if assigned to that skill otherwise 0
+ *
+ */
+function vq($operator_id,$outcome_type_id)
+{
+ global $db;
+
+ $sql = "SELECT operator_id,outcome_type_id
+ FROM operator_skill
+ WHERE operator_id = '$operator_id' and outcome_type_id = '$outcome_type_id'";
+
+ $vq = $db->Execute($sql);
+
+ if ($vq)
+ return $vq->RecordCount();
+ else
+ return 0;
+}
+
+/**
+ * Assign an operator to a skill (outcome_type)
+ *
+ * @param int $operator_id Operator id
+ * @param int $outcome_type_id Outcome type id (skill)
+ *
+ */
+function vqi($operator_id,$outcome_type_id)
+{
+ global $db;
+
+ $sql = "INSERT INTO
+ operator_skill (operator_id,outcome_type_id)
+ VALUES('$operator_id','$outcome_type_id')";
+
+ $db->Execute($sql);
+}
+
+/**
+ * Delete a skill (outcome_type) from an operator
+ *
+ * @param int $operator_id Operator id
+ * @param int $outcome_type_id Outcome type id (skill)
+ *
+ */
+function vqd($operator_id,$outcome_type_id)
+{
+ global $db;
+
+ $sql = "DELETE FROM
+ operator_skill
+ WHERE operator_id = '$operator_id' and outcome_type_id = '$outcome_type_id'";
+
+ $db->Execute($sql);
+}
+
+
+if (isset($_POST['submit']))
+{
+ $db->StartTrans();
+
+ $sql = "DELETE
+ FROM operator_skill
+ WHERE operator_id IN (
+ SELECT operator_id
+ FROM operator
+ WHERE enabled = 1)";
+
+ $db->Execute($sql);
+
+ foreach ($_POST as $g => $v)
+ {
+ $a = explode("_",$g);
+ if ($a[0] == "cb")
+ vqi($a[2],$a[1]);
+ }
+
+ $db->CompleteTrans();
+}
+
+
+
+$sql = "SELECT outcome_type_id,description
+ FROM outcome_type
+ ORDER by outcome_type_id ASC";
+
+$outcome_types = $db->GetAll($sql);
+
+$sql = "SELECT operator_id, CONCAT(firstName,' ', lastName) as description, username
+ FROM operator
+ WHERE enabled = 1
+ ORDER by operator_id ASC";
+
+$operators = $db->GetAll($sql);
+
+
+xhtml_head(T_("Assign operators to Skills"),true,array("../include/bootstrap-3.3.2/css/bootstrap.min.css","../include/iCheck/skins/square/blue.css","../css/custom.css"),array("../js/jquery-2.1.3.min.js","../include/iCheck/icheck.min.js"));
+
+print "
" . T_("Set which types of cases will be made available to each operator. Please note that all operators will be allowed to assign all possible outcomes to a case. This restricts which ones will be assigned to an operator.") . "