From 1650a2dda641701a2646b8cee5ebfed7ec13612e Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Tue, 11 Sep 2018 18:22:39 +0530
Subject: [PATCH] Procedure changed for Student merge screen

---
 .../application/models/Data_correction.php    | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/Apollo/api/application/models/Data_correction.php b/Apollo/api/application/models/Data_correction.php
index 179d3bd6..e7884a04 100644
--- a/Apollo/api/application/models/Data_correction.php
+++ b/Apollo/api/application/models/Data_correction.php
@@ -30,20 +30,24 @@ group by Student_id,cid";
 	
 	 Public function getMobile($deleteNo=null,$mergeNo=null)
 	{
-	  $sql = "call SP_MERGE_STUDENT_DATA('".$deleteNo."','".$mergeNo."',@countRow);
+	  $sql = "call SP_MERGE_STUDENT_DATA('".$deleteNo."','".$mergeNo."',@err_meesage,@suc_message);
               ";
-	  $a=$this->db->query($sql);		  
-	  $sqlOut = " select @countRow as counts;";		  
-        $b=$this->db->query($sqlOut);
-        $batch = $b->result();
-		//echo $batch[0]->counts;
-        if ($batch[0]->counts > 0) {
+      $a=$this->db->query($sql);	
+      //To get error message	  
+	  $sql_err = " select @err_message as err_message;";		  
+        $b=$this->db->query($sql_err);
+        $err_res = $b->result();
+        //To get success message
+        $sqlOut = " select @suc_message as suc_message;";		  
+        $c=$this->db->query($sqlOut);
+        $suc_res = $c->result();
+		//echo $batch[0]->err_message;
+        if ($suc_res[0]->suc_message != null) {
             $results['MergeStatus']      = true;
-            $results['after_Merge'] = $batch;
-			$results['message']      = 'Student details successfully merged';
+            $results['message']      = $suc_res[0]->suc_message;
         } else {
             $results['MergeStatus'] = false;
-            $results['message']      = 'Can not Merge';
+            $results['message']      = $err_res[0]->err_message;
         }
         return $results;	
 	}