RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

worked on asset section in master -vadivel J

Browse Source
This commit is contained in:
vadivelJ96 2024-09-06 09:34:48 +05:30
parent 85fdc8d705
commit 018c48aab8
14 changed files with 218 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Config/Routes.php
View File

@ -73,8 +73,12 @@ $routes->get('exportcost', 'CostCenter::exportcost');
// Asset Detail Routes // Asset Detail Routes
$routes->get('assetListing', 'Assetdetails::assetListing'); $routes->get('assetListing', 'Assetdetails::assetListing');
$routes->get('addasset', 'Assetdetails::addasset'); $routes->get('addasset', 'Assetdetails::addasset');
$routes->post('assetdetails/getpodetails','Assetdetails::getpodetails');
$routes->post('assetdetails/getline','Assetdetails::getline');
$routes->get('assetdetails/editOldasset', 'Assetdetails::editOldasset'); $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', 'Assetdetails::editasset');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editOldasset/(:num)', 'Assetdetails::editasset/$1'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editOldasset/(:num)', 'Assetdetails::editasset/$1');
$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editasset', 'Assetdetails::editasset'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editasset', 'Assetdetails::editasset');

42
app/Controllers/Assetdetails.php
View File

@ -66,13 +66,11 @@ class Assetdetails extends BaseController
$data['AssetStatus'] = $this->assetdetails_model->getConfigValue('C015'); $data['AssetStatus'] = $this->assetdetails_model->getConfigValue('C015');
$data['po'] = $this->assetdetails_model->getPO(); $data['po'] = $this->assetdetails_model->getPO();
// print_r($data);die();
$this->global['pageTitle'] = 'Add Asset'; $this->global['pageTitle'] = 'Add Asset';
$this->loadViews("addasset", $this->global, $data, NULL); $this->loadViews("addasset", $this->global, $data, NULL);
} }
function getpodetails() function getpodetails()
{ {
$PO = $this->request->getPost('PONO'); $PO = $this->request->getPost('PONO');
@ -83,12 +81,10 @@ class Assetdetails extends BaseController
$HTML = "<option value='0'>SelectMaterialCode</option>"; $HTML = "<option value='0'>SelectMaterialCode</option>";
if (count($data) > 0) { if (count($data) > 0) {
for ($j = 0; $j < count($data); $j++) { for ($j = 0; $j < count($data); $j++) {
$Code = $data[$j]->LineItemNo; $lineItem = $data[$j]->LineItemNo;
$Name = $data[$j]->MaterialCode; $materialCode= $data[$j]->MaterialCode;
$HTML .= "<option value='" . $materialCode . "'>" . $lineItem . "-" . $materialCode . "</option>";
$HTML .= "<option value='" . $Code . "'>" . $Code . "-" . $Name . "</option>";
} }
} }
//echo $HTML; //echo $HTML;
@ -268,7 +264,12 @@ class Assetdetails extends BaseController
$asset = array(); $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); $result = $this->assetdetails_model->addNewasset($asset);
if ($result > 0) { if ($result > 0) {
@ -310,7 +311,7 @@ class Assetdetails extends BaseController
// $data['DepartmentList'] = $this->assetdetails_model->getDepartment($Department); // $data['DepartmentList'] = $this->assetdetails_model->getDepartment($Department);
$data['AssetStatusList'] = $this->assetdetails_model->getConfigValue('C015'); $data['AssetStatusList'] = $this->assetdetails_model->getConfigValue('C015');
$data['PO'] = $this->assetdetails_model->getPO($PO); $data['PO'] = $this->assetdetails_model->getPO($PO);
//print_r($data);die(); // print_r($data);die();
$this->global['pageTitle'] = 'Edit Asset'; $this->global['pageTitle'] = 'Edit Asset';
$this->loadViews("editOldasset", $this->global, $data, NULL); $this->loadViews("editOldasset", $this->global, $data, NULL);
@ -376,7 +377,7 @@ class Assetdetails extends BaseController
$Asset_Code = $this->request->getPost('AssetCode'); $Asset_Code = $this->request->getPost('AssetCode');
$assetName = $this->request->getPost('AssetName'); $assetName = $this->request->getPost('AssetName');
$AssetName = (!empty($assetName)) ? strtoupper((string)$assetName) : ''; $AssetName = (!empty($assetName)) ? strtoupper((string)$assetName) : '';
$Description = $this->request->getPost('Description'); $Description = $this->request->getPost('PODescription');
$Department = $this->request->getPost('AssetDept'); $Department = $this->request->getPost('AssetDept');
$Location = $this->request->getPost('Location'); $Location = $this->request->getPost('Location');
$User = $this->request->getPost('User'); $User = $this->request->getPost('User');
@ -411,11 +412,28 @@ class Assetdetails extends BaseController
$IsActive = '0'; $IsActive = '0';
} }
$asset = array(); $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); $result = $this->assetdetails_model->editasset($asset, $Asset_Code);

