mirror of https://github.com/itflow-org/itflow
Add Client Field to Project Tickets, combine Ticket Number and Subject to 1 column
This commit is contained in:
parent
fdd8faf46a
commit
09f2072d27
|
|
@ -60,6 +60,7 @@ if (isset($_GET['project_id'])) {
|
||||||
// Get Tickets
|
// Get Tickets
|
||||||
$sql_tickets = mysqli_query($mysqli, "SELECT * FROM tickets
|
$sql_tickets = mysqli_query($mysqli, "SELECT * FROM tickets
|
||||||
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
|
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
|
||||||
|
LEFT JOIN clients ON ticket_client_id = client_id
|
||||||
LEFT JOIN users ON ticket_assigned_to = user_id
|
LEFT JOIN users ON ticket_assigned_to = user_id
|
||||||
WHERE ticket_project_id = $project_id ORDER BY ticket_number ASC"
|
WHERE ticket_project_id = $project_id ORDER BY ticket_number ASC"
|
||||||
);
|
);
|
||||||
|
|
@ -226,12 +227,12 @@ if (isset($_GET['project_id'])) {
|
||||||
<table class="table table-striped table-borderless table-hover">
|
<table class="table table-striped table-borderless table-hover">
|
||||||
<thead class="text-dark">
|
<thead class="text-dark">
|
||||||
<tr>
|
<tr>
|
||||||
<th>Number</th>
|
<th>Ticket</th>
|
||||||
<th>Subject</th>
|
|
||||||
<th>Priority</th>
|
<th>Priority</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th>Assigned</th>
|
<th>Assigned</th>
|
||||||
<th>Last Response</th>
|
<th>Last Response</th>
|
||||||
|
<th>Client</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|
@ -285,6 +286,9 @@ if (isset($_GET['project_id'])) {
|
||||||
|
|
||||||
$project_id = intval($row['ticket_project_id']);
|
$project_id = intval($row['ticket_project_id']);
|
||||||
|
|
||||||
|
$client_id = intval($row['client_id']);
|
||||||
|
$client_name = nullable_htmlentities($row['client_name']);
|
||||||
|
|
||||||
$contact_name = nullable_htmlentities($row['contact_name']);
|
$contact_name = nullable_htmlentities($row['contact_name']);
|
||||||
$contact_email = nullable_htmlentities($row['contact_email']);
|
$contact_email = nullable_htmlentities($row['contact_email']);
|
||||||
$contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
|
$contact_archived_at = nullable_htmlentities($row['contact_archived_at']);
|
||||||
|
|
@ -324,16 +328,13 @@ if (isset($_GET['project_id'])) {
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
<!-- Ticket Number -->
|
<!-- Ticket Number / Subject -->
|
||||||
<td>
|
<td>
|
||||||
<a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a>
|
<a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>">
|
||||||
|
<span class="badge badge-pill badge-secondary p-3 mr-2"><?php echo "$ticket_prefix$ticket_number"; ?></span>
|
||||||
|
<?php echo $ticket_subject; ?>
|
||||||
|
</a>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<!-- Ticket Subject -->
|
|
||||||
<td>
|
|
||||||
<a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<!-- Ticket Priority -->
|
<!-- Ticket Priority -->
|
||||||
<td><?php echo $ticket_priority_display; ?></a></td>
|
<td><?php echo $ticket_priority_display; ?></a></td>
|
||||||
|
|
||||||
|
|
@ -350,6 +351,7 @@ if (isset($_GET['project_id'])) {
|
||||||
<div><?php echo $ticket_updated_at_display; ?></div>
|
<div><?php echo $ticket_updated_at_display; ?></div>
|
||||||
<div><?php echo $ticket_reply_by_display; ?></div>
|
<div><?php echo $ticket_reply_by_display; ?></div>
|
||||||
</td>
|
</td>
|
||||||
|
<td><?php echo $client_name; ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue