mirror of
https://github.com/itflow-org/itflow
synced 2026-02-28 02:44:53 +00:00
Merge branch 'master' into See-All-Timers
This commit is contained in:
Andrew Malsbury
GitHub
79
ticket.php
79
ticket.php
@@ -101,6 +101,7 @@ if (isset($_GET['ticket_id'])) {
|
||||
$asset_ip = nullable_htmlentities($row['asset_ip']);
|
||||
$asset_name = nullable_htmlentities($row['asset_name']);
|
||||
$asset_type = nullable_htmlentities($row['asset_type']);
|
||||
$asset_uri = nullable_htmlentities($row['asset_uri']);
|
||||
$asset_make = nullable_htmlentities($row['asset_make']);
|
||||
$asset_model = nullable_htmlentities($row['asset_model']);
|
||||
$asset_serial = nullable_htmlentities($row['asset_serial']);
|
||||
@@ -295,72 +296,62 @@ if (isset($_GET['ticket_id'])) {
|
||||
<textarea class="form-control tinymce" name="ticket_reply" placeholder="Type a response"></textarea>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<div class="input-group input-group-sm">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
|
||||
</div>
|
||||
<select class="form-control select2" name="status" required>
|
||||
<option <?php if ($ticket_status == "In-Progress") {echo "selected";}?> >In-Progress</option>
|
||||
<option <?php if ($ticket_status == "Pending-Client") {echo "selected";}?> >Pending-Client</option>
|
||||
<option <?php if ($ticket_status == "Pending-Vendor") {echo "selected";}?> >Pending-Vendor</option>
|
||||
<option <?php if ($ticket_status == "Pending-Shipment") {echo "selected";}?> >Pending-Shipment</option>
|
||||
<option <?php if ($ticket_status == "Scheduled") {echo "selected";}?> >Scheduled</option>
|
||||
<?php if($config_ticket_autoclose) { ?>
|
||||
<option <?php if ($ticket_status == 'Auto Close') { echo "selected"; } ?> >Auto Close</option>
|
||||
<?php } ?>
|
||||
</select>
|
||||
<div class="col-md-2">
|
||||
<div class="input-group mb-3">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
|
||||
</div>
|
||||
<select class="form-control select2" name="status" required>
|
||||
<option <?php if ($ticket_status == "In-Progress") {echo "selected";}?> >In-Progress</option>
|
||||
<option <?php if ($ticket_status == "Pending-Client") {echo "selected";}?> >Pending-Client</option>
|
||||
<option <?php if ($ticket_status == "Pending-Vendor") {echo "selected";}?> >Pending-Vendor</option>
|
||||
<option <?php if ($ticket_status == "Pending-Shipment") {echo "selected";}?> >Pending-Shipment</option>
|
||||
<option <?php if ($ticket_status == "Scheduled") {echo "selected";}?> >Scheduled</option>
|
||||
<?php if($config_ticket_autoclose) { ?>
|
||||
<option <?php if ($ticket_status == 'Auto Close') { echo "selected"; } ?> >Auto Close</option>
|
||||
<?php } ?>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Time Tracking: Hours -->
|
||||
|
||||
<div class="col-sm-2">
|
||||
<div class="input-group input-group-sm mb-3">
|
||||
<div class="col-sm-3 col-lg-2">
|
||||
<div class="input-group mb-3">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text"><i class="fas fa-fw fa-clock"></i></span>
|
||||
</div>
|
||||
<input type="text" class="form-control" inputmode="numeric" id="hours" name="hours" placeholder="Hrs" min="0" max="23" pattern="0?[0-9]|1[0-9]|2[0-3]">
|
||||
<div class="input-group-append">
|
||||
<span class="input-group-text">H</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Time Tracking: Minutes -->
|
||||
|
||||
<div class="col-sm-1">
|
||||
<div class="input-group input-group-sm mb-3">
|
||||
<div class="input-group mb-3">
|
||||
<input type="text" class="form-control" inputmode="numeric" id="minutes" name="minutes" placeholder="Mins" min="0" max="59" pattern="[0-5]?[0-9]">
|
||||
|
||||
<div class="input-group-append">
|
||||
<span class="input-group-text">M</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Time Tracking: Seconds -->
|
||||
|
||||
<div class="col-sm-1">
|
||||
<div class="input-group input-group-sm mb-3">
|
||||
<div class="input-group mb-3">
|
||||
<input type="text" class="form-control" inputmode="numeric" id="seconds" name="seconds" placeholder="Secs" min="0" max="59" pattern="[0-5]?[0-9]">
|
||||
<div class="input-group-append">
|
||||
<span class="input-group-text">S</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Timer Controls -->
|
||||
|
||||
<div class="col-sm-1">
|
||||
<div class="btn-group" role="group">
|
||||
<button type="button" class="btn btn-success btn-sm" id="startStopTimer"><i class="fas fa-fw fa-pause"></i></button>
|
||||
<button type="button" class="btn btn-danger btn-sm" id="resetTimer"><i class="fas fa-fw fa-redo-alt"></i></button>
|
||||
<div class="col-sm-2">
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-success" id="startStopTimer"><i class="fas fa-fw fa-pause"></i></button>
|
||||
<button type="button" class="btn btn-danger" id="resetTimer"><i class="fas fa-fw fa-redo-alt"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="form-row">
|
||||
|
||||
|
||||
<?php if(!empty($contact_email && $contact_email !== $session_email)){ ?>
|
||||
|
||||
@@ -519,7 +510,7 @@ if (isset($_GET['ticket_id'])) {
|
||||
|
||||
<!-- Contact card -->
|
||||
<div class="card card-body card-outline card-dark mb-3">
|
||||
<h4 class="text-secondary">Contact</h4>
|
||||
<h5 class="text-secondary">Contact</h5>
|
||||
|
||||
<?php if (!empty($contact_id)) { ?>
|
||||
|
||||
@@ -590,7 +581,7 @@ if (isset($_GET['ticket_id'])) {
|
||||
|
||||
<!-- Ticket watchers card -->
|
||||
<div class="card card-body card-outline card-dark mb-3">
|
||||
<h4 class="text-secondary">Watchers</h4>
|
||||
<h5 class="text-secondary">Watchers</h5>
|
||||
|
||||
<div>
|
||||
<a href="#" data-toggle="modal" data-target="#addTicketWatcherModal"><i class="fa fa-fw fa-plus mr-2"></i>Add a Watcher</a>
|
||||
@@ -612,7 +603,7 @@ if (isset($_GET['ticket_id'])) {
|
||||
|
||||
<!-- Ticket Details card -->
|
||||
<div class="card card-body card-outline card-dark mb-3">
|
||||
<h4 class="text-secondary">Details</h4>
|
||||
<h5 class="text-secondary">Details</h5>
|
||||
<div>
|
||||
<i class="fa fa-fw fa-thermometer-half text-secondary ml-1 mr-2"></i><a href="#" data-toggle="modal" data-target="#editTicketPriorityModal<?php echo $ticket_id; ?>"><?php echo $ticket_priority_display; ?></a>
|
||||
</div>
|
||||
@@ -649,7 +640,7 @@ if (isset($_GET['ticket_id'])) {
|
||||
|
||||
<!-- Asset card -->
|
||||
<div class="card card-body card-outline card-dark mb-3">
|
||||
<h4 class="text-secondary">Asset</h4>
|
||||
<h5 class="text-secondary">Asset</h5>
|
||||
|
||||
<?php if ($asset_id == 0) { ?>
|
||||
|
||||
@@ -660,7 +651,7 @@ if (isset($_GET['ticket_id'])) {
|
||||
<?php } else { ?>
|
||||
|
||||
<div>
|
||||
<i class="fa fa-fw fa-desktop text-secondary ml-1 mr-2"></i><strong><?php echo $asset_name; ?></strong>
|
||||
<a href='client_asset_details.php?client_id=<?php echo $client_id?>&asset_id=<?php echo $asset_id?>' ><i class="fa fa-fw fa-desktop text-secondary ml-1 mr-2"></i><strong><?php echo $asset_name; ?></strong></a>
|
||||
</div>
|
||||
|
||||
<?php if (!empty($asset_os)) { ?>
|
||||
@@ -693,6 +684,12 @@ if (isset($_GET['ticket_id'])) {
|
||||
</div>
|
||||
<?php }
|
||||
|
||||
if (!empty($asset_uri)) { ?>
|
||||
<div class="mt-1">
|
||||
<i class="fa fa-fw fa-globe text-secondary ml-1 mr-2"></i><a href="<?php echo $asset_uri; ?>" target="_blank"><?php echo $asset_uri; ?></a>
|
||||
</div>
|
||||
<?php }
|
||||
|
||||
if ($ticket_asset_count > 0) { ?>
|
||||
|
||||
<button class="btn btn-block btn-secondary mt-2" data-toggle="modal" data-target="#assetTicketsModal">Service History (<?php echo $ticket_asset_count; ?>)</button>
|
||||
@@ -744,7 +741,7 @@ if (isset($_GET['ticket_id'])) {
|
||||
|
||||
<!-- Vendor card -->
|
||||
<div class="card card-body card-outline card-dark mb-3">
|
||||
<h4 class="text-secondary">Vendor</h4>
|
||||
<h5 class="text-secondary">Vendor</h5>
|
||||
<?php if (empty($vendor_id)) { ?>
|
||||
<div>
|
||||
<a href="#" data-toggle="modal" data-target="#editTicketVendorModal<?php echo $ticket_id; ?>"><i class="fa fa-fw fa-plus mr-2"></i>Add a Vendor</a>
|
||||
|
||||
Reference in New Issue
Block a user