diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php index bf6700dd..67647fa8 100755 --- a/application/models/batchcard_model.php +++ b/application/models/batchcard_model.php @@ -221,9 +221,11 @@ class batchcard_model extends CI_Model function getmaint_dtl_MntDate($dateval) { - $this->db->select('*'); - $this->db->from('T_Batchcard_MaintanceDetails'); - $this->db->where('Maint_Date',$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.Maint_Date',$dateval); $bmd = $this->db->get(); return $bmd->result(); } diff --git a/application/views/dailybatchcard.php b/application/views/dailybatchcard.php index fa6559a3..d3bb56a8 100755 --- a/application/views/dailybatchcard.php +++ b/application/views/dailybatchcard.php @@ -483,8 +483,8 @@ function keyValidate(e) var autostartstoptime = $('#description').val(); var openreading = $('#open_reading').val(); var closereading = $('#close_reading').val(); - var lessbreakdown = $('#less_maintenance').val(); - var lessmaintenances = $('#less_break_down_hrs').val(); + var lessbreakdown = $('#less_break_down_hrs').val(); + var lessmaintenances = $('#less_maintenance').val(); if(d == '' || a == -1) { alert('Please Enter Date and Approved by');