From e13d6313cf27db08cbd489c3eef5efc17c4705f2 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 19 Apr 2018 19:43:08 +0530 Subject: [PATCH] batchcard changes --- application/controllers/batchcard.php | 20 +++- application/models/batchcard_model.php | 110 ++++++++++---------- application/views/BatchcardHistEdit.php | 6 +- application/views/BatchcardMaintAdd.php | 32 +++++- application/views/BatchcardMaintEdit.php | 42 +++++++- application/views/BatchcardMaintListing.php | 7 +- application/views/dailybatchcard.php | 10 +- application/views/editDailyData.php | 7 +- application/views/employeeListing.php | 4 +- 9 files changed, 167 insertions(+), 71 deletions(-) diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php index 020df641..3016b1a3 100755 --- a/application/controllers/batchcard.php +++ b/application/controllers/batchcard.php @@ -439,9 +439,11 @@ class batchcard extends BaseController $did = $this->uri->segment(3); $data['emplist'] = $this->batchcard_model->getEmplistforReport(); $data['dailydata'] = $this->batchcard_model->getIndividualDailyData($did); - //$ddate = explode("-",$data['dailydata'][0]->ddate); - //$dateval =$ddate[2].'-'.$ddate[1].'-'.$ddate[0]; - $data['Maintenances'] = $this->batchcard_model->getmaint_dtl_MntDate($data['dailydata'][0]->ddate); + $ddate = explode("-",$data['dailydata'][0]->ddate); + $dateval =$ddate[2].'-'.$ddate[1].'-'.$ddate[0]; + //$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->loadViews("editDailyData", $this->global,$data,NULL); @@ -681,6 +683,8 @@ class batchcard extends BaseController function getMaintenancesDetails(){ $date = $this->input->post('id1'); + // echo $date; + // die(); $arraydata = $this->batchcard_model->maintenancesdata($date); if(count($arraydata) != 0){ echo json_encode($arraydata);} @@ -693,6 +697,7 @@ class batchcard extends BaseController } function addMaint(){ + $data['emplist'] = $this->batchcard_model->getEmplistforReport(); $data['MachineList'] = $this->batchcard_model->getmachine_codename(); $this->global['pageTitle'] = 'Siddharth : Add Maintenance/Breakdown'; $this->loadViews("BatchcardMaintAdd", $this->global,$data,NULL); @@ -701,6 +706,7 @@ class batchcard extends BaseController $MntID = base64_decode(urldecode($this->uri->segment(3))); + $data['emplist'] = $this->batchcard_model->getEmplistforReport(); $data['MachineList'] = $this->batchcard_model->getmachine_codename(); $data['MaintEdit'] = $this->batchcard_model->getmaint_dtl_MntID($MntID); $data['MaintFileEdit'] = $this->batchcard_model->getfiledetails($MntID); @@ -730,8 +736,10 @@ class batchcard extends BaseController $cost_material = $this->input->post('cost_material'); $cost_labour = $this->input->post('cost_labour'); $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, //print_r($addmntbr); //die(); @@ -817,10 +825,12 @@ class batchcard extends BaseController $cost_material = $this->input->post('cost_material'); $cost_labour = $this->input->post('cost_labour'); $updatedby = $this->session->userdata ( 'userId' ); + $approvedby = $this->input->post('approvedby'); + $workdoneby = $this->input->post('workdoneby'); // $date = new DateTime('now', new DateTimeZone('Asia/Kolkata')); // $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, //print_r($editmntbr); //die(); diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php index abbe1ab9..a4c1e4ef 100755 --- a/application/models/batchcard_model.php +++ b/application/models/batchcard_model.php @@ -214,9 +214,13 @@ class batchcard_model extends CI_Model } function getmaint_dtl() { - - $this->db->select('*'); - $this->db->from('T_Batchcard_MaintanceDetails'); + // $r->FirstName.' '.$r->LastName + $this->db->select('BMD.*'); + $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(); return $bmd->result(); } @@ -231,29 +235,6 @@ class batchcard_model extends CI_Model 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) { $this->db->where('Maint_ID',$MntID); @@ -263,19 +244,28 @@ class batchcard_model extends CI_Model return $bmd; } - function maintenancesdata($date,$Autostartstoptime){ - $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,'%d-%m-%Y') = '".$date."'"; - //'%Y-%m-%d' - //DATE_FORMAT(bm.CreatedOn,'%d-%m-%Y') FROM - $res = $this->db->query($sql); - return $res->result(); + function maintenancesdata($date){ + + $this->db->select("bm.*,mm.Machine_Name"); + $this->db->select("DATE_FORMAT(bm.CreatedOn,'%d-%m-%Y') AS date", FALSE); + $this->db->select("DATE_FORMAT(bm.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_Batchcard_MaintanceDetails bm"); + $this->db->join("T_Machine_Master mm", "bm.Machine_Code = mm.Machine_Code", "left"); + $this->db->join("T_Employee_Details ED1", "bm.Approved_By = ED1.EmpID", "left"); + $this->db->join("T_Employee_Details ED2", "bm.WorkDone_By = ED2.EmpID", "left"); + $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(){ $this->db->select('Machine_Code,Machine_Name'); $this->db->from('T_Machine_Master'); @@ -515,26 +505,32 @@ class batchcard_model extends CI_Model 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); - return $res->result(); + + $this->db->select('T_Machine_Master.*,T_Batchcard_MaintanceDetails.*,T_DepartmentDetails.DepartmentName'); + $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(); } } diff --git a/application/views/BatchcardHistEdit.php b/application/views/BatchcardHistEdit.php index ea47bb8d..fa2ec9e2 100755 --- a/application/views/BatchcardHistEdit.php +++ b/application/views/BatchcardHistEdit.php @@ -255,6 +255,8 @@ Maintenances Description Maintenances Reason Total hrs for Maintenances + Work Done By + Approved By @@ -389,7 +391,9 @@ $(function() { html += ''+ta.Maint_Location+''; html += ''+ta.Maint_Description+''; html += ''+ta.Maint_Reason+''; - html += ''+ta.Maint_Total_hrs+''; + html += ''+ta.Maint_Total_hrs+''; + html += ''+ta.Worker_Name+''; + html += ''+ta.Approver_Name+''; $('#Hist_Append').append(html); sno++; diff --git a/application/views/BatchcardMaintAdd.php b/application/views/BatchcardMaintAdd.php index e5d945ac..099b5799 100755 --- a/application/views/BatchcardMaintAdd.php +++ b/application/views/BatchcardMaintAdd.php @@ -1,6 +1,5 @@ -