From e4725dfb158f6c4ae14bb0ea8cf47eec157386ac Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 13 May 2025 09:51:42 +0000 Subject: [PATCH] Igr Column Alignment --- app/Controllers/Inwardgateregister.php | 8 ++++---- app/Views/accountsDashboard.php | 21 +++++++++++---------- app/Views/viewinwardgateregister.php | 21 +++++++++++---------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 0694a022..6d4426aa 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -1039,11 +1039,11 @@ function viewIGRDetails() $str2 = trim($str2); $str2 = ($str2 === "CREATED") ? "GENERATED" : $str2; - $history_content .= $history[$j]->IGR_No . " was ` " . $str2 . " ` by " . $history[$j]->FullName . - " on " . $history[$j]->indian_date . " at " . $history[$j]->indian_time; + $history_content .= "
  • ".$history[$j]->IGR_No . " was ` " . $str2 . " ` by " . $history[$j]->FullName . + " on " . $history[$j]->indian_date . " at " . $history[$j]->indian_time. "

    • "; } else { - $history_content .= $history[$j]->IGR_No . " was ` GENERATED ` by " . $history[$j]->FullName . - " on " . $history[$j]->indian_date . " at " . $history[$j]->indian_time; + $history_content .= "
  • ".$history[$j]->IGR_No . " was ` GENERATED ` by " . $history[$j]->FullName . + " on " . $history[$j]->indian_date . " at " . $history[$j]->indian_time. "

    • "; } } else if (intval($history[$j]->is_edit) === 1) { $str = $history[$j]->field; diff --git a/app/Views/accountsDashboard.php b/app/Views/accountsDashboard.php index 486668e5..f8da7a77 100644 --- a/app/Views/accountsDashboard.php +++ b/app/Views/accountsDashboard.php @@ -179,12 +179,12 @@ - + + - @@ -209,6 +209,14 @@ if(!empty($draft)){ ?> + - + diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 94f1b19b..70555f3e 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -211,13 +211,14 @@
    Create DateInvoice Date IGR Date IGR No PO No Supplier Name Invoice NoInvoice Date Item Count Rec Qty Net Weight
    DeliveryChellanDate; + if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){ + echo ""; + }else{ + $idate = new DateTime($invdate); + echo $idate->format('d-m-Y'); } + ?> IGRNO ?> @@ -218,14 +226,7 @@ SupplierName ?> DeliveryChellanOrInvoiceNo ?>DeliveryChellanDate; - if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){ - echo ""; - }else{ - $date = new DateTime($invdate); - echo $date->format('d-m-Y'); } - ?>itemCount ?> ReceivedQuantity ?> NetWeight ?>
    + - + @@ -248,6 +249,13 @@ $time = $createddate->format('h:i A'); ?> + - @@ -2333,7 +2334,7 @@ return new Date(parts[2], parts[1] - 1, parts[0]).getTime(); // Convert to timestamp }; - var orderColumnIndex = get('roleText') == 'Auditor') ? 6 : 0; ?>; + var orderColumnIndex = get('roleText') == 'Auditor') ? 0 : 1; ?>; table = $('#view_inward_gate_register').DataTable({ dom: 'Blfrtip', buttons: [ @@ -2900,7 +2901,7 @@ $("#gasShortageCalculator, #editGasShortageCalculator").submit(function (event) document.getElementById('exportGasShortage').addEventListener('click',function(){ - exportTableToExcel(tableId, 'gas_shortage_format('d-m-Y') ?>.xlsx'); + exportTableToExcel(tableId, 'gas_shortage_format('d-m-Y') ?>.xlsx'); })
    Invoice Date IGR Date IGR Time IGR No PO No Supplier Name Invoice NoInvoice Date
    DeliveryChellanDate; + if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){ + echo ""; + }else{ + $idate = new DateTime($invdate); + echo $idate->format('d-m-Y'); } ?> @@ -269,13 +277,6 @@ SupplierName ?> DeliveryChellanOrInvoiceNo ?>DeliveryChellanDate; - if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){ - echo ""; - }else{ - $date = new DateTime($invdate); - echo $date->format('d-m-Y'); } ?> itemCount ?>