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 @@
| Name of the Cadidate: | +Name of the Candidate: | {{Course.Firstname}} {{Course.Lastname}} |
| Father's Nmae: | +Father's Name: | {{Course.Fathername}} |