Merge branch 'master' of bitbucket.org:venbaittech/ams
This commit is contained in:
commit
435ac78060
@ -11,31 +11,31 @@
|
|||||||
</ul>
|
</ul>
|
||||||
<div class="clearfix"></div>
|
<div class="clearfix"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="x_content">
|
<div class="x_content">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-12">
|
<div class="col-sm-12">
|
||||||
<div class="card-box table-responsive">
|
|
||||||
|
|
||||||
<table id="datatable-buttons" class="table table-striped table-bordered" width="100%">
|
<table id="datatable-buttons" class="table table-striped table-bordered" width="100%">
|
||||||
<thead>
|
<thead>
|
||||||
<tr class="headings">
|
<tr class="headings">
|
||||||
|
|
||||||
<th class="column-title">Action </th>
|
|
||||||
<th class="column-title">Asset Name </th>
|
<th class="column-title">Asset Name </th>
|
||||||
<th class="column-title">Manufacturer </th>
|
<th class="column-title">Manufacturer </th>
|
||||||
<th class="column-title">Asset Tag </th>
|
<th class="column-title">Tag </th>
|
||||||
<th class="column-title">Serial </th>
|
<th class="column-title">Serial </th>
|
||||||
<th class="column-title">Model </th>
|
<th class="column-title">Model </th>
|
||||||
<th class="column-title">Category </th>
|
<th class="column-title">Category </th>
|
||||||
<th class="column-title">Status </th>
|
<th class="column-title">Status </th>
|
||||||
<th class="column-title">Notes </th>
|
<!-- <th class="column-title">Notes </th>
|
||||||
<th class="column-title">Warranty </th>
|
<th class="column-title">Warranty </th>
|
||||||
<th class="column-title">Order No </th>
|
<th class="column-title">Order No </th>
|
||||||
<th class="column-title">Purchase Date </th>
|
<th class="column-title">Purchase Date </th>
|
||||||
<th class="column-title">Supplier </th>
|
<th class="column-title">Supplier </th>
|
||||||
<th class="column-title">Cost </th>
|
<th class="column-title">Cost </th>
|
||||||
<th class="column-title">Location </th>
|
<th class="column-title">Location </th> -->
|
||||||
|
<th class="column-title" >Action </th>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@ -45,9 +45,22 @@
|
|||||||
<?php foreach ($tableData as $key => $value) { ?>
|
<?php foreach ($tableData as $key => $value) { ?>
|
||||||
<tr class="even pointer">
|
<tr class="even pointer">
|
||||||
|
|
||||||
<td style=" text-align: center; font-size: 16px;">
|
|
||||||
|
<td class=" "> <?php echo $value->name; ?> </td>
|
||||||
|
<td class=" "><?php echo $value->manufacturer_name; ?> </td>
|
||||||
|
<td class=" "><?php echo $value->tag; ?></td>
|
||||||
|
<td class=" "><?php echo $value->serial; ?></td>
|
||||||
|
<td class=" "><?php echo $value->model; ?></td>
|
||||||
|
<td class=" "><?php echo $value->category_name; ?></td>
|
||||||
|
<td class=" "><?php echo $value->status; ?></td>
|
||||||
|
<!--<td class=" "><?php echo $value->notes; ?> </td>
|
||||||
|
<td class=" "><?php echo $value->warranty; ?> </td>
|
||||||
|
<td class=" "><?php echo $value->order_no; ?></td>
|
||||||
|
<td class=" "><?php echo $value->purchase_date; ?></td>
|
||||||
|
<td class=" "><?php echo $value->supplier_name; ?></td>
|
||||||
|
<td class=" "><?php echo $value->cost; ?></td>
|
||||||
|
<td class=" "><?php echo $value->location_name; ?></td> -->
|
||||||
|
<td style=" text-align: center; font-size: 16px;">
|
||||||
<a href="<?php echo base_url()?>Asset/editAsset/<?php echo md5($value->id);?>" ><i class="fa fa-pencil"></i></a>
|
<a href="<?php echo base_url()?>Asset/editAsset/<?php echo md5($value->id);?>" ><i class="fa fa-pencil"></i></a>
|
||||||
|
|
||||||
<a href="<?php echo base_url()?>Asset/addAsset/<?php echo md5($value->id);?>" ><i class="fa fa-copy"></i></a>
|
<a href="<?php echo base_url()?>Asset/addAsset/<?php echo md5($value->id);?>" ><i class="fa fa-copy"></i></a>
|
||||||
@ -58,20 +71,6 @@
|
|||||||
<i class="fa fa-eye"></i>
|
<i class="fa fa-eye"></i>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td class=" "> <?php echo $value->name; ?> </td>
|
|
||||||
<td class=" "><?php echo $value->manufacturer_name; ?> </td>
|
|
||||||
<td class=" "><?php echo $value->tag; ?></td>
|
|
||||||
<td class=" "><?php echo $value->serial; ?></td>
|
|
||||||
<td class=" "><?php echo $value->model; ?></td>
|
|
||||||
<td class=" "><?php echo $value->category_name; ?></td>
|
|
||||||
<td class=" "><?php echo $value->status; ?></td>
|
|
||||||
<td class=" "><?php echo $value->notes; ?> </td>
|
|
||||||
<td class=" "><?php echo $value->warranty; ?> </td>
|
|
||||||
<td class=" "><?php echo $value->order_no; ?></td>
|
|
||||||
<td class=" "><?php echo $value->purchase_date; ?></td>
|
|
||||||
<td class=" "><?php echo $value->supplier_name; ?></td>
|
|
||||||
<td class=" "><?php echo $value->cost; ?></td>
|
|
||||||
<td class=" "><?php echo $value->location_name; ?></td>
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
@ -79,7 +78,7 @@
|
|||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user