RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Igr Column Alignment

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-05-13 09:51:42 +00:00
parent 4b4b2e068b
commit e4725dfb15
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/Inwardgateregister.php
View File

@ -1039,11 +1039,11 @@ function viewIGRDetails()
$str2 = trim($str2); $str2 = trim($str2);
$str2 = ($str2 === "CREATED") ? "GENERATED" : $str2; $str2 = ($str2 === "CREATED") ? "GENERATED" : $str2;
$history_content .= $history[$j]->IGR_No . " was <b> ` " . $str2 . " ` </b> by " . $history[$j]->FullName . $history_content .= "<li> ".$history[$j]->IGR_No . " was <b> ` " . $str2 . " ` </b> by " . $history[$j]->FullName .
" on " . $history[$j]->indian_date . " at " . $history[$j]->indian_time; " on " . $history[$j]->indian_date . " at " . $history[$j]->indian_time. " </li><br>";
} else { } else {
$history_content .= $history[$j]->IGR_No . " was <b> ` GENERATED ` </b> by " . $history[$j]->FullName . $history_content .= "<li> ".$history[$j]->IGR_No . " was <b> ` GENERATED ` </b> by " . $history[$j]->FullName .
" on " . $history[$j]->indian_date . " at " . $history[$j]->indian_time; " on " . $history[$j]->indian_date . " at " . $history[$j]->indian_time. " </li><br>";
} }
} else if (intval($history[$j]->is_edit) === 1) { } else if (intval($history[$j]->is_edit) === 1) {
$str = $history[$j]->field; $str = $history[$j]->field;

21
app/Views/accountsDashboard.php
View File

@ -179,12 +179,12 @@
<table id="view_inward_gate_register" class="table table-bordered table-hover"> <table id="view_inward_gate_register" class="table table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<th>Create Date</th> <th>Invoice Date </th>
<th>IGR Date</th>
<th>IGR No</th> <th>IGR No</th>
<th>PO No</th> <th>PO No</th>
<th>Supplier Name</th> <th>Supplier Name</th>
<th>Invoice No</th> <th>Invoice No</th>
<th>Invoice Date </th>
<th>Item Count</th> <th>Item Count</th>
<th>Rec Qty</th> <th>Rec Qty</th>
<th>Net Weight</th> <th>Net Weight</th>
@ -209,6 +209,14 @@
if(!empty($draft)){ if(!empty($draft)){
?> ?>
<tr id="<?php echo $index ?>" > <tr id="<?php echo $index ?>" >
<td align="left" style="padding-left:0.4%;"><?php
$invdate = $record->DeliveryChellanDate;
if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
echo "";
}else{
$idate = new DateTime($invdate);
echo $idate->format('d-m-Y'); }
?></td>
<td align="left" style="padding-left:0.4%;"><?php echo $date; ?></td> <td align="left" style="padding-left:0.4%;"><?php echo $date; ?></td>
<td style="cursor:pointer; color:#0bb2b5" ><a data-toggle="modal" data-target="#Igrshow" data-id="<?php echo $index;?>" data-inx="<?php echo $index;?>" data-userid="<?php echo $record->IGRNO ?>" data-igrstatus="<?php echo $record->IGRStatus ?>"> <td style="cursor:pointer; color:#0bb2b5" ><a data-toggle="modal" data-target="#Igrshow" data-id="<?php echo $index;?>" data-inx="<?php echo $index;?>" data-userid="<?php echo $record->IGRNO ?>" data-igrstatus="<?php echo $record->IGRStatus ?>">
<?php echo $record->IGRNO ?></a> <?php echo $record->IGRNO ?></a>
@ -218,14 +226,7 @@
</td> </td>
<td><?php echo $record->SupplierName ?></td> <td><?php echo $record->SupplierName ?></td>
<td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td> <td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td>
<td align="left" style="padding-left:0.4%;"><?php
$invdate = $record->DeliveryChellanDate;
if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
echo "";
}else{
$date = new DateTime($invdate);
echo $date->format('d-m-Y'); }
?></td>
<td align="center"><?php echo $record->itemCount ?></td> <td align="center"><?php echo $record->itemCount ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td> <td align="right"><?php echo $record->ReceivedQuantity ?></td>
<td align="center"><?php echo $record->NetWeight ?></td> <td align="center"><?php echo $record->NetWeight ?></td>

21
app/Views/viewinwardgateregister.php
View File

@ -211,13 +211,14 @@
<table id="view_inward_gate_register" class="table table-bordered table-hover"> <table id="view_inward_gate_register" class="table table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<th>Invoice Date</th>
<th>IGR Date</th> <th>IGR Date</th>
<th>IGR Time</th> <th>IGR Time</th>
<th>IGR No</th> <th>IGR No</th>
<th>PO No</th> <th>PO No</th>
<th>Supplier Name</th> <th>Supplier Name</th>
<th>Invoice No</th> <th>Invoice No</th>
<th>Invoice Date </th>
<!--!!!!!..... Don't remove the comment ..!!!!!!!!!!!! --> <!--!!!!!..... Don't remove the comment ..!!!!!!!!!!!! -->
@ -248,6 +249,13 @@
$time = $createddate->format('h:i A'); $time = $createddate->format('h:i A');
?> ?>
<tr id="<?php echo $index ?>" > <tr id="<?php echo $index ?>" >
<td align="left" style="padding-left: 0.4%"><?php
$invdate = $record->DeliveryChellanDate;
if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
echo "";
}else{
$idate = new DateTime($invdate);
echo $idate->format('d-m-Y'); } ?></td>
<td align="left" style="padding-left: 0.4%"><?php echo $date; ?></td> <td align="left" style="padding-left: 0.4%"><?php echo $date; ?></td>
<td align="center"><?php echo $time; ?></td> <td align="center"><?php echo $time; ?></td>
<td style="cursor:pointer; color:#0bb2b5" > <td style="cursor:pointer; color:#0bb2b5" >
@ -269,13 +277,6 @@
</td> </td>
<td><?php echo $record->SupplierName ?></td> <td><?php echo $record->SupplierName ?></td>
<td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td> <td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td>
<td align="left" style="padding-left: 0.4%"><?php
$invdate = $record->DeliveryChellanDate;
if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
echo "";
}else{
$date = new DateTime($invdate);
echo $date->format('d-m-Y'); } ?></td>
<td align="center" <td align="center"
style=" display : none ;"><?php echo $record->itemCount ?></td> style=" display : none ;"><?php echo $record->itemCount ?></td>
@ -2333,7 +2334,7 @@
return new Date(parts[2], parts[1] - 1, parts[0]).getTime(); // Convert to timestamp return new Date(parts[2], parts[1] - 1, parts[0]).getTime(); // Convert to timestamp
}; };
var orderColumnIndex = <?php echo (session()->get('roleText') == 'Auditor') ? 6 : 0; ?>; var orderColumnIndex = <?php echo (session()->get('roleText') == 'Auditor') ? 0 : 1; ?>;
table = $('#view_inward_gate_register').DataTable({ table = $('#view_inward_gate_register').DataTable({
dom: 'Blfrtip', dom: 'Blfrtip',
buttons: [ buttons: [
@ -2900,7 +2901,7 @@ $("#gasShortageCalculator, #editGasShortageCalculator").submit(function (event)
document.getElementById('exportGasShortage').addEventListener('click',function(){ document.getElementById('exportGasShortage').addEventListener('click',function(){
exportTableToExcel(tableId, 'gas_shortage_<?= $date->format('d-m-Y') ?>.xlsx'); exportTableToExcel(tableId, 'gas_shortage_<?= $idate->format('d-m-Y') ?>.xlsx');
}) })