diff --git a/Apollo/api/application/controllers/HallTickets_Controller.php b/Apollo/api/application/controllers/HallTickets_Controller.php index 5a9be8a7..8a0b6b91 100644 --- a/Apollo/api/application/controllers/HallTickets_Controller.php +++ b/Apollo/api/application/controllers/HallTickets_Controller.php @@ -325,7 +325,7 @@ class HallTickets_Controller extends REST_Controller { { $fileArray[]=$filedetailsarray['SubjectID']; } - + // print_r( $fileArray); $data['subjectDetails'] = $this->Hallticket_model->getExistDetailsfileupload($university,$courseArray,$branchId); // print_r( $data['subjectDetails']); if($data['subjectDetails'] == 1 ) @@ -337,7 +337,13 @@ class HallTickets_Controller extends REST_Controller { { $maparray[]=$object->SubjectCode; } - if ($fileArray == $maparray) + // $a1=$fileArray; + // $b1=$maparray; + // print_r($maparray); + $result=array_diff($fileArray,$maparray); + $unmatched= sizeof($result); + + if ($unmatched == 0 ) { foreach($courseArray as $CourseDatialArray) 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; } diff --git a/Apollo/assets/views/hallticket/batchshedule.html b/Apollo/assets/views/hallticket/batchshedule.html index b54daebc..08b058d2 100644 --- a/Apollo/assets/views/hallticket/batchshedule.html +++ b/Apollo/assets/views/hallticket/batchshedule.html @@ -167,8 +167,8 @@