From 33d8667c349d3cb98e2d64749aa907f163327f82 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 29 Jan 2019 14:46:45 +0530
Subject: [PATCH 1/3] reregistration form and course de activate issue no :
 1619 , 1623

---
 .../api/application/models/Student_model.php  | 25 ++++++++++++++++++-
 Apollo/assets/js/controllers/studentCtrl.js   |  4 +++
 .../reregistration/reregistrationformpdf.html |  4 +--
 .../student/editStudentCourseDetails.html     |  2 +-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php
index 68e2641f..540b19de 100755
--- a/Apollo/api/application/models/Student_model.php
+++ b/Apollo/api/application/models/Student_model.php
@@ -1565,7 +1565,28 @@ if(count($qry)>0)
 
        //echo $Enrollment ;
 
-       //print_r($reqArr);die();
+      // print_r($reqArr);die();
+
+
+       if($reqArr['IsActive'] == 0)
+       {
+            $this->db->select('*');
+            $this->db->from('T_Students_Fees_Status');
+            $this->db->where('StudentID',$reqArr['StudentID']);
+            $this->db->where('CourseID',$reqArr['CourseID']);
+
+            $qry=$this->db->get();
+            $qry=$qry->result(); 
+
+            if(count($qry)>0)
+                {
+                
+                $result['StudentStatus'] = false;
+                $result['message'] = "Fees Satus are active";
+                return $result;
+
+                }
+       }
 
 
        if($Enrollment !='')
@@ -1618,6 +1639,8 @@ if(count($qry)>0)
             }
         }
         return $result;
+
+
     }
 
     //get login branch employee list 
diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js
index e5cdbeb6..4c6cd77a 100755
--- a/Apollo/assets/js/controllers/studentCtrl.js
+++ b/Apollo/assets/js/controllers/studentCtrl.js
@@ -2501,6 +2501,8 @@ $scope.getPhoneNoHistoy = function(studentId)
                 $scope.courseEditLoading = false;
                 $scope.studentCourseList = response.data.course_details;
                 // $scope.stucour =  $scope.studentCourse[0];
+
+                console.log($scope.studentCourseList);
             } else {
                 $scope.courselist = false;
                 $scope.courseEditLoading='';
@@ -2634,6 +2636,8 @@ $scope.getPhoneNoHistoy = function(studentId)
 
     // update sutdent course details
     $scope.updateStudentCourseDetails = function (form, datas, hidedoj) {
+
+        //alert('in');return false;
         if (form.$invalid) {
             var field = null, firstError = null;
             for (field in form) {
diff --git a/Apollo/assets/views/reregistration/reregistrationformpdf.html b/Apollo/assets/views/reregistration/reregistrationformpdf.html
index 8d24dac2..58a869eb 100755
--- a/Apollo/assets/views/reregistration/reregistrationformpdf.html
+++ b/Apollo/assets/views/reregistration/reregistrationformpdf.html
@@ -61,11 +61,11 @@
                 <table style="height: 105px; width: 100%;border-collapse: collapse;" >
                         <tbody>
                         <tr>
-                        <td style="width: 28.0547%;">Name of the Cadidate:</td>
+                        <td style="width: 28.0547%;">Name of the Candidate:</td>
                         <td style="width: 68.9453%; border-bottom: 1px dotted;">{{Course.Firstname}} {{Course.Lastname}}</td>
                         </tr>
                         <tr>
-                        <td style="width: 28.0547%;">Father's Nmae:</td>
+                        <td style="width: 28.0547%;">Father's Name:</td>
                         <td style="width: 68.9453%; border-bottom: 1px dotted;">{{Course.Fathername}}</td>
                         </tr>
                         <tr>
diff --git a/Apollo/assets/views/student/editStudentCourseDetails.html b/Apollo/assets/views/student/editStudentCourseDetails.html
index 7829b4cb..09846cc4 100755
--- a/Apollo/assets/views/student/editStudentCourseDetails.html
+++ b/Apollo/assets/views/student/editStudentCourseDetails.html
@@ -169,7 +169,7 @@
 
                                 <span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining is required</span>
                             </div>
-<div ng-hide="stucour.Fee_paid_exist == 1 && localUserType == 'R002'">
+<div ng-hide="stucour.Fee_paid_exist == 1 && localUserType == 'R002'"  ng-if="localUserType == 'R003' || localUserType == 'R004'">
                             <div class="col-md-4" >
                                 <label>
                                     Active/De-Active

From 7ec62bb157f980fa3b02dda231d82c995eaa564b Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 29 Jan 2019 15:13:39 +0530
Subject: [PATCH 2/3] delete ppc option issue no : 1612

---
 .../api/application/models/Fees_status_model.php   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index 806a394c..89482d47 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -2177,18 +2177,18 @@ $REGID='';
         public function deleteSetFees($details=null){
             $this->db->where('FeesID', $details['FeesID']);
             $this->db->delete(FEES_INSTALLMENT);
-            if ($this->db->affected_rows() >= '1') {
+           // if ($this->db->affected_rows() >= '1') {
                 $this->db->where('FeesID', $details['FeesID']);
                 $this->db->delete(STUDENTS_FEES_STATUS);
                 $result['deleteStatus']=true;
                 $result['message']="Successfully Fees Details Deleted";
 
-            }
-            else{
-                $result['deleteStatus']=false;
-                $result['message']="Something went wrong.please try again";
-            }
-			// print_r($this->db->last_query());die();
+            // }
+            // else{
+            //     $result['deleteStatus']=false;
+            //     $result['message']="Something went wrong.please try again";
+            // }
+		//print_r($this->db->last_query());die();
             return $result;
 
 

From f7ad019853117b877b8b1242c2a41b2d16feda40 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 29 Jan 2019 16:57:03 +0530
Subject: [PATCH 3/3] promote batch data disply, issue no 1607

---
 .../api/application/controllers/SessionMaster_Controller.php   | 2 ++
 Apollo/api/application/models/Reregister_model.php             | 3 +++
 Apollo/api/application/models/SessionMaster_model.php          | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/Apollo/api/application/controllers/SessionMaster_Controller.php b/Apollo/api/application/controllers/SessionMaster_Controller.php
index 6cfcb908..5afb16b2 100755
--- a/Apollo/api/application/controllers/SessionMaster_Controller.php
+++ b/Apollo/api/application/controllers/SessionMaster_Controller.php
@@ -99,6 +99,8 @@ class SessionMaster_Controller extends REST_Controller {
         $details['UpdatedBy'] = $this->post('updatedBy');
         $details['UpdatedOn'] = $now->format("Y-m-d H:i:s");
         $details['BranchCode'] = $this->post('branchCode');
+
+       // echo $details['BranchCode'];die();
         $updateDetails = $this->sessionM_model->updateSession($details,$universityDetails);// Check if the users data store contains users (in case the database result returns NULL)
 
         if ($updateDetails)
diff --git a/Apollo/api/application/models/Reregister_model.php b/Apollo/api/application/models/Reregister_model.php
index 27beec85..3c08a364 100644
--- a/Apollo/api/application/models/Reregister_model.php
+++ b/Apollo/api/application/models/Reregister_model.php
@@ -94,6 +94,9 @@ class Reregister_model extends CI_Model
 		$data['studentListOne'] =  $res->result();
 		//print_r($data['studentListOne']);
 		$data['finalStudentList'] = array();
+
+
+		//print_r($this->db->last_query());die();
 		foreach($data['studentListOne'] as $student)
 		{
 			
diff --git a/Apollo/api/application/models/SessionMaster_model.php b/Apollo/api/application/models/SessionMaster_model.php
index dadbe11e..3c59c2c5 100755
--- a/Apollo/api/application/models/SessionMaster_model.php
+++ b/Apollo/api/application/models/SessionMaster_model.php
@@ -136,6 +136,7 @@ class SessionMaster_model extends CI_Model {
                                 $existStatusUpdate['IsActive']=true;
                                 $existStatusUpdate['UpdatedBy']=$arrayDetails['UpdatedBy'];
                                 $existStatusUpdate['UpdatedOn']=$arrayDetails['UpdatedOn'];
+                                $existStatusUpdate['BranchID']=$arrayDetails['BranchCode'];
                                 $this->db->where('SessionID',$arrayDetails['SessionID']);
                                 $this->db->where('UniversityID',$urow);
                                 $this->db->update(SESSIONDETAILS, $existStatusUpdate);
@@ -146,6 +147,7 @@ class SessionMaster_model extends CI_Model {
                                 $update_array["IsActive"]=true;
                                 $update_array["CreatedBy"]=$arrayDetails['UpdatedBy'];
                                 $update_array["CreatedOn"]=$arrayDetails['UpdatedOn'];
+                                $update_array['BranchID']=$arrayDetails['BranchCode'];
                                 $this->db->insert(SESSIONDETAILS, $update_array);
 
                             }