From b9e1ad4cac532de31c69bfc2e05c2f6e132bc880 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Wed, 31 Jul 2024 10:40:19 +0530 Subject: [PATCH 1/3] CHANGES_in Requisition UI : GWM --- app/Views/editrequisitionform.php | 58 ++++++++--- app/Views/includes/footer.php | 28 +++++- app/Views/includes/header.php | 42 ++++++++ app/Views/requisitionform.php | 157 ++++++++++++++++++------------ app/Views/requisitionlisting.php | 66 +++++++++---- 5 files changed, 254 insertions(+), 97 deletions(-) diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php index 5ca339bc..ef5aaba1 100644 --- a/app/Views/editrequisitionform.php +++ b/app/Views/editrequisitionform.php @@ -42,7 +42,27 @@ if (!empty($ReqPOType)) { } ?> + + + + + + --> + + + + diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php index 930f88a3..2c61feb6 100644 --- a/app/Views/requisitionform.php +++ b/app/Views/requisitionform.php @@ -21,6 +21,18 @@ if (!empty($Emp)) { .num { text-align: right; } + #MaterialCode~.select2 .select2-selection--single{ + height: auto; + max-height: 45px; + padding: 5px 3px; + line-height: normal; + } + #MaterialCode~.select2 .select2-selection__rendered{ + overflow: visible; + text-overflow: ellipsis; + white-space: pre-wrap; + line-height: normal; + }
@@ -34,12 +46,35 @@ if (!empty($Emp)) {
-   Back +   Back +
+ +
+ + + + * +
+ 'Select Requested By'); + if (!empty($RequestBy)) { + foreach ($RequestBy as $EID) : + $RequestByOpt[$EID->EmpID] = $EID->Full_Name; + endforeach; + } + echo form_dropdown('EmpID', $RequestByOpt, set_value('EmpID'), 'id="EmpID"', 'class = "form-control select2"', 'required="true"'); + // $data = array('name' => 'EmpID', 'value' => set_value('EmpID', $FirstName), 'id' => 'EmpID', 'class' => 'form-control', 'readonly' => 'true'); + // echo form_input($data); + ?> + +
+
+
- + *
'Select Request Type'); @@ -61,23 +96,7 @@ if (!empty($Emp)) {
-
- -
- 'Select Requested By'); - if (!empty($RequestBy)) { - foreach ($RequestBy as $EID) : - $RequestByOpt[$EID->EmpID] = $EID->Full_Name; - endforeach; - } - echo form_dropdown('EmpID', $RequestByOpt, set_value('EmpID'), 'id="EmpID"', 'class = "form-control select2"', 'required="true"'); - // $data = array('name' => 'EmpID', 'value' => set_value('EmpID', $FirstName), 'id' => 'EmpID', 'class' => 'form-control', 'readonly' => 'true'); - // echo form_input($data); - ?> - -
-
+
@@ -99,7 +118,7 @@ if (!empty($Emp)) {
- + *
'Select Cost Center Name'); @@ -112,7 +131,7 @@ if (!empty($Emp)) { endforeach; } - echo form_dropdown('CostCenter', $Costs, set_value('CostCenter'), 'id="CostCenter"', 'class = "form-control"'); + echo form_dropdown('CostCenter', $Costs, set_value('CostCenter'), 'id="CostCenter"', 'class = "form-control select2"'); ?> @@ -127,7 +146,7 @@ if (!empty($Emp)) { ?>
-
-
- -
- 'Description', 'value' => set_value('Description'), 'id' => 'Description', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - - - - ?> -
-
- @@ -289,16 +307,8 @@ if (!empty($Emp)) {
-
- -
- 'EditDescription', 'value' => set_value('EditDescription'), 'id' => 'EditDescription', 'class' => 'form-control', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
+ +
-
+
-
+
+
+ +
+ 'EditDescription', 'value' => set_value('EditDescription'), 'id' => 'EditDescription', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ Cancel Edit - Cancel +
@@ -365,9 +385,10 @@ if (!empty($Emp)) {
-   Save - - + +   Save As Draft + +

@@ -401,6 +422,8 @@ if (!empty($Emp)) { $("#CostCenter").select2(); $("#RequestType").select2(); $("#MaterialCode").select2(); + $("#EmpID").select2(); + $("#ScheduleType").select2(); $('#CostCenter').change(function() { @@ -453,7 +476,11 @@ if (!empty($Emp)) { $('#txtDeletedRow').val(''); $("#Description").val(''); $("#UOM").val(''); - $('#CostCenter').val("-1"); + // Get the ID of the first option + var firstOptionId = $('#CostCenter option:first').val(); + // Reset the Select2 dropdown to the first option + $('#CostCenter').val(firstOptionId).select2('data', { id: firstOptionId, text: $('#CostCenter option:selected').text() }); + removeHiddenRows($('#Items').find('tr').length); $('#tempAppend').empty(); @@ -661,10 +688,10 @@ if (!empty($Emp)) { From dc8afc70ea32902a230d299b9d6708b72e92bdf2 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Wed, 31 Jul 2024 12:30:16 +0530 Subject: [PATCH 2/3] CHANGES_in igr list cost center name model : GWM --- app/Config/Routes.php | 1 + app/Controllers/Inwardgateregister.php | 7 +++ app/Models/Inwardgateregister_model.php | 18 +++++++ app/Views/viewinwardgateregister.php | 62 ++++++++++++++++++++++++- 4 files changed, 87 insertions(+), 1 deletion(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 1971a74a..5dc43d28 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -258,6 +258,7 @@ $routes->post('UpdateIGR', 'Inwardgateregister::UpdateIGR'); $routes->post('updateIGRWeight', 'Inwardgateregister::updateIGRWeight'); $routes->post('UpdateIGRLineItem', 'Inwardgateregister::updateIGRLineItem'); $routes->post('ViewIGRHistory', 'Inwardgateregister::ViewIGRHistory'); +$routes->post('getCostCenterData', 'Inwardgateregister::getCostCenterData'); $routes->post('ViewIGRfile', 'Inwardgateregister::ViewIGRfile'); $routes->post('inwardgateregister/addloadfile', 'Inwardgateregister::addloadfile'); $routes->post('inwardgateregister/edituploadfile', 'Inwardgateregister::edituploadfile'); diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index fe55e59a..668d945b 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -589,6 +589,13 @@ function viewIGRDetails() $result = $this->inwardgateregister_model->ViewIGRHistory($IGRNO); return $this->response->setJSON($result); } + function getCostCenterData() + { + $pono = $this->request->getPost('pono'); + $result = $this->inwardgateregister_model->getCostCenterData($pono); + + return $this->response->setJSON($result); + } function UpdateIGR() diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 850309a7..ff5575d9 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -904,4 +904,22 @@ class Inwardgateregister_model extends Model // Pass the result to the view or return it as JSON // return $this->response->setJSON($result); } + + public function getCostCenterData($pono) + { + $builder = $this->db->table('t_purchaseorder_lineitem'); + + $builder->select('t_purchaseorder_lineitem.ReqNo,reqMaster.CostCenterCode,CSMaster.CostCenterName'); + $builder->join('t_requestion_master reqMaster', 't_purchaseorder_lineitem.ReqNo = reqMaster.ReqNo', 'left'); + $builder->join('t_costcenter_master CSMaster', 'reqMaster.CostCenterCode = CSMaster.CostCenterCode', 'left'); + $builder->where('PONO', $pono); + $builder->groupBy('t_purchaseorder_lineitem.ReqNo'); + $query = $builder->get(); + $result = $query->getResult(); + return $result; + + + } + + } \ No newline at end of file diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 25c8c7c8..b136580a 100644 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -106,7 +106,7 @@ $createddate = new DateTime($record->CreatedDate); echo $createddate->format('d-m-Y h:i A'); ?> IGRNO ?> - PONO ?> + PONO ?> SupplierName ?> DeliveryChellanOrInvoiceNo ?> " title="IGR History" data-igrno="IGRNO ?>" data-pono="PONO ?>"> +   + @@ -357,6 +359,27 @@
+ + +