SD-SimpleDesk

@@ -72,7 +72,7 @@

 	padding: 0 4px 0 7px;

 }

-dd#assigned_button {

+dd#urgency_button, dd#assigned_button {

 	padding: 1px 0;

 }

@@ -104,7 +104,7 @@ h3.ticketheader img {

 /* Ticket details (Left-floated box) */

 .shd_ticket_side_column {

 	float: left;

-	width: 20%;

+	width: 23%;

 	padding: 0 5px 5px 5px;

 }

 .shd_ticketdetails {

@@ -137,7 +137,7 @@ form#postmodify .shd_ticket_roundframe {

 	min-height: 250px;

 }

 .shd_ticket_description {

-	margin-left: 260px;

+	margin-left: 23%;

 }

 #shd_ticket_text {

@@ -34,19 +34,19 @@ function shd_sendJSONDocument(sUrl, funcCallback)

 /* The privacy toggle in AJAX */

 function shd_privacyControl(oOpts)

 {

-	this.opts = oOpts; // attaches to the link, but it doesn't exist until after DOM is loaded!

+	this.opt = oOpts; // attaches to the link, but it doesn't exist until after DOM is loaded!

 	$(document).ready(this.init.bind(this));

 }

 shd_privacyControl.prototype.init = function ()

 {

-	$('#' + this.opts.sSrcA).on('click', this.action.bind(this));

+	$('#' + this.opt.sSrcA).on('click', this.action.bind(this));

 }

 shd_privacyControl.prototype.action = function (e)

 {

 	e.preventDefault();

-	shd_getJSONDocument(this.opts.sUrl + ';' + this.opts.sSession, this.callback.bind(this));

+	shd_getJSONDocument(this.opt.sUrl + ';' + this.opt.sSession, this.callback.bind(this));

 	return false;

 }

@@ -55,10 +55,10 @@ shd_privacyControl.prototype.callback = function (oRecvd)

 	if (oRecvd && oRecvd.success === false)

 		alert(oRecvd.error);

 	else if (oRecvd && oRecvd.message)

-		$('#' + this.opts.sDestSpan).html(oRecvd.message);

+		$('#' + this.opt.sDestSpan).html(oRecvd.message);

 	else

 		if (confirm(shd_ajax_problem))

-			window.location = smf_scripturl + '?action=helpdesk;sa=privacychange;ticket=' + this.opts.ticket + ';' + this.opts.sSession;

+			window.location = smf_scripturl + '?action=helpdesk;sa=privacychange;ticket=' + this.opt.ticket + ';' + this.opt.sSession;

 	return false;

 }

@@ -66,23 +66,31 @@ shd_privacyControl.prototype.callback = function (oRecvd)

 /* The urgency doodad */

 function shd_urgencyControl(oOpts)

 {

-	this.opts = oOpts; // attaches to the link, but it doesn't exist until after DOM is loaded!

+	this.opt = oOpts; // attaches to the link, but it doesn't exist until after DOM is loaded!

 	$(document).ready(this.init.bind(this));

 }

 shd_urgencyControl.prototype.init = function ()

 {

-	for (var i in this.opts.aButtonOps)

+	for (var i in this.opt.aButtonOps)

 	{

-		if (!this.opts.aButtonOps.hasOwnProperty(i))

+		if (!this.opt.aButtonOps.hasOwnProperty(i))

 			continue;

-		var oDiv = $('#urglink_' + this.opts.aButtonOps[i]);

+		var oDiv = $('#urglink_' + this.opt.aButtonOps[i]);

 		if (oDiv !== null && i == 'up')

 			oDiv.on('click', this.actionUp.bind(this));

 		else if (oDiv !== null && i == 'down')

 			oDiv.on('click', this.actionDown.bind(this)); // I *did* try to make this a single parameterised function but it always fired when it wasn't supposed to

 	}

+

+	// Setup the assign by list option.

+	this.bCollapsed = true;

+	this.opt.sUrlExpand = smf_prepareScriptUrl(smf_scripturl) + 'action=helpdesk;sa=ajax;op=urgencylist;ticket=' + this.opt.iTicketId;

+	this.opt.sUrlAssign = smf_prepareScriptUrl(smf_scripturl) + 'action=helpdesk;sa=ajax;op=urgency;assign;ticket=' + this.opt.iTicketId;

+	$('#' + this.opt.sSelectButtonId).html('<img src="' + this.opt.sImageCollapsed + '" id="urgency_' + this.opt.sSelf + '" class="shd_urgency_button">');

+	$('.shd_ticketdetails').on('click', '#urgency_' + this.opt.sSelf, this.clickList.bind(this));

+

 }

 shd_urgencyControl.prototype.actionUp = function (e)

