diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 89aadcd7..1c193551 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -8,6 +8,8 @@ use CodeIgniter\Validation\Exceptions\ValidationException; use App\Models\Inwardgateregister_model; +use DateTime; + use ZipArchive; /** @@ -97,16 +99,17 @@ class Inwardgateregister extends BaseController $toDate = date('Y-m-d'); $fromDate = date('Y-m-d'); - + + + $this->global['pageTitle'] = 'Accounts Dashboard'; + $result = $this->inwardgateregister_model->customViewigrListing($fromDate, $toDate); + $igrList = $result[0]; - $this->global['pageTitle'] = 'Accounts Dashboard'; - $result = $this->inwardgateregister_model->ViewigrListing($fromDate, $toDate); - $igrList = $result[0]; foreach ($igrList as &$igr) { $igrNo = $igr->IGRNO; $fileDetails = $this->inwardgateregister_model->getAllIgrFileDetails($igrNo); - $igr->isIgrFilePresent = false; // Initialize the key + $igr->isIgrFilePresent = false; foreach ($fileDetails as $file) { if (!empty($file->file)) { @@ -126,7 +129,8 @@ class Inwardgateregister extends BaseController $data['fromDate'] = date('d-m-Y', strtotime($fromDate)); $data['toDate'] = date('d-m-Y', strtotime($toDate)); - $this->loadViews("accountsDashboard", $this->global, $data, NULL); + $this->loadViews("accountsDashboard" , $this->global, $data, NULL); + } function addIGR() diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index c7d83dc1..564456fb 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -1343,7 +1343,8 @@ class StockController extends BaseController $data['timeDropdown'] = $this->generateTimeOptions(); $data['supplierData'] = $this->supplier_model->supplierlisting(); - $data['drierDetails'] = $this->drierMachineDetails_model->where('date >=', $data['startDate']) + $data['drierDetails'] = $this->drierMachineDetails_model + ->where('date >=', $data['startDate']) ->where('date <=', $data['endDate']) ->orderBy('date','asc') ->findAll(); @@ -1353,6 +1354,8 @@ class StockController extends BaseController $this->global['pageTitle'] = 'Drier Details'; $this->loadViews("drierMachineDetails", $this->global, $data, NULL); + + } public function addOrEditdrierMachineDetails() @@ -1362,7 +1365,9 @@ class StockController extends BaseController if (empty($drierData)) { + $additionalEntry = $this->request->getPost(); + if (!empty($additionalEntry)) { $drierData[] = [ 'Date' => $this->convertToDateWithFlexibleFormats($additionalEntry['Date'], ["d-m-Y", "Y-m-d", "m/d/Y", "m-d-Y"], "Y-m-d"), @@ -1460,13 +1465,27 @@ class StockController extends BaseController $this->db->transCommit(); - if (!empty($additionalEntry)) { - return redirect()->back()->with('success', " Data Saved Successfully..!!"); + if (!empty($additionalEntry)) { + // Data to be sent via POST + $postData = [ + 'month' => $this->convertToDateWithFlexibleFormats($additionalEntry['Date'], ["d-m-Y", "Y-m-d", "m/d/Y", "m-d-Y"], "M-Y"), + + ]; + + // Generate the form and submit it via JavaScript + echo '
'; + foreach ($postData as $key => $value) { + echo ''; + } + echo '
'; + echo ''; + exit; } - + echo "Data saved successfully . $message1"; - } catch (\Exception $e) { // Rollback the transaction on any failure $this->db->transRollback(); @@ -1560,7 +1579,7 @@ class StockController extends BaseController array_push($tempInsert, ['date' => $value['database']]); } } - dd('i am here'); + $this->factoryVehicleDieselStockSummary_model->insertBatch($tempInsert); $data['summaryDetails'] = $this->factoryVehicleDieselStockSummary_model->where('date >=', $data['startDate'])->where('date <=', $data['endDate'])->findAll(); diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 49011109..6abda06c 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -399,6 +399,45 @@ class Inwardgateregister_model extends Model // echo $this->db->getLastQuery()->getQuery();die; return [$result,$result2]; } + + + function customViewigrListing($fromDate,$toDate) + { + + $builder = $this->db->table('t_igr_master igr') + ->select('igr.*,PO.IsOpenOrder,PO.DeliveryDate,sup.SupplierName,PO.POType,trans.name as TransporterName , SUM(IGRD.QuantityAsPerInvoice) as ReceivedQuantity, SUM(IGRD.NetWeight) as NetWeight , count(IGRD.IGRNo) as itemCount') + ->join('t_purchaseorder_master PO', 'igr.PONO = PO.PONO') + ->join('t_supplierdetailsn sup', 'PO.SupplierID = sup.SupplierID') + ->join('t_transporter trans', 'igr.TransporterId = trans.id' , 'left') + ->join('t_igr_details IGRD', 'igr.IGRNo = IGRD.IGRNo') + ->where('igr.IGRStatus !=', MRIR_CREATED) + ->groupStart() + ->where('Date(igr.CreatedDate) >=', $fromDate) + ->orWhere('Date(igr.UpdatedOn) >=', $fromDate) + ->groupEnd() + ->groupStart() + ->where('Date(igr.CreatedDate) <=', $toDate) + ->orWhere('Date(igr.UpdatedOn) <=', $toDate) + ->groupEnd() + ->groupBy('igr.IGRNo') + ->orderBy('igr.CreatedDate', 'desc'); + $query = $builder->get(); + $result = $query->getResult(); + + $builder2 = $this->db->table('t_igr_details igr_details') + ->select('igr.*,PO.IsOpenOrder,PO.DeliveryDate,sup.SupplierName,PO.POType,trans.name as TransporterName,item.MaterialName, igr_details.QuantityAsPerInvoice as ReceivedQuantity , igr_details.NetWeight as NetWeight') + ->join('t_igr_master igr', 'igr_details.IGRNo = igr.IGRNo') + ->join('t_purchaseorder_master PO', 'igr.PONO = PO.PONO') + ->join('t_supplierdetailsn sup', 'PO.SupplierID = sup.SupplierID') + ->join('t_transporter trans', 'igr.TransporterId = trans.id' , 'left') + ->join('t_materialmaster` item', 'igr_details.MaterialCode = item.MaterialCode' , 'left') + ->where('igr.IGRStatus !=', MRIR_CREATED) + ->orderBy('igr.CreatedDate', 'desc'); + $query2 = $builder2->get(); + $result2 = $query2->getResult(); + // echo $this->db->getLastQuery()->getQuery();die; + return [$result,$result2]; + } diff --git a/app/Views/accountsDashboard.php b/app/Views/accountsDashboard.php index 68baa677..0dfb22ac 100644 --- a/app/Views/accountsDashboard.php +++ b/app/Views/accountsDashboard.php @@ -205,7 +205,7 @@ $date = $createddate->format('d-m-Y'); $time = $createddate->format('h:i A'); $draft = []; - $record->IGRStatus == 'ST074'? $draft [] = $record:''; + $record->IGRStatus == 'ST074' || 'ST027' ? $draft [] = $record:''; if(!empty($draft)){ ?> @@ -227,7 +227,26 @@ VehicleNo ?> DriverName ?> TransporterName ?> - IGRStatus == 'ST074' ? 'Draft' : 'Completed'; ?> + IGRStatus == 'ST027' || 'ST040') + { + $igrStatusUpdate = "Created"; + } + else if($record->IGRStatus == 'ST028') + { + $igrStatusUpdate = "Closed"; + }else if($record->IGRStatus == 'ST029') + { + $igrStatusUpdate = "Cancelled"; + }else if($record->IGRStatus == 'ST042') + { + $igrStatusUpdate = "Partial Igr Created"; + }else if($record->IGRStatus == 'ST074') + { + $igrStatusUpdate = "Draft"; + } + ?> + diff --git a/app/Views/drierMachineDetails.php b/app/Views/drierMachineDetails.php index d4d8bf78..16842267 100644 --- a/app/Views/drierMachineDetails.php +++ b/app/Views/drierMachineDetails.php @@ -173,11 +173,13 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); #drierTable td:nth-child(1) { position: sticky; left: 0; - background-color: #ffffff; + background-color:#00a65a; z-index: 2; border-right: 2px solid #ddd; - color: #0e0b0b; + color: #ffffff; } + +
@@ -486,7 +488,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
- + +
@@ -962,31 +967,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); } - $(document).ready(function() { - initialFilterDate(); - }); - function initialFilterDate(){ - - let fromDate = $('#fromDateFilter').val(); //01-12-2024 - let toDate = $('#toDateFilter').val(); //05-12-2024 - - console.log("from Date and to date ..!!") - console.log(fromDate,toDate); - - $('#drierTable').find('tbody tr').each(function() { - const rowCells = $(this).find('td'); - let tableDate = rowCells.eq(0).text(); - let result = checkDateRange(fromDate,toDate,tableDate); - if (result) { - $(this).show(); - } else { - $(this).hide(); - } - - }); - - } function checkDateRange(fromDate, toDate, tableDate) { // Convert the dates to a comparable format (YYYY-MM-DD) diff --git a/app/Views/factoryDieselMachineDetails.php b/app/Views/factoryDieselMachineDetails.php index 9ce5c0dd..dcd36a10 100644 --- a/app/Views/factoryDieselMachineDetails.php +++ b/app/Views/factoryDieselMachineDetails.php @@ -372,7 +372,7 @@ foreach ($period as $day) { + contenteditable="true" style="padding: 5px;"> + contenteditable="true" style="padding: 5px;"> + + + + + + + get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor'){ ?> +
    • + + + + + + + get('roleText') == 'System Administrator'){ ?> +
    • + + + get('roleText') == 'System Administrator'){ ?> +
  • Factory Machines Details
    • - + + + diff --git a/app/Views/trpSandUseStockDetails.php b/app/Views/trpSandUseStockDetails.php index f00a9bc4..c3395bad 100644 --- a/app/Views/trpSandUseStockDetails.php +++ b/app/Views/trpSandUseStockDetails.php @@ -156,8 +156,8 @@ height: 20px; } - #dustAndRoughStockDetailsTableId th:nth-child(1), - #dustAndRoughStockDetailsTableId td:nth-child(1) { + #trpSandUseStockDetailsTableId th:nth-child(1), + #trpSandUseStockDetailsTableId td:nth-child(1) { position: sticky; left: 0; background-color: #00a65a;