From ffbcacf18ffc0188ec57767a6d19198839e658a1 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Thu, 30 Aug 2018 16:08:56 +0530 Subject: [PATCH 01/11] receive fee details changes : kdk --- .../Receive_Enrolment_Fees_Univ_model.php | 7 ++- .../student_university_fee_compare.js | 42 ++++++++++++++- .../student/studentUnivFeeCompareDetails.html | 51 +++++++++++++++++-- 3 files changed, 91 insertions(+), 9 deletions(-) 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
+
+ +
+
From a557f99528f673d9f9a53a9ff76268fda089526f Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 16:13:11 +0530 Subject: [PATCH 02/11] controller and model changes fo fees compare --- ...Receive_Enrolment_Fees_Univ_Controller.php | 27 ++++++ .../Receive_Enrolment_Fees_Univ_model.php | 89 +++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php index 203c33b0..459f63ab 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -32,6 +32,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { // Configure limits on our controller methods // Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php $this->methods['receiveEnrolmentFromUniv_post']['limit'] = 500; // 500 requests per hour per user/key + $this->methods['formIDFeeCompareDetails_post']['limit'] = 500; // load the model $this->load->model('Receive_Enrolment_Fees_Univ_model', 'receive_model'); @@ -98,6 +99,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } public function getStudentUnivFeeCompareDetails_post(){ + $searchData = $this->post('search'); $univID = $searchData['University']; @@ -120,4 +122,29 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + /* + * get form id bases get fees comparsion details + * created by kms + * */ + public function formIDFeeCompareDetails_post(){ + $formData['FormID'] = $this->post('formId');; + $formData['EnrolmentNo'] = $this->post('enrolmentId');; + + $getDetails = $this->receive_model->getFormIDFeeDetails($formData); + if ($getDetails['Status']=true) + { + $getDetails['status'] =REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'Something went wrong.please try again!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + } + } \ No newline at end of file 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..6f7ef7f8 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -779,4 +779,93 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { } return $resultArr; } + /* + * form id bases get fees compare details + * created by kms + * */ + public function getFormIDFeeDetails($serachForm=null){ + // create array for find sem value + $keyArray = array(0 => 'SEM1', 1 => 'SEM2', 2 => 'SEM3', 3 => 'SEM4',4 => 'SEM5',5 => 'SEM6',6 => 'SEM7',7 => 'SEM8',8 => 'YEAR1',9 => 'YEAR2',10 => 'YEAR3',11 => 'YEAR4'); + $valueArray = array("1","2","3","4","5","6","7","8","1","2","3","4"); + if($serachForm['FormID']!=''){ + $this->db->select("ENU.FormID,ENU.SemesterYear,STC.StudentID,STC.BranchID,CF.ID,CF.ProgramType,CF.Sem_Year,FFRU.Amount as UniversityPaidAmount"); + $this->db->from(ENROLMENTRECEIVEDFROMUNIV.' as ENU'); + $this->db->join(STUDENTCOURSE.' as STC', 'STC.EnrollmentID = ENU.EnrolmentNo'); + $this->db->join(COURSE_FEES.' as CF', 'CF.CourseID = STC.CourseID'); + $this->db->join(FORMFEESRECEIVEDFROMUNIV.' as FFRU', 'FFRU.FormID = ENU.FormID'); + $this->db->where('ENU.FormID',$serachForm['FormID']); + $this->db->where('ENU.EnrolmentNo',$serachForm['EnrolmentNo']); + $studentCourseDetails = $this->db->get(); + + //this is for sem year type check fees + if($studentCourseDetails->num_rows()>1){ + foreach ($studentCourseDetails->result() as $fetchRow){ + $serachKey= array_search(strtoupper($fetchRow->Sem_Year),$keyArray); + if($valueArray[$serachKey]==$fetchRow->SemesterYear){ + $this->db->select("SUM(BillAMount) as StudentPaidAmount"); + $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); + $this->db->join(STUDENTS_FEES_PAID.' as SFP', 'SFP.FeesId = SFS.FeesID'); + $this->db->where('SFS.FeesType',$fetchRow->ID); + $this->db->where('SFP.IsActive','1'); + $feesDetails = $this->db->get()->last_row(); + if($feesDetails){ + $feesArray['Status']=true; + $feesArray['Message']="Fees paid both student and university"; + $feesArray['Type']=$fetchRow->Sem_Year; + $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; + $feesArray['StudentPaidAmount']=$feesDetails->StudentPaidAmount; + break; + } + else{ + $feesArray['Status']=true; + $feesArray['Message']="University fees paid and student fees pending"; + $feesArray['Type']=$fetchRow->Sem_Year; + $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; + $feesArray['StudentPaidAmount']=0; + break; + } + } + + } + + } + else if($studentCourseDetails->num_rows()==1){ + foreach ($studentCourseDetails->result() as $fetchRow){ + $this->db->select("SUM(BillAMount) as StudentPaidAmount"); + $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); + $this->db->join(STUDENTS_FEES_PAID.' as SFP', 'SFP.FeesId = SFS.FeesID'); + $this->db->where('SFS.FeesType',$fetchRow->ID); + $this->db->where('SFP.IsActive','1'); + $feesDetails = $this->db->get()->last_row(); + if($feesDetails){ + $feesArray['Status']=true; + $feesArray['Message']="Fees paid both student and university"; + $feesArray['Type']=$fetchRow->Sem_Year; + $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; + $feesArray['StudentPaidAmount']=$feesDetails->StudentPaidAmount; + break; + } + else{ + $feesArray['Status']=true; + $feesArray['Message']="University fees paid and student fees pending"; + $feesArray['Type']=$fetchRow->Sem_Year; + $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; + $feesArray['StudentPaidAmount']=0; + } + + } + } + else{ + $feesArray['Status']=false; + $feesArray['Message']="Student record is mismatch because of enrolment number is not registered in student course details"; + + } + } + + else{ + $feesArray['Status']=false; + $feesArray['Message']="Please check form id"; + } + return $feesArray; + } } \ No newline at end of file From 5a3e65d9ed9d23349a008ec8e070c2ad7c8a9b5a Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 16:14:47 +0530 Subject: [PATCH 03/11] api changes --- Apollo/assets/js/controllers/student_university_fee_compare.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index b6546dc4..7c6f742c 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -289,7 +289,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.popupLoad = true; var getFeeCompareDetailsList = { method: 'POST', - url: apiPoint.url + 'getjsldkfjalkjlkkjf/', + url: apiPoint.url + 'formIDFeeCompareDetails/', headers: { 'Content-Type': 'application/json' }, From 5bdb38252832fe694e54a95284cdef5d343c7f07 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 16:22:47 +0530 Subject: [PATCH 04/11] api changes --- .../Receive_Enrolment_Fees_Univ_Controller.php | 10 ++++++++-- .../js/controllers/student_university_fee_compare.js | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php index 459f63ab..b5be32e6 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -133,16 +133,22 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { $getDetails = $this->receive_model->getFormIDFeeDetails($formData); if ($getDetails['Status']=true) { - $getDetails['status'] =REST_Controller::HTTP_OK; + $getDetails['status'] =true; // Set the response and exit $this->response($getDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code } + else if($getDetails['Status']=false){ + $this->response([ + 'message' => $getDetails['Message'], + 'status' => false + ], REST_Controller::HTTP_OK); // NOT_FOUND (404) being the HTTP response code + } else { // Set the response and exit $this->response([ 'message' => 'Something went wrong.please try again!', - 'status' => REST_Controller::HTTP_NOT_FOUND + 'status' => false ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code } } diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 7c6f742c..1644159e 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -301,7 +301,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil }; $http(getFeeCompareDetailsList).then(function (response) { - if (response.data.stuFeeList == true) { + if (response.data.status == true) { $scope.popupLoad = false; $scope.popupLoadData = true; } else { From 21e36b789c53542187e2328dee1d971c5153d42c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 16:40:35 +0530 Subject: [PATCH 05/11] commit changes --- .../assets/views/student/studentUnivFeeCompareDetails.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index 20273cda..e8c8aa45 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -152,7 +152,7 @@

Loading...

{{statusMessage}}

-
+
@@ -161,8 +161,8 @@ - - + +
{{formPaymentDetails.UniversityPaidAmount}}{{formPaymentDetails.StudentPaidAmount}}
From b507941d8082109d813b91b9020d23d7709430e5 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 16:40:54 +0530 Subject: [PATCH 06/11] commit changes --- .../Receive_Enrolment_Fees_Univ_Controller.php | 6 ++---- .../models/Receive_Enrolment_Fees_Univ_model.php | 12 ++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php index b5be32e6..08bbe12e 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -131,16 +131,14 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { $formData['EnrolmentNo'] = $this->post('enrolmentId');; $getDetails = $this->receive_model->getFormIDFeeDetails($formData); - if ($getDetails['Status']=true) + if ($getDetails['status']=true) { - $getDetails['status'] =true; // Set the response and exit $this->response($getDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code } - else if($getDetails['Status']=false){ + else if($getDetails['status']=false){ $this->response([ 'message' => $getDetails['Message'], - 'status' => false ], REST_Controller::HTTP_OK); // NOT_FOUND (404) being the HTTP response code } else 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 de8b2e71..991ee3cb 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -808,7 +808,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->where('SFP.IsActive','1'); $feesDetails = $this->db->get()->last_row(); if($feesDetails){ - $feesArray['Status']=true; + $feesArray['status']=true; $feesArray['Message']="Fees paid both student and university"; $feesArray['Type']=$fetchRow->Sem_Year; $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; @@ -816,7 +816,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { break; } else{ - $feesArray['Status']=true; + $feesArray['status']=true; $feesArray['Message']="University fees paid and student fees pending"; $feesArray['Type']=$fetchRow->Sem_Year; $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; @@ -837,7 +837,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->where('SFP.IsActive','1'); $feesDetails = $this->db->get()->last_row(); if($feesDetails){ - $feesArray['Status']=true; + $feesArray['status']=true; $feesArray['Message']="Fees paid both student and university"; $feesArray['Type']=$fetchRow->Sem_Year; $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; @@ -845,7 +845,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { break; } else{ - $feesArray['Status']=true; + $feesArray['status']=true; $feesArray['Message']="University fees paid and student fees pending"; $feesArray['Type']=$fetchRow->Sem_Year; $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; @@ -855,14 +855,14 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { } } else{ - $feesArray['Status']=false; + $feesArray['status']=false; $feesArray['Message']="Student record is mismatch because of enrolment number is not registered in student course details"; } } else{ - $feesArray['Status']=false; + $feesArray['status']=false; $feesArray['Message']="Please check form id"; } return $feesArray; From 9465d2b3104092266e74d65afb4b8ea6acfe8f02 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 16:41:09 +0530 Subject: [PATCH 07/11] commit changes --- .../assets/js/controllers/student_university_fee_compare.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 1644159e..4196f8d7 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -285,7 +285,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.popupLoad = false; $scope.popupLoadData = false; + $scope.formPaymentDetails=""; $scope.getFeeCompareDetails = function(formId, enrolmentId){ + $scope.popupLoadData = false; + $scope.formPaymentDetails=""; $scope.popupLoad = true; var getFeeCompareDetailsList = { method: 'POST', @@ -304,9 +307,12 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil if (response.data.status == true) { $scope.popupLoad = false; $scope.popupLoadData = true; + $scope.formPaymentDetails=response.data; + } else { $scope.popupLoad = false; $scope.popupLoadData = true; + $scope.formPaymentDetails=response.data; } }); } From 7c52cb9ba23b2c092a80e26a19decf0999a96d4e Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 17:02:43 +0530 Subject: [PATCH 08/11] commit changes --- .../assets/js/controllers/student_university_fee_compare.js | 2 +- Apollo/assets/views/student/studentUnivFeeCompareDetails.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 4196f8d7..6baa2a57 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -198,7 +198,6 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil * */ $scope.extractDetails=""; $scope.readXlsxDetails = function (workbook) { - $scope.extractDetails=""; /* DO SOMETHING WITH workbook HERE */ for (var sheetName in workbook.Sheets) { var jsonData = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]); @@ -277,6 +276,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $http(updateUniversityEnrolment).then(function (response) { if (response.data.stuFeeList == true) { swal("", "Updated Successfully", "success"); + $state.go($state.current, {}, {reload: true}); } else { swal("", "Failed", "error"); } diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index e8c8aa45..8cce6754 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -207,14 +207,14 @@
- +
- +
From e3474d0bdf7a1e93ff1aea3fb3c516257c38a170 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 17:11:05 +0530 Subject: [PATCH 09/11] directive file type accept changes --- Apollo/assets/js/directives/convert_Json/convertJson.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/directives/convert_Json/convertJson.js b/Apollo/assets/js/directives/convert_Json/convertJson.js index 735112c5..be1e4175 100644 --- a/Apollo/assets/js/directives/convert_Json/convertJson.js +++ b/Apollo/assets/js/directives/convert_Json/convertJson.js @@ -2,7 +2,7 @@ app.directive('jsXls', function () { return { restrict: 'E', - template: '', + template: '', replace: true, link: function (scope, element, attrs) { From 7baad2b2f73c5e7ad12d48a533ab8214df271eaa Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 17:16:46 +0530 Subject: [PATCH 10/11] label changes --- .../assets/views/student/studentUnivFeeCompareDetails.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index 8cce6754..5a93b6ab 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -132,9 +132,10 @@ {{p.FormType}} - + {{p.Firstname}} {{p.Lastname}} + {{p.Fathername}} {{p.UniversityName}} @@ -156,7 +157,7 @@
- + From bd3b8f1fd6127cb3cacce1c25573bce24557008c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 17:25:57 +0530 Subject: [PATCH 11/11] model changes --- .../Receive_Enrolment_Fees_Univ_model.php | 335 +----------------- 1 file changed, 2 insertions(+), 333 deletions(-) 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 991ee3cb..c8bc52b6 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -305,337 +305,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { return $finalArray; } - public function updateEnrolmentDetails1($enrolment=null,$local=null) - { - // create array for find sem value - $keyArray = array(0 => 'SEM1', 1 => 'SEM2', 2 => 'SEM3', 3 => 'SEM4',4 => 'SEM5',5 => 'SEM6',6 => 'SEM7',7 => 'SEM8',8 => 'YEAR1',9 => 'YEAR2',10 => 'YEAR3',11 => 'YEAR4'); - $valueArray = array("1","2","3","4","5","6","7","8","1","2","3","4"); - $errorArray=array(); - // loop for fetch details - foreach ($enrolment as $checkRow){ - // check enrolment no and form id in upload list - if(array_key_exists("Enrollment_No",$checkRow) AND array_key_exists("Form Id",$checkRow)){ - // check enrolment no exist in student course details details - $this->db->select('STC.StudentID,STC.BranchID,CF.ID,CF.ProgramType,CF.Sem_Year'); - $this->db->from(STUDENTCOURSE.' as STC'); - $this->db->join(COURSE_FEES.' as CF', 'CF.CourseID = STC.CourseID'); - $this->db->where('STC.EnrollmentID',$checkRow['Enrollment_No']); - $studentCourseDetails = $this->db->get(); - if($studentCourseDetails->num_rows()>1){ - foreach ($studentCourseDetails->result() as $feesRow){ - // change sem year - $serachKey= array_search(strtoupper($feesRow->Sem_Year),$keyArray); - if($valueArray[$serachKey]==$checkRow['Semester']){ - $this->db->select('FeesID'); - $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); - $this->db->where('SFS.StudentID',$feesRow->StudentID); - $this->db->where('SFS.FeesType',$feesRow->ID); - $studentFeesDetails = $this->db->get()->last_row(); - if($studentFeesDetails){ - $this->db->select('FeesID'); - $this->db->from(ENROLMENTRECEIVEDFROMUNIV.' as ENU'); - $this->db->where('ENU.FormID',$checkRow['Form Id']); - $this->db->where('ENU.EnrolmentNo',$checkRow['Enrollment_No']); - $checkFormExist = $this->db->get(); - - if($checkFormExist->num_rows()==0){ - $insert['FormID']=$checkRow['Form Id']; - $insert['EnrolmentNo']=$checkRow['Enrollment_No']; - // check key exist in json array - if(array_key_exists('Roll_No',$checkRow)){ - $insert['RollNo']=$checkRow['Roll_No']; - } - - $insert['CentreCode']=$checkRow['Centre Code']; - $insert['CentreState']=$checkRow['Centre State']; - if(array_key_exists('Student_Mob_No',$checkRow)){ - $insert['MobileNumber']=$checkRow['Student_Mob_No']; - } - $insert['StudentName']=$checkRow['Student_Name']; - $insert['FatherName']=$checkRow['Father_Name']; - $insert['MotherName']=$checkRow['Mother_Name']; - $insert['EmailID']=$checkRow['Student_Email_Id']; - $insert['IDProof']=$checkRow['ID_Proof']; - $insert['Gender'] = $checkRow['Gender']; - $insert['DOB'] = $checkRow['Date_Of_Birth']; - if(array_key_exists('Address',$checkRow)) { - $insert['PresentAddress'] = $checkRow['Address']; - } - $insert['AadharNumber'] = $checkRow['Adhar_No']; - if(array_key_exists('Category',$checkRow)) { - $insert['Category'] = $checkRow['Category']; - } - $insert['CourseCode'] = $checkRow['Course_Code']; - $insert['UniversityCode'] = "AU001"; - $insert['UniversityName'] = "Anna University"; - if(array_key_exists('Specialization',$checkRow)) { - $insert['Specialization'] = $checkRow['Specialization']; - } - $insert['SemesterYear'] = $checkRow['Semester']; - if(array_key_exists('Session',$checkRow)) { - $insert['SessionName'] = $checkRow['Session']; - } - if(array_key_exists('Year',$checkRow)) { - $insert['Year'] = $checkRow['Year']; - } - if(array_key_exists('Form Type',$checkRow)) { - $insert['FormType'] = $checkRow['Form Type']; - } - if(array_key_exists('Entry Mode',$checkRow)) { - $insert['EntryMode'] = $checkRow['Entry Mode']; - } - if(array_key_exists('Remarks',$checkRow)) { - $insert['Remarks'] = $checkRow['Remarks']; - } - if(array_key_exists('Affidavit_Status',$checkRow)) { - $insert['AffidavitStatus'] = $checkRow['Affidavit_Status']; - } - if(array_key_exists('Migration_Status',$checkRow)) { - $insert['MigrationStatus'] = $checkRow['Migration_Status']; - } - if(array_key_exists('Finance_Status',$checkRow)) { - $insert['FinanceStatus'] = $checkRow['Finance_Status']; - } - if(array_key_exists('Most Urgent DMC',$checkRow)) { - $insert['MostUrgentDMC'] = $checkRow['Most Urgent DMC']; - } - $insert['BranchCode'] = $feesRow->BranchID; - if(array_key_exists('created_By',$checkRow)) { - $insert['CreatedByName'] = $checkRow['created_By']; - } - if(array_key_exists('Created_Date',$checkRow)) { - $insert['CreatedDate'] = $checkRow['Created_Date']; - } - if(array_key_exists('Approved_By',$checkRow)) { - $insert['ApprovedByName'] = $checkRow['Approved_By']; - } - if(array_key_exists('Approved_Date',$checkRow)) { - $insert['ApprovedDate'] = $checkRow['Approved_Date']; - } - $insert['FeesID'] = $studentFeesDetails->FeesID; - $this->db->insert(ENROLMENTRECEIVEDFROMUNIV, $insert); - - } - //this is else for update details - /*else{ - - }*/ - } - else{ - // for capture error message - $error["StudentName"]=$checkRow['Student_Name']; - $error["Message"]="This Student Don't have fees details."; - $errorArray[]=$error; - } - - } - } - } - else if($studentCourseDetails->num_rows()==1){ - foreach ($studentCourseDetails->result() as $feesRow){ - // change sem year - $this->db->select('FeesID'); - $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); - $this->db->where('SFS.StudentID',$feesRow->StudentID); - $this->db->where('SFS.FeesType',$feesRow->ID); - $studentFeesDetails = $this->db->get()->last_row(); - if($studentFeesDetails){ - $this->db->select('FeesID'); - $this->db->from(ENROLMENTRECEIVEDFROMUNIV.' as ENU'); - $this->db->where('ENU.FormID',$checkRow['Form Id']); - $this->db->where('ENU.EnrolmentNo',$checkRow['Enrollment_No']); - $checkFormExist = $this->db->get(); - - if($checkFormExist->num_rows()==0){ - $insert['FormID']=$checkRow['Form Id']; - $insert['EnrolmentNo']=$checkRow['Enrollment_No']; - // check key exist in json array - if(array_key_exists('Roll_No',$checkRow)){ - $insert['RollNo']=$checkRow['Roll_No']; - } - - $insert['CentreCode']=$checkRow['Centre Code']; - $insert['CentreState']=$checkRow['Centre State']; - if(array_key_exists('Student_Mob_No',$checkRow)){ - $insert['MobileNumber']=$checkRow['Student_Mob_No']; - } - $insert['StudentName']=$checkRow['Student_Name']; - $insert['FatherName']=$checkRow['Father_Name']; - $insert['MotherName']=$checkRow['Mother_Name']; - $insert['EmailID']=$checkRow['Student_Email_Id']; - $insert['IDProof']=$checkRow['ID_Proof']; - $insert['Gender'] = $checkRow['Gender']; - $insert['DOB'] = $checkRow['Date_Of_Birth']; - if(array_key_exists('Address',$checkRow)) { - $insert['PresentAddress'] = $checkRow['Address']; - } - $insert['AadharNumber'] = $checkRow['Adhar_No']; - if(array_key_exists('Category',$checkRow)) { - $insert['Category'] = $checkRow['Category']; - } - $insert['CourseCode'] = $checkRow['Course_Code']; - $insert['UniversityCode'] = "AU001"; - $insert['UniversityName'] = "Anna University"; - if(array_key_exists('Specialization',$checkRow)) { - $insert['Specialization'] = $checkRow['Specialization']; - } - $insert['SemesterYear'] = $checkRow['Semester']; - if(array_key_exists('Session',$checkRow)) { - $insert['SessionName'] = $checkRow['Session']; - } - if(array_key_exists('Year',$checkRow)) { - $insert['Year'] = $checkRow['Year']; - } - if(array_key_exists('Form Type',$checkRow)) { - $insert['FormType'] = $checkRow['Form Type']; - } - if(array_key_exists('Entry Mode',$checkRow)) { - $insert['EntryMode'] = $checkRow['Entry Mode']; - } - if(array_key_exists('Remarks',$checkRow)) { - $insert['Remarks'] = $checkRow['Remarks']; - } - if(array_key_exists('Affidavit_Status',$checkRow)) { - $insert['AffidavitStatus'] = $checkRow['Affidavit_Status']; - } - if(array_key_exists('Migration_Status',$checkRow)) { - $insert['MigrationStatus'] = $checkRow['Migration_Status']; - } - if(array_key_exists('Finance_Status',$checkRow)) { - $insert['FinanceStatus'] = $checkRow['Finance_Status']; - } - if(array_key_exists('Most Urgent DMC',$checkRow)) { - $insert['MostUrgentDMC'] = $checkRow['Most Urgent DMC']; - } - $insert['BranchCode'] = $feesRow->BranchID; - if(array_key_exists('created_By',$checkRow)) { - $insert['CreatedByName'] = $checkRow['created_By']; - } - if(array_key_exists('Created_Date',$checkRow)) { - $insert['CreatedDate'] = $checkRow['Created_Date']; - } - if(array_key_exists('Approved_By',$checkRow)) { - $insert['ApprovedByName'] = $checkRow['Approved_By']; - } - if(array_key_exists('Approved_Date',$checkRow)) { - $insert['ApprovedDate'] = $checkRow['Approved_Date']; - } - $insert['FeesID'] = $studentFeesDetails->FeesID; - $this->db->insert(ENROLMENTRECEIVEDFROMUNIV, $insert); - } - //this is else for update details - /*else{ - - }*/ - } - else{ - // for capture error message - $error["StudentName"]=$checkRow['Student_Name']; - $error["Message"]="This Student Don't have fees details."; - $errorArray[]=$error; - } - - } - - } - else{ - // start - $insert['FormID']=$checkRow['Form Id']; - $insert['EnrolmentNo']=$checkRow['Enrollment_No']; - // check key exist in json array - if(array_key_exists('Roll_No',$checkRow)){ - $insert['RollNo']=$checkRow['Roll_No']; - } - - $insert['CentreCode']=$checkRow['Centre Code']; - $insert['CentreState']=$checkRow['Centre State']; - if(array_key_exists('Student_Mob_No',$checkRow)){ - $insert['MobileNumber']=$checkRow['Student_Mob_No']; - } - $insert['StudentName']=$checkRow['Student_Name']; - $insert['FatherName']=$checkRow['Father_Name']; - $insert['MotherName']=$checkRow['Mother_Name']; - $insert['EmailID']=$checkRow['Student_Email_Id']; - $insert['IDProof']=$checkRow['ID_Proof']; - $insert['Gender'] = $checkRow['Gender']; - $insert['DOB'] = $checkRow['Date_Of_Birth']; - if(array_key_exists('Address',$checkRow)) { - $insert['PresentAddress'] = $checkRow['Address']; - } - $insert['AadharNumber'] = $checkRow['Adhar_No']; - if(array_key_exists('Category',$checkRow)) { - $insert['Category'] = $checkRow['Category']; - } - $insert['CourseCode'] = $checkRow['Course_Code']; - $insert['UniversityCode'] = "AU001"; - $insert['UniversityName'] = "Anna University"; - if(array_key_exists('Specialization',$checkRow)) { - $insert['Specialization'] = $checkRow['Specialization']; - } - $insert['SemesterYear'] = $checkRow['Semester']; - if(array_key_exists('Session',$checkRow)) { - $insert['SessionName'] = $checkRow['Session']; - } - if(array_key_exists('Year',$checkRow)) { - $insert['Year'] = $checkRow['Year']; - } - if(array_key_exists('Form Type',$checkRow)) { - $insert['FormType'] = $checkRow['Form Type']; - } - if(array_key_exists('Entry Mode',$checkRow)) { - $insert['EntryMode'] = $checkRow['Entry Mode']; - } - if(array_key_exists('Remarks',$checkRow)) { - $insert['Remarks'] = $checkRow['Remarks']; - } - if(array_key_exists('Affidavit_Status',$checkRow)) { - $insert['AffidavitStatus'] = $checkRow['Affidavit_Status']; - } - if(array_key_exists('Migration_Status',$checkRow)) { - $insert['MigrationStatus'] = $checkRow['Migration_Status']; - } - if(array_key_exists('Finance_Status',$checkRow)) { - $insert['FinanceStatus'] = $checkRow['Finance_Status']; - } - if(array_key_exists('Most Urgent DMC',$checkRow)) { - $insert['MostUrgentDMC'] = $checkRow['Most Urgent DMC']; - } - $insert['BranchCode'] = '1'; - if(array_key_exists('created_By',$checkRow)) { - $insert['CreatedByName'] = $checkRow['created_By']; - } - if(array_key_exists('Created_Date',$checkRow)) { - $insert['CreatedDate'] = $checkRow['Created_Date']; - } - if(array_key_exists('Approved_By',$checkRow)) { - $insert['ApprovedByName'] = $checkRow['Approved_By']; - } - if(array_key_exists('Approved_Date',$checkRow)) { - $insert['ApprovedDate'] = $checkRow['Approved_Date']; - } - $insert['FeesID'] = ""; - $this->db->insert(ENROLMENTRECEIVEDFROMUNIV, $insert); - // end - - // for capture error message - $error["StudentName"]=$checkRow['Student_Name']; - $error["Message"]="Enrolment number is not exist in course details."; - $errorArray[]=$error; - } - - } - else{ - // for capture error message - $error["StudentName"]=$checkRow['Student_Name']; - $error["Message"]="Enrolment number/Form id is not exist."; - $errorArray[]=$error; - } - - } - $finalArray['details']=$errorArray; - print_r($finalArray);die(); - return false; - } public function formIdFeeDetails($formFeeDetails=null,$local=null){ // print_r($formFeeDetails);exit(); @@ -784,8 +453,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { * */ public function getFormIDFeeDetails($serachForm=null){ // create array for find sem value - $keyArray = array(0 => 'SEM1', 1 => 'SEM2', 2 => 'SEM3', 3 => 'SEM4',4 => 'SEM5',5 => 'SEM6',6 => 'SEM7',7 => 'SEM8',8 => 'YEAR1',9 => 'YEAR2',10 => 'YEAR3',11 => 'YEAR4'); - $valueArray = array("1","2","3","4","5","6","7","8","1","2","3","4"); + $keyArray = array(0 => 'SEM1', 1 => 'SEM2', 2 => 'SEM3', 3 => 'SEM4',4 => 'SEM5',5 => 'SEM6',6 => 'SEM7',7 => 'SEM8',8 => 'YEAR1',9 => 'YEAR2',10 => 'YEAR3',11 => 'YEAR4',12 => "DMC CHANGE SEM1",13 => "DMC CHANGE SEM2",14 => "DMC CHANGE SEM3",15 => "DMC CHANGE SEM4",16 => "DMC CHANGE SEM5",17 => "DMC CHANGE SEM6",18 => "DMC CHANGE SEM7",19 => "DMC CHANGE SEM8",20 => "DMC CHANGE YEAR1",21 => "DMC CHANGE YEAR2",22 => "DMC CHANGE YEAR3",23 => "DMC CHANGE YEAR4"); + $valueArray = array("1","2","3","4","5","6","7","8","1","2","3","4","1","2","3","4","5","6","7","8","1","2","3","4"); if($serachForm['FormID']!=''){ $this->db->select("ENU.FormID,ENU.SemesterYear,STC.StudentID,STC.BranchID,CF.ID,CF.ProgramType,CF.Sem_Year,FFRU.Amount as UniversityPaidAmount"); $this->db->from(ENROLMENTRECEIVEDFROMUNIV.' as ENU');
University Fee DetailsUniversity Fee Paid Details Student Fee Paid Details