From fbbda5bb78aec8e54ba2bcc8b8fb5e90401f3c44 Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Fri, 13 Apr 2018 10:06:38 +0530
Subject: [PATCH] batchcard changes

---
 application/controllers/batchcard.php  |  2 +-
 application/models/batchcard_model.php | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php
index 393dcf98..083858cc 100755
--- a/application/controllers/batchcard.php
+++ b/application/controllers/batchcard.php
@@ -681,7 +681,7 @@ class batchcard extends BaseController
 	function getMaintenancesDetails(){
 	
 		$date = $this->input->post('id1');
-		$arraydata = $this->batchcard_model->getmaint_dtl_MntDate($date);
+		$arraydata = $this->batchcard_model->maintenancesdata($date);
 		if(count($arraydata) != 0){
 		echo json_encode($arraydata);}
 	}
diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php
index 1a580e40..abbe1ab9 100755
--- a/application/models/batchcard_model.php
+++ b/application/models/batchcard_model.php
@@ -263,19 +263,19 @@ 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,$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 getmachine_codename(){
 		$this->db->select('Machine_Code,Machine_Name');
 		$this->db->from('T_Machine_Master');