Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#209 Update search and export pages to show new status table

Browse Source 
Still need to fix searching and need to test exporting
This commit is contained in:
Mike Koch 2015-07-28 13:00:26 -04:00
parent 50778c02dd
commit c9360fd538
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/export.php
View File

@ -243,12 +243,12 @@ $fid = 1;
require(HESK_PATH . 'inc/assignment_search.inc.php'); require(HESK_PATH . 'inc/assignment_search.inc.php');
// --> TICKET STATUS // --> TICKET STATUS
$possibleStatusSql = 'SELECT `ID`, `Key` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`'; $possibleStatusSql = 'SELECT `ID` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`';
$possibleStatusRS = hesk_dbQuery($possibleStatusSql); $possibleStatusRS = hesk_dbQuery($possibleStatusSql);
$possible_status = array(); $possible_status = array();
while ($row = $possibleStatusRS->fetch_assoc()) while ($row = $possibleStatusRS->fetch_assoc())
{ {
$possible_status[$row['ID']] = $hesklang[$row['Key']]; $possible_status[$row['ID']] = mfh_getDisplayTextForStatusId($row['ID']);
} }
$status = $possible_status; $status = $possible_status;
@ -507,9 +507,7 @@ if (isset($_GET['w']))
$result = hesk_dbQuery($sql); $result = hesk_dbQuery($sql);
while ($ticket=hesk_dbFetchAssoc($result)) while ($ticket=hesk_dbFetchAssoc($result))
{ {
$statusContentKeySql = 'SELECT `Key` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `ID` = '.$ticket['status']; $ticket['status'] = mfh_getDisplayTextForStatusId($ticket['status']);
$statusContentKeyRow = hesk_dbQuery($statusContentKeySql)->fetch_assoc();
$ticket['status'] = $hesklang[$statusContentKeyRow['Key']];
switch ($ticket['priority']) switch ($ticket['priority'])
{ {
@ -788,7 +786,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
?> ?>
<div class="col-xs-4"> <div class="col-xs-4">
<div class="checkbox"> <div class="checkbox">
<label><input type="checkbox" name="s<?php echo $row['ID']; ?>" value="1" <?php if (isset($status[$row['ID']])) {echo 'checked="checked"';} ?> /> <span style="color: <?php echo $row['TextColor']; ?>"><?php echo $hesklang[$row['Key']]; ?></span></label> <label><input type="checkbox" name="s<?php echo $row['ID']; ?>" value="1" <?php if (isset($status[$row['ID']])) {echo 'checked="checked"';} ?> /> <span style="color: <?php echo $row['TextColor']; ?>"><?php echo mfh_getDisplayTextForStatusId($row['ID']); ?></span></label>
</div> </div>
</div> </div>
<?php <?php

8
inc/show_search_form.inc.php
View File

@ -38,10 +38,10 @@ if ( ! isset($status) )
{ {
$status = array(); $status = array();
//-- We don't want to check statuses that are considered "closed" //-- We don't want to check statuses that are considered "closed"
$statusRS = hesk_dbQuery('SELECT `ID`, `Key` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsClosed` = 0'); $statusRS = hesk_dbQuery('SELECT `ID` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsClosed` = 0');
while ($row = $statusRS->fetch_assoc()) while ($row = $statusRS->fetch_assoc())
{ {
$status[$row['ID']] = $row['Key']; $status[$row['ID']] = mfh_getDisplayTextForStatusId($row['ID']);
} }
} }
@ -131,7 +131,7 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
<tr> <tr>
<?php <?php
$rowCounter = 1; $rowCounter = 1;
$statusRS = hesk_dbQuery('SELECT `ID`, `Key`, `TextColor` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`'); $statusRS = hesk_dbQuery('SELECT `ID`, `TextColor` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`');
while ($row = $statusRS->fetch_assoc()) while ($row = $statusRS->fetch_assoc())
{ {
if ($rowCounter > 3) if ($rowCounter > 3)
@ -149,7 +149,7 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
} }
echo '<label><input type="checkbox" name="s'.$row['ID'].'" value="1"'; echo '<label><input type="checkbox" name="s'.$row['ID'].'" value="1"';
if (isset($status[$row['ID']])) {echo 'checked="checked"';} if (isset($status[$row['ID']])) {echo 'checked="checked"';}
echo '/> <span style="font-weight: bold;color: '.$row['TextColor'].';">'.$hesklang[$row['Key']].'</span></label></td>'; echo '/> <span style="font-weight: bold;color: '.$row['TextColor'].';">'.mfh_getDisplayTextForStatusId($row['ID']).'</span></label></td>';
$rowCounter++; $rowCounter++;
} }