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

master module changes-1 vadivel J 19-12-2024

Browse Source
This commit is contained in:
vadivelJ96 2024-12-19 16:05:39 +05:30
parent f48d71b004
commit 498713b8e6
27 changed files with 234 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/Assetdetails.php
View File

@ -346,7 +346,9 @@ class Assetdetails extends BaseController
function checkAssetName(){
$data = $this->request->getPost();
$result = $this->assetdetails_model->checkAssetName($data['assetName']);
$assetId = $data['assetId']??'';
$assetName = str_replace(" ","",$data['assetName']) ;
$result = $this->assetdetails_model->checkAssetName($assetId,$assetName);
return $this->response->setJSON($result);
}

7
app/Controllers/Configurationctrl.php
View File

@ -159,9 +159,12 @@ class Configurationctrl extends BaseController
public function configNameCheck(){
$data = $this->request->getPost();
$configName = ($data['configName']);
$configName = str_replace(" ","",$data['configName']);
$configId = $data['configId'];
$result = $this->configmodel->configNameCheck($configName);
$result = $this->configmodel->configNameCheck($configId,$configName);
// dd($result);
return $this->response->setJSON($result);

6
app/Controllers/CostCenter.php
View File

@ -136,7 +136,11 @@ class CostCenter extends BaseController
function checkCostCenter(){
$data = $this->request->getPost();
$result = $this->costcenter_model->checkCostCenter( $data['CostCenterName']);
$CostCenterId = $data['CostCenterId'];
$CostCenterName = $data['CostCenterName'];
$result = $this->costcenter_model->checkCostCenter( $CostCenterId,$CostCenterName);
return $this->response->setJSON($result);
}

4
app/Controllers/Department.php
View File

@ -250,8 +250,10 @@ class Department extends BaseController
function checkDepartmentName(){
$data = $this->request->getPost();
$departmentName = str_replace(" ","",$data['departmentName']);
$depCode =$data['depCode'];
$departmentName = $data['departmentName'];
$result = $this->department_model->checkDepartmentName($departmentName);
$result = $this->department_model->checkDepartmentName($depCode,$departmentName);
return $this->response->setJSON($result);
}

6
app/Controllers/FactoryMachineController.php
View File

@ -177,9 +177,11 @@ class FactoryMachineController extends BaseController
$data = $this->request->getPost();
$machineName = $data['machineName'];
$machineId = $data['machineId'];
$result = $this->factoryMachineMaster_model->where('machine_name',$machineName)->find();
$machineName = str_replace(" ","", $data['machineName']);
$result = $this->factoryMachineMaster_model->checkMachineName($machineId , $machineName);
return $this->response->setJSON($result);

12
app/Controllers/Rawmaterialdetails.php
View File

@ -414,14 +414,16 @@ class Rawmaterialdetails extends BaseController
function checkmaterial()
{
$material = $this->request->getPost('id');
$data = $this->request->getPost();
$materialCode = $data['materialCode'] ?? '';
$materialName = str_replace(' ', '', $data['materialName']);
$this->rawmaterialdetails_model = new rawmaterialdetails_model();;
$query = $this->rawmaterialdetails_model->checkMaterialExists($material);
$query = $this->rawmaterialdetails_model->checkMaterialExists($materialCode , $materialName);
return $this->response->setJSON($query);
//if(!empty($material)){
// echo json_encode($query);
//}
}
function exportmaterial()

19
app/Controllers/Supplier.php
View File

@ -309,11 +309,17 @@ class Supplier extends BaseController
function checksupplier()
{
$supp_id = $this->request->getPost('supplierId') ?? '';
$supp_name = $this->request->getPost('id');
$supp_name = $this->request->getPost('supplierName');
$supp_name = str_replace(' ', '', $supp_name);
$query = $this->supplier_model->checkSupplierExists($supp_name);
$query = $this->supplier_model->checkSupplierExists($supp_id , $supp_name);
return $this->response->setJSON($query);
}
@ -467,11 +473,14 @@ class Supplier extends BaseController
* check the Transporter exists?
*/
function checkTransporter(){
function checkTransporter(){
$data = $this->request->getPost();
$message = $this->supplier_model->checkTransporter($data['transportername']);
return $this->response->setJSON($message);
$transporterId = $data['transporterid']??'';
$transporterName = $data['transportername'];
$message = $this->supplier_model->checkTransporter($transporterId,$transporterName);
return $this->response->setJSON($message);
}

16
app/Models/Assetdetails_model.php
View File

@ -269,14 +269,20 @@ class Assetdetails_model extends Model
}
function checkAssetName($assetName)
function checkAssetName($assetId,$assetName)
{
$builder = $this->db->table('t_asset_details')
->select('t_asset_details.*')
->where('AssetName', $assetName);
$query = $builder->get();
->select('t_asset_details.*');
if(!empty($assetId)){
$builder = $builder->where('AssetCode !=', $assetId);
}
$builder = $builder->where('REPLACE(AssetName , " ", "") ',$assetName);
return $query->getResultArray();
$query = $builder->get();
return $query->getResultArray();
}

15
app/Models/Config_model.php
View File

@ -178,14 +178,17 @@ class Config_model extends Model
return $query->getResult();
}
public function configNameCheck($configName){
$builder = $this->db->table('t_configmaster')
->where('ConfigName ', $configName);
$query = $builder->get();
public function configNameCheck($configId,$configName){
$builder = $this->db->table('t_configmaster');
// dd( $this->db->getLastQuery());
if(!empty($configId)){
$builder = $builder -> where('Config_ID !=' ,$configId);
}
$builder = $builder->where('REPLACE(ConfigName , " ", "") ',$configName);
$query = $builder->get();
return $query->getResultArray();
return $query->getResultArray();
}
public function configValueCheck($configId , $configValue){

10
app/Models/Costcenter_model.php
View File

@ -429,10 +429,14 @@ where Dept.DEPCode not in
return "Cost center $CostCenterCode deactivated successfully.";
}
function checkCostCenter($CostCenterName){
function checkCostCenter($CostCenterId,$CostCenterName){
$builder = $this->db->table('t_costcenter_master')
->select('CostCenterName,IsActive')
->where('CostCenterName', $CostCenterName);
->select('CostCenterName,IsActive');
if(!empty($CostCenterId)){
$builder = $builder -> where('id !=' ,$CostCenterId);
}
$builder = $builder->where('REPLACE(CostCenterName , " ", "") ',$CostCenterName);
$query = $builder->get();
return $query->getResult();

12
app/Models/Department_model.php
View File

@ -150,12 +150,18 @@ function getdepcode()
}
function checkDepartmentName($departmentName){
$builder = $this->db->table('t_departmentdetails')
->where('DepartmentName', $departmentName);
function checkDepartmentName($depCode ,$departmentName){
$builder = $this->db->table('t_departmentdetails');
if(!empty($depCode)){
$builder = $builder -> where(' DEPCode !=', $depCode);
}
$builder = $builder->where('REPLACE(DepartmentName , " ", "") ',$departmentName);
$query = $builder->get();
$result =$query->getResultArray();
return $result;
}

26
app/Models/FactoryMachineModel.php
View File

@ -38,5 +38,31 @@ class FactoryMachineModel extends Model
// Skip validation (set to true to skip validation rules)
protected $skipValidation = false;
public function checkMachineName($machineId,$machineName){
$builder = $this->db->table('t_factoryMachineMaster');
if(!empty($machineId)){
$builder = $builder->where('id !=' , $machineId);
}
$builder = $builder->where('REPLACE(machine_name, " ", "") ',$machineName);
$query = $builder->get();
if ($query->getNumRows() > 0) {
return $query->getResultArray();
} else {
return [];
}
}
}

21
app/Models/Rawmaterialdetails_model.php
View File

@ -313,20 +313,21 @@ class Rawmaterialdetails_model extends Model
// $this->db->update('T_PurchaseOrderDetails', $POInfo);
// return $this->db->affectedRows();
// }
function checkMaterialExists($material)
function checkMaterialExists($materialCode , $materialName)
{
// $sql="SELECT MaterialCode, MaterialName, MaterialType, Category,REPLACE(MaterialName, ' ', '')
// FROM t_materialmaster
// WHERE REPLACE(MaterialName, ' ', '') LIKE REPLACE('%'".$material."'%', ' ', '')";
$builder = $this->db->table('t_materialmaster')
->select('MaterialCode,MaterialName,MaterialType,Category,IsActive')
->like('REPLACE(MaterialName, " ", "")', $material);
->select('MaterialCode,MaterialName,MaterialType,Category,IsActive');
if(!empty($materialCode)){
$builder = $builder->where('MaterialCode !=' , $materialCode);
}
$builder->where('REPLACE(MaterialName, " ", "")' , $materialName);
$query = $builder->get();
//print_r($query-getResult());
return $query->getResult();
if ($query->getNumRows() > 0) {
return $query->getResultArray();
} else {
return [];
}
}
function checkMaterialCategory($mc)

28
app/Models/Supplier_model.php
View File

@ -53,16 +53,17 @@ class Supplier_model extends Model
}
function checkTransporter($transporterName){
$builder = $this->db->table('t_transporter')
->where('name', $transporterName);
function checkTransporter($transporterId,$transporterName){
$builder = $this->db->table('t_transporter');
if(!empty($transporterId)){
$builder = $builder->where('id !=',$transporterId);
}
$builder = $builder->where('REPLACE(name , " ", "") ',$transporterName);
$query = $builder->get();
return $query->getResult();
}
function deleteTransporter($Sid, $SupplierInfo){
$builder = $this->db->table('t_transporter')
@ -198,15 +199,20 @@ class Supplier_model extends Model
return $query->getResultArray();
}
function checkSupplierExists($supp_name)
function checkSupplierExists($supp_id,$supp_name)
{
$builder = $this->db->table('t_supplierdetailsn')
->select('SupplierID,SupplierName,Address,IsActive')
->like('REPLACE(SupplierName, " ", "")', $supp_name);
$builder = $this->db->table('t_supplierdetailsn');
$builder = $builder->select('SupplierID, SupplierName, Address, IsActive');
if(!empty($supp_id)){
$builder = $builder->where('SupplierID !=' , $supp_id);
}
$builder = $builder->where('REPLACE(SupplierName, " ", "") ',$supp_name);
$query = $builder->get();
if ($query->getNumRows() > 0) {
return $query->getResultArray();
} else {

17
app/Views/addRawMaterial.php
View File

@ -293,19 +293,20 @@
$('#MaterialName').change(function() {
var materialname = $('#MaterialName').val().trim();
var materialName = $('#MaterialName').val();
var materialCode = '';
if(materialname == ''){
if(materialName == ''){
return;
}
//material = material.replace(/\s*$/,"");
var material = materialname.replace(/ /g, '');
//alert(m.length+" "+m+" "+s+" "+s.length);
var material = materialName.replace(/ /g, '');
$('#loader').show();
$.ajax({
data: {
id: material
materialCode,
materialName
},
type: "POST",
url: "<?php echo base_url(); ?>materialExist",
@ -335,9 +336,9 @@
}
},
error: function() {
error: function(error) {
$('#loader').hide();
alert("Error Occur");
alert("Error Occur" ,error);
},
complete: function(){
$('#loader').hide();

8
app/Views/addSupplier.php
View File

@ -258,14 +258,16 @@
}
$('#supplierName').change(function() {
var suppliername = $('#supplierName').val();
var supplier = suppliername.replace(/ /g, '');
var supplierName = $('#supplierName').val().trim();
var supplierId = $('#SupplierID').val();
$('#loader').show();
$.ajax({
type: "POST",
url: "<?= base_url() . 'supplierExist' ?>",
data: {
id: supplier
supplierId ,
supplierName
},
success: function(data) {
var count = data?data.length:0;

7
app/Views/addasset.php
View File

@ -25,7 +25,7 @@
<div class="form-row">
<div class=" col-md-3">
<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 id="AssetName" name="AssetName" value="<?php echo isset($_POST['AssetName']) ? $_POST['AssetName'] : '' ?>">
</div>
<div class=" col-md-3">
@ -433,14 +433,15 @@
$('#AssetName').on('change',function(){
let assetName = $(this).val();
let assetName = $(this).val().trim();
let assetId = $('#AssetCode').val() ?? '';
$('#loader').show();
$.ajax({
type:'POST',
url:'<?php echo base_url()?>assetdetails/checkAssetName',
data:{assetName},
data:{assetId,assetName},
success: function(data){
if(data && data.length>0){
let IsActive = data[0].IsActive;

11
app/Views/addconfig.php
View File

@ -391,17 +391,18 @@
$('#configurationname').change(function () {
$('#loader').show();
$.ajax({
data: {configName: $('#configurationname').val()},
data: {configName: $('#configurationname').val().trim() , configId : $('#ConfigId').val()??''},
type: 'POST',
url: "<?php echo base_url(); ?>configurationctrl/configNameCheck",
success: function (data) {
success: function (data) {
if(data && data.length > 0){
if(data[0].isActive == 1){
alert("This Configuration Name is already present. kindly change it..!!");
$('#configurationname').val('');
return;
$('#configurationname').val('');
return;
}else{
alert("This Configuration Name is already present in deleted section. kindly reactivate it If needed..!!");
$('#configurationname').val('');

5
app/Views/adddepartment.php
View File

@ -155,11 +155,12 @@
<script>
$("#DepartmentName").on('change',function(){
let departmentName = $("#DepartmentName").val();
let departmentName = $("#DepartmentName").val().trim();
let depCode =$("#DEPCode").val()??'';
$('#loader').show();
$.ajax({
type:"POST",
data:{departmentName},
data:{departmentName,depCode},
url:"<?php echo base_url();?>checkDepartmentName",
success:function(data){

4
app/Views/costListing.php
View File

@ -124,7 +124,6 @@
<td><?php echo $record->CostCenterName ?></td>
<td><?php echo $record->FirstName ?></td>
<td><?php if ($record->IsActive == 1) {echo"Active";}else{echo "InActive";}?></td>
<td><?php if ($record->IsActive == 1) {echo"Active";}else{echo "InActive";}?></td>
<td>
<?php
if ($record->IsActive == 0) {
@ -227,7 +226,8 @@
type: 'POST',
url: "<?php echo base_url(); ?>checkCostCenter",
data: {
CostCenterName: $('#CostCenterName').val()
CostCenterId : $('#id').val(),
CostCenterName: $('#CostCenterName').val().trim()
},
success: function (data) {
$('#loader').hide();

9
app/Views/editOldasset.php
View File

@ -163,7 +163,7 @@ if (!empty($assetList)) {
<div class="col-md-3">
<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; ?>" required>
</div>
<div class="col-md-3">
<label for="Description">Asset Description <span class="badge">*</span></label>
@ -428,14 +428,15 @@ if (!empty($assetList)) {
$('#AssetName').on('change',function(){
let assetName = $(this).val();
let assetId = $('#AssetCode').val();
let assetName = $(this).val().trim();
$('#loader').show();
$.ajax({
type:'POST',
url:'<?php echo base_url()?>assetdetails/checkAssetName',
data:{assetName},
data:{assetId,assetName},
success: function(data){
if(data && data.length>0){
let IsActive = data[0].IsActive;
@ -452,7 +453,7 @@ if (!empty($assetList)) {
},
error: function(error){
//error
console.error('error ocurred' + error);
console.error( error);
},
complete :function (){
$('#loader').hide();

10
app/Views/editRawmaterial.php
View File

@ -440,18 +440,20 @@ if ($total <= $reorder) {
$('#MaterialName').change(function() {
var materialname = $('#MaterialName').val();
var materialName = $('#MaterialName').val();
var materialCode = $('#RMcode').val();
if(materialname == ''){
if(materialName == ''){
return;
}
var material = materialname.replace(/ /g, '');
var material = materialName.replace(/ /g, '');
$('#loader').show();
$.ajax({
data: {
id: material
materialCode,
materialName
},
type: "POST",
url: "<?php echo base_url(); ?>materialExist",

20
app/Views/editSupplier.php
View File

@ -596,16 +596,19 @@ if (!empty($supplier)) {
//Call to ajax existing PAN
$('#supplierName').change(function () {
var suppliername = $('#supplierName').val();
var supplier = suppliername.replace(/ /g, '');
var supplierName = $('#supplierName').val().trim();
var supplierId = $('#SupplierID').val();
$('#loader').show();
$.ajax({
$.ajax({
type: "POST",
url: "<?= base_url() . 'supplierExist' ?>",
data: {
id: supplier
supplierId ,
supplierName
},
success: function (data) {
console.log(data)
var count = data.length;
if (count >= 1) {
$('#loader').hide();
@ -618,21 +621,16 @@ if (!empty($supplier)) {
$.each(data, function (i, obj) {
related_supplier += obj.SupplierID + " - " + obj.SupplierName + " - " + obj.Address + "\n";
});
alert("'" + suppliername + "' - supplier details are , " + " \n \n" + related_supplier);
alert("'" + supplierName + "' - supplier details are , " + " \n \n" + related_supplier);
$("#supplierName").val('');
$("#supplierName").focus();
} else {
$('#loader').hide();
//4Debug
// alert('This is New Supplier! ');
}
//4Debug
//console.log(data);
},
error: function (error) {
$('#loader').hide();
//4Debug
// alert("Error Occur");
console.error("an error occur supplierExist", error)
}

5
app/Views/editconfig.php
View File

@ -496,7 +496,10 @@ if (!empty($master)) {
$('#ConfigName').change(function () {
$('#loader').show();
$.ajax({
data: { configName: $('#ConfigName').val() },
data: {
configName: $('#ConfigName').val().trim(),
configId : $('#ConfigId').val().trim()
},
type: 'POST',
url: "<?php echo base_url(); ?>configurationctrl/configNameCheck",
success: function (data) {

41
app/Views/editdepartment.php
View File

@ -168,4 +168,43 @@
<!-- end row -->
</div> <!-- container -->
</div> <!-- content -->
</div>
</div>
<script>
$("#DepartmentName").on('change',function(){
let departmentName = $("#DepartmentName").val().trim();
let depCode =$("#DEPCode").val();
$('#loader').show();
$.ajax({
type:"POST",
data:{departmentName,depCode},
url:"<?php echo base_url();?>checkDepartmentName",
success:function(data){
if(data && data.length >0){
let isActive = data[0].IsActive;
if(isActive == 1){
alert("Department name already Exists ..!! ");
}else{
alert("Department Name already Existing in the deleted section.!!");
}
window.location.reload();
}
},
error:function(error){
console.log("error occured..!!")
console.error(error);
},
complete:function(){
$('#loader').hide();
console.log("ajax call is completed..!!")
}
})
})
</script>

10
app/Views/factoryMachineMasterDetailsForm.php
View File

@ -52,6 +52,8 @@ $energyType = $masterData['energy_type'] ?? '';
<div class="card">
<div class="card-body">
<form action="<?= empty($masterData)
? base_url('createFactoryMachineMasterDetails')
: base_url('updateFactoryMachineMasterDetails?id=' . $masterData['id']); ?>" method="post"
@ -90,6 +92,9 @@ $energyType = $masterData['energy_type'] ?? '';
</div>
</div>
<?php if(!empty($masterData)){ ?>
<input type="hidden" id="machineId" value="<?=$masterData['id']?>">
<?php } ?>
<br>
<!-- submit and cancel button section -->
@ -123,12 +128,13 @@ $energyType = $masterData['energy_type'] ?? '';
<script>
$('#machineName').on('change', function () {
let machineName = $(this).val();
let machineName = $(this).val().trim();
let machineId = $('#machineId').val()??'';
$('#loader').show();
$.ajax({
type: "POST",
url: "<?php echo base_url(); ?>/checkMachineName",
data: { machineName },
data: { machineName , machineId },
success: function (data) {
if (data && data.length > 0) {
let isActive = data[0].is_active;

3
app/Views/transporterListing.php
View File

@ -259,7 +259,7 @@
var formData = {
transporterid: $('#transporterid').val(),
transportername: $('#transportername').val()
transportername: $('#transportername').val().trim()
};
let checkTransporterExists = function checkTransporterExists() {
@ -269,6 +269,7 @@
type: 'POST',
url: "<?php echo base_url(); ?>checkTransporter",
data: {
transporterid:$('#transporterid').val()??'',
transportername
},
success: function (data) {