" . T_("Availability and shift management") . "
" . T_("Questionnaire progress") . "
"; print "" . T_("Performance") . "
"; print "" . T_("Select a questionnaire from the list below") . "
"; +display_questionnaire_chooser($questionnaire_id); + + +if ($questionnaire_id != false) +{ + + $sql = "SELECT q.availability_group_id,a.description as description + FROM questionnaire_availability as q, availability_group as a + WHERE q.availability_group_id = a.availability_group_id + AND q.questionnaire_id = '$questionnaire_id'"; + + $qs = $db->GetAll($sql); + + if (empty($qs)) + { + print "" . T_("There are no availability groups selected for this questionnaire") . "
"; + } + else + { + print "" . T_("Availability groups selected for this questionnaire") . "
"; + foreach($qs as $q) + { + print "{$q['availability_group_id']} - {$q['description']} (" . T_("Click to unassign") . ")
"; + } + } + + $sql = "SELECT si.availability_group_id,si.description + FROM availability_group as si + LEFT JOIN questionnaire_availability as q ON (q.questionnaire_id = '$questionnaire_id' AND q.availability_group_id = si.availability_group_id) + WHERE q.questionnaire_id is NULL"; + + $qs = $db->GetAll($sql); + + if (!empty($qs)) + { + + + print "" . T_("Add an availability group to this questionnaire:") . "
"; + ?> + + diff --git a/admin/supervisor.php b/admin/supervisor.php index 8f9844dd..da66fcad 100644 --- a/admin/supervisor.php +++ b/admin/supervisor.php @@ -184,8 +184,27 @@ if ($case_id != false) $db->Execute($sql); } + if (isset($_GET['submitag'])) + { + $db->StartTrans(); + $sql = "DELETE FROM case_availability + WHERE case_id = '$case_id'"; + $db->Execute($sql); + + foreach($_GET as $key => $val) + { + if (substr($key,0,2) == "ag") + { + $sql = "INSERT INTO case_availability (case_id,availability_group_id) + VALUES ($case_id,'$val')"; + $db->Execute($sql); + } + } + $db->CompleteTrans(); + } + $sql = "SELECT o.description,o.outcome_id, q.description as qd, si.description as sd FROM `case` as c, `outcome` as o, questionnaire as q, sample as s, sample_import as si WHERE c.case_id = '$case_id' @@ -303,6 +322,50 @@ if ($case_id != false) = 1 availability group is in use for this case + $sql = "SELECT qa.availability_group_id,ag.description,ca.availability_group_id as selected_group_id + FROM `case` as c + JOIN questionnaire_availability AS qa ON (qa.questionnaire_id = c.questionnaire_id) + JOIN availability_group AS ag ON (ag.availability_group_id = qa.availability_group_id) + LEFT JOIN case_availability AS ca ON (ca.availability_group_id = qa.availability_group_id and ca.case_id = c.case_id) + WHERE c.case_id = '$case_id'"; + + $rs = $db->GetAll($sql); + + //Display all availability groups as checkboxes + + print "" . T_("Select groups to limit availability (Selecting none means always available)") . "
"; + print " + " . T_("Availability groups not defined for this questionnaire") . ""; + } + + + //assign this to an operator for their next case print "" . T_("Assign this case to operator (will appear as next case for them)") . "
"; ?> diff --git a/admin/systemsortprocess.php b/admin/systemsortprocess.php index 47d27035..db37f4ce 100644 --- a/admin/systemsortprocess.php +++ b/admin/systemsortprocess.php @@ -119,7 +119,10 @@ while (!is_process_killed($process_id)) //check if process killed every $sleepin LEFT JOIN appointment as apn on (apn.case_id = c.case_id AND apn.completed_call_id is NULL AND (CONVERT_TZ(NOW(),'System','UTC') >= apn.start) AND (CONVERT_TZ(NOW(),'System','UTC') <= apn.end)) LEFT JOIN call_restrict as cr on (cr.day_of_week = DAYOFWEEK(CONVERT_TZ(NOW(), 'System' , s.Time_zone_name)) and TIME(CONVERT_TZ(NOW(), 'System' , s.Time_zone_name)) >= cr.start and TIME(CONVERT_TZ(NOW(), 'System' , s.Time_zone_name)) <= cr.end) LEFT JOIN questionnaire_sample_exclude_priority AS qsep ON (qsep.questionnaire_id = c.questionnaire_id AND qsep.sample_id = c.sample_id) + LEFT JOIN case_availability AS casa ON (casa.case_id = c.case_id) + LEFT JOIN availability AS ava ON (ava.availability_group_id = casa.availability_group_id) WHERE c.current_operator_id IS NULL + AND (casa.case_id IS NULL OR (ava.day_of_week = DAYOFWEEK(CONVERT_TZ(NOW(),'System',s.Time_zone_name)) AND TIME(CONVERT_TZ(NOW(), 'System' , s.Time_zone_name)) >= ava.start AND TIME(CONVERT_TZ(NOW(), 'System' , s.Time_zone_name)) <= ava.end )) AND (a.call_id is NULL or (a.end < CONVERT_TZ(DATE_SUB(NOW(), INTERVAL ou.default_delay_minutes MINUTE),'System','UTC'))) AND ap.case_id is NULL AND ((qsep.questionnaire_id is NULL) or qsep.exclude = 0) diff --git a/availability.php b/availability.php new file mode 100644 index 00000000..58a4d406 --- /dev/null +++ b/availability.php @@ -0,0 +1,151 @@ + + * @copyright Australian Consortium for Social and Political Research Incorporated (ACSPRI) 2011 + * @package queXS + * @subpackage user + * @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"); + +/** + * Operator functions + */ +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"); + +xhtml_head(T_("Availability"),true,array("css/table.css"),$js); + +$operator_id = get_operator_id(); +$case_id = get_case_id($operator_id); + +if (is_using_availability($case_id)) +{ + if (isset($_POST['count'])) + { + $db->StartTrans(); + + $sql = "DELETE FROM case_availability + WHERE case_id = '$case_id'"; + + $db->Execute($sql); + + //if number of selected items != count then add + $count = intval($_POST['count']); + + $pcount = 0; + foreach($_POST as $key => $val) + { + if (substr($key,0,2) == "ag") + $pcount++; + } + + //if ($pcount != $count) + //{ + foreach($_POST as $key => $val) + { + if (substr($key,0,2) == "ag") + { + $sql = "INSERT INTO case_availability (case_id,availability_group_id) + VALUES ($case_id,'$val')"; + $db->Execute($sql); + } + } + //} + + $db->CompleteTrans(); + } + + //List all availability group items and whether selected or not (all selected by default unless >= 1 availability group is in use for this case + + $sql = "SELECT qa.availability_group_id,ag.description,ca.availability_group_id as selected_group_id + FROM `case` as c + JOIN questionnaire_availability AS qa ON (qa.questionnaire_id = c.questionnaire_id) + JOIN availability_group AS ag ON (ag.availability_group_id = qa.availability_group_id) + LEFT JOIN case_availability AS ca ON (ca.availability_group_id = qa.availability_group_id and ca.case_id = c.case_id) + WHERE c.case_id = '$case_id'"; + + $rs = $db->GetAll($sql); + + //See if all are selecetd or not + $allselected = true; + $count = count($rs); + foreach($rs as $r) + { + if (!empty($r['selected_group_id'])) + { + $allselected = false; + break; + } + } + + //Display all availability groups as checkboxes + + print "" . T_("Select groups to limit availability (Selecting none means always available)") . "
"; + print ""; +} +else +{ + print "" . T_("Availability groups not defined for this questionnaire") . "
"; +} + + + +xhtml_foot(); + + +?> diff --git a/database/quexs.sql b/database/quexs.sql index 27f2039b..4a0886e2 100644 --- a/database/quexs.sql +++ b/database/quexs.sql @@ -1388,3 +1388,95 @@ CREATE TABLE `timezone_template` ( `Time_zone_name` char(64) NOT NULL, PRIMARY KEY (`Time_zone_name`) ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `availability` +-- + +CREATE TABLE IF NOT EXISTS `availability` ( + `availability_id` bigint(20) NOT NULL auto_increment, + `availability_group_id` bigint(20) NOT NULL, + `start` time NOT NULL, + `end` time NOT NULL, + `day_of_week` tinyint(1) NOT NULL, + PRIMARY KEY (`availability_id`), + KEY `availability_group_id` (`availability_group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- +-- Dumping data for table `availability` +-- + +INSERT INTO `availability` (`availability_id`, `availability_group_id`, `start`, `end`, `day_of_week`) VALUES +(1, 1, '00:00:00', '11:59:59', 2), +(2, 1, '00:00:00', '11:59:59', 3), +(3, 1, '00:00:00', '11:59:59', 4), +(4, 1, '00:00:00', '11:59:59', 5), +(5, 1, '00:00:00', '11:59:59', 6), +(6, 2, '12:00:00', '17:59:59', 2), +(7, 2, '12:00:00', '17:59:59', 3), +(8, 2, '12:00:00', '17:59:59', 4), +(9, 2, '12:00:00', '17:59:59', 5), +(10, 2, '12:00:00', '17:59:59', 6), +(11, 3, '18:00:00', '23:59:59', 2), +(12, 3, '18:00:00', '23:59:59', 3), +(13, 3, '18:00:00', '23:59:59', 4), +(14, 3, '18:00:00', '23:59:59', 5), +(15, 3, '18:00:00', '23:59:59', 6), +(16, 4, '00:00:00', '23:59:59', 7); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `availability_group` +-- + +CREATE TABLE IF NOT EXISTS `availability_group` ( + `availability_group_id` bigint(20) NOT NULL auto_increment, + `description` text collate utf8_unicode_ci NOT NULL, + PRIMARY KEY (`availability_group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- +-- Dumping data for table `availability_group` +-- + +INSERT INTO `availability_group` (`availability_group_id`, `description`) VALUES +(1, 'Weekday mornings (Before 12pm)'), +(2, 'Weekday afternoons (After 12pm but before 6pm)'), +(3, 'Evenings (After 6pm)'), +(4, 'Saturdays'); + +-- -------------------------------------------------------- + +-- +-- Table structure for table `case_availability` +-- + +CREATE TABLE IF NOT EXISTS `case_availability` ( + `case_id` bigint(20) NOT NULL, + `availability_group_id` bigint(20) NOT NULL, + PRIMARY KEY (`case_id`,`availability_group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- +-- Dumping data for table `case_availability` +-- + +-- -------------------------------------------------------- + +-- +-- Table structure for table `questionnaire_availability` +-- + +CREATE TABLE IF NOT EXISTS `questionnaire_availability` ( + `questionnaire_id` bigint(20) NOT NULL, + `availability_group_id` bigint(20) NOT NULL, + PRIMARY KEY (`questionnaire_id`,`availability_group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- +-- Dumping data for table `questionnaire_availability` +-- diff --git a/functions/functions.operator.php b/functions/functions.operator.php index 59c9c9d0..4cb0cdbd 100644 --- a/functions/functions.operator.php +++ b/functions/functions.operator.php @@ -44,6 +44,33 @@ include_once(dirname(__FILE__).'/../config.inc.php'); include_once(dirname(__FILE__).'/../db.inc.php'); +/** + * Check if the project associated with this case is using + * questionnaire availability + * + * @param int $case_id + * + * @return boolean True if using case availability, false if not + * @author Adam Zammit
'/>