SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

batchcard changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-04-19 19:43:08 +05:30
parent dcecd50670
commit e13d6313cf
9 changed files with 167 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
application/controllers/batchcard.php
View File

@ -439,9 +439,11 @@ class batchcard extends BaseController
$did = $this->uri->segment(3); $did = $this->uri->segment(3);
$data['emplist'] = $this->batchcard_model->getEmplistforReport(); $data['emplist'] = $this->batchcard_model->getEmplistforReport();
$data['dailydata'] = $this->batchcard_model->getIndividualDailyData($did); $data['dailydata'] = $this->batchcard_model->getIndividualDailyData($did);
//$ddate = explode("-",$data['dailydata'][0]->ddate); $ddate = explode("-",$data['dailydata'][0]->ddate);
//$dateval =$ddate[2].'-'.$ddate[1].'-'.$ddate[0]; $dateval =$ddate[2].'-'.$ddate[1].'-'.$ddate[0];
$data['Maintenances'] = $this->batchcard_model->getmaint_dtl_MntDate($data['dailydata'][0]->ddate); //$data['Maintenances'] = $this->batchcard_model->getmaint_dtl_MntDate($data['dailydata'][0]->ddate);
$data['Maintenances'] = $this->batchcard_model->maintenancesdata($dateval);
//$arraydata = $this->batchcard_model->maintenancesdata($date);
$this->global['pageTitle'] = 'Siddharth : Daily Batch Card Edit'; $this->global['pageTitle'] = 'Siddharth : Daily Batch Card Edit';
$this->loadViews("editDailyData", $this->global,$data,NULL); $this->loadViews("editDailyData", $this->global,$data,NULL);
@ -681,6 +683,8 @@ class batchcard extends BaseController
function getMaintenancesDetails(){ function getMaintenancesDetails(){
$date = $this->input->post('id1'); $date = $this->input->post('id1');
// echo $date;
// die();
$arraydata = $this->batchcard_model->maintenancesdata($date); $arraydata = $this->batchcard_model->maintenancesdata($date);
if(count($arraydata) != 0){ if(count($arraydata) != 0){
echo json_encode($arraydata);} echo json_encode($arraydata);}
@ -693,6 +697,7 @@ class batchcard extends BaseController
} }
function addMaint(){ function addMaint(){
$data['emplist'] = $this->batchcard_model->getEmplistforReport();
$data['MachineList'] = $this->batchcard_model->getmachine_codename(); $data['MachineList'] = $this->batchcard_model->getmachine_codename();
$this->global['pageTitle'] = 'Siddharth : Add Maintenance/Breakdown'; $this->global['pageTitle'] = 'Siddharth : Add Maintenance/Breakdown';
$this->loadViews("BatchcardMaintAdd", $this->global,$data,NULL); $this->loadViews("BatchcardMaintAdd", $this->global,$data,NULL);
@ -701,6 +706,7 @@ class batchcard extends BaseController
$MntID = base64_decode(urldecode($this->uri->segment(3))); $MntID = base64_decode(urldecode($this->uri->segment(3)));
$data['emplist'] = $this->batchcard_model->getEmplistforReport();
$data['MachineList'] = $this->batchcard_model->getmachine_codename(); $data['MachineList'] = $this->batchcard_model->getmachine_codename();
$data['MaintEdit'] = $this->batchcard_model->getmaint_dtl_MntID($MntID); $data['MaintEdit'] = $this->batchcard_model->getmaint_dtl_MntID($MntID);
$data['MaintFileEdit'] = $this->batchcard_model->getfiledetails($MntID); $data['MaintFileEdit'] = $this->batchcard_model->getfiledetails($MntID);
@ -730,8 +736,10 @@ class batchcard extends BaseController
$cost_material = $this->input->post('cost_material'); $cost_material = $this->input->post('cost_material');
$cost_labour = $this->input->post('cost_labour'); $cost_labour = $this->input->post('cost_labour');
$createdby = $this->session->userdata ( 'userId' ); $createdby = $this->session->userdata ( 'userId' );
$approvedby = $this->input->post('approvedby');
$workdoneby = $this->input->post('workdoneby');
$addmntbr = array('Type'=>$type,'Machine_Code'=>$machinecode,'Maint_Subtype'=>$maintenance_subtype, 'Maint_Location'=>$location, 'Maint_Description'=>$maintenance_description, 'Maint_Reason'=>$maintenance_reason, 'Maint_Time_from'=>$maintenance_time_from, 'Maint_Time_to'=>$maintenance_time_to, 'Maint_Total_hrs'=>$maintenance_total_hrs, 'Cost_Material'=>$cost_material, 'Cost_Labour'=>$cost_labour, 'CreatedBy'=>$createdby); $addmntbr = array('Type'=>$type,'Machine_Code'=>$machinecode,'Maint_Subtype'=>$maintenance_subtype, 'Maint_Location'=>$location, 'Maint_Description'=>$maintenance_description, 'Maint_Reason'=>$maintenance_reason, 'Maint_Time_from'=>$maintenance_time_from, 'Maint_Time_to'=>$maintenance_time_to, 'Maint_Total_hrs'=>$maintenance_total_hrs, 'Cost_Material'=>$cost_material, 'Cost_Labour'=>$cost_labour,'WorkDone_By'=>$workdoneby,'Approved_By'=>$approvedby,'CreatedBy'=>$createdby);
//'Maint_Date'=>$maintenance_date,'Maint_Time'=>$maintenance_time, //'Maint_Date'=>$maintenance_date,'Maint_Time'=>$maintenance_time,
//print_r($addmntbr); //print_r($addmntbr);
//die(); //die();
@ -817,10 +825,12 @@ class batchcard extends BaseController
$cost_material = $this->input->post('cost_material'); $cost_material = $this->input->post('cost_material');
$cost_labour = $this->input->post('cost_labour'); $cost_labour = $this->input->post('cost_labour');
$updatedby = $this->session->userdata ( 'userId' ); $updatedby = $this->session->userdata ( 'userId' );
$approvedby = $this->input->post('approvedby');
$workdoneby = $this->input->post('workdoneby');
// $date = new DateTime('now', new DateTimeZone('Asia/Kolkata')); // $date = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
// $updatedon = $date->format('d-m-Y H:i:s'); // $updatedon = $date->format('d-m-Y H:i:s');
$editmntbr = array('Type'=>$type,'Machine_Code'=>$machinecode,'Maint_Subtype'=>$maintenance_subtype, 'Maint_Location'=>$location, 'Maint_Description'=>$maintenance_description, 'Maint_Reason'=>$maintenance_reason, 'Maint_Time_from'=>$maintenance_time_from, 'Maint_Time_to'=>$maintenance_time_to, 'Maint_Total_hrs'=>$maintenance_total_hrs, 'Cost_Material'=>$cost_material, 'Cost_Labour'=>$cost_labour, 'UpdatedBy'=>$updatedby); $editmntbr = array('Type'=>$type,'Machine_Code'=>$machinecode,'Maint_Subtype'=>$maintenance_subtype, 'Maint_Location'=>$location, 'Maint_Description'=>$maintenance_description, 'Maint_Reason'=>$maintenance_reason, 'Maint_Time_from'=>$maintenance_time_from, 'Maint_Time_to'=>$maintenance_time_to, 'Maint_Total_hrs'=>$maintenance_total_hrs, 'Cost_Material'=>$cost_material, 'Cost_Labour'=>$cost_labour,'WorkDone_By'=>$workdoneby,'Approved_By'=>$approvedby,'UpdatedBy'=>$updatedby);
//'Maint_Date'=>$maintenance_date,'Maint_Time'=>$maintenance_time, //'Maint_Date'=>$maintenance_date,'Maint_Time'=>$maintenance_time,
//print_r($editmntbr); //print_r($editmntbr);
//die(); //die();

106
application/models/batchcard_model.php
View File

@ -214,9 +214,13 @@ class batchcard_model extends CI_Model
} }
function getmaint_dtl() function getmaint_dtl()
{ {
// $r->FirstName.' '.$r->LastName
$this->db->select('*'); $this->db->select('BMD.*');
$this->db->from('T_Batchcard_MaintanceDetails'); $this->db->select('CONCAT(ED1.FirstName, " - " , ED1.LastName) AS Approver_Name', FALSE);
$this->db->select('CONCAT(ED2.FirstName, " - " , ED2.LastName) AS Worker_Name', FALSE);
$this->db->from('T_Batchcard_MaintanceDetails BMD');
$this->db->join('T_Employee_Details ED1', 'ED1.EmpID = BMD.Approved_By', 'left');
$this->db->join('T_Employee_Details ED2', 'ED2.EmpID = BMD.WorkDone_By', 'left');
$bmd = $this->db->get(); $bmd = $this->db->get();
return $bmd->result(); return $bmd->result();
} }
@ -231,29 +235,6 @@ class batchcard_model extends CI_Model
return $bmd->result(); return $bmd->result();
} }
function getmaint_dtl_MntDate($dateval)
{
// $converted = date('Y-m-d H:i:s',$dateval);
// $this->db->select('bm.*,mm.Machine_Name');
// $this->db->from('T_Batchcard_MaintanceDetails bm');
// $this->db->join('T_Machine_Master mm', 'bm.Machine_Code = mm.Machine_Code', 'left');
// $this->db->where('mm.Machines_Category = "TRP"');
// $this->db->where('bm.CreatedOn',$converted);
// $bmd = $this->db->get();
// return $bmd->result();
$sql = "select bm.*,mm.Machine_Name,
DATE_FORMAT(bm.CreatedOn,'%d-%m-%Y') as date,
DATE_FORMAT(bm.CreatedOn,'%l:%i %p') as time
from T_Batchcard_MaintanceDetails as bm
left join T_Machine_Master as mm on bm.Machine_Code = mm.Machine_Code
where mm.Machines_Category = 'TRP'
and DATE_FORMAT(bm.CreatedOn,'%Y-%m-%d') = '".$dateval."'";
$bmd = $this->db->query($sql);
return $bmd->result();
}
function updatemaint_dtl($array,$MntID) function updatemaint_dtl($array,$MntID)
{ {
$this->db->where('Maint_ID',$MntID); $this->db->where('Maint_ID',$MntID);
@ -263,19 +244,28 @@ class batchcard_model extends CI_Model
return $bmd; return $bmd;
} }
function maintenancesdata($date,$Autostartstoptime){ function maintenancesdata($date){
$sql = "select bm.*,mm.Machine_Name,
DATE_FORMAT(bm.CreatedOn,'%d-%m-%Y') as date, $this->db->select("bm.*,mm.Machine_Name");
DATE_FORMAT(bm.CreatedOn,'%l:%i %p') as time $this->db->select("DATE_FORMAT(bm.CreatedOn,'%d-%m-%Y') AS date", FALSE);
from T_Batchcard_MaintanceDetails as bm $this->db->select("DATE_FORMAT(bm.CreatedOn,'%l:%i %p') AS time", FALSE);
left join T_Machine_Master as mm on bm.Machine_Code = mm.Machine_Code $this->db->select("CONCAT(ED1.FirstName, ' - ' , ED1.LastName) AS Approver_Name", FALSE);
where mm.Machines_Category = 'TRP' $this->db->select("CONCAT(ED2.FirstName, ' - ' , ED2.LastName) AS Worker_Name", FALSE);
and DATE_FORMAT(bm.CreatedOn,'%d-%m-%Y') = '".$date."'"; $this->db->from("T_Batchcard_MaintanceDetails bm");
//'%Y-%m-%d' $this->db->join("T_Machine_Master mm", "bm.Machine_Code = mm.Machine_Code", "left");
//DATE_FORMAT(bm.CreatedOn,'%d-%m-%Y') FROM $this->db->join("T_Employee_Details ED1", "bm.Approved_By = ED1.EmpID", "left");
$res = $this->db->query($sql); $this->db->join("T_Employee_Details ED2", "bm.WorkDone_By = ED2.EmpID", "left");
return $res->result(); $this->db->where("mm.Machines_Category = 'TRP'");
//AND DATE_FORMAT(bm.CreatedOn,'%Y-%m-%d') = '19-04-2018'
$this->db->where("DATE_FORMAT(bm.CreatedOn,'%d-%m-%Y')",$date);
$bmd = $this->db->get();
return $bmd->result();
//print_r($this->db->last_query());
//die();
} }
function getmachine_codename(){ function getmachine_codename(){
$this->db->select('Machine_Code,Machine_Name'); $this->db->select('Machine_Code,Machine_Name');
$this->db->from('T_Machine_Master'); $this->db->from('T_Machine_Master');
@ -515,26 +505,32 @@ class batchcard_model extends CI_Model
function getHist_tbls($MachineCode){ function getHist_tbls($MachineCode){
$sql = "SELECT T_Machine_Master.*,T_Batchcard_MaintanceDetails.*,
T_DepartmentDetails.DepartmentName,
DATE_FORMAT(T_Batchcard_MaintanceDetails.CreatedOn, '%d-%m-%Y') as date,
DATE_FORMAT(T_Batchcard_MaintanceDetails.CreatedOn, '%l:%i %p') as time
FROM T_Machine_Master
LEFT JOIN T_Batchcard_MaintanceDetails ON T_Batchcard_MaintanceDetails.Machine_Code=T_Machine_Master.Machine_Code
LEFT JOIN T_DepartmentDetails ON T_DepartmentDetails.DEPCode=T_Machine_Master.Machines_Dept
WHERE T_Machine_Master.Machine_Code = '".$MachineCode."'" ;
$res = $this->db->query($sql); $this->db->select('T_Machine_Master.*,T_Batchcard_MaintanceDetails.*,T_DepartmentDetails.DepartmentName');
return $res->result(); $this->db->select("DATE_FORMAT(T_Batchcard_MaintanceDetails.CreatedOn,'%d-%m-%Y') AS date", FALSE);
$this->db->select("DATE_FORMAT(T_Batchcard_MaintanceDetails.CreatedOn,'%l:%i %p') AS time", FALSE);
$this->db->select("CONCAT(ED1.FirstName, ' - ' , ED1.LastName) AS Approver_Name", FALSE);
$this->db->select("CONCAT(ED2.FirstName, ' - ' , ED2.LastName) AS Worker_Name", FALSE);
$this->db->from('T_Machine_Master');
$this->db->join('T_Batchcard_MaintanceDetails','T_Batchcard_MaintanceDetails.Machine_Code=T_Machine_Master.Machine_Code');
$this->db->join('T_DepartmentDetails','T_DepartmentDetails.DEPCode=T_Machine_Master.Machines_Dept');
$this->db->join('T_Employee_Details ED1', 'ED1.EmpID = T_Batchcard_MaintanceDetails.Approved_By', 'left');
$this->db->join('T_Employee_Details ED2', 'ED2.EmpID = T_Batchcard_MaintanceDetails.WorkDone_By', 'left');
$this->db->where('T_Machine_Master.Machine_Code',$MachineCode);
$res = $this->db->get();
return $res->result();
// $sql = "SELECT T_Machine_Master.*,T_Batchcard_MaintanceDetails.*,
// T_DepartmentDetails.DepartmentName,
// DATE_FORMAT(T_Batchcard_MaintanceDetails.CreatedOn, '%d-%m-%Y') as date,
// DATE_FORMAT(T_Batchcard_MaintanceDetails.CreatedOn, '%l:%i %p') as time,
// FROM T_Machine_Master
// LEFT JOIN T_Batchcard_MaintanceDetails ON T_Batchcard_MaintanceDetails.Machine_Code=T_Machine_Master.Machine_Code
// LEFT JOIN T_DepartmentDetails ON T_DepartmentDetails.DEPCode=T_Machine_Master.Machines_Dept
// WHERE T_Machine_Master.Machine_Code = '".$MachineCode."'" ;
// $res = $this->db->query($sql);
// return $res->result();
// $this->db->select('T_Machine_Master.*,T_Batchcard_MaintanceDetails.*,T_DepartmentDetails.DepartmentName');
// $this->db->from('T_Machine_Master');
// $this->db->join('T_Batchcard_MaintanceDetails','T_Batchcard_MaintanceDetails.Machine_Code=T_Machine_Master.Machine_Code');
// $this->db->join('T_DepartmentDetails','T_DepartmentDetails.DEPCode=T_Machine_Master.Machines_Dept');
// $this->db->where('T_Machine_Master.Machine_Code',$MachineCode);
// $res = $this->db->get();
// return $res->result();
} }
} }

