SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

machine name issues fixes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-03-21 15:08:20 +05:30
parent ef8a44a519
commit 3b7ccc93b9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/models/batchcard_model.php
View File

@ -221,9 +221,11 @@ class batchcard_model extends CI_Model
function getmaint_dtl_MntDate($dateval) function getmaint_dtl_MntDate($dateval)
{ {
$this->db->select('*'); $this->db->select('bm.*,mm.Machine_Name');
$this->db->from('T_Batchcard_MaintanceDetails'); $this->db->from('T_Batchcard_MaintanceDetails bm');
$this->db->where('Maint_Date',$dateval); $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(); $bmd = $this->db->get();
return $bmd->result(); return $bmd->result();
} }

4
application/views/dailybatchcard.php
View File

@ -483,8 +483,8 @@ function keyValidate(e)
var autostartstoptime = $('#description').val(); var autostartstoptime = $('#description').val();
var openreading = $('#open_reading').val(); var openreading = $('#open_reading').val();
var closereading = $('#close_reading').val(); var closereading = $('#close_reading').val();
var lessbreakdown = $('#less_maintenance').val(); var lessbreakdown = $('#less_break_down_hrs').val();
var lessmaintenances = $('#less_break_down_hrs').val(); var lessmaintenances = $('#less_maintenance').val();
if(d == '' || a == -1) if(d == '' || a == -1)
{ {
alert('Please Enter Date and Approved by'); alert('Please Enter Date and Approved by');