consolidatereport alignment issues fixes
This commit is contained in:
parent
f589150ae6
commit
a71a3783b9
@ -1,16 +1,7 @@
|
||||
|
||||
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
|
||||
$("#client_name").select2();
|
||||
|
||||
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
$(document).ready(function () { $("#client_name").select2(); }); </script>
|
||||
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
|
||||
|
||||
<style>
|
||||
.dataTables_filter input {padding: 4px;}
|
||||
.dataTables_filter {
|
||||
@ -32,23 +23,18 @@
|
||||
background-color: #5d0411;
|
||||
border-color: #5d0411;
|
||||
}
|
||||
|
||||
th{ white-space: nowrap; }
|
||||
td{ white-space: wrap; }
|
||||
.dataTable > thead > tr > th[class*="sort"]:after{
|
||||
content: "" !important;
|
||||
}
|
||||
|
||||
.dataTable > thead > tr > th[class*="sort"]:after{ 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 > td.sorting { padding-right: inherit; }
|
||||
|
||||
</style>
|
||||
|
||||
<div class="content-wrapper">
|
||||
<section class="content"><br/>
|
||||
<div class="row" style="min-height: 600px;">
|
||||
@ -78,13 +64,12 @@ table.dataTable thead > tr > td.sorting {
|
||||
|
||||
<div class="form-group has-feedback">
|
||||
<div class="col-md-4">
|
||||
<label for="client_name">
|
||||
<?php echo 'Supplier'; ?>
|
||||
</label>
|
||||
<label for="client_name"><?php echo 'Supplier'; ?></label>
|
||||
<div class="input-group">
|
||||
<select class="form-control" id="client_name" name="client_name">
|
||||
<option value="">Select Supplier</option>
|
||||
<?php
|
||||
|
||||
foreach($cust as $item):
|
||||
|
||||
{?>
|
||||
@ -268,132 +253,20 @@ table.dataTable thead > tr > td.sorting {
|
||||
<tfoot width="100%">
|
||||
<tr>
|
||||
<td style="text-align:center;"><strong>Total</strong></td>
|
||||
<td style="text-align:right;"><strong><?php
|
||||
{
|
||||
echo '';
|
||||
|
||||
}
|
||||
?>
|
||||
</strong></td>
|
||||
<td style="text-align:right;"><strong><?php
|
||||
{
|
||||
echo $apr;
|
||||
|
||||
}
|
||||
?>
|
||||
</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>
|
||||
|
||||
|
||||
<td style="text-align:right;"><strong><?php echo ''; ?> </strong></td>
|
||||
<td style="text-align:right;"><strong><?php echo $apr; ?> </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>
|
||||
|
||||
@ -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>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<?php
|
||||
|
||||
}
|
||||
@ -533,144 +405,23 @@ table.dataTable thead > tr > td.sorting {
|
||||
<tfoot width="100%">
|
||||
<tr>
|
||||
<td style="text-align:center;"><strong>Total</strong></td>
|
||||
<td><strong><?php
|
||||
{
|
||||
echo '';
|
||||
|
||||
}
|
||||
?>
|
||||
</strong></td>
|
||||
<td style="text-align:right;"><strong><?php
|
||||
{
|
||||
echo number_format($apr,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>
|
||||
|
||||
|
||||
|
||||
<td><strong><?php echo ''; ?></strong></td>
|
||||
<td style="text-align:right;"><strong><?php echo number_format($apr,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>
|
||||
|
||||
</tfoot>
|
||||
<?php
|
||||
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
</table>
|
||||
|
||||
<?php } ?></table>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -737,9 +488,6 @@ $(document).ready(function() {
|
||||
},
|
||||
|
||||
'colvis'
|
||||
],
|
||||
columns:[
|
||||
{ id:"col1", width:2 }
|
||||
]
|
||||
} );
|
||||
} );
|
||||
@ -761,6 +509,3 @@ function toggleTables(which)
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user