diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 33bc631f..5dd09b3c 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -73,8 +73,12 @@ $routes->get('exportcost', 'CostCenter::exportcost'); // Asset Detail Routes $routes->get('assetListing', 'Assetdetails::assetListing'); $routes->get('addasset', 'Assetdetails::addasset'); +$routes->post('assetdetails/getpodetails','Assetdetails::getpodetails'); +$routes->post('assetdetails/getline','Assetdetails::getline'); + $routes->get('assetdetails/editOldasset', 'Assetdetails::editOldasset'); -// $routes->post('addNewasset', 'Assetdetails::addNewasset'); +//uncommenting addNewAsset +$routes->post('addNewasset', 'Assetdetails::addNewasset'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editOldasset', 'Assetdetails::editasset'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editOldasset/(:num)', 'Assetdetails::editasset/$1'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editasset', 'Assetdetails::editasset'); diff --git a/app/Controllers/Assetdetails.php b/app/Controllers/Assetdetails.php index b09799f2..cecc86b2 100644 --- a/app/Controllers/Assetdetails.php +++ b/app/Controllers/Assetdetails.php @@ -66,13 +66,11 @@ class Assetdetails extends BaseController $data['AssetStatus'] = $this->assetdetails_model->getConfigValue('C015'); $data['po'] = $this->assetdetails_model->getPO(); - // print_r($data);die(); $this->global['pageTitle'] = 'Add Asset'; $this->loadViews("addasset", $this->global, $data, NULL); } - function getpodetails() { $PO = $this->request->getPost('PONO'); @@ -83,12 +81,10 @@ class Assetdetails extends BaseController $HTML = ""; if (count($data) > 0) { for ($j = 0; $j < count($data); $j++) { - $Code = $data[$j]->LineItemNo; - $Name = $data[$j]->MaterialCode; + $lineItem = $data[$j]->LineItemNo; + $materialCode= $data[$j]->MaterialCode; - - - $HTML .= ""; + $HTML .= ""; } } //echo $HTML; @@ -268,7 +264,12 @@ class Assetdetails extends BaseController $asset = array(); - $asset = array('AssetName' => $AssetName, 'Description' => $Description, 'DEPCode' => $Department, 'Location' => $Location, 'UserName' => $User, 'SupplierCode' => $SupplierName, 'DateOfPurchase' => $DOpurchase, 'DateOfCommison' => $DOCommission, 'AssetValue' => $AssetValue, 'AssetStatus' => $AssetStatus, 'IsActive' => $IsActive, 'Remarks' => $Remarks, 'CreatedBy' => $CreatedBy, 'PONO' => $PONO, 'POLineItem' => $lineitem, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity); + $asset = array('AssetName' => $AssetName, 'Description' => $Description, 'DEPCode' => $Department, 'Location' => $Location, + 'UserName' => $User, 'SupplierCode' => $SupplierName, 'DateOfPurchase' => $DOpurchase, 'DateOfCommison' => $DOCommission, + 'AssetValue' => $AssetValue, 'AssetStatus' => $AssetStatus, 'IsActive' => $IsActive, 'Remarks' => $Remarks, + 'CreatedBy' => $CreatedBy, 'PONO' => $PONO, 'POLineItem' => $lineitem, 'MaterialCode' => $MaterialCode, + 'Quantity' => $Quantity); + $result = $this->assetdetails_model->addNewasset($asset); if ($result > 0) { @@ -310,7 +311,7 @@ class Assetdetails extends BaseController // $data['DepartmentList'] = $this->assetdetails_model->getDepartment($Department); $data['AssetStatusList'] = $this->assetdetails_model->getConfigValue('C015'); $data['PO'] = $this->assetdetails_model->getPO($PO); - //print_r($data);die(); + // print_r($data);die(); $this->global['pageTitle'] = 'Edit Asset'; $this->loadViews("editOldasset", $this->global, $data, NULL); @@ -376,7 +377,7 @@ class Assetdetails extends BaseController $Asset_Code = $this->request->getPost('AssetCode'); $assetName = $this->request->getPost('AssetName'); $AssetName = (!empty($assetName)) ? strtoupper((string)$assetName) : ''; - $Description = $this->request->getPost('Description'); + $Description = $this->request->getPost('PODescription'); $Department = $this->request->getPost('AssetDept'); $Location = $this->request->getPost('Location'); $User = $this->request->getPost('User'); @@ -411,11 +412,28 @@ class Assetdetails extends BaseController $IsActive = '0'; } - $asset = array(); - $asset = array('AssetName' => $AssetName, 'Description' => $Description, 'DEPCode' => $Department, 'Location' => $Location, 'UserName' => $User, 'SupplierCode' => $SupplierName, 'DateOfPurchase' => $DOpurchase, 'DateOfCommison' => $DOCommission, 'AssetValue' => $Assetvalue, 'AssetStatus' => $AssetStatus, 'IsActive' => $IsActive, 'Remarks' => $Remarks, 'UpdatedBy' => $UpdatedBy, 'PONO' => $PONO, 'POLineItem' => $lineitem, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity); + $asset = array( + 'AssetName' => $AssetName, + 'Description' => $Description, + 'DEPCode' => $Department, + 'Location' => $Location, + 'UserName' => $User, + 'SupplierCode' => $SupplierName, + 'DateOfPurchase' => $DOpurchase, + 'DateOfCommison' => $DOCommission, + 'AssetValue' => $Assetvalue, + 'AssetStatus' => $AssetStatus, + 'IsActive' => $IsActive, + 'Remarks' => $Remarks, + 'UpdatedBy' => $UpdatedBy, + 'PONO' => $PONO, + 'POLineItem' => $lineitem, + 'MaterialCode' => $MaterialCode, + 'Quantity' => $Quantity); + $result = $this->assetdetails_model->editasset($asset, $Asset_Code); diff --git a/app/Models/Assetdetails_model.php b/app/Models/Assetdetails_model.php index dd88663f..e24aaf28 100644 --- a/app/Models/Assetdetails_model.php +++ b/app/Models/Assetdetails_model.php @@ -88,7 +88,10 @@ class Assetdetails_model extends Model function getlineitemre($line) { $builder = $this->db->table('t_purchaseorder_lineitem POL') - ->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POL.Quantity,POM.POType,re.TotalValue,req.ReqNo,emp.firstname,emp.Departmentcode,dep.DepartmentName,sup.SupplierName,date(POM.DeliveryDate) as DeliveryDate,POM.PODate,POM.SupplierID') + ->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POL.Quantity,POM.POType,re.TotalValue, + req.ReqNo,emp.firstname,emp.Departmentcode,dep.DepartmentName,sup.SupplierName, + date(POM.DeliveryDate) as DeliveryDate,POM.PODate,POM.SupplierID') + ->join('t_requestion_master req', 'req.ReqNo = POL.ReqNo', 'left') ->join('t_purchaseorder_master POM', 'POM.PONO=POL.PONO', 'left') ->join('t_materialmaster MM', 'MM.MaterialCode = POL.MaterialCode', 'left') diff --git a/app/Models/Department_model.php b/app/Models/Department_model.php index e306a6f2..57cf407b 100644 --- a/app/Models/Department_model.php +++ b/app/Models/Department_model.php @@ -52,7 +52,7 @@ class Department_model extends Model { $builder = $this->db->table('t_departmentdetails as BaseT') ->select('BaseT.CreatedDt,BaseT.DepartmentName, BaseT.DEPCode, BaseT.HeadDept, BaseT.IsActive') - ->orderBy("BaseT.DEPCode", "asc"); + ->orderBy("BaseT.DEPCode", "desc"); $query =$builder->get(); $result = $query->getResult(); return $result; diff --git a/app/Views/addasset.php b/app/Views/addasset.php index fc84c896..f6b0a6f8 100644 --- a/app/Views/addasset.php +++ b/app/Views/addasset.php @@ -29,6 +29,7 @@ +
@@ -44,7 +45,7 @@
- +
+ + + + + +
- -
@@ -97,7 +104,7 @@
- +
@@ -112,7 +119,7 @@
- +
@@ -147,7 +154,7 @@
- > + >
@@ -228,26 +235,18 @@ data: 'PONO=' + PONO, dataType: 'json', success: function(data) { - //alert(data); - + console.log(data); var line = ''; - $('#SelectMaterialCode').empty(); - //alert('before'); + $('#MaterialCode').empty(); + $.each(data, function(i, item) { - //alert(item); //line =''; - //line +=''; + //line +=''; //$('#DeliveryDate').val(item.DeliveryDate); line += item; - - - - - - - $('#SelectMaterialCode').append(line); + $('#MaterialCode').append(line); }); @@ -261,10 +260,16 @@ }); - $('#SelectMaterialCode').on('change', function() { + $('#MaterialCode').on('change', function() { + var selectedText = $('#MaterialCode option:selected').text(); - var line = $(this).val(); + var lineItemNo = selectedText.split('-')[0]; + + var id = lineItemNo + + var line = id; + //line +='' if (line) { $.ajax({ @@ -272,12 +277,14 @@ url: "assetdetails/getline", data: 'line=' + line, success: function(data) { - // alert(data); - var id = $('#SelectMaterialCode').val(); + + $.each(JSON.parse(data), function(i, item) { if (id == item.LineItemNo) { + alert(item.LineItemNo); + // alert(item.MaterialCode); $('#DateOfPurchase').val(item.PODate); if (item.DeliveryDate != null) { @@ -300,7 +307,8 @@ } $('#SupplierName').val(item.SupplierName); $('#SupID').val(item.SupplierID); - $('#MaterialCode').val(item.MaterialCode); + // $('#MaterialCode').val(item.MaterialCode); + $('#lineitem').val(item.LineItemNo); $('#UOM').val(item.UOM); $('#Quantity').val(item.Quantity); $('#depcode').val(item.Departmentcode); @@ -358,7 +366,7 @@ return false; } - if ($("option:selected", $("#SelectMaterialCode")).val() == '-1') { + if ($("option:selected", $("#MaterialCode")).val() == '-1') { alert('Please Select MaterialCode'); return false; } @@ -392,7 +400,7 @@ var maxdt = year - 15; // $("#PONO").select2(); - // $("#SelectMaterialCode").select2(); + // $("#MaterialCode").select2(); //$("#AssetStatus").select2(); $("#DateOfCommission").datepicker({ @@ -402,8 +410,6 @@ changeMonth: true, changeYear: true, - - }); $("#DateOfPurchase").datepicker({ minDate: new Date(year - SIAStartYear, 1, 1), @@ -412,12 +418,8 @@ changeMonth: true, changeYear: true, - - }); - - }); function isNumberKey(evt) { diff --git a/app/Views/assetListing.php b/app/Views/assetListing.php index 044ea601..bc2bd88d 100644 --- a/app/Views/assetListing.php +++ b/app/Views/assetListing.php @@ -70,7 +70,7 @@
- +
@@ -99,7 +99,7 @@ } else { $cdate = date('d-m-Y', strtotime($record->CreatedDt)); } ?> - + diff --git a/app/Views/configlisting.php b/app/Views/configlisting.php index 0999e3ff..f94972d2 100644 --- a/app/Views/configlisting.php +++ b/app/Views/configlisting.php @@ -90,6 +90,8 @@
+
Created Date AssetCode, 5) ?> AssetName ?> Description ?>
+
@@ -111,7 +113,7 @@ } else { $cdate = date('d-m-Y', strtotime($record->CreatedDate)); } ?> - + diff --git a/app/Views/departmentListing.php b/app/Views/departmentListing.php index 890d60bc..49111537 100644 --- a/app/Views/departmentListing.php +++ b/app/Views/departmentListing.php @@ -119,7 +119,7 @@ } else { $cdate = date('d-m-Y', strtotime($record->CreatedDt)); } ?> - + diff --git a/app/Views/editOldasset.php b/app/Views/editOldasset.php index 0b85a583..ab92c67f 100644 --- a/app/Views/editOldasset.php +++ b/app/Views/editOldasset.php @@ -160,6 +160,9 @@ if (!empty($assetList)) {
+ + +
@@ -191,11 +194,15 @@ if (!empty($assetList)) { } } ?> + + +
- +
@@ -213,16 +220,18 @@ if (!empty($assetList)) {
+ - +
+ - +
@@ -306,7 +315,7 @@ if (!empty($assetList)) { //alert(data); var line = ''; - $('#SelectMaterialCode').empty(); + $('#MaterialCode').empty(); //alert('before'); $.each(data, function(i, item) { //alert(item); @@ -321,9 +330,7 @@ if (!empty($assetList)) { - - $('#SelectMaterialCode').append(line); - + $('#MaterialCode').append(line); }); @@ -335,10 +342,17 @@ if (!empty($assetList)) { }); - $('#SelectMaterialCode').on('change', function() { + $('#MaterialCode').on('change', function() { - var line = $(this).val(); + var selectedText = $('#MaterialCode option:selected').text(); + + var lineItemNo = selectedText.split('-')[0]; + + var id = lineItemNo + + var line = id; + //line +='' if (line) { $.ajax({ @@ -348,7 +362,6 @@ if (!empty($assetList)) { success: function(data) { //alert(data); - var id = $('#SelectMaterialCode').val(); $.each(JSON.parse(data), function(i, item) { if (id == item.LineItemNo) { @@ -373,12 +386,21 @@ if (!empty($assetList)) { } $('#SupplierName').val(item.SupplierName); $('#SupID').val(item.SupplierID); - - $('#MaterialCode').val(item.MaterialCode); + $('#lineitem').val(item.LineItemNo); + //$('#MaterialCode').val(item.MaterialCode); $('#UOM').val(item.UOM); $('#Quantity').val(item.Quantity); $('#depcode').val(item.Departmentcode); $('#AssetDept').val(item.DepartmentName); + + console.log("supplier information"); + console.log(item.SupplierName); + console.log(item.SupplierID); + + console.log("department information"); + console.log(item.DepartmentName); + console.log(item.Departmentcode); + $('#PODescription').val(item.MaterialName); $('#Assetvalue').val(item.TotalValue); @@ -389,7 +411,8 @@ if (!empty($assetList)) { var date = new Date(item.PODate); var date3 = (date.getDate() + '-' + (date.getMonth() + 1) + '-' + date.getFullYear()); - $("#DateOfPurchase").val(date3); + $("#DateOfPurchase").val(date3); + } diff --git a/app/Views/login.php b/app/Views/login.php index 42b12b43..7b0ee679 100644 --- a/app/Views/login.php +++ b/app/Views/login.php @@ -34,98 +34,108 @@ -
Config_ID ?> ConfigName ?> Comments ?> DEPCode; ?> DepartmentName ?> HeadDept ?>
- + @@ -110,7 +110,7 @@ } else { $cdate = date('d-m-Y', strtotime($record->CreatedDate)); } ?> - + diff --git a/app/Views/supplierListing.php b/app/Views/supplierListing.php index fa143412..fc48e3d0 100644 --- a/app/Views/supplierListing.php +++ b/app/Views/supplierListing.php @@ -113,7 +113,16 @@ $cdate = date('d-m-Y', strtotime($record->CreatedOn)); } ?> - + + diff --git a/app/Views/transporterListing.php b/app/Views/transporterListing.php index 75a4efdb..50b8e81c 100644 --- a/app/Views/transporterListing.php +++ b/app/Views/transporterListing.php @@ -109,6 +109,7 @@
+
Created Date Material Code MaterialCode ?> MaterialName ?> MaterialType ?>SupplierID ?> + + SupplierID ?> + + + SupplierName ?> Address ?> ContactNumber ?>
diff --git a/app/Views/userListing.php b/app/Views/userListing.php index 871e2f99..4afaba4a 100644 --- a/app/Views/userListing.php +++ b/app/Views/userListing.php @@ -83,6 +83,7 @@
+ @@ -106,7 +107,7 @@ } else { $cdate = date('d-m-Y', strtotime($record->createdDtm)); } ?> - +
Created Date FirstName ?> EmailId ?>