@@ -100,7 +108,7 @@ shd_urgencyControl.prototype.actionDown = function (e)

 shd_urgencyControl.prototype.action = function (direction)

 {

 	this.direction = direction;

-	shd_getJSONDocument(this.opts.sUrl + this.opts.aButtonOps[direction] + ';' + this.opts.sSession, this.callback.bind(this));

+	shd_getJSONDocument(this.opt.sUrl + this.opt.aButtonOps[direction] + ';' + this.opt.sSession, this.callback.bind(this));

 	return false;

 }

@@ -110,7 +118,7 @@ shd_urgencyControl.prototype.callback = function (oRecvd)

 		alert(oRecvd.error);

 	else if (oRecvd && oRecvd.message)

 	{

-		$('#' + this.opts.sDestSpan).html(oRecvd.message);

+		$('#' + this.opt.sDestSpan).html(oRecvd.message);

 		var btn_set = ['increase', 'decrease'];

 		for (var i in btn_set)

@@ -127,11 +135,82 @@ shd_urgencyControl.prototype.callback = function (oRecvd)

 	}

 	else

 		if (confirm(shd_ajax_problem))

-			window.location = smf_scripturl + '?action=helpdesk;sa=urgencychange;ticket=' + this.opts.ticket + ';change=' + this.opts.aButtonOps[this.direction] + ';' + this.opts.sSession;

+			window.location = smf_scripturl + '?action=helpdesk;sa=urgencychange;ticket=' + this.opt.iTicketId + ';change=' + this.opt.aButtonOps[this.direction] + ';' + this.opt.sSession;

 	return false;

 }

+shd_urgencyControl.prototype.clickList = function ()

+{

+	if (this.bCollapsed)

+		this.expandList();

+	else

+		this.collapseList();

+}

+

+shd_urgencyControl.prototype.expandList = function ()

+{

+	this.bCollapsed = false;

+console.log('shd_urgencyControl.prototype.expandList:', this.opt.sSelectButtonId, $('#' + this.opt.sSelectButtonId), this.opt.sImageExpanded);

+	$('#urgency_' + this.opt.sSelf).attr('src', this.opt.sImageExpanded);

+

+	// Fetch the list of items

+	shd_getJSONDocument(this.opt.sUrlExpand + ';' + this.opt.sSession, this.expandList_callback.bind(this));

+}

+

+shd_urgencyControl.prototype.expandList_callback = function (oRecvd)

+{

+	if (oRecvd && oRecvd.success === false)

+		alert(oRecvd.error);

+	else if (oRecvd && oRecvd.urgencies)

+	{

+		$('#' + this.opt.sSelectListId).show();

+

+		var newhtml = '';

+		var cur = 0;

+		for (var i in oRecvd.urgencies)

+		{

+			if (!oRecvd.urgencies.hasOwnProperty(i))

+				continue;

+

+			cur = oRecvd.urgencies[i];

+			selected = cur.selected ? ' selected="selected"' : '';

+			newhtml += '<option class="shd_urgencies" data-id="' + cur.id + '"' + selected + '>' + cur.name + '</option>';

+		}

+

+		$('#' + this.opt.sSelectListId).html(newhtml);

+		$('#' + this.opt.sSelectListId).on('change', this.assignUrgency.bind(this));

+	}

+}