5
app/Models/Assetdetails_model.php
View File

@ -88,7 +88,10 @@ class Assetdetails_model extends Model
function getlineitemre($line) function getlineitemre($line)
{ {
$builder = $this->db->table('t_purchaseorder_lineitem POL') $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_requestion_master req', 'req.ReqNo = POL.ReqNo', 'left')
->join('t_purchaseorder_master POM', 'POM.PONO=POL.PONO', 'left') ->join('t_purchaseorder_master POM', 'POM.PONO=POL.PONO', 'left')
->join('t_materialmaster MM', 'MM.MaterialCode = POL.MaterialCode', 'left') ->join('t_materialmaster MM', 'MM.MaterialCode = POL.MaterialCode', 'left')

2
app/Models/Department_model.php
View File

@ -52,7 +52,7 @@ class Department_model extends Model
{ {
$builder = $this->db->table('t_departmentdetails as BaseT') $builder = $this->db->table('t_departmentdetails as BaseT')
->select('BaseT.CreatedDt,BaseT.DepartmentName, BaseT.DEPCode, BaseT.HeadDept, BaseT.IsActive') ->select('BaseT.CreatedDt,BaseT.DepartmentName, BaseT.DEPCode, BaseT.HeadDept, BaseT.IsActive')
->orderBy("BaseT.DEPCode", "asc"); ->orderBy("BaseT.DEPCode", "desc");
$query =$builder->get(); $query =$builder->get();
$result = $query->getResult(); $result = $query->getResult();
return $result; return $result;

66
app/Views/addasset.php
View File

@ -29,6 +29,7 @@
<label class="col-form-label" for="AssetName">Asset Name<span class="badge">*</span></label> <label class="col-form-label" for="AssetName">Asset Name<span class="badge">*</span></label>
<input type="text" class="form-control " required style="text-transform:uppercase;" id="AssetName" name="AssetName" value="<?php echo isset($_POST['AssetName']) ? $_POST['AssetName'] : '' ?>"> <input type="text" class="form-control " required style="text-transform:uppercase;" id="AssetName" name="AssetName" value="<?php echo isset($_POST['AssetName']) ? $_POST['AssetName'] : '' ?>">
</div> </div>
<div class=" col-md-3"> <div class=" col-md-3">
<label class="col-form-label" for="AssetDescription">Asset Description<span class="badge">*</span></label> <label class="col-form-label" for="AssetDescription">Asset Description<span class="badge">*</span></label>
<input type="text" class="form-control required" id="Description" required name="Description" value="<?php echo isset($_POST['Description']) ? $_POST['Description'] : '' ?>"> <input type="text" class="form-control required" id="Description" required name="Description" value="<?php echo isset($_POST['Description']) ? $_POST['Description'] : '' ?>">
@ -44,7 +45,7 @@
</div> </div>
<div class="form-row" style="margin-top:20px"> <div class="form-row" style="margin-top:20px">
<div class="col-md-3"> <div class="col-md-3">
<label for="PurchaseOrderNumber">Purchase Order Number<span class="badge">*</span></label> <label for="PONO">Purchase Order Number<span class="badge">*</span></label>
<select class="form-control required " required id="PONO" required name="PONO"> <select class="form-control required " required id="PONO" required name="PONO">
<option value="">Select PO Number</option> <option value="">Select PO Number</option>
<?php <?php
@ -68,9 +69,15 @@
?> ?>
</select> </select>
</div> </div>
<input type="text" class="form-control required" id="lineitem" name="lineitem" value="-1" hidden>
<div class="col-md-3"> <div class="col-md-3">
<label for="SelectMaterialCode">Select Material Code</label> <label for="MaterialCode">Select Material Code</label>
<select class="form-control required select2" required="" id="SelectMaterialCode" name="lineitem"> <select class="form-control required select2" required="" id="MaterialCode" name="MaterialCode">
<option value="-1">Select Material Code</option> <option value="-1">Select Material Code</option>
</select> </select>
</div> </div>
@ -97,7 +104,7 @@
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label for="Quantity">Purchase Date<span style="color:red">*</span></label> <label for="Quantity">Purchase Date<span style="color:red">*</span></label>
<input type="date" id="DateOfPurchase" name="DateOfPurchase" onkeypress="return false;" maxlength="10" class="form-control" value="<?php echo isset($_POST['DateOfPurchase']) ? $_POST['DateOfPurchase'] : '' ?>"> <input id="DateOfPurchase" name="DateOfPurchase" onkeypress="return false;" maxlength="10" class="form-control" value="<?php echo isset($_POST['DateOfPurchase']) ? $_POST['DateOfPurchase'] : '' ?>">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label for="SupplierName">Supplier Name</label> <label for="SupplierName">Supplier Name</label>
@ -112,7 +119,7 @@
<div class="form-row" style="margin-top:20px"> <div class="form-row" style="margin-top:20px">
<div class="col-md-3"> <div class="col-md-3">
<label for="DateOfCommission">Date Of Commission<span style="color:red">*</span></label> <label for="DateOfCommission">Date Of Commission<span style="color:red">*</span></label>
<input type="date" id="DateOfCommission" required name="DateOfCommission" onkeypress="return false;" maxlength="10" class="form-control" value="<?php echo isset($_POST['DateOfCommission']) ? $_POST['DateOfCommission'] : '' ?>"> <input id="DateOfCommission" required name="DateOfCommission" onkeypress="return false;" maxlength="10" class="form-control" value="<?php echo isset($_POST['DateOfCommission']) ? $_POST['DateOfCommission'] : '' ?>">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label for="AssetValue">Asset Value</label> <label for="AssetValue">Asset Value</label>
@ -147,7 +154,7 @@
</div> </div>
<div class="form-row" style="margin-top:20px"> <div class="form-row" style="margin-top:20px">
<div class="col-md-3"> <div class="col-md-3">
<input type="checkbox" id="isactive" name="isactive" <?php echo (isset($_POST['isactive']) ? 'checked' : '') ?>> <label for="">IsActive</label> <input type="checkbox" id="isactive" name="isactive" <?php echo (isset($_POST['isactive']) ? 'checked' : '') ?>> <label for="isactive">IsActive</label>
</div> </div>
</div> </div>
</div> </div>
@ -228,26 +235,18 @@
data: 'PONO=' + PONO, data: 'PONO=' + PONO,
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
//alert(data); console.log(data);
var line = ''; var line = '';
$('#SelectMaterialCode').empty(); $('#MaterialCode').empty();
//alert('before');
$.each(data, function(i, item) { $.each(data, function(i, item) {
//alert(item);
//line ='<option>select Material Code</option>'; //line ='<option>select Material Code</option>';
//line +='<option value='+item.LineItemNo+'>'+item.LineItemNo+'-'+item.MaterialCode+'</option>'; //line +='<option value='+item.MaterialCode+'>'+item.LineItemNo+'-'+item.MaterialCode+'</option>';
//$('#DeliveryDate').val(item.DeliveryDate); //$('#DeliveryDate').val(item.DeliveryDate);
line += item; line += item;
$('#MaterialCode').append(line);
$('#SelectMaterialCode').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 +='<option>select Material Code</option>' //line +='<option>select Material Code</option>'
if (line) { if (line) {
$.ajax({ $.ajax({
@ -272,12 +277,14 @@
url: "<?php echo base_url() ?>assetdetails/getline", url: "<?php echo base_url() ?>assetdetails/getline",
data: 'line=' + line, data: 'line=' + line,
success: function(data) { success: function(data) {
// alert(data);
var id = $('#SelectMaterialCode').val();
$.each(JSON.parse(data), function(i, item) { $.each(JSON.parse(data), function(i, item) {
if (id == item.LineItemNo) { if (id == item.LineItemNo) {
alert(item.LineItemNo);
// alert(item.MaterialCode);
$('#DateOfPurchase').val(item.PODate); $('#DateOfPurchase').val(item.PODate);
if (item.DeliveryDate != null) { if (item.DeliveryDate != null) {
@ -300,7 +307,8 @@
} }
$('#SupplierName').val(item.SupplierName); $('#SupplierName').val(item.SupplierName);
$('#SupID').val(item.SupplierID); $('#SupID').val(item.SupplierID);
$('#MaterialCode').val(item.MaterialCode); // $('#MaterialCode').val(item.MaterialCode);
$('#lineitem').val(item.LineItemNo);
$('#UOM').val(item.UOM); $('#UOM').val(item.UOM);
$('#Quantity').val(item.Quantity); $('#Quantity').val(item.Quantity);
$('#depcode').val(item.Departmentcode); $('#depcode').val(item.Departmentcode);
@ -358,7 +366,7 @@
return false; return false;
} }
if ($("option:selected", $("#SelectMaterialCode")).val() == '-1') { if ($("option:selected", $("#MaterialCode")).val() == '-1') {
alert('Please Select MaterialCode'); alert('Please Select MaterialCode');
return false; return false;
} }
@ -392,7 +400,7 @@
var maxdt = year - 15; var maxdt = year - 15;
// $("#PONO").select2(); // $("#PONO").select2();
// $("#SelectMaterialCode").select2(); // $("#MaterialCode").select2();
//$("#AssetStatus").select2(); //$("#AssetStatus").select2();
$("#DateOfCommission").datepicker({ $("#DateOfCommission").datepicker({
@ -402,8 +410,6 @@
changeMonth: true, changeMonth: true,
changeYear: true, changeYear: true,
}); });
$("#DateOfPurchase").datepicker({ $("#DateOfPurchase").datepicker({
minDate: new Date(year - SIAStartYear, 1, 1), minDate: new Date(year - SIAStartYear, 1, 1),
@ -412,12 +418,8 @@
changeMonth: true, changeMonth: true,
changeYear: true, changeYear: true,
}); });
}); });
function isNumberKey(evt) { function isNumberKey(evt) {

4
app/Views/assetListing.php
View File

@ -70,7 +70,7 @@
</form> </form>
<div class="card-body"> <div class="card-body">
<table class="table table-bordered table-hover" id="asset_list_table" style="background-color:#fff;"> <table class="table dt-responsive nowrap w-100" id="asset_list_table" style="background-color:#fff;">
<thead > <thead >
<tr> <tr>
<th>Created Date</th> <th>Created Date</th>
@ -99,7 +99,7 @@
} else { } else {
$cdate = date('d-m-Y', strtotime($record->CreatedDt)); $cdate = date('d-m-Y', strtotime($record->CreatedDt));
} ?> } ?>
<td align="right"><?php echo $cdate; ?></td> <td ><?php echo $cdate; ?></td>
<td><u><a href="<?php echo base_url() . 'assetdetails/editOldasset/?AssetID=' . $record->AssetCode ?>" data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to view Asset details"><?php echo substr($record->AssetCode, 5) ?> <td><u><a href="<?php echo base_url() . 'assetdetails/editOldasset/?AssetID=' . $record->AssetCode ?>" data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to view Asset details"><?php echo substr($record->AssetCode, 5) ?>
<td><?php echo $record->AssetName ?></td> <td><?php echo $record->AssetName ?></td>
<td><?php echo $record->Description ?></td> <td><?php echo $record->Description ?></td>

4
app/Views/configlisting.php
View File

@ -90,6 +90,8 @@
<div class="error" id="error"></div> <div class="error" id="error"></div>
</form> </form>
<div class="card-body"> <div class="card-body">
<table class="table dt-responsive nowrap w-100" id="datatable" >
<table id="config_list_table" class="table dt-responsive nowrap w-100"> <table id="config_list_table" class="table dt-responsive nowrap w-100">
<thead> <thead>
<tr> <tr>
@ -111,7 +113,7 @@
} else { } else {
$cdate = date('d-m-Y', strtotime($record->CreatedDate)); $cdate = date('d-m-Y', strtotime($record->CreatedDate));
} ?> } ?>
<td align="right"><?php echo $cdate; ?> </td> <td ><?php echo $cdate; ?> </td>
<td><?php echo $record->Config_ID ?></td> <td><?php echo $record->Config_ID ?></td>
<td><?php echo $record->ConfigName ?></td> <td><?php echo $record->ConfigName ?></td>
<td><?php echo $record->Comments ?> </td> <td><?php echo $record->Comments ?> </td>

2
app/Views/departmentListing.php
View File

@ -119,7 +119,7 @@
} else { } else {
$cdate = date('d-m-Y', strtotime($record->CreatedDt)); $cdate = date('d-m-Y', strtotime($record->CreatedDt));
} ?> } ?>
<td align="right"><?php echo $cdate; ?> </td> <td ><?php echo $cdate; ?> </td>
<td><u><a href="<?php echo base_url() . 'editOlddepartment/?SID=' . $record->DEPCode ?>" data-toggle="tooltip" title="<?php echo $record->DEPCode ?> - Click here to view Department details"><?php echo $record->DEPCode; ?></a></u></td> <td><u><a href="<?php echo base_url() . 'editOlddepartment/?SID=' . $record->DEPCode ?>" data-toggle="tooltip" title="<?php echo $record->DEPCode ?> - Click here to view Department details"><?php echo $record->DEPCode; ?></a></u></td>
<td><?php echo $record->DepartmentName ?></td> <td><?php echo $record->DepartmentName ?></td>
<td><?php echo $record->HeadDept ?></td> <td><?php echo $record->HeadDept ?></td>

51
app/Views/editOldasset.php
View File

@ -160,6 +160,9 @@ if (!empty($assetList)) {
<div class="card-body"> <div class="card-body">
<form role="form" id="addAsset" action="<?php echo base_url() ?>editasset" method="post"> <form role="form" id="addAsset" action="<?php echo base_url() ?>editasset" method="post">
<div class="form-row"> <div class="form-row">
<input type="text" class="form-control" id="AssetCode" name="AssetCode" value="<?php echo $AssetCode; ?>" hidden>
<div class="col-md-3"> <div class="col-md-3">
<label for="AssetName">Asset Name <span class="badge">*</span></label> <label for="AssetName">Asset Name <span class="badge">*</span></label>
<input type="text" class="form-control" id="AssetName" name="AssetName" value="<?php echo $AssetName; ?>" style="text-transform:uppercase;" required> <input type="text" class="form-control" id="AssetName" name="AssetName" value="<?php echo $AssetName; ?>" style="text-transform:uppercase;" required>
@ -191,11 +194,15 @@ if (!empty($assetList)) {
} }
} ?> } ?>
</select> </select>
<input type="text" class="form-control required" id="lineitem"
name="lineitem" value="<?php echo $POLineItem; ?>" hidden>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label for="SelectMaterialCode">Select Material Code</label> <label for="SelectMaterialCode">Select Material Code</label>
<select class="form-control select2" id="SelectMaterialCode" name="lineitem"> <select class="form-control select2" id="MaterialCode" name="MaterialCode">
<option value="<?php echo $POLineItem; ?>"><?php echo $POLineItem; ?></option> <option value="<?php echo $MaterialCode; ?>"><?php echo $POLineItem."-".$MaterialCode; ?></option>
</select> </select>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
@ -213,16 +220,18 @@ if (!empty($assetList)) {
<input type="text" class="form-control" id="PODescription" name="PODescription" value="<?php echo $MaterialName; ?>" readonly> <input type="text" class="form-control" id="PODescription" name="PODescription" value="<?php echo $MaterialName; ?>" readonly>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<input type="hidden" name="AssetDept" id="depcode">
<label for="AssetDept">Asset Department</label> <label for="AssetDept">Asset Department</label>
<input type="text" class="form-control" id="AssetDept" name="AssetDept" value="<?php echo $DepartmentName; ?>" readonly> <input type="text" class="form-control" id="AssetDept" name="" value="<?php echo $DepartmentName; ?>" readonly>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label for="DateOfPurchase">Purchase Date</label> <label for="DateOfPurchase">Purchase Date</label>
<input type="text" class="form-control" id="DateOfPurchase" name="DateOfPurchase" value="<?php echo $DateOfPurchase; ?>" required onkeypress="return false;"> <input type="text" class="form-control" id="DateOfPurchase" name="DateOfPurchase" value="<?php echo $DateOfPurchase; ?>" required onkeypress="return false;">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<input type="hidden" name="SupplierName" id="SupID">
<label for="SupplierName">Supplier Name</label> <label for="SupplierName">Supplier Name</label>
<input type="text" class="form-control" id="SupplierName" name="SupplierName" value="<?php echo $SupplierName; ?>" readonly> <input type="text" class="form-control" id="SupplierName" name="" value="<?php echo $SupplierName; ?>" readonly>
</div> </div>
</div> </div>
<div class="form-row mt-3"> <div class="form-row mt-3">
@ -306,7 +315,7 @@ if (!empty($assetList)) {
//alert(data); //alert(data);
var line = ''; var line = '';
$('#SelectMaterialCode').empty(); $('#MaterialCode').empty();
//alert('before'); //alert('before');
$.each(data, function(i, item) { $.each(data, function(i, item) {
//alert(item); //alert(item);
@ -321,9 +330,7 @@ if (!empty($assetList)) {
$('#MaterialCode').append(line);
$('#SelectMaterialCode').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 +='<option>select Material Code</option>' //line +='<option>select Material Code</option>'
if (line) { if (line) {
$.ajax({ $.ajax({
@ -348,7 +362,6 @@ if (!empty($assetList)) {
success: function(data) { success: function(data) {
//alert(data); //alert(data);
var id = $('#SelectMaterialCode').val();
$.each(JSON.parse(data), function(i, item) { $.each(JSON.parse(data), function(i, item) {
if (id == item.LineItemNo) { if (id == item.LineItemNo) {
@ -373,12 +386,21 @@ if (!empty($assetList)) {
} }
$('#SupplierName').val(item.SupplierName); $('#SupplierName').val(item.SupplierName);
$('#SupID').val(item.SupplierID); $('#SupID').val(item.SupplierID);
$('#lineitem').val(item.LineItemNo);
$('#MaterialCode').val(item.MaterialCode); //$('#MaterialCode').val(item.MaterialCode);
$('#UOM').val(item.UOM); $('#UOM').val(item.UOM);
$('#Quantity').val(item.Quantity); $('#Quantity').val(item.Quantity);
$('#depcode').val(item.Departmentcode); $('#depcode').val(item.Departmentcode);
$('#AssetDept').val(item.DepartmentName); $('#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); $('#PODescription').val(item.MaterialName);
$('#Assetvalue').val(item.TotalValue); $('#Assetvalue').val(item.TotalValue);
@ -389,7 +411,8 @@ if (!empty($assetList)) {
var date = new Date(item.PODate); var date = new Date(item.PODate);
var date3 = (date.getDate() + '-' + (date.getMonth() + 1) + '-' + date.getFullYear()); var date3 = (date.getDate() + '-' + (date.getMonth() + 1) + '-' + date.getFullYear());
$("#DateOfPurchase").val(date3); $("#DateOfPurchase").val(date3);
} }

162
app/Views/login.php
View File

@ -34,98 +34,108 @@
<body class="loading auth-fluid-pages pb-0"> <body class="loading auth-fluid-pages pb-0">
<div class="login-bg"> <div class="login-bg">
<div class="auth-fluid"> <div class="auth-fluid">
<!-- Auth fluid right content --> <!-- Auth fluid right content -->
<div class="auth-fluid-right"> <div class="auth-fluid-right">
<div class="auth-user-testimonial"> <div class="auth-user-testimonial">
<h3 class="mb-3 text-white">Welcome to Resico!</h3> <h3 class="mb-3 text-white">Welcome to Resico!</h3>
<p class="lead font-weight-normal"> <p class="lead font-weight-normal">
<i class="mdi mdi-format-quote-open"></i> <i class="mdi mdi-format-quote-open"></i>
Resico (India) Pvt Ltd has marked its presence in the domestic market Resico (India) Pvt Ltd has marked its presence in the domestic market
as one of the renowned Manufacturers and Suppliers of washed graded dry Silica sand. as one of the renowned Manufacturers and Suppliers of washed graded dry Silica sand.
Backed by the modern technology, our company has gained the trust of the clients present all across the country. Backed by the modern technology, our company has gained the trust of the clients present all
Our washed graded dry Silica sand is extensively used in various industrial applications. across the country.
<i class="mdi mdi-format-quote-close"></i> Our washed graded dry Silica sand is extensively used in various industrial applications.
</p> <i class="mdi mdi-format-quote-close"></i>
</p>
</div> <!-- end auth-user-testimonial-->
</div>
<!-- end Auth fluid right content -->
<!--Auth fluid left content --> </div> <!-- end auth-user-testimonial-->
<div class="auth-fluid-form-box"> </div>
<div class="align-items-center d-flex h-100"> <!-- end Auth fluid right content -->
<div class="card-body">
<!-- Logo --> <!--Auth fluid left content -->
<div class="auth-brand text-center text-lg-left"> <div class="auth-fluid-form-box">
<div class="auth-logo"> <div class="align-items-center d-flex h-100">
<a href="index.html" class="logo logo-dark text-center"> <div class="card-body">
<span class="logo-lg">
<img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> " alt=""
height="100">
</span>
</a>
<a href="index.html" class="logo logo-light text-center"> <!-- Logo -->
<span class="logo-lg"> <div class="auth-brand text-center text-lg-left">
<img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> " alt="" <div class="auth-logo">
height="100"> <a href="index.html" class="logo logo-dark text-center">
</span> <span class="logo-lg">
</a> <img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> "
<a href="index.html" class="logo logo-light text-center"> alt="" height="100">
<span class="logo-lg"> </span>
<img src="<?php echo base_url(); ?> " alt="" height="22"> </a>
</span>
</a>
</div>
</div>
<!-- title-->
<!-- <h4 class="mt-0">Sign In</h4> -->
<!-- form --> <a href="index.html" class="logo logo-light text-center">
<form action="<?php echo base_url(); ?>loginMe" method="post"> <span class="logo-lg">
<div class="form-group"> <img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> "
<label for="emailaddress">Email address</label> alt="" height="100">
<input type="email" class="form-control" placeholder="Enter your email" name="email" </span>
required="" /> </a>
</div> <a href="index.html" class="logo logo-light text-center">
<div class="form-group"> <span class="logo-lg">
<a href="auth-recoverpw-2.html" class="text-muted float-right"><small>Forgot your <img src="<?php echo base_url(); ?> " alt="" height="22">
password?</small></a> </span>
<label for="password">Password</label> </a>
<div class="input-group input-group-merge">
<input type="password" class="form-control" placeholder="Enter your password"
name="password" id="password" required />
<div class="input-group-append" data-password="false">
<div class="input-group-text">
<span class="password-eye"></span>
</div>
</div>
</div> </div>
</div> </div>
<!-- title-->
<!-- <h4 class="mt-0">Sign In</h4> -->
<div class="form-group mb-0 text-center"> <!-- development-change-02/09/2024 -->
<button class="btn btn-primary btn-block" type="submit">Log In </button> <!-- displaying error message in the form -->
</div>
<?php if (session()->has('error')): ?>
<div class="alert alert-danger">
<?= session('error') ?>
</div>
<?php endif; ?>
</form> <!-- form -->
<!-- end form--> <form action="<?php echo base_url(); ?>loginMe" method="post">
<div class="form-group">
<label for="emailaddress">Email address</label>
<input type="email" class="form-control" placeholder="Enter your email" name="email"
required="" />
</div>
<div class="form-group">
<a href="auth-recoverpw-2.html" class="text-muted float-right"><small>Forgot your
password?</small></a>
<label for="password">Password</label>
<div class="input-group input-group-merge">
<input type="password" class="form-control" placeholder="Enter your password"
name="password" id="password" required />
<div class="input-group-append" data-password="false">
<div class="input-group-text">
<span class="password-eye"></span>
</div>
</div>
</div>
</div>
<div class="form-group mb-0 text-center">
<button class="btn btn-primary btn-block" type="submit">Log In </button>
</div>
</form>
<!-- end form-->
</div> <!-- end .card-body --> </div> <!-- end .card-body -->
</div> <!-- end .align-items-center.d-flex.h-100--> </div> <!-- end .align-items-center.d-flex.h-100-->
</div>
<!-- end auth-fluid-form-box-->
</div> </div>
<!-- end auth-fluid-form-box-->
</div> </div>
</div>
<!-- end auth-fluid--> <!-- end auth-fluid-->

4
app/Views/rawmaterialListing.php
View File

@ -86,7 +86,7 @@
<div class="card-body"> <div class="card-body">
<table id="raw_material_list_table" class="table dt-responsive nowrap w-100"> <table id="raw_material_list_table" class="table dt-responsive nowrap w-100">
<thead> <thead>
<tr> <tr>
<th>Created Date</th> <th>Created Date</th>
<th>Material Code</th> <th>Material Code</th>
@ -110,7 +110,7 @@
} else { } else {
$cdate = date('d-m-Y', strtotime($record->CreatedDate)); $cdate = date('d-m-Y', strtotime($record->CreatedDate));
} ?> } ?>
<td style="width:8%;" align="right"><?php echo $cdate; ?></td> <td style="width:8%;" ><?php echo $cdate; ?></td>
<td style="width:9%;"><u><a class="a_tag_link" href="<?php echo base_url() . 'viewRawmaterial?RID=' . $record->MaterialCode . '&MType=' . $record->MaterialType . '&UOM=' . $record->UOM . '&date1=' . $date ?>" data-toggle="tooltip" title="<?php echo $record->MaterialCode; ?> - Click here to view Material details"><?php echo $record->MaterialCode ?> </a></u></td> <td style="width:9%;"><u><a class="a_tag_link" href="<?php echo base_url() . 'viewRawmaterial?RID=' . $record->MaterialCode . '&MType=' . $record->MaterialType . '&UOM=' . $record->UOM . '&date1=' . $date ?>" data-toggle="tooltip" title="<?php echo $record->MaterialCode; ?> - Click here to view Material details"><?php echo $record->MaterialCode ?> </a></u></td>
<td style="width:12%;"><?php echo $record->MaterialName ?></td> <td style="width:12%;"><?php echo $record->MaterialName ?></td>
<td style="width:10%;"><?php echo $record->MaterialType ?></td> <td style="width:10%;"><?php echo $record->MaterialType ?></td>

11
app/Views/supplierListing.php
View File

@ -113,7 +113,16 @@
$cdate = date('d-m-Y', strtotime($record->CreatedOn)); $cdate = date('d-m-Y', strtotime($record->CreatedOn));
} ?> } ?>
<td style="width:75px" align="right"><?php echo $cdate; ?></td> <td style="width:75px" align="right"><?php echo $cdate; ?></td>
<td><u><a class="a-tag-link" href="<?= base_url() ?>viewsupplier?SID=<?= $record->SupplierID ?>&Payment=<?= $record->PaymentTerms ?>" data-toggle="tooltip" title="<?= $record->SupplierID ?> - Click here to view Supplier details"><?= $record->SupplierID ?></a></u></td>
<td>
<u>
<a class="a-tag-link"
href="<?= base_url() ?>viewsupplier?SID=<?= $record->SupplierID ?>&Payment=<?= $record->PaymentTerms ?>"
data-toggle="tooltip"
title="<?= $record->SupplierID ?> - Click here to view Supplier details"><?= $record->SupplierID ?>
</a>
</u>
</td>
<td><?php echo $record->SupplierName ?></td> <td><?php echo $record->SupplierName ?></td>
<td><?php echo $record->Address ?></td> <td><?php echo $record->Address ?></td>
<td><?php echo $record->ContactNumber ?></td> <td><?php echo $record->ContactNumber ?></td>

1
app/Views/transporterListing.php
View File

@ -109,6 +109,7 @@
<div class="error" id="error"></div> <div class="error" id="error"></div>
</form> </form>
<div class="card-body"> <div class="card-body">
<table id="transporter_list" class="table dt-responsive nowrap w-100"> <table id="transporter_list" class="table dt-responsive nowrap w-100">
<thead> <thead>
<tr> <tr>

3
app/Views/userListing.php
View File

@ -83,6 +83,7 @@
</form> </form>
<div class="card-body"> <div class="card-body">
<table id="user_list_table" class="table dt-responsive nowrap w-100"> <table id="user_list_table" class="table dt-responsive nowrap w-100">
<thead> <thead>
<tr> <th>Created Date</th> <tr> <th>Created Date</th>
<!-- <th>User Id</th> --> <!-- <th>User Id</th> -->
@ -106,7 +107,7 @@
} else { } else {
$cdate = date('d-m-Y', strtotime($record->createdDtm)); $cdate = date('d-m-Y', strtotime($record->createdDtm));
} ?> } ?>
<td align="right"><?php echo $cdate; ?> </td> <td ><?php echo $cdate; ?> </td>
<!-- <td><?php echo $record->userId ?></td> --> <!-- <td><?php echo $record->userId ?></td> -->
<td><?php echo $record->FirstName ?></td> <td><?php echo $record->FirstName ?></td>
<td><?php echo $record->EmailId ?></td> <td><?php echo $record->EmailId ?></td>