consolidatereport alignment issues fixes
This commit is contained in:
venbatechnologies@gmail.com
parent
f589150ae6
commit
a71a3783b9
@ -1,63 +1,49 @@
|
||||
|
||||
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
|
||||
$("#client_name").select2();
|
||||
|
||||
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
<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>
|
||||
|
||||
<style>
|
||||
.dataTables_filter input {padding: 4px;}
|
||||
.dataTables_filter {
|
||||
.dataTables_filter {
|
||||
width: 50%;
|
||||
float: right;
|
||||
text-align: right;
|
||||
}
|
||||
.dataTables_paginate {
|
||||
.dataTables_paginate {
|
||||
width: 50%;
|
||||
float: right;
|
||||
text-align: right;
|
||||
}
|
||||
div.dt-buttons {
|
||||
div.dt-buttons {
|
||||
position: relative;
|
||||
float: right;
|
||||
|
||||
}
|
||||
.btn-success {
|
||||
.btn-success {
|
||||
background-color: #5d0411;
|
||||
border-color: #5d0411;
|
||||
}
|
||||
|
||||
th{ white-space: nowrap; }
|
||||
td{ white-space: wrap; }
|
||||
.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;
|
||||
}
|
||||
}
|
||||
th{ white-space: nowrap; }
|
||||
td{ white-space: wrap; }
|
||||
.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; }
|
||||
|
||||
</style>
|
||||
<div class="content-wrapper">
|
||||
<section class="content"><br/>
|
||||
<div class="row" style="min-height: 600px;">
|
||||
</style>
|
||||
|
||||
<div class="content-wrapper">
|
||||
<section class="content"><br/>
|
||||
<div class="row" style="min-height: 600px;">
|
||||
<!-- Left col -->
|
||||
<div class="col-md-12">
|
||||
<!-- TABLE: LATEST ORDERS -->
|
||||
<div class="box box-info">
|
||||
<div class="box-header with-border">
|
||||
<center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Consolidate-Inward</b><br><br>
|
||||
<center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Consolidate-Inward</b><br><br>
|
||||
<?php
|
||||
if($this->input->post('client_name')){
|
||||
$cl=$this->input->post('client_name');
|
||||
@ -74,18 +60,17 @@ table.dataTable thead > tr > td.sorting {
|
||||
|
||||
<div class="panel-body">
|
||||
|
||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||
|
||||
<form method="post" action="<?php echo base_url($this->uri->uri_string()); ?>">
|
||||
|
||||
<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):
|
||||
|
||||
foreach($cust as $item):
|
||||
|
||||
{?>
|
||||
|
||||
@ -147,28 +132,28 @@ table.dataTable thead > tr > td.sorting {
|
||||
<table class="table table-bordered table-hover" id="tab" style="font-size:14px;">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="text-align:center;">Supplier Name</th>
|
||||
<th style="white-space: wrap;">Material Name</th>
|
||||
<th style="text-align:center;">Supplier Name</th>
|
||||
<th style="white-space: wrap;">Material Name</th>
|
||||
<th style="text-align:center;">Apr</th>
|
||||
<th style="text-align:center;">May</th>
|
||||
<th style="text-align:center;">Jun</th>
|
||||
<th style="text-align:center;">Jul</th>
|
||||
<th style="text-align:center;">Aug</th>
|
||||
<th style="text-align:center;">Sep</th>
|
||||
<th style="text-align:center;">Oct</th>
|
||||
<th style="text-align:center;">Nov</th>
|
||||
<th style="text-align:center;">Dec</th>
|
||||
<th style="text-align:center;">Jan</th>
|
||||
<th style="text-align: center;">Feb</th>
|
||||
<th style="text-align: center;">Mar</th>
|
||||
<th style="text-align: center;">Total</th>
|
||||
<th style="text-align:center;">Sep</th>
|
||||
<th style="text-align:center;">Oct</th>
|
||||
<th style="text-align:center;">Nov</th>
|
||||
<th style="text-align:center;">Dec</th>
|
||||
<th style="text-align:center;">Jan</th>
|
||||
<th style="text-align: center;">Feb</th>
|
||||
<th style="text-align: center;">Mar</th>
|
||||
<th style="text-align: center;">Total</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<?php
|
||||
if(!empty($spurchse)){
|
||||
<?php
|
||||
if(!empty($spurchse)){
|
||||
$apr = 0;
|
||||
$may = 0;
|
||||
$jun = 0;
|
||||
@ -188,7 +173,7 @@ table.dataTable thead > tr > td.sorting {
|
||||
<td style="text-align:left;">
|
||||
<a href="<?= base_url() ?>report/ilink_purchase?sid=<?php echo $result->sid;?>&mid=<?php echo $result->mid;?>&ab=<?php echo $ab;?>"><?php echo $result->supplier_name;?> </a>
|
||||
</td>
|
||||
<td style="text-align:left;"><?php
|
||||
<td style="text-align:left;"><?php
|
||||
if(!empty($result->material_name)) { echo $result->material_name ; } else {echo "-";}
|
||||
?></td>
|
||||
<td style="text-align:right;"><?php
|
||||
@ -268,133 +253,21 @@ 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>
|
||||
|
||||
</tfoot>
|
||||
@ -413,28 +286,28 @@ table.dataTable thead > tr > td.sorting {
|
||||
<table class="table table-bordered table-hover" style="font-size:13px!important;" id="ta">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="text-align:center;">Supplier Name</th>
|
||||
<th style="text-align:center;">Material Name</th>
|
||||
<th style="text-align:center;">Apr (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">May (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Jun (<i class="fa fa-rupee "></i>)</th>
|
||||
<th style="text-align:center;">Jul (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Aug (<i class="fa fa-rupee "></i>)</th>
|
||||
<th style="text-align:center;">Sep (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Oct (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Nov (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Dec (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Jan (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align: center;">Feb (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align: center;">Mar (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align: center;">Total (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Supplier Name</th>
|
||||
<th style="text-align:center;">Material Name</th>
|
||||
<th style="text-align:center;">Apr (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">May (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Jun (<i class="fa fa-rupee "></i>)</th>
|
||||
<th style="text-align:center;">Jul (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Aug (<i class="fa fa-rupee "></i>)</th>
|
||||
<th style="text-align:center;">Sep (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Oct (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Nov (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Dec (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align:center;">Jan (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align: center;">Feb (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align: center;">Mar (<i class="fa fa-rupee " ></i>)</th>
|
||||
<th style="text-align: center;">Total (<i class="fa fa-rupee " ></i>)</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
<?php
|
||||
if(!empty($spurchse)){
|
||||
if(!empty($spurchse)){
|
||||
$apr = 0;
|
||||
$may = 0;
|
||||
$jun = 0;
|
||||
@ -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
|
||||
|
||||
}
|
||||
@ -531,146 +403,25 @@ table.dataTable thead > tr > td.sorting {
|
||||
?>
|
||||
</tbody>
|
||||
<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>
|
||||
|
||||
|
||||
|
||||
<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>
|
||||
</tr>
|
||||
|
||||
</tfoot>
|
||||
<?php
|
||||
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
</table>
|
||||
|
||||
</tfoot>
|
||||
<?php } ?></table>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -690,18 +441,18 @@ table.dataTable thead > tr > td.sorting {
|
||||
<script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
|
||||
|
||||
<script>
|
||||
$('.DataTables_sort_icon').remove();
|
||||
$('.DataTables_sort_icon').remove();
|
||||
|
||||
// Bootstrap datepicker
|
||||
// Set up your table
|
||||
$(document).ready(function() {
|
||||
table = $('#tab').DataTable( {
|
||||
"responsive": true,
|
||||
"bAutoWidth": true,
|
||||
"bAutoWidth": true,
|
||||
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
|
||||
"<'row'<'col-md-6'><'col-md-6'>>" +
|
||||
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
|
||||
buttons: [
|
||||
buttons: [
|
||||
|
||||
{
|
||||
extend: 'excelHtml5',
|
||||
@ -723,7 +474,7 @@ $(document).ready(function() {
|
||||
"dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" +
|
||||
"<'row'<'col-md-6'><'col-md-6'>>" +
|
||||
"<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>",
|
||||
buttons: [
|
||||
buttons: [
|
||||
|
||||
{
|
||||
extend: 'excelHtml5',
|
||||
@ -737,10 +488,7 @@ $(document).ready(function() {
|
||||
},
|
||||
|
||||
'colvis'
|
||||
],
|
||||
columns:[
|
||||
{ id:"col1", width:2 }
|
||||
]
|
||||
]
|
||||
} );
|
||||
} );
|
||||
|
||||
@ -760,7 +508,4 @@ function toggleTables(which)
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
Loading…
Reference in New Issue
Block a user