+

+shd_urgencyControl.prototype.assignUrgency = function (e)

+{

+	// Click handler for the assignment list, to issue the assign

+	ajax_indicator(true);

+

+	var selectedIndex = e.currentTarget.selectedIndex;	

+	shd_getJSONDocument(this.opt.sUrlAssign + ';urgency=' + e.currentTarget[selectedIndex].dataset.id + ';'+ this.opt.sSession, this.assignUrgencyCallback.bind(this));

+}

+

+shd_urgencyControl.prototype.assignUrgencyCallback = function(oRecvd)

+{

+	// Click handler callback for assignment, to handle once the request has been made

+	this.collapseList();

+

+	if (oRecvd && oRecvd.success === false)

+		alert(oRecvd.error);

+	else if (oRecvd && oRecvd.message)

+		document.getElementById(this.opt.sDestSpan).innerHTML = oRecvd.message;

+}

+

+shd_urgencyControl.prototype.collapseList = function ()

+{

+	this.bCollapsed = true;

+	$('#' + this.opt.sSelectListId).hide().html();

+	$('#urgency_' + this.opt.sSelf).attr('src', this.opt.sImageCollapsed);

+}

+

+

 /* Attachment selector, based on http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/

 * The code below is modified under the MIT licence, http://the-stickman.com/using-code-from-this-site-ie-licence/ not reproduced here for

 * convenience of users using this software (as this is an active downloaded file) */

@@ -224,7 +303,7 @@ shd_attach_select.prototype.addListRow = function (element)

 	var new_row = document.createElement('div');

 	var new_row_button = document.createElement('input');

 	new_row_button.type = 'button';

-	new_row_button.value = this.opts.message_txt_delete;

+	new_row_button.value = this.opt.message_txt_delete;

 	new_row_button.className = 'button';

 	new_row.element = element;

@@ -240,7 +319,7 @@ shd_attach_select.prototype.addListRow = function (element)

 	new_row.innerHTML = element.value + '   ';

 	new_row.appendChild(new_row_button);

-	document.getElementById(this.opts.file_container).appendChild(new_row);

+	document.getElementById(this.opt.file_container).appendChild(new_row);

 };

 shd_attach_select.prototype.checkActive = function()

@@ -57,6 +57,7 @@ $txt['shd_log_marknotprivate'] = '&quot;<a href="{scripturl}?action=helpdesk;sa=

 //@{

 $txt['shd_log_urgency_increase'] = '&quot;<a href="{scripturl}?action=helpdesk;sa=ticket;ticket={ticket}">{subject}</a>&quot; increased to <strong>{urgency}</strong>.';

 $txt['shd_log_urgency_decrease'] = '&quot;<a href="{scripturl}?action=helpdesk;sa=ticket;ticket={ticket}">{subject}</a>&quot; decreased to <strong>{urgency}</strong>.';

+$txt['shd_log_urgency_change'] = '&quot;<a href="{scripturl}?action=helpdesk;sa=ticket;ticket={ticket}">{subject}</a>&quot; changed to <strong>{urgency}</strong>.';

 //@}

 //! @name Ticket/topic, topic/ticket moves

