diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 776f3945..1b2f2176 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -264,6 +264,11 @@ $routes->post('inwardgateregister/edituploadfile', 'Inwardgateregister::edituplo $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'AddOgr', 'Inwardgateregister::addoutwardgateregister'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'ViewOgr', 'Inwardgateregister::ViewOgr'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EditOGR', 'Inwardgateregister::EditOGR'); +$routes->get('drivernameautocomplete' , 'Inwardgateregister::drivernameautocomplete'); +$routes->get('drivermobileautocomplete', 'Inwardgateregister::drivermobileautocomplete'); + + + // Application MRIR Routes $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'EditMRIR', 'MRIRcontroller::editmaterialinspectionreport'); diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 00edb421..46a98778 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -320,6 +320,7 @@ class Inwardgateregister extends BaseController $Mat_Rcvd_Dt = (string)$this->request->getPost('MaterialRcvdDate'); $MaterialRcvdDt = get_date_time_format($Mat_Rcvd_Dt); $VehicleNo = $this->request->getPost('VehicleNo'); + $VehicleType = $this->request->getPost('VehicleType'); $DriverName = $this->request->getPost('DriverName'); $DriverMobileNumber = $this->request->getPost('DriverMobileNumber'); $CreatedBy = $this->session->get('userId'); @@ -354,11 +355,9 @@ class Inwardgateregister extends BaseController } } } - #Step 3 Master Details Gathering to Save In DB - $igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus); + $igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'VehicleType'=>$VehicleType,'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus); $igr['MasterFile'] = $requestMasterFileName; - // print_r( $igr );die; #Step 4 Calling DB to Save IGR Master $IGRNO = $this->inwardgateregister_model->addigrM($igr); // echo "master - no problem"; @@ -585,8 +584,38 @@ class Inwardgateregister extends BaseController "; } +function drivernameautocomplete(){ + $dr = $this->request->getGet('query'); + $query = $this->inwardgateregister_model->checkdrivername($dr); + echo json_encode($query); +} +public function drivermobileautocomplete() { + $dr = $this->request->getGet('query'); + $drName = $this->request->getGet('driverName'); + $query = $this->inwardgateregister_model->checkdriverMobile($dr, $drName); + echo json_encode($query); +} +public function drivermobileautocomplete2() { + $driverName = $this->request->getGet('drivername'); + $term = $this->request->getGet('term'); + + // Debugging + if (!$driverName || !$term) { + return $this->response->setJSON(['error' => 'Missing parameters']); + } + + $query = $this->inwardgateregister_model->checkdriverMobile($driverName, $term); + + // Check the output + if (is_array($query)) { + return $this->response->setJSON($query); + } else { + return $this->response->setJSON(['error' => 'Invalid response from model']); + } +} + function viewIGRDetails() { @@ -637,6 +666,7 @@ function viewIGRDetails() $VehicleNo = $this->request->getPost('vehicle_no'); + $VehicleType = $this->request->getPost('vehicle_type'); $DriverName = $this->request->getPost('driver'); $DriverMobileNumber = $this->request->getPost('driver_mobile'); @@ -651,7 +681,7 @@ function viewIGRDetails() $path = ROOTPATH.'public/uploads/Igrfiles/'; if(!is_dir($path)) { mkdir($path, 0777, true); } - $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby); + $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'VehicleType'=>$VehicleType,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby); $MasterFile = $this->request->getfile('MasterFile'); diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 915355ff..a16e5246 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -168,7 +168,44 @@ class Inwardgateregister_model extends Model return $result; } + function checkdrivername($dr) + { + $temp[] = ''; + $builder = $this->db->table('t_igr_master') + ->distinct() + ->select('DriverName') + ->like('DriverName', $dr); + $query = $builder->get(); + $temparr[] = ''; + foreach ($query->getResult() as $arr) { + $temparr[] = $arr->DriverName; + } + $temp['suggestions'] = $temparr; + + return $temp; + } + + public function checkdriverMobile($mobile,$driverName) { + $builder = $this->db->table('t_igr_master') + ->distinct() + ->select('DriverMobileNumber') + ->like('DriverMobileNumber', $mobile); + if($driverName){ + $builder->where('DriverName', $driverName); + } + + + $query = $builder->get(); + $temparr[] = ''; + foreach ($query->getResult() as $arr) { + $temparr[] = $arr->DriverMobileNumber; + } + // echo $this->db->getLastQuery()->getQuery();die; + $temp['suggestions'] = $temparr; + + return $temp; + } function viewpurchaseorder($PO) { diff --git a/app/Views/editEmployee.php b/app/Views/editEmployee.php index 5a827ae1..08e46969 100644 --- a/app/Views/editEmployee.php +++ b/app/Views/editEmployee.php @@ -1058,12 +1058,7 @@ legend { placeholder="Referrer Contact Number" class="form-control" onkeypress="return isNumberKey(event)"> - - - -
Work LocationWork Location* -
+
@@ -1100,6 +1095,12 @@ legend {
+ + + +
+ +
Bank Details diff --git a/app/Views/includes/new_footer.php b/app/Views/includes/new_footer.php index 5ea20056..05486071 100644 --- a/app/Views/includes/new_footer.php +++ b/app/Views/includes/new_footer.php @@ -4,11 +4,26 @@ - - + + + - +
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index a3f8f330..e0a30438 100644 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -2,13 +2,13 @@ - RI + <?php echo $pageTitle; ?> - + @@ -43,294 +43,29 @@ @@ -376,7 +106,7 @@ - + @@ -399,151 +129,6 @@ - -
  • - -
    - - - - New Projects - - - - - - Create Users - - - - - - Revenue Report - - - - - - Settings - - -
    - - - - - Help & Support - - -
    -
    • - -
  • - -
    -
    -
    - -
    -
    -
    UI Components
    - -
    - -
    -
    Applications
    - -
    - -
    -
    Extra Pages
    - -
    -
    -
    -
    -
    -

    Special Discount Sale!

    -

    Save up to 70% off.

    - -
    -
    -
    - -
    -
    • @@ -562,116 +147,128 @@ Dashboards
    - Sales - CRM - Analytics + Home + Sales
  • - -
    - - Calendar - Chat -
    - -
    - Products List - Products Grid - Product Detail - Create Product - Customers - Orders - Order Detail - Sellers - Shopping Cart - Checkout -
    -
    -
    - -
    - Inbox - Read Email - Email Templates -
    -
    - - Companies +
    - -
    - List - Details - Kanban Board +
    + Raise Requisition + Purchase Order From Requisition
    - -
    - Members List - Profile +
    + Purchase Order List + Approve Purchase Order + Emergency Purchase Order + Pending Purchase Order + Amendment Purchase Order
    - File Manager - Tickets +
    + +
    + Inward Gate Register Entry + View Inward Gate Register +
    +
    +
    +
    • + +
  • + +
    + Employee Details + Attendance + +
    + +
    + Monthly Pay Information + PaySlip Generator + Edit Payslip + Employee Salary Details + Public Holidays + Leave Reports + +
    +
    +
  • - +
    +
    + +
    + Supplier Details + Cost Details + Asset Details + Company Master + Config Details + Department Details + Material Details + Users +
    +
    +
    +
    • + +
  • + -
    +
    @@ -679,186 +276,6 @@
    • -
  • - -
    -
    - -
    - Nestable List - Range Slider - Sweet Alert - Tour Page - Tree View - Scrollspy -
    -
    - Widgets -
    - -
    - General Elements - Advanced - Validation - Pickers - Wizard - Masks - Summernote - Quilljs Editor - File Uploads - X Editable -
    -
    -
    - -
    - Flot Charts - Apex Charts - Morris Charts - Chartjs Charts - Peity Charts - Chartist Charts - C3 Charts - Sparklines Charts - Jquery Knob Charts -
    -
    -
    - -
    - Basic Tables - Data Tables - Editable Tables - Responsive Tables - FooTable - Tablesaw Tables -
    -
    -
    - -
    - Feather - Remix - Boxicons - Material Design - Font Awesome 5 - Weather -
    -
    -
    - -
    - Google Maps - Vector Maps - Mapael Maps -
    -
    -
    -
    • - -
  • - -
    -
    - -
    - Log In - Register - Signin - Signup - Recover Password - Lock Screen - Logout - Confirm Mail -
    -
    - -
    - -
    - Log In 2 - Register 2 - Signin - Signup 2 - Recover Password 2 - Lock Screen 2 - Logout 2 - Confirm Mail 2 -
    -
    - -
    - -
    - Error 404 - Error 404-alt - Error 500 -
    -
    - -
    - -
    - Starter - Timeline - Sitemap - Invoice - FAQs - Search Results - Pricing - Maintenance - Coming Soon - Gallery -
    -
    -
    -
    • -
  • - -
    - Vertical - Detached - Two Column Menu - Preloader -
    -
    • diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index 10cff9a4..abcfaf57 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -10,10 +10,49 @@ text-align: left; } + + - - + + + + + + + + - + + +

    @@ -219,8 +257,8 @@
    - - 'InvoiceNO','value' => set_value('InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' ); + + 'InvoiceNO','value' => set_value('InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' ); echo form_input($data); ?>
    @@ -240,19 +278,26 @@
    -
    +
    'VehicleNo','value' => set_value('VehicleNo'),'id'=>'Vehicle_No', 'class' => 'form-control'); echo form_input($data); ?>
    -
    +
    + + 'Vehicle Type',"Rented"=>'Rented',"Owned"=>'Owned'); + echo form_dropdown('VehicleType', $opt,set_value('VehicleType'),'id="Vehicle_Type"' ,'class="form-control select2'); + ?> +
    +
    'DriverName','value' => set_value('DriverName'),'id'=>'Driver_Name', 'class' => 'form-control'); echo form_input($data); ?>
    -
    +
    'DriverMobileNumber','value' => set_value('DriverMobileNumber'),'id'=>'DriverMobileNumber', 'class' => 'form-control'); echo form_input($data); @@ -314,8 +359,8 @@
    Close - Save as Draft IGR Generate IGR + Save as Draft IGR
    @@ -544,6 +589,7 @@ var invoiceDateInput = modal.find('#Invoice_Date'); var MaterialRcvdDateInput = modal.find('#MaterialRcvdDate'); var VehicleNoInput = modal.find('#Vehicle_No'); + var VehicleTypeInput = modal.find('#Vehicle_Type'); var DriverInput = modal.find('#Driver_Name'); var DriverMobileNumberInput = modal.find('#DriverMobileNumber'); var MasterFileInput = modal.find('#MasterFile'); @@ -601,6 +647,7 @@ console.log(parsedData); $('#printLink').attr('href', '#'); $('.help-block').text(''); $("#Vehicle_No").val(''); + $("#Vehicle_Type").val(''); $("#Driver_Name").val(''); $("#DriverMobileNumber").val(''); $("#IGRStatus").val(''); @@ -639,6 +686,7 @@ console.log(parsedData); $('#draftIGR').text(button_text_for_IGRDraft); $("#hiddenIsOpenOrder").val(isOpenOrder); $("#Vehicle_No").val(item.VehicleNo); + $("#Vehicle_Type").val(item.VehicleType); $("#Driver_Name").val(item.DriverName); $("#DriverMobileNumber").val(item.DriverMobileNumber); $("#IGRStatus").val(item.IGRStatus); @@ -794,6 +842,7 @@ console.log(parsedData); formData.append('mrc', $("#MaterialRcvdDate").val()); formData.append('invdate', $("#Invoice_Date").val()); formData.append('vehicle_no', $('#Vehicle_No').val()); + formData.append('vehicle_type', $('#Vehicle_Type').val()); formData.append('driver', $('#Driver_Name').val()); formData.append('driver_mobile', $('#DriverMobileNumber').val()); formData.append('status', status); @@ -852,6 +901,7 @@ console.log(parsedData); formData.append('mrc', $("#MaterialRcvdDate").val()); formData.append('invdate', $("#Invoice_Date").val()); formData.append('vehicle_no', $('#Vehicle_No').val()); + formData.append('vehicle_type', $('#Vehicle_Type').val()); formData.append('driver', $('#Driver_Name').val()); formData.append('driver_mobile', $('#DriverMobileNumber').val()); formData.append('status', status); diff --git a/public/new_assets/images/RESICO (1).png b/public/new_assets/images/RESICO (1).png new file mode 100644 index 00000000..8ac12945 Binary files /dev/null and b/public/new_assets/images/RESICO (1).png differ diff --git a/public/new_assets/images/RESICO (2).png b/public/new_assets/images/RESICO (2).png new file mode 100644 index 00000000..a8625f88 Binary files /dev/null and b/public/new_assets/images/RESICO (2).png differ diff --git a/public/new_assets/images/RI.png b/public/new_assets/images/RI.png new file mode 100644 index 00000000..946f0aa3 Binary files /dev/null and b/public/new_assets/images/RI.png differ diff --git a/public/new_assets/images/RI_favicon.png b/public/new_assets/images/RI_favicon.png new file mode 100644 index 00000000..2ac84a5d Binary files /dev/null and b/public/new_assets/images/RI_favicon.png differ diff --git a/public/new_assets/images/RI_logo.png b/public/new_assets/images/RI_logo.png new file mode 100644 index 00000000..6445e7e0 Binary files /dev/null and b/public/new_assets/images/RI_logo.png differ diff --git a/public/new_assets/images/RI_logo_dark.png b/public/new_assets/images/RI_logo_dark.png new file mode 100644 index 00000000..13d42d46 Binary files /dev/null and b/public/new_assets/images/RI_logo_dark.png differ diff --git a/public/new_assets/images/RI_logo_light.png b/public/new_assets/images/RI_logo_light.png new file mode 100644 index 00000000..d46aaca2 Binary files /dev/null and b/public/new_assets/images/RI_logo_light.png differ diff --git a/public/new_assets/images/avatar.png b/public/new_assets/images/avatar.png new file mode 100644 index 00000000..fd53ef29 Binary files /dev/null and b/public/new_assets/images/avatar.png differ