6
application/views/BatchcardHistEdit.php
View File

@ -255,6 +255,8 @@
<th>Maintenances Description</th> <th>Maintenances Description</th>
<th>Maintenances Reason</th> <th>Maintenances Reason</th>
<th>Total hrs for Maintenances</th> <th>Total hrs for Maintenances</th>
<th>Work Done By</th>
<th>Approved By</th>
</tr> </tr>
</thead> </thead>
<tbody id="Hist_Append"> <tbody id="Hist_Append">
@ -389,7 +391,9 @@ $(function() {
html += '<td style="text-align:right;">'+ta.Maint_Location+'</td>'; html += '<td style="text-align:right;">'+ta.Maint_Location+'</td>';
html += '<td style="text-align:right;">'+ta.Maint_Description+'</td>'; html += '<td style="text-align:right;">'+ta.Maint_Description+'</td>';
html += '<td style="text-align:right;">'+ta.Maint_Reason+'</td>'; html += '<td style="text-align:right;">'+ta.Maint_Reason+'</td>';
html += '<td style="text-align:right;">'+ta.Maint_Total_hrs+'</td></tr>'; html += '<td style="text-align:right;">'+ta.Maint_Total_hrs+'</td>';
html += '<td style="text-align:right;">'+ta.Worker_Name+'</td>';
html += '<td style="text-align:right;">'+ta.Approver_Name+'</td></tr>';
$('#Hist_Append').append(html); $('#Hist_Append').append(html);
sno++; sno++;

32
application/views/BatchcardMaintAdd.php
View File

@ -1,6 +1,5 @@
<script src="<?php echo base_url().'assets/jquery.plugin.js'?>"></script> <script src="<?php echo base_url().'assets/jquery.plugin.js'?>"></script>
<script src="<?php echo base_url().'assets/jquery.timeentry.js'?>"></script> <script src="<?php echo base_url().'assets/jquery.timeentry.js'?>"></script>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.min.js"></script> -->
<style> <style>
/* .daterangepicker .ranges { /* .daterangepicker .ranges {
@ -133,7 +132,22 @@
<input type="hidden" name="hideconstant" id="hideconstant" value="0" /> <input type="hidden" name="hideconstant" id="hideconstant" value="0" />
</div> </div>
<div>&nbsp;</div>
<div class="col-md-12">
<legend></legend>
<div class="col-md-3">
<label>Work Done By</label>
<select class="form-control select2" id="workdoneby" name="workdoneby">
<option value=" ">Select Worker Name</option>
</select>
</div>
<div class="col-md-3 col-md-offset-6">
<label>Approved By</label>
<select class="form-control select2" id="approvedby" name="approvedby">
<option value=" ">Select Approver Name</option>
</select>
</div>
</div>
</div><!-- row --> </div><!-- row -->
</div><!--box body --> </div><!--box body -->
<div class="box-footer" style="text-align:right"> <div class="box-footer" style="text-align:right">
@ -151,8 +165,11 @@ $(function() {
$('#maintenance_total_hrs').val(''); $('#maintenance_total_hrs').val('');
$('#maintenance_date_time').val(''); $('#maintenance_date_time').val('');
var mach_arr = []; var mach_arr = [];
var emp_arr = [];
$("#machine").select2(); $("#machine").select2();
$("#approvedby").select2();
$("#workdoneby").select2();
$('#maintenance_date').datepicker({ $('#maintenance_date').datepicker({
//minDate : 'year+16', //minDate : 'year+16',
@ -228,6 +245,17 @@ $(function() {
$("#machine").append( $('<option></option>').val(ma.Machine_Code).html(ma.Machine_Code+'-'+ma.Machine_Name)); $("#machine").append( $('<option></option>').val(ma.Machine_Code).html(ma.Machine_Code+'-'+ma.Machine_Name));
}); });
emp_arr = <?php echo json_encode($emplist)?>;
// $.each(emp_arr,function(e,ea){
// $("#approvedby").append( $('<option></option>').val(ea.EmpID).html(ea.FirstName+' '+ea.LastName));
// $("#workdoneby").append( $('<option></option>').val(ea.EmpID).html(ea.FirstName+' '+ea.LastName));
// });
$.each(emp_arr,function(e,ea){
$("#approvedby , #workdoneby").append( $('<option></option>').val(ea.EmpID).html(ea.FirstName+' '+ea.LastName));
});
var value = $( 'input[name=radiobtn]:checked' ).val(); var value = $( 'input[name=radiobtn]:checked' ).val();
if(value == '0'){ if(value == '0'){
$("#subtype").show();} $("#subtype").show();}

42
application/views/BatchcardMaintEdit.php
View File

@ -15,6 +15,8 @@ $Mnt_Date_Time = '';
$Mnt_Total_hrs = ''; $Mnt_Total_hrs = '';
$Cost_material = ''; $Cost_material = '';
$Cost_labour = ''; $Cost_labour = '';
$Approved_by = '';
$Workdone_by = '';
// $filecount = ''; // $filecount = '';
if(!empty($MaintEdit)) if(!empty($MaintEdit))
@ -36,9 +38,17 @@ if(!empty($MaintEdit))
$Mnt_total_hrs = $Me->Maint_Total_hrs; $Mnt_total_hrs = $Me->Maint_Total_hrs;
$Cost_material = $Me->Cost_Material; $Cost_material = $Me->Cost_Material;
$Cost_labour = $Me->Cost_Labour; $Cost_labour = $Me->Cost_Labour;
$Approved_by = $Me->Approved_By;
$Workdone_by = $Me->WorkDone_By;
} }
} }
// $approvedby = array(-1=>'Select Approver Name');
// foreach($emplist as $r)
// {
// $approvedby[$r->FirstName.' '.$r->LastName] = $r->FirstName.' '.$r->LastName.'-'.$r->shortName;
// }
// if(!empty($MaintFileEdit)){ // if(!empty($MaintFileEdit)){
// $filecount = count($MaintFileEdit); // $filecount = count($MaintFileEdit);
// } // }
@ -179,6 +189,25 @@ if(!empty($MaintEdit))
</div> </div>
<div>&nbsp;</div>
<div class="col-md-12">
<legend></legend>
<div class="col-md-3">
<label>Work Done By:</label>
<!-- <input type="text" name="work_done_by" id="work_done_by" value="<?php echo $this->session->userdata ( 'name' );?>" readonly class="form-control"> -->
<select class="form-control select2" id="workdoneby" name="workdoneby">
<option value=" ">Select Worker Name</option>
</select>
</div>
<div class="col-md-3 col-md-offset-6">
<label>Approved By:</label>
<select class="form-control select2" id="approvedby" name="approvedby">
<option value=" ">Select Approver Name</option>
</select>
</div>
</div>
</div><!-- row --> </div><!-- row -->
</div><!--box body --> </div><!--box body -->
<div class="box-footer" style="text-align:right"> <div class="box-footer" style="text-align:right">
@ -200,8 +229,11 @@ var counterConstant = 0;
$(function() { $(function() {
var mach_arr = []; var mach_arr = [];
var file_arr = []; var file_arr = [];
var emp_arr = [];
$("#machine").select2(); $("#machine").select2();
$("#approvedby").select2();
$("#workdoneby").select2();
$('#maintenance_date').datepicker({ $('#maintenance_date').datepicker({
//minDate : 'year+16', //minDate : 'year+16',
@ -210,12 +242,20 @@ $(function() {
mach_arr = <?php echo json_encode($MachineList)?>; mach_arr = <?php echo json_encode($MachineList)?>;
file_arr = <?php echo json_encode($MaintFileEdit)?>; file_arr = <?php echo json_encode($MaintFileEdit)?>;
emp_arr = <?php echo json_encode($emplist)?>;
$.each(mach_arr,function(m,ma){ $.each(emp_arr,function(e,ea){
$("#approvedby , #workdoneby").append( $('<option></option>').val(ea.EmpID).html(ea.FirstName+' '+ea.LastName));
});
$.each(mach_arr,function(m,ma){
$("#machine").append( $('<option></option>').val(ma.Machine_Code).html(ma.Machine_Code+'-'+ma.Machine_Name)); $("#machine").append( $('<option></option>').val(ma.Machine_Code).html(ma.Machine_Code+'-'+ma.Machine_Name));
}); });
$('#machine option[value="<?php echo $Machinecode ?>"]').prop('selected', true); $('#machine option[value="<?php echo $Machinecode ?>"]').prop('selected', true);
$('#approvedby option[value="<?php echo $Approved_by ?>"]').prop('selected', true);
$('#workdoneby option[value="<?php echo $Workdone_by ?>"]').prop('selected', true);
var mybaseurl='<?php echo base_url('uploads/images');?>'; var mybaseurl='<?php echo base_url('uploads/images');?>';
$.each(file_arr,function(f,fa){ $.each(file_arr,function(f,fa){

7
application/views/BatchcardMaintListing.php
View File

@ -22,7 +22,8 @@
<thead style="background-color:#ddf"> <thead style="background-color:#ddf">
<tr> <tr>
<th colspan="4"><center>Maintenance Details</center></th> <th colspan="4"><center>Maintenance Details</center></th>
<th colspan="4"><center>Time Taken for Maintenance</center></th> <th colspan="3"><center>Time Taken for Maintenance</center></th>
<th colspan="3"></th>
</tr> </tr>
<tr> <tr>
<th >Nature of maintenance</th> <th >Nature of maintenance</th>
@ -33,6 +34,8 @@
<th >From</th> <th >From</th>
<th >To</th> <th >To</th>
<th >Total Hrs</th> <th >Total Hrs</th>
<th >Work Done By</th>
<th >Approved By</th>
<th >Action</th> <th >Action</th>
</tr> </tr>
</thead> </thead>
@ -54,6 +57,8 @@
<td><?php echo $ml->Maint_Time_from ?></td> <td><?php echo $ml->Maint_Time_from ?></td>
<td><?php echo $ml->Maint_Time_to ?></td> <td><?php echo $ml->Maint_Time_to ?></td>
<td><?php echo $ml->Maint_Total_hrs ?></td> <td><?php echo $ml->Maint_Total_hrs ?></td>
<td><?php echo $ml->Worker_Name ?></td>
<td><?php echo $ml->Approver_Name ?></td>
<td><u><a href="<?php echo base_url().'batchcard/editMaint/'.urlencode(base64_encode($ml->Maint_ID)) ?>" data-toggle="tooltip" title="Click here to Edit details"><i class="fa fa-edit" style="font-size:20px;"></i></a></u></td> <td><u><a href="<?php echo base_url().'batchcard/editMaint/'.urlencode(base64_encode($ml->Maint_ID)) ?>" data-toggle="tooltip" title="Click here to Edit details"><i class="fa fa-edit" style="font-size:20px;"></i></a></u></td>
</tr> </tr>
<?php <?php

10
application/views/dailybatchcard.php
View File

@ -371,6 +371,7 @@ foreach($emplist as $r)
<th colspan="8"><center>Maintenance Details</center></th> <th colspan="8"><center>Maintenance Details</center></th>
<th colspan="3"><center>Time Taken for Maintenance</center></th> <th colspan="3"><center>Time Taken for Maintenance</center></th>
<th colspan="2"><center>Cost Details</center></th> <th colspan="2"><center>Cost Details</center></th>
<th colspan="2"></th>
</tr> </tr>
<tr> <tr>
<th>S.No</th> <th>S.No</th>
@ -386,6 +387,8 @@ foreach($emplist as $r)
<th>Total hours</th> <th>Total hours</th>
<th>Material</th> <th>Material</th>
<th>Labour</th> <th>Labour</th>
<th>Work Done By</th>
<th>Approved By</th>
</tr> </tr>
</thead> </thead>
<tbody id="Maint_Append"> <tbody id="Maint_Append">
@ -577,12 +580,13 @@ function keyValidate(e)
}); });
$('#Maint_Append').empty(); $('#Maint_Append').empty();
var Index = 1 ; var Index = 1 ;
//alert(rd);
$.ajax({ $.ajax({
data:{id1:rd}, data:{id1:rd},
method:"POST", method:"POST",
url:"<?php echo base_url().'batchcard/getMaintenancesDetails'; ?>", url:"<?php echo base_url().'batchcard/getMaintenancesDetails'; ?>",
success:function(data){ success:function(data){
//alert(data);
if(data) if(data)
{ {
var data = JSON.parse(data); var data = JSON.parse(data);
@ -649,7 +653,9 @@ function keyValidate(e)
html += '<td style="text-align:right;">'+arr.Maint_Time_to+'</td>'; html += '<td style="text-align:right;">'+arr.Maint_Time_to+'</td>';
html += '<td style="text-align:right;">'+arr.Maint_Total_hrs+'</td>'; html += '<td style="text-align:right;">'+arr.Maint_Total_hrs+'</td>';
html += '<td style="text-align:left;">'+arr.Cost_Material+'</td>'; html += '<td style="text-align:left;">'+arr.Cost_Material+'</td>';
html += '<td style="text-align:rignt;">'+arr.Cost_Labour+'</td></tr>'; html += '<td style="text-align:rignt;">'+arr.Cost_Labour+'</td>';
html += '<td style="text-align:right;">'+arr.Worker_Name+'</td>';
html += '<td style="text-align:right;">'+arr.Approver_Name+'</td></tr>';
$('#Maint_Append').append(html); $('#Maint_Append').append(html);
Index++; Index++;

7
application/views/editDailyData.php
View File

@ -381,6 +381,7 @@ foreach($emplist as $r)
<th colspan="8"><center>Maintenance Details</center></th> <th colspan="8"><center>Maintenance Details</center></th>
<th colspan="3"><center>Time Taken for Maintenance</center></th> <th colspan="3"><center>Time Taken for Maintenance</center></th>
<th colspan="2"><center>Cost Details</center></th> <th colspan="2"><center>Cost Details</center></th>
<th colspan="2"></th>
</tr> </tr>
<tr> <tr>
<th>S.No</th> <th>S.No</th>
@ -396,6 +397,8 @@ foreach($emplist as $r)
<th>Total hours</th> <th>Total hours</th>
<th>Material</th> <th>Material</th>
<th>Labour</th> <th>Labour</th>
<th>Work Done By</th>
<th>Approved By</th>
</tr> </tr>
</thead> </thead>
<tbody id="Maint_Append"> <tbody id="Maint_Append">
@ -502,7 +505,9 @@ var Index = 1;
html += '<td style="text-align:right;">'+arr.Maint_Time_to+'</td>'; html += '<td style="text-align:right;">'+arr.Maint_Time_to+'</td>';
html += '<td style="text-align:right;">'+arr.Maint_Total_hrs+'</td>'; html += '<td style="text-align:right;">'+arr.Maint_Total_hrs+'</td>';
html += '<td style="text-align:left;">'+arr.Cost_Material+'</td>'; html += '<td style="text-align:left;">'+arr.Cost_Material+'</td>';
html += '<td style="text-align:rignt;">'+arr.Cost_Labour+'</td></tr>'; html += '<td style="text-align:rignt;">'+arr.Cost_Labour+'</td>';
html += '<td style="text-align:right;">'+arr.Worker_Name+'</td>';
html += '<td style="text-align:right;">'+arr.Approver_Name+'</td></tr>';
$('#Maint_Append').append(html); $('#Maint_Append').append(html);
Index++; Index++;

2
application/views/employeeListing.php
View File

@ -27,6 +27,7 @@
<th>Email ID</th> <th>Email ID</th>
<th>Designation</th> <th>Designation</th>
<th>Department</th> <th>Department</th>
<th>Active</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -43,6 +44,7 @@
<td><?php echo $record->EmailId ?></td> <td><?php echo $record->EmailId ?></td>
<td><?php echo $record->Designation ?></td> <td><?php echo $record->Designation ?></td>
<td><?php echo $record->DepartmentName ?></td> <td><?php echo $record->DepartmentName ?></td>
<td><?php echo ($record->IsActive == 1)? ' Active ' : ' In Active ' ; ?></td>
</tr> </tr>
<?php <?php
} }