@@ -59,6 +59,7 @@ function shd_ajax()

 	$subactions = array(

 		'privacy' => 'shd_ajax_privacy',

 		'urgency' => 'shd_ajax_urgency',

+		'urgencylist' => 'shd_ajax_urgencylist',

 		'quote' => 'shd_ajax_quote',

 		'assign' => 'shd_ajax_assign',

 		'assign2' => 'shd_ajax_assign2',

@@ -223,6 +224,22 @@ function shd_ajax_urgency()

 	if (empty($row))

 		return array('error' => $txt['shd_no_ticket']);

+	// We will need this later.

+	require_once($sourcedir . '/sd_source/Subs-SimpleDeskPost.php');

+

+	// If being assigned from the list, we do it differently.

+	if (isset($_GET['assign']) && isset($_GET['urgency']) && ctype_digit($_GET['urgency']))

+	{

+		shd_get_urgency_options($row['id_member_started'] == $user_info['id'], $row['id_dept']);

+

+		if (empty($context['ticket_form']['urgency']['options'][$_GET['urgency']]))

+			return array('success' => false, 'error' => $txt['shd_cannot_change_urgency']);

+

+		$new_urgency = (int) $_GET['urgency'];

+		$action = 'urgency_change';

+	}

+	else

+	{

 		$can_urgency = shd_can_alter_urgency($row['urgency'], $row['id_member_started'], ($row['status'] == TICKET_STATUS_CLOSED), ($row['status'] == TICKET_STATUS_DELETED), $row['id_dept']);

 		if (empty($_GET['change']) || empty($can_urgency[$_GET['change']]))

@@ -230,8 +247,9 @@ function shd_ajax_urgency()

 		$new_urgency = $row['urgency'] + ($_GET['change'] == 'increase' ? 1 : -1);

 		$action = 'urgency_' . $_GET['change'];

+	}

-	require_once($sourcedir . '/sd_source/Subs-SimpleDeskPost.php');

+	// Build the modify information.

 	$msgOptions = array();

 	$posterOptions = array();

 	$ticketOptions = array(

@@ -266,6 +284,79 @@ function shd_ajax_urgency()

 	return $context['ajax_return'];

 }

+/**

+ *	Handles AJAX updates to ticket urgency list.

+ *

+ *	Operations:

+ *	- silent session check; if fail, add to $context['ajax_return']['error']

+ *	- ticket id check; if fail, add to $context['ajax_return']['error']

+ *	- get enough ticket data to do this

+ *	- check permissions with {@link shd_can_alter_urgency()} and permissions; if fail, add to $context['ajax_return']['error']

+ *	- identify whether the new urgency needs 'urgent' styling or not and put the new urgency in $context['ajax_return']['message']

+ *	- update the database with the new urgency

+ *	- identify whether the new urgency continues to allow the current user to change urgency or not

+ *	- put the button links if appropriate into $context['ajax_return']['increase'] and $context['ajax_return']['decrease'] and return

+ *

+ *	@return array Response data for Ajax.

+ *  @since 2.1

+*/

+function shd_ajax_urgencylist()

+{

+	global $smcFunc, $user_info, $context, $txt, $scripturl, $settings, $sourcedir;

+

+	$session_check = checkSession('get', '', false); // check the session but don't die fatally.

+	if (!empty($session_check))

+		return array('success' => false, 'error' => $txt[$session_check]);

+

+	// First, figure out the state of the ticket - is it private or not? Can we even see it?

+	if (empty($context['ticket_id']))

+		return array('success' => false, 'error' => $txt['shd_no_ticket']);

+

+	$query = shd_db_query('', '

+		SELECT id_member_started, subject, urgency, status, id_dept

+		FROM {db_prefix}helpdesk_tickets AS hdt

+		WHERE {query_see_ticket}

+			AND id_ticket = {int:current_ticket}',

+		array(

+			'current_ticket' => $context['ticket_id'],

+		)

+	);

+

+	$row = $smcFunc['db_fetch_assoc']($query);

+	$smcFunc['db_free_result']($query);

+

+	// No ticket, no luck.

+	if (empty($row))

+		return array('error' => $txt['shd_no_ticket']);

+

+	// Build the list.

+	$context['ajax_return'] = array(

+		'success' => true,

+		'urgencies' => array(),

+	);

+

+	// Get the options.

+	require_once($sourcedir . '/sd_source/Subs-SimpleDeskPost.php');

+	shd_get_urgency_options($row['id_member_started'] == $user_info['id'], $row['id_dept']);

+

+	foreach($context['ticket_form']['urgency']['options'] as $urgency => $urgency_txt)

+	{

+		$can_urgency = shd_can_alter_urgency($urgency, $row['id_member_started'], ($row['status'] == TICKET_STATUS_CLOSED), ($row['status'] == TICKET_STATUS_DELETED), $row['id_dept']);

+

+		// Can't do this either way? Don't show this as a option.

+		if (empty($can_urgency['increase']) && empty($can_urgency['decrease']))

+			continue;

+

+		$context['ajax_return']['urgencies'][$urgency] = array(

+			'id' => $urgency,

+			'name' => $txt[$urgency_txt],

+			'selected' => $row['urgency'] == $urgency,

+		);

+	}

+	

+	return $context['ajax_return'];

+}

+

 /**

  *	Collects ticket post data for quoting posts through AJAX (i.e. inserting a quote live into the postbox)

  *

@@ -451,6 +451,7 @@ function shd_log_action($action, $params, $do_last_update = true)

 		'marknotprivate' => 'shd_logopt_privacy',

 		'urgency_increase' => 'shd_logopt_urgency',

 		'urgency_decrease' => 'shd_logopt_urgency',

+		'urgency_change' => 'shd_logopt_urgency',

 		'tickettotopic' => 'shd_logopt_tickettopicmove',

 		'topictoticket' => 'shd_logopt_tickettopicmove',

 		'delete' => 'shd_logopt_delete',

@@ -69,7 +72,12 @@ function template_viewticket()

 						<dd id="item_urgency"><span id="urgency">', $context['ticket']['urgency']['label'], '</span>

 							<span id="urgency_increase">', (!empty($context['ticket']['urgency']['increase']) ? '<a id="urglink_increase" href="' . $scripturl . '?action=helpdesk;sa=urgencychange;ticket=' . $context['ticket']['id'] . ';change=increase;' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . $txt['shd_urgency_increase'] . '"><span class="generic_icons urgency_increase" title="' . $txt['shd_urgency_increase'] . '"></span></a>' : ''), '</span>

 							<span id="urgency_decrease">', (!empty($context['ticket']['urgency']['decrease']) ? '<a id="urglink_decrease" href="' . $scripturl . '?action=helpdesk;sa=urgencychange;ticket=' . $context['ticket']['id'] . ';change=decrease;' . $context['session_var'] . '=' . $context['session_id'] . '" title="' . $txt['shd_urgency_decrease'] . '"><span class="generic_icons urgency_decrease" title="' . $txt['shd_urgency_decrease'] . '"></span></a>' : ''), '</span>

+							<span id="urgency_button"></span>

+						</dd>

+						<dd class="shd_urgency_list">

+							<select id="urgency_list" class="hidden"></select>

 						</dd>

+

 						<dt><img src="', $settings['default_images_url'], '/simpledesk/staff.png" alt="" class="shd_smallicon"> ', $txt['shd_ticket_assignedto'], ':</dt>

 						<dd><span id="assigned_to">', $context['ticket']['assigned']['link'], '</span><span id="assigned_button"></span></dd>

 						<dt class="shd_assignees_list">

@@ -1073,16 +1083,21 @@ function template_shd_js_privacy()

 */

 function template_shd_js_urgency()

 {

-	global $context;

+	global $context, $settings;

 	echo '

 		var urgencyCtl = new shd_urgencyControl({

-			ticket: ', $context['ticket_id'], ',

+			sSelf: "urgencyCtl",

+			iTicketId: ' . $context['ticket_id'] . ',

 			sUrl: smf_scripturl + "?action=helpdesk;sa=ajax;op=urgency;ticket=', $context['ticket_id'], ';change=",

 			sSession: smf_session_var + "=" + smf_session_id,

 			sDestSpan: "urgency",

 			aButtons: ["up", "down"],

-			aButtonOps: { up: "increase", down: "decrease" }

+			aButtonOps: {up:"increase", down:"decrease"},

+			sSelectButtonId: "urgency_button",

+			sSelectListId: "urgency_list",

+			sImageCollapsed: ', JavaScriptEscape($settings['default_images_url'] . '/simpledesk/ajax_assign.png'), ',

+			sImageExpanded: ', JavaScriptEscape($settings['default_images_url'] . '/simpledesk/ajax_assign_cancel.png'), ',

 		});';

 }