Change columns to have widths assigned by the source. Add assignee to the tickets awaiting response for staff (Fixes #79)
jdarwood007 commited on 2019-02-23 09:25:12
Showing 2 changed files, with 73 additions and 72 deletions.
- sd_source/SimpleDesk.php 0b4c640..3fb99d6
- sd_template/SimpleDesk.template.php 915fa38..27acce9
| ... | ... |
@@ -1298,7 +1298,7 @@ function shd_helpdesk_listing() |
| 1298 | 1298 |
* - recycled: deleted tickets |
| 1299 | 1299 |
* - withdeleted: tickets with deleted replies |
| 1300 | 1300 |
* |
| 1301 |
- * @return array An indexed array of the columns in the order they should be displayed. |
|
| 1301 |
+ * @return array An indexed array of the columns in the order they should be displayed as the key. Value contains the width of the column. |
|
| 1302 | 1302 |
* @see shd_main_helpdesk() |
| 1303 | 1303 |
* @see shd_closed_tickets() |
| 1304 | 1304 |
* @see shd_recycle_bin() |
| ... | ... |
@@ -1310,85 +1310,86 @@ function shd_get_block_columns($block) |
| 1310 | 1310 |
{
|
| 1311 | 1311 |
case 'assigned': |
| 1312 | 1312 |
return array( |
| 1313 |
- 'ticket_id', |
|
| 1314 |
- 'ticket_name', |
|
| 1315 |
- 'starting_user', |
|
| 1316 |
- 'replies', |
|
| 1317 |
- 'status', |
|
| 1318 |
- 'urgency', |
|
| 1319 |
- 'updated', |
|
| 1320 |
- 'actions', |
|
| 1313 |
+ 'ticket_id' => 8, |
|
| 1314 |
+ 'ticket_name' => 15, |
|
| 1315 |
+ 'starting_user' => 12, |
|
| 1316 |
+ 'replies' => 7, |
|
| 1317 |
+ 'status' => 17, |
|
| 1318 |
+ 'urgency' => 8, |
|
| 1319 |
+ 'updated' => 22, |
|
| 1320 |
+ 'actions' => 5, |
|
| 1321 | 1321 |
); |
| 1322 | 1322 |
case 'new': |
| 1323 | 1323 |
return array( |
| 1324 |
- 'ticket_id', |
|
| 1325 |
- 'ticket_name', |
|
| 1326 |
- 'starting_user', |
|
| 1327 |
- 'assigned', |
|
| 1328 |
- 'urgency', |
|
| 1329 |
- 'updated', |
|
| 1330 |
- 'actions', |
|
| 1324 |
+ 'ticket_id' => 8, |
|
| 1325 |
+ 'ticket_name' => 15, |
|
| 1326 |
+ 'starting_user' => 12, |
|
| 1327 |
+ 'assigned' => 12, |
|
| 1328 |
+ 'urgency' => 8, |
|
| 1329 |
+ 'updated' => 22, |
|
| 1330 |
+ 'actions' => 5, |
|
| 1331 | 1331 |
); |
| 1332 | 1332 |
case 'staff': |
| 1333 | 1333 |
return array( |
| 1334 |
- 'ticket_id', |
|
| 1335 |
- 'ticket_name', |
|
| 1336 |
- 'starting_user', |
|
| 1337 |
- 'replies', |
|
| 1338 |
- 'assigned', |
|
| 1339 |
- 'urgency', |
|
| 1340 |
- 'updated', |
|
| 1341 |
- 'actions', |
|
| 1334 |
+ 'ticket_id' => 8, |
|
| 1335 |
+ 'ticket_name' => 15, |
|
| 1336 |
+ 'starting_user' => 12, |
|
| 1337 |
+ 'replies' => 7, |
|
| 1338 |
+ 'assigned' => 12, |
|
| 1339 |
+ 'urgency' => 8, |
|
| 1340 |
+ 'updated' => 22, |
|
| 1341 |
+ 'actions' => 5, |
|
| 1342 | 1342 |
); |
| 1343 | 1343 |
case 'user_staff': |
| 1344 | 1344 |
return array( |
| 1345 |
- 'ticket_id', |
|
| 1346 |
- 'ticket_name', |
|
| 1347 |
- 'starting_user', |
|
| 1348 |
- 'last_reply', |
|
| 1349 |
- 'replies', |
|
| 1350 |
- 'urgency', |
|
| 1351 |
- 'updated', |
|
| 1352 |
- 'actions', |
|
| 1345 |
+ 'ticket_id' => 8, |
|
| 1346 |
+ 'ticket_name' => 15, |
|
| 1347 |
+ 'starting_user' => 12, |
|
| 1348 |
+ 'last_reply' => 11, |
|
| 1349 |
+ 'replies' => 7, |
|
| 1350 |
+ 'assigned' => 12, |
|
| 1351 |
+ 'urgency' => 8, |
|
| 1352 |
+ 'updated' => 22, |
|
| 1353 |
+ 'actions' => 5, |
|
| 1353 | 1354 |
); |
| 1354 | 1355 |
case 'user_user': |
| 1355 | 1356 |
return array( |
| 1356 |
- 'ticket_id', |
|
| 1357 |
- 'ticket_name', |
|
| 1358 |
- 'last_reply', |
|
| 1359 |
- 'replies', |
|
| 1360 |
- 'urgency', |
|
| 1361 |
- 'updated', |
|
| 1362 |
- 'actions', |
|
| 1357 |
+ 'ticket_id' => 8, |
|
| 1358 |
+ 'ticket_name' => 15, |
|
| 1359 |
+ 'last_reply' => 22, |
|
| 1360 |
+ 'replies' => 7, |
|
| 1361 |
+ 'urgency' => 8, |
|
| 1362 |
+ 'updated' => 22, |
|
| 1363 |
+ 'actions' => 5, |
|
| 1363 | 1364 |
); |
| 1364 | 1365 |
case 'closed': |
| 1365 | 1366 |
return array( |
| 1366 |
- 'ticket_id', |
|
| 1367 |
- 'ticket_name', |
|
| 1368 |
- 'starting_user', |
|
| 1369 |
- 'replies', |
|
| 1370 |
- 'updated', |
|
| 1371 |
- 'actions', |
|
| 1367 |
+ 'ticket_id' => 8, |
|
| 1368 |
+ 'ticket_name' => 15, |
|
| 1369 |
+ 'starting_user' => 12, |
|
| 1370 |
+ 'replies' => 7, |
|
| 1371 |
+ 'updated' => 22, |
|
| 1372 |
+ 'actions' => 5, |
|
| 1372 | 1373 |
); |
| 1373 | 1374 |
case 'recycled': |
| 1374 | 1375 |
return array( |
| 1375 |
- 'ticket_id', |
|
| 1376 |
- 'ticket_name', |
|
| 1377 |
- 'starting_user', |
|
| 1378 |
- 'allreplies', |
|
| 1379 |
- 'assigned', |
|
| 1380 |
- 'updated', |
|
| 1381 |
- 'actions', |
|
| 1376 |
+ 'ticket_id' => 8, |
|
| 1377 |
+ 'ticket_name' => 15, |
|
| 1378 |
+ 'starting_user' => 12, |
|
| 1379 |
+ 'allreplies' => 7, |
|
| 1380 |
+ 'assigned' => 12, |
|
| 1381 |
+ 'updated' => 22, |
|
| 1382 |
+ 'actions' => 5, |
|
| 1382 | 1383 |
); |
| 1383 | 1384 |
case 'withdeleted': |
| 1384 | 1385 |
return array( |
| 1385 |
- 'ticket_id', |
|
| 1386 |
- 'ticket_name', |
|
| 1387 |
- 'starting_user', |
|
| 1388 |
- 'allreplies', |
|
| 1389 |
- 'assigned', |
|
| 1390 |
- 'updated', |
|
| 1391 |
- 'actions', |
|
| 1386 |
+ 'ticket_id' => 8, |
|
| 1387 |
+ 'ticket_name' => 15, |
|
| 1388 |
+ 'starting_user' => 12, |
|
| 1389 |
+ 'allreplies' => 7, |
|
| 1390 |
+ 'assigned' => 12, |
|
| 1391 |
+ 'updated' => 22, |
|
| 1392 |
+ 'actions' => 5, |
|
| 1392 | 1393 |
); |
| 1393 | 1394 |
default: |
| 1394 | 1395 |
return array(); |
| ... | ... |
@@ -343,55 +343,55 @@ function template_ticket_block() |
| 343 | 343 |
<tr class="title_bar">'; |
| 344 | 344 |
|
| 345 | 345 |
$block_width = 0; |
| 346 |
- foreach ($context['ticket_blocks'][$context['current_block']]['columns'] as $column) |
|
| 346 |
+ foreach ($context['ticket_blocks'][$context['current_block']]['columns'] as $column => $width) |
|
| 347 | 347 |
{
|
| 348 | 348 |
$block_width++; |
| 349 | 349 |
switch ($column) |
| 350 | 350 |
{
|
| 351 | 351 |
case 'ticket_id': |
| 352 | 352 |
echo ' |
| 353 |
- <td width="8%" colspan="2"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('ticketid', $txt['shd_ticket']), '</td>';
|
|
| 353 |
+ <td', !empty($width) ? ' width="' . $width . '%"' : '', ' colspan="2"><img src="', $settings['default_images_url'], '/simpledesk/ticket.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('ticketid', $txt['shd_ticket']), '</td>';
|
|
| 354 | 354 |
$block_width++; // is 2 blocks wide |
| 355 | 355 |
break; |
| 356 | 356 |
case 'ticket_name': |
| 357 | 357 |
echo ' |
| 358 |
- <td width="15%">', template_shd_menu_header('ticketname', $txt['shd_ticket_name']), '</td>';
|
|
| 358 |
+ <td', !empty($width) ? ' width="' . $width . '%"' : '', '>', template_shd_menu_header('ticketname', $txt['shd_ticket_name']), '</td>';
|
|
| 359 | 359 |
break; |
| 360 | 360 |
case 'starting_user': |
| 361 | 361 |
echo ' |
| 362 |
- <td width="12%"><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('starter', $txt['shd_ticket_started_by']), '</td>';
|
|
| 362 |
+ <td', !empty($width) ? ' width="' . $width . '%"' : '', '><img src="', $settings['default_images_url'], '/simpledesk/user.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('starter', $txt['shd_ticket_started_by']), '</td>';
|
|
| 363 | 363 |
break; |
| 364 | 364 |
case 'last_reply': |
| 365 | 365 |
echo ' |
| 366 |
- <td width="20%"><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('lastreply', $txt['shd_ticket_updated_by']), '</td>';
|
|
| 366 |
+ <td', !empty($width) ? ' width="' . $width . '%"' : '', '><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('lastreply', $txt['shd_ticket_updated_by']), '</td>';
|
|
| 367 | 367 |
break; |
| 368 | 368 |
case 'assigned': |
| 369 | 369 |
echo ' |
| 370 |
- <td width="12%"><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('assigned', $txt['shd_ticket_assigned']), '</td>';
|
|
| 370 |
+ <td', !empty($width) ? ' width="' . $width . '%"' : '', '><img src="', $settings['default_images_url'], '/simpledesk/staff.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('assigned', $txt['shd_ticket_assigned']), '</td>';
|
|
| 371 | 371 |
break; |
| 372 | 372 |
case 'status': |
| 373 | 373 |
echo ' |
| 374 |
- <td width="17%"><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('status', $txt['shd_ticket_status']), '</td>';
|
|
| 374 |
+ <td', !empty($width) ? ' width="' . $width . '%"' : '', '><img src="', $settings['default_images_url'], '/simpledesk/status.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('status', $txt['shd_ticket_status']), '</td>';
|
|
| 375 | 375 |
break; |
| 376 | 376 |
case 'urgency': |
| 377 | 377 |
echo ' |
| 378 |
- <td width="8%"><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('urgency', $txt['shd_ticket_urgency']), '</td>';
|
|
| 378 |
+ <td', !empty($width) ? ' width="' . $width . '%"' : '', '><img src="', $settings['default_images_url'], '/simpledesk/urgency.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('urgency', $txt['shd_ticket_urgency']), '</td>';
|
|
| 379 | 379 |
break; |
| 380 | 380 |
case 'updated': |
| 381 | 381 |
echo ' |
| 382 |
- <td width="22%"><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('updated', $txt['shd_ticket_updated']), '</td>';
|
|
| 382 |
+ <td', !empty($width) ? ' width="' . $width . '%"' : '', '><img src="', $settings['default_images_url'], '/simpledesk/time.png" class="shd_smallicon" alt=""> ', template_shd_menu_header('updated', $txt['shd_ticket_updated']), '</td>';
|
|
| 383 | 383 |
break; |
| 384 | 384 |
case 'replies': |
| 385 | 385 |
echo ' |
| 386 |
- <td width="7%">', template_shd_menu_header('replies', $txt['shd_ticket_num_replies']), '</td>';
|
|
| 386 |
+ <td', !empty($width) ? ' width="' . $width . '%"' : '', '>', template_shd_menu_header('replies', $txt['shd_ticket_num_replies']), '</td>';
|
|
| 387 | 387 |
break; |
| 388 | 388 |
case 'allreplies': |
| 389 | 389 |
echo ' |
| 390 |
- <td width="7%">', template_shd_menu_header('allreplies', $txt['shd_ticket_num_replies']), '</td>';
|
|
| 390 |
+ <td', !empty($width) ? ' width="' . $width . '%"' : '', '>', template_shd_menu_header('allreplies', $txt['shd_ticket_num_replies']), '</td>';
|
|
| 391 | 391 |
break; |
| 392 | 392 |
case 'actions': |
| 393 | 393 |
echo ' |
| 394 |
- <td width="5%">', $txt['shd_actions'], '</td>'; |
|
| 394 |
+ <td', !empty($width) ? ' width="' . $width . '%"' : '', '>', $txt['shd_actions'], '</td>'; |
|
| 395 | 395 |
break; |
| 396 | 396 |
default: |
| 397 | 397 |
echo ' |
| ... | ... |
@@ -417,7 +417,7 @@ function template_ticket_block() |
| 417 | 417 |
echo ' |
| 418 | 418 |
<tr class="windowbg">'; |
| 419 | 419 |
|
| 420 |
- foreach ($context['ticket_blocks'][$context['current_block']]['columns'] as $column) |
|
| 420 |
+ foreach ($context['ticket_blocks'][$context['current_block']]['columns'] as $column => $width) |
|
| 421 | 421 |
{
|
| 422 | 422 |
switch ($column) |
| 423 | 423 |
{
|
| 424 | 424 |