mirror of https://github.com/itflow-org/itflow
More work on #324 Tickets
This commit is contained in:
johnnyq
parent
5e9eb4d27d
commit
ef8e9285aa
190
ticket.php
190
ticket.php
|
|
@ -171,8 +171,8 @@ if(isset($_GET['ticket_id'])){
|
||||||
<i class="fas fa-fw fa-ellipsis-v"></i>
|
<i class="fas fa-fw fa-ellipsis-v"></i>
|
||||||
</button>
|
</button>
|
||||||
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
|
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
|
||||||
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">Edit</a>
|
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#ticketEditModal<?php echo $ticket_id; ?>">Edit</a>
|
||||||
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#mergeTicketModal<?php echo $ticket_id; ?>">Merge</a>
|
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#ticketMergeModal<?php echo $ticket_id; ?>">Merge</a>
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a class="dropdown-item text-danger" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
|
<a class="dropdown-item text-danger" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -295,7 +295,7 @@ if(isset($_GET['ticket_id'])){
|
||||||
<i class="fas fa-fw fa-ellipsis-v"></i>
|
<i class="fas fa-fw fa-ellipsis-v"></i>
|
||||||
</button>
|
</button>
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketReplyModal<?php echo $ticket_reply_id; ?>"><i class="fas fa-fw fa-edit text-secondary"></i> Edit</a>
|
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#ticketReplyEditModal<?php echo $ticket_reply_id; ?>"><i class="fas fa-fw fa-edit text-secondary"></i> Edit</a>
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a class="dropdown-item text-danger" href="post.php?archive_ticket_reply=<?php echo $ticket_reply_id; ?>"><i class="fas fa-fw fa-trash text-danger"></i> Archive</a>
|
<a class="dropdown-item text-danger" href="post.php?archive_ticket_reply=<?php echo $ticket_reply_id; ?>"><i class="fas fa-fw fa-trash text-danger"></i> Archive</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -310,7 +310,7 @@ if(isset($_GET['ticket_id'])){
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
include("edit_ticket_reply_modal.php");
|
include("ticket_reply_edit_modal.php");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -320,73 +320,69 @@ if(isset($_GET['ticket_id'])){
|
||||||
|
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
|
|
||||||
<div class="card card-outline card-primary mb-3">
|
<div class="card card-body card-outline card-primary mb-3">
|
||||||
<div class="card-body">
|
<div>
|
||||||
<div>
|
<h5><strong><?php echo $client_name; ?></strong></h5>
|
||||||
<h5><strong><?php echo $client_name; ?></strong></h5>
|
<?php
|
||||||
<?php
|
if(!empty($location_phone)){
|
||||||
if(!empty($location_phone)){
|
?>
|
||||||
?>
|
<i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i><?php echo $location_phone; ?>
|
||||||
<i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i><?php echo $location_phone; ?>
|
<br>
|
||||||
<br>
|
<?php
|
||||||
<?php
|
}
|
||||||
}
|
?>
|
||||||
?>
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
if(!empty($client_tags_display)){
|
if(!empty($client_tags_display)){
|
||||||
echo "$client_tags_display";
|
echo "$client_tags_display";
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php if(!empty($contact_id)){ ?>
|
<?php if(!empty($contact_id)){ ?>
|
||||||
|
|
||||||
<div class="card card-outline card-dark mb-3">
|
<div class="card card-body card-outline card-dark mb-3">
|
||||||
<div class="card-body">
|
<div>
|
||||||
<div>
|
<h4 class="text-secondary">Contact</h4>
|
||||||
<h4 class="text-secondary">Contact</h4>
|
<i class="fa fa-fw fa-user text-secondary ml-1 mr-2 mb-2"></i><strong><?php echo $contact_name; ?></strong>
|
||||||
<i class="fa fa-fw fa-user text-secondary ml-1 mr-2 mb-2"></i><strong><?php echo $contact_name; ?></strong>
|
<br>
|
||||||
<br>
|
<i class="fa fa-fw fa-info-circle text-secondary ml-1 mr-2 mb-2"></i><?php echo $primary_contact_display; ?>
|
||||||
<i class="fa fa-fw fa-info-circle text-secondary ml-1 mr-2 mb-2"></i><?php echo $primary_contact_display; ?>
|
<br>
|
||||||
<br>
|
<i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2 mb-2"></i>Related tickets: Open <strong><?php echo $ticket_related_open; ?></strong> | Closed <strong><?php echo $ticket_related_closed; ?></strong> | Total <strong><?php echo $ticket_related_total; ?></strong>
|
||||||
<i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2 mb-2"></i>Related tickets: Open <strong><?php echo $ticket_related_open; ?></strong> | Closed <strong><?php echo $ticket_related_closed; ?></strong> | Total <strong><?php echo $ticket_related_total; ?></strong>
|
<hr>
|
||||||
<hr>
|
<?php
|
||||||
<?php
|
if(!empty($location_name)){
|
||||||
if(!empty($location_name)){
|
?>
|
||||||
?>
|
<i class="fa fa-fw fa-map-marker-alt text-secondary ml-1 mr-2 mb-2"></i><?php echo $location_name; ?>
|
||||||
<i class="fa fa-fw fa-map-marker-alt text-secondary ml-1 mr-2 mb-2"></i><?php echo $location_name; ?>
|
<br>
|
||||||
<br>
|
<?php
|
||||||
<?php
|
}
|
||||||
}
|
?>
|
||||||
?>
|
<?php
|
||||||
<?php
|
if(!empty($contact_email)){
|
||||||
if(!empty($contact_email)){
|
?>
|
||||||
?>
|
<i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2 mb-2"></i><a href="mailto:<?php echo $contact_email; ?>"><?php echo $contact_email; ?></a>
|
||||||
<i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2 mb-2"></i><a href="mailto:<?php echo $contact_email; ?>"><?php echo $contact_email; ?></a>
|
<br>
|
||||||
<br>
|
<?php
|
||||||
<?php
|
}
|
||||||
}
|
?>
|
||||||
?>
|
<?php
|
||||||
<?php
|
if(!empty($contact_phone)){
|
||||||
if(!empty($contact_phone)){
|
?>
|
||||||
?>
|
<i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i><?php echo $contact_phone; ?>
|
||||||
<i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i><?php echo $contact_phone; ?>
|
<br>
|
||||||
<br>
|
<?php
|
||||||
<?php
|
}
|
||||||
}
|
?>
|
||||||
?>
|
<?php
|
||||||
<?php
|
if(!empty($contact_mobile)){
|
||||||
if(!empty($contact_mobile)){
|
?>
|
||||||
?>
|
<i class="fa fa-fw fa-mobile text-secondary ml-1 mr-2 mb-2"></i><?php echo $contact_mobile; ?>
|
||||||
<i class="fa fa-fw fa-mobile text-secondary ml-1 mr-2 mb-2"></i><?php echo $contact_mobile; ?>
|
<br>
|
||||||
<br>
|
<?php
|
||||||
<?php
|
}
|
||||||
}
|
?>
|
||||||
?>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
@ -394,37 +390,35 @@ if(isset($_GET['ticket_id'])){
|
||||||
|
|
||||||
<?php if(!empty($asset_id)){ ?>
|
<?php if(!empty($asset_id)){ ?>
|
||||||
|
|
||||||
<div class="card card-outline card-dark mb-3">
|
<div class="card card-body card-outline card-dark mb-3">
|
||||||
<div class="card-body">
|
<div>
|
||||||
<div>
|
<h4 class="text-secondary">Asset</h4>
|
||||||
<h4 class="text-secondary">Asset</h4>
|
<i class="fa fa-fw fa-desktop text-secondary ml-1 mr-2 mb-2"></i><strong><?php echo $asset_name; ?></strong>
|
||||||
<i class="fa fa-fw fa-desktop text-secondary ml-1 mr-2 mb-2"></i><strong><?php echo $asset_name; ?></strong>
|
<br>
|
||||||
<br>
|
<?php
|
||||||
<?php
|
if(!empty($asset_make)){
|
||||||
if(!empty($asset_make)){
|
?>
|
||||||
?>
|
<i class="fa fa-fw fa-tag text-secondary ml-1 mr-2 mb-2"></i><?php echo "$asset_make $asset_model"; ?>
|
||||||
<i class="fa fa-fw fa-tag text-secondary ml-1 mr-2 mb-2"></i><?php echo "$asset_make $asset_model"; ?>
|
<br>
|
||||||
<br>
|
<?php
|
||||||
<?php
|
}
|
||||||
}
|
?>
|
||||||
?>
|
<?php
|
||||||
<?php
|
if(!empty($asset_serial)){
|
||||||
if(!empty($asset_serial)){
|
?>
|
||||||
?>
|
<i class="fa fa-fw fa-barcode text-secondary ml-1 mr-2 mb-2"></i><?php echo $asset_serial; ?>
|
||||||
<i class="fa fa-fw fa-barcode text-secondary ml-1 mr-2 mb-2"></i><?php echo $asset_serial; ?>
|
<br>
|
||||||
<br>
|
<?php
|
||||||
<?php
|
}
|
||||||
}
|
?>
|
||||||
?>
|
<?php
|
||||||
<?php
|
if(!empty($asset_os)){
|
||||||
if(!empty($asset_os)){
|
?>
|
||||||
?>
|
<i class="fa fa-fw fa-tag text-secondary ml-1 mr-2 mb-2"></i><?php echo $asset_os; ?>
|
||||||
<i class="fa fa-fw fa-tag text-secondary ml-1 mr-2 mb-2"></i><?php echo $asset_os; ?>
|
<br>
|
||||||
<br>
|
<?php
|
||||||
<?php
|
}
|
||||||
}
|
?>
|
||||||
?>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
@ -498,8 +492,8 @@ if(isset($_GET['ticket_id'])){
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
include("edit_ticket_modal.php");
|
include("ticket_edit_modal.php");
|
||||||
include("merge_ticket_modal.php");
|
include("ticket_merge_modal.php");
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="modal" id="addTicketModal" tabindex="-1">
|
<div class="modal" id="ticketAddModal" tabindex="-1">
|
||||||
<div class="modal-dialog modal-lg">
|
<div class="modal-dialog modal-lg">
|
||||||
<div class="modal-content bg-dark">
|
<div class="modal-content bg-dark">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="modal" id="editTicketModal<?php echo $ticket_id; ?>" tabindex="-1">
|
<div class="modal" id="ticketEditModal<?php echo $ticket_id; ?>" tabindex="-1">
|
||||||
<div class="modal-dialog modal-lg">
|
<div class="modal-dialog modal-lg">
|
||||||
<div class="modal-content bg-dark">
|
<div class="modal-content bg-dark">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="modal" id="mergeTicketModal<?php echo $ticket_id; ?>" tabindex="-1">
|
<div class="modal" id="ticketMergeModal<?php echo $ticket_id; ?>" tabindex="-1">
|
||||||
<div class="modal-dialog modal-md">
|
<div class="modal-dialog modal-md">
|
||||||
<div class="modal-content bg-dark">
|
<div class="modal-content bg-dark">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="modal" id="editTicketReplyModal<?php echo $ticket_reply_id; ?>" tabindex="-1">
|
<div class="modal" id="ticketReplyEditModal<?php echo $ticket_reply_id; ?>" tabindex="-1">
|
||||||
<div class="modal-dialog modal-lg">
|
<div class="modal-dialog modal-lg">
|
||||||
<div class="modal-content bg-dark">
|
<div class="modal-content bg-dark">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
|
|
@ -113,7 +113,7 @@
|
||||||
<div class="card-header py-2">
|
<div class="card-header py-2">
|
||||||
<h3 class="card-title mt-2"><i class="fa fa-fw fa-tags"></i> Tickets</h3>
|
<h3 class="card-title mt-2"><i class="fa fa-fw fa-tags"></i> Tickets</h3>
|
||||||
<div class='card-tools'>
|
<div class='card-tools'>
|
||||||
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal"><i class="fas fa-fw fa-plus"></i> New Ticket</button>
|
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#ticketAddModal"><i class="fas fa-fw fa-plus"></i> New Ticket</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
|
@ -273,14 +273,14 @@
|
||||||
<i class="fas fa-ellipsis-h"></i>
|
<i class="fas fa-ellipsis-h"></i>
|
||||||
</button>
|
</button>
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">Edit</a>
|
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#ticketEditModal<?php echo $ticket_id; ?>">Edit</a>
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a class="dropdown-item text-danger" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
|
<a class="dropdown-item text-danger" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
include("edit_ticket_modal.php");
|
include("ticket_edit_modal.php");
|
||||||
|
|
||||||
?>
|
?>
|
||||||
</td>
|
</td>
|
||||||
|
|
@ -299,6 +299,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php include("add_ticket_modal.php"); ?>
|
<?php include("ticket_add_modal.php"); ?>
|
||||||
|
|
||||||
<?php include("footer.php");
|
<?php include("footer.php");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue