diff --git a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php index eba28a5d..f89ab7e1 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -647,7 +647,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { foreach ($formFeeDetails as $formIdDetails){ $formIds = $formIdDetails['FormId']; -// $bar ? $bar : $baz; $formType = $formIdDetails['Form Type'] ? $formIdDetails['Form Type'] : ''; $CentreCode = $formIdDetails['CentreCode'] ?: ''; $CourseCode = $formIdDetails['Course_Code'] ?: ''; @@ -757,14 +756,14 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { public function getStudentUnivFeeCompareDetails($univCode=null,$courseCode=null){ // echo $univID, $courseID;exit(); - $this->db->select('t1.*,t2.EnrolmentNo,t2.CourseName, t4.*,t5.UniversityID, t5.UniversityName'); + $this->db->select('t1.FormID, t1.FormType, t2.SemesterYear, t2.EnrolmentNo,t2.CourseName,t2.RollNo, t4.*,t5.UniversityID, t5.UniversityName'); $this->db->from('T_FormId_FeeDetails_Received_From_University as t1'); $this->db->join('T_Enrolment_Received_From_University as t2', 't2.FormID = t1.FormID'); $this->db->join('T_Student_CourseDetails as t3', 't3.EnrollmentID = t2.EnrolmentNo'); $this->db->join('T_StudentDetails as t4', 't4.StudentID = t3.StudentID'); $this->db->join('T_UniversityMaster as t5', 't5.UniversityID = t3.UniversityID'); - // $this->db->where('t2.CourseCode', $courseID); - // $this->db->where('t2.UniversityCode', $univCode); + $this->db->where('t2.CourseCode', $courseCode); + $this->db->where('t2.UniversityCode', $univCode); $details = $this->db->get(); $detailsList = $details->result(); diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 2ab31354..b6546dc4 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -115,7 +115,12 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil }; + + $scope.Searchloader = false; + $scope.studentData = false; + $scope.onSubmit = function(){ + $scope.Searchloader = true; if($scope.searchData.University !== '' && $scope.searchData.Course !==''){ $scope.Searchloader = true; var empListreq = { @@ -135,9 +140,11 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.studentData = true; $scope.data = response.data.studentFeeCompareDetails; $scope.studentListLength = $scope.data.length; + // $scope.statusMessage = $scope.data.message; } else { $scope.Searchloader = false; $scope.studentData = false; + $scope.statusMessage = $scope.data.message; } }); }else { @@ -145,6 +152,11 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil } } + $scope.editId = -1; + $scope.setEditId=function(id){ + $scope.editId = id; + } + /*upload model*/ $scope.uploadModel = { university: "", @@ -263,7 +275,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil }; $http(updateUniversityEnrolment).then(function (response) { - if (response.data.branchListStatus == true) { + if (response.data.stuFeeList == true) { swal("", "Updated Successfully", "success"); } else { swal("", "Failed", "error"); @@ -271,4 +283,32 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil }); } + $scope.popupLoad = false; + $scope.popupLoadData = false; + $scope.getFeeCompareDetails = function(formId, enrolmentId){ + $scope.popupLoad = true; + var getFeeCompareDetailsList = { + method: 'POST', + url: apiPoint.url + 'getjsldkfjalkjlkkjf/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + formId: formId, + enrolmentId: enrolmentId + } + }; + + $http(getFeeCompareDetailsList).then(function (response) { + if (response.data.stuFeeList == true) { + $scope.popupLoad = false; + $scope.popupLoadData = true; + } else { + $scope.popupLoad = false; + $scope.popupLoadData = true; + } + }); + } + }]); diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index 9b7b5e67..20273cda 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -82,7 +82,7 @@
- @@ -94,13 +94,19 @@
- -
- +
+
+

Loading...

+

{{statusMessage}}

+
+
+
+ + + @@ -118,6 +128,9 @@ + + + + + +
FormID Form Type + Student Name Father Name @@ -108,9 +114,13 @@ University Course + Sem/Year Enrolment ID Action +
{{p.FormID}} + {{p.FormType}} + {{p.Firstname}} {{p.Lastname}} @@ -126,7 +139,37 @@ {{p.Fathername}} {{p.UniversityName}} {{p.CourseName}}{{p.SemesterYear}} {{p.EnrolmentNo}} + +
+
+
+

Loading...

+

{{statusMessage}}

+
+
+
+ + + + + + + + + + + +
University Fee DetailsStudent Fee Paid Details
+
+ +
+