consolidatereport alignment issues fixes
This commit is contained in:
parent
f589150ae6
commit
a71a3783b9
@ -1,17 +1,8 @@
|
|||||||
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () { $("#client_name").select2(); }); </script>
|
||||||
|
|
||||||
$("#client_name").select2();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||||
<style>
|
|
||||||
|
<style>
|
||||||
.dataTables_filter input {padding: 4px;}
|
.dataTables_filter input {padding: 4px;}
|
||||||
.dataTables_filter {
|
.dataTables_filter {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
@ -32,26 +23,21 @@
|
|||||||
background-color: #5d0411;
|
background-color: #5d0411;
|
||||||
border-color: #5d0411;
|
border-color: #5d0411;
|
||||||
}
|
}
|
||||||
|
|
||||||
th{ white-space: nowrap; }
|
th{ white-space: nowrap; }
|
||||||
td{ white-space: wrap; }
|
td{ white-space: wrap; }
|
||||||
.dataTable > thead > tr > th[class*="sort"]:after{
|
.dataTable > thead > tr > th[class*="sort"]:after{ content: "" !important; }
|
||||||
content: "" !important;
|
table.dataTable thead > tr > th.sorting_asc,
|
||||||
}
|
table.dataTable thead > tr > th.sorting_desc,
|
||||||
|
table.dataTable thead > tr > th.sorting,
|
||||||
|
table.dataTable thead > tr > td.sorting_asc,
|
||||||
|
table.dataTable thead > tr > td.sorting_desc,
|
||||||
|
table.dataTable thead > tr > td.sorting { padding-right: inherit; }
|
||||||
|
|
||||||
table.dataTable thead > tr > th.sorting_asc,
|
</style>
|
||||||
table.dataTable thead > tr > th.sorting_desc,
|
|
||||||
table.dataTable thead > tr > th.sorting,
|
|
||||||
table.dataTable thead > tr > td.sorting_asc,
|
|
||||||
table.dataTable thead > tr > td.sorting_desc,
|
|
||||||
table.dataTable thead > tr > td.sorting {
|
|
||||||
padding-right: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
<div class="content-wrapper">
|
||||||
<div class="content-wrapper">
|
<section class="content"><br/>
|
||||||
<section class="content"><br/>
|
<div class="row" style="min-height: 600px;">
|
||||||
<div class="row" style="min-height: 600px;">
|
|
||||||
<!-- Left col -->
|
<!-- Left col -->
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<!-- TABLE: LATEST ORDERS -->
|
<!-- TABLE: LATEST ORDERS -->
|
||||||
@ -78,13 +64,12 @@ table.dataTable thead > tr > td.sorting {
|
|||||||
|
|
||||||
<div class="form-group has-feedback">
|
<div class="form-group has-feedback">
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
<label for="client_name">
|
<label for="client_name"><?php echo 'Supplier'; ?></label>
|
||||||
<?php echo 'Supplier'; ?>
|
|
||||||
</label>
|
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<select class="form-control" id="client_name" name="client_name">
|
<select class="form-control" id="client_name" name="client_name">
|
||||||
<option value="">Select Supplier</option>
|
<option value="">Select Supplier</option>
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
foreach($cust as $item):
|
foreach($cust as $item):
|
||||||
|
|
||||||
{?>
|
{?>
|
||||||
@ -268,132 +253,20 @@ table.dataTable thead > tr > td.sorting {
|
|||||||
<tfoot width="100%">
|
<tfoot width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td style="text-align:center;"><strong>Total</strong></td>
|
<td style="text-align:center;"><strong>Total</strong></td>
|
||||||
<td style="text-align:right;"><strong><?php
|
<td style="text-align:right;"><strong><?php echo ''; ?> </strong></td>
|
||||||
{
|
<td style="text-align:right;"><strong><?php echo $apr; ?> </strong></td>
|
||||||
echo '';
|
<td style="text-align:right;"><strong><?php echo $may; ?> </strong></td>
|
||||||
|
<td style="text-align:right;"><strong><?php echo $jun; ?> </strong></td>
|
||||||
}
|
<td style="text-align:right;"><strong><?php echo $jul; ?> </strong></td>
|
||||||
?>
|
<td style="text-align:right;"><strong><?php echo $aug; ?> </strong></td>
|
||||||
</strong></td>
|
<td style="text-align:right;"><strong><?php echo $sep; ?> </strong></td>
|
||||||
<td style="text-align:right;"><strong><?php
|
<td style="text-align:right;"><strong><?php echo $oct; ?> </strong></td>
|
||||||
{
|
<td style="text-align:right;"><strong><?php echo $nov; ?> </strong></td>
|
||||||
echo $apr;
|
<td style="text-align:right;"><strong><?php echo $dec; ?> </strong></td>
|
||||||
|
<td style="text-align:right;"><strong><?php echo $jan; ?> </strong></td>
|
||||||
}
|
<td style="text-align:right;"><strong><?php echo $feb; ?> </strong></td>
|
||||||
?>
|
<td style="text-align:right;"><strong><?php echo $mar; ?> </strong></td>
|
||||||
</strong></td>
|
<td style="text-align:right;"><strong><?php echo $tot; ?> </strong></td>
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $may;
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $jun;
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $jul;
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $aug;
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $sep;
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $oct;
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $nov;
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $dec;
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $jan;
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $feb;
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $mar;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo $tot;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
@ -522,7 +395,6 @@ table.dataTable thead > tr > td.sorting {
|
|||||||
<a href="<?= base_url() ?>report/i_consolidate_year?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a>
|
<a href="<?= base_url() ?>report/i_consolidate_year?ab=<?php echo $ab;?>&sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>"><?php echo number_format($result->vtotal,2,'.','');?> </a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -533,144 +405,23 @@ table.dataTable thead > tr > td.sorting {
|
|||||||
<tfoot width="100%">
|
<tfoot width="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td style="text-align:center;"><strong>Total</strong></td>
|
<td style="text-align:center;"><strong>Total</strong></td>
|
||||||
<td><strong><?php
|
<td><strong><?php echo ''; ?></strong></td>
|
||||||
{
|
<td style="text-align:right;"><strong><?php echo number_format($apr,2,'.',''); ?> </strong></td>
|
||||||
echo '';
|
<td style="text-align:right;"><strong><?php echo number_format($may,2,'.',''); ?> </strong></td>
|
||||||
|
<td style="text-align:right;"><strong><?php echo number_format($jun,2,'.',''); ?> </strong></td>
|
||||||
}
|
<td style="text-align:right;"><strong><?php echo number_format($jul,2,'.',''); ?> </strong></td>
|
||||||
?>
|
<td style="text-align:right;"><strong><?php echo number_format($aug,2,'.',''); ?> </strong></td>
|
||||||
</strong></td>
|
<td style="text-align:right;"><strong><?php echo number_format($sep,2,'.',''); ?> </strong></td>
|
||||||
<td style="text-align:right;"><strong><?php
|
<td style="text-align:right;"><strong><?php echo number_format($oct,2,'.',''); ?> </strong></td>
|
||||||
{
|
<td style="text-align:right;"><strong><?php echo number_format($nov,2,'.',''); ?> </strong></td>
|
||||||
echo number_format($apr,2,'.','');
|
<td style="text-align:right;"><strong><?php echo number_format($dec,2,'.',''); ?> </strong></td>
|
||||||
|
<td style="text-align:right;"><strong><?php echo number_format($jan,2,'.',''); ?> </strong></td>
|
||||||
}
|
<td style="text-align:right;"><strong><?php echo number_format($feb,2,'.',''); ?> </strong></td>
|
||||||
?>
|
<td style="text-align:right;"><strong><?php echo number_format($mar,2,'.',''); ?> </strong></td>
|
||||||
</strong></td>
|
<td style="text-align:right;"><strong><?php echo number_format($tot,2,'.',''); ?> </strong></td>
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($may,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($jun,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($jul,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($aug,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($sep,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;"><strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($oct,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($nov,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($dec,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($jan,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($feb,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</strong>
|
|
||||||
</td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($mar,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
<td style="text-align:right;">
|
|
||||||
<strong>
|
|
||||||
<?php
|
|
||||||
{
|
|
||||||
echo number_format($tot,2,'.','');
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
?>
|
|
||||||
</strong></td>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
</tfoot>
|
</tfoot>
|
||||||
<?php
|
<?php } ?></table>
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -690,14 +441,14 @@ table.dataTable thead > tr > td.sorting {
|
|||||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$('.DataTables_sort_icon').remove();
|
$('.DataTables_sort_icon').remove();
|
||||||
|
|
||||||
// Bootstrap datepicker
|
// Bootstrap datepicker
|
||||||
// Set up your table
|
// Set up your table
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
table = $('#tab').DataTable( {
|
table = $('#tab').DataTable( {
|
||||||
"responsive": true,
|
"responsive": true,
|
||||||
"bAutoWidth": true,
|
"bAutoWidth": true,
|
||||||
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
|
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
|
||||||
"<'row'<'col-md-6'><'col-md-6'>>" +
|
"<'row'<'col-md-6'><'col-md-6'>>" +
|
||||||
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
|
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
|
||||||
@ -737,10 +488,7 @@ $(document).ready(function() {
|
|||||||
},
|
},
|
||||||
|
|
||||||
'colvis'
|
'colvis'
|
||||||
],
|
]
|
||||||
columns:[
|
|
||||||
{ id:"col1", width:2 }
|
|
||||||
]
|
|
||||||
} );
|
} );
|
||||||
} );
|
} );
|
||||||
|
|
||||||
@ -761,6 +509,3 @@ function toggleTables(which)
|
|||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user