minor change commit - vadivel J
This commit is contained in:
parent
5c9d1bac14
commit
719f57ec51
@ -59,7 +59,7 @@ class FactoryMachineController extends BaseController
|
|||||||
|
|
||||||
$data['masterData']='';
|
$data['masterData']='';
|
||||||
|
|
||||||
return $this->loadViews("factoryMachineMasterDetailsCreate", $this->global, $data, NULL);
|
return $this->loadViews("factoryMachineMasterDetailsForm", $this->global, $data, NULL);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,10 +72,8 @@ class FactoryMachineController extends BaseController
|
|||||||
|
|
||||||
$data['masterData'] = $this->factoryMachineMaster_model->where('id', $id)->where('is_active', 1)->first();
|
$data['masterData'] = $this->factoryMachineMaster_model->where('id', $id)->where('is_active', 1)->first();
|
||||||
|
|
||||||
//here we are using same view - create Factory Machine Master Detail for
|
|
||||||
// updating Factory Machine Master Detail
|
|
||||||
|
|
||||||
return $this->loadViews("factoryMachineMasterDetailsCreate", $this->global, $data, NULL);
|
return $this->loadViews("factoryMachineMasterDetailsForm", $this->global, $data, NULL);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -396,8 +396,7 @@
|
|||||||
$("#MatCate").append(`<option value="${materialCategory}" selected > ${materialCategory} </option>`)
|
$("#MatCate").append(`<option value="${materialCategory}" selected > ${materialCategory} </option>`)
|
||||||
}else{
|
}else{
|
||||||
$("#addMaterialCaterogyModal").modal('hide');
|
$("#addMaterialCaterogyModal").modal('hide');
|
||||||
alert('Error Adding Category..!!');
|
alert('Error Adding Category..!!');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -126,8 +126,7 @@
|
|||||||
<td align="center"><?php echo $record['energy_type'] ?></td>
|
<td align="center"><?php echo $record['energy_type'] ?></td>
|
||||||
<td align="center">
|
<td align="center">
|
||||||
<a data-toggle="tooltip"
|
<a data-toggle="tooltip"
|
||||||
href="<?php echo base_url(); ?>
|
href="<?php echo base_url()?>loadView_updateFactoryMachineMasterDetail?id=<?php echo $record['id'] ?>"
|
||||||
loadView_updateFactoryMachineMasterDetail?id=<?php echo $record['id'] ?>"
|
|
||||||
>
|
>
|
||||||
<i class="fa fa-pencil-alt" data-toggle="tooltip"
|
<i class="fa fa-pencil-alt" data-toggle="tooltip"
|
||||||
title="Click here to Edit "></i>
|
title="Click here to Edit "></i>
|
||||||
@ -137,7 +136,6 @@
|
|||||||
|
|
||||||
|
|
||||||
<a data-toggle="tooltip" onclick="confirmDelete(event)"
|
<a data-toggle="tooltip" onclick="confirmDelete(event)"
|
||||||
|
|
||||||
href="<?php echo base_url(); ?>deleteFactoryMachineMasterDetails?id=<?php echo $record['id'] ?>"
|
href="<?php echo base_url(); ?>deleteFactoryMachineMasterDetails?id=<?php echo $record['id'] ?>"
|
||||||
>
|
>
|
||||||
<i class="fa fa-trash" data-toggle="tooltip"
|
<i class="fa fa-trash" data-toggle="tooltip"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user