Move details above asset, fix asset merging into other cards

This commit is contained in:
Marcus Hill
2022-02-27 17:08:55 +00:00
parent 90f62cecaa
commit e481accb79
+56 -55
View File
@@ -333,6 +333,7 @@ if(isset($_GET['ticket_id'])){
<div class="col-md-3">
<!-- Client card -->
<div class="card card-body card-outline card-primary mb-3">
<div>
<h5><strong><?php echo $client_name; ?></strong></h5>
@@ -353,8 +354,8 @@ if(isset($_GET['ticket_id'])){
</div>
</div>
<!-- Client contact card -->
<?php if(!empty($contact_id)){ ?>
<div class="card card-body card-outline card-dark mb-3">
<div>
<h4 class="text-secondary">Contact</h4>
@@ -401,60 +402,7 @@ if(isset($_GET['ticket_id'])){
<?php } ?>
<?php if(!empty($asset_id)){ ?>
<div class="card card-body card-outline card-dark mb-3">
<div>
<h4 class="text-secondary">Asset</h4>
<i class="fa fa-fw fa-desktop text-secondary ml-1 mr-2 mb-2"></i> Asset name: <strong><?php echo $asset_name; ?></strong>
<br>
<?php
}
?>
<?php
if(!empty($asset_os)){
?>
<i class="fa fa-fw fa-tag text-secondary ml-1 mr-2 mb-2"></i> OS: <?php echo $asset_os; ?>
<br>
<?php
if(!empty($asset_ip)){
?>
<i class="fa fa-fw fa-network-wired text-secondary ml-1 mr-2 mb-2"></i> IP: <?php echo "$asset_ip"; ?>
<br>
<?php
}
?>
<?php
if(!empty($asset_make)){
?>
<i class="fa fa-fw fa-tag text-secondary ml-1 mr-2 mb-2"></i> Model: <?php echo "$asset_make $asset_model"; ?>
<br>
<?php
}
?>
<?php
if(!empty($asset_serial)){
?>
<i class="fa fa-fw fa-barcode text-secondary ml-1 mr-2 mb-2"></i> Service Tag: <?php echo $asset_serial; ?>
<br>
<?php
}
?>
<?php
if(!empty($asset_warranty_expire)){
?>
<i class="fa fa-fw fa-tag text-secondary ml-1 mr-2 mb-2"></i> Warranty expire: <strong><font color="<?php echo $color?>" > <?php echo $dt_value?></font></strong>
<br>
<?php
}
?>
</div>
</div>
<?php } ?>
<!-- Ticket Details card -->
<div class="card card-body card-outline card-dark mb-3">
<h4 class="text-secondary">Details</h4>
<div class="ml-1"><i class="fa fa-fw fa-thermometer-half text-secondary mr-2 mb-2"></i><?php echo $ticket_priority_display; ?></div>
@@ -473,6 +421,59 @@ if(isset($_GET['ticket_id'])){
<?php } ?>
</div>
<!-- Ticket asset details card -->
<?php if(!empty($asset_id)){ ?>
<div class="card card-body card-outline card-dark mb-3">
<div>
<h4 class="text-secondary">Asset</h4>
<i class="fa fa-fw fa-desktop text-secondary ml-1 mr-2 mb-2"></i> Asset name: <strong><?php echo $asset_name; ?></strong>
<br>
<?php
if(!empty($asset_os)) {
?>
<i class="fa fa-fw fa-tag text-secondary ml-1 mr-2 mb-2"></i> OS: <?php echo $asset_os; ?>
<br>
<?php
if (!empty($asset_ip)) {
?>
<i class="fa fa-fw fa-network-wired text-secondary ml-1 mr-2 mb-2"></i> IP: <?php echo "$asset_ip"; ?>
<br>
<?php
}
?>
<?php
if (!empty($asset_make)) {
?>
<i class="fa fa-fw fa-tag text-secondary ml-1 mr-2 mb-2"></i> Model: <?php echo "$asset_make $asset_model"; ?>
<br>
<?php
}
?>
<?php
if (!empty($asset_serial)) {
?>
<i class="fa fa-fw fa-barcode text-secondary ml-1 mr-2 mb-2"></i> Service Tag: <?php echo $asset_serial; ?>
<br>
<?php
}
?>
<?php
if (!empty($asset_warranty_expire)) {
?>
<i class="fa fa-fw fa-tag text-secondary ml-1 mr-2 mb-2"></i> Warranty expire: <strong><font
color="<?php echo $color ?>"> <?php echo $dt_value ?></font></strong>
<br>
<?php
}
}
?>
</div>
</div>
<?php } ?>
<form action="post.php" method="post">
<input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
<div class="form-group">