From 31a2ead630928a4d2479e8207bba66156fce9ead Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Thu, 30 Aug 2018 11:20:29 +0530 Subject: [PATCH 1/6] student university fee details comparition : kdk --- .../Receive_Enrolment_Fees_Univ_model.php | 43 +++++++++++-------- .../student_university_fee_compare.js | 4 +- .../student/studentUnivFeeCompareDetails.html | 43 +++++++++++++++++++ 3 files changed, 71 insertions(+), 19 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 3de970e7..ef67760c 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -736,25 +736,34 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { // } // } - return 'true'; + $results['stuFeeList'] = true; + $results['stuFeeList_details'] = "details updated successfully."; + return $results; } - public function getStudentUnivFeeCompareDetails($univCode=null,$courseCode=null){ -// echo $univID, $courseID;exit(); + public function getStudentUnivFeeCompareDetails($univCode=null,$courseCode=null){ + // echo $univID, $courseID;exit(); - // $this->db->select('t1.*,t2.EnrolmentNo'); - // $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', 'LEFT'); - // $this->db->join('T_Student_CourseDetails as t3', 't3.EnrollmentID = t2.EnrolmentNo', 'LEFT'); - // $this->db->join('T_StudentDetails as t4', 't4.StudentID = t3.StudentID', 'LEFT'); - // // $this->db->where('t2.CourseCode', $courseID); - // // $this->db->where('t2.UniversityCode', $univCode); - // $details = $this->db->get(); - // $detailsList = $details->result(); - // print_r($detailsList);exit(); - - // return "$roleDetails->Sem_Year $roleDetails->CourseName"; - - } + $this->db->select('t1.*,t2.EnrolmentNo,t2.CourseName, 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); + $details = $this->db->get(); + $detailsList = $details->result(); + if($detailsList){ + $resultArr['studentFeeCompareDetails'] = $detailsList; + $resultArr['formTypeStatus'] = true; + $resultArr['message'] = "Successfully data generated"; + } else { + $resultArr['studentFeeCompareDetails'] = []; + $resultArr['formTypeStatus'] = false; + $resultArr['message'] = "No record found"; + } + return $resultArr; + } } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 8f2539d9..b81d0011 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -130,10 +130,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil } }; $http(empListreq).then(function (response) { - if (response.data.studentList) { + if (response.data.formTypeStatus) { $scope.Searchloader = false; $scope.studentData = true; - $scope.data = response.data.student_details; + $scope.data = response.data.studentFeeCompareDetails; $scope.studentListLength = $scope.data.length; } else { $scope.Searchloader = false; diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index 5f18476b..347ecd0b 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -92,6 +92,49 @@ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + +
FormID + Student Name + Father Name + University + Course + Enrolment ID +
+ {{p.FormID}} + + + {{p.Firstname}} {{p.Lastname}} + + {{p.Fathername}}{{p.UniversityName}}{{p.CourseName}}{{p.EnrolmentNo}}
+ + + +
+
From 7d8ef5cb36d5dff418285a251dbf36b0f8904d2d Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Thu, 30 Aug 2018 12:37:12 +0530 Subject: [PATCH 2/6] directive changes : kdk --- Apollo/assets/js/directives/convert_Json/convertJson.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/js/directives/convert_Json/convertJson.js b/Apollo/assets/js/directives/convert_Json/convertJson.js index 1717f597..735112c5 100644 --- a/Apollo/assets/js/directives/convert_Json/convertJson.js +++ b/Apollo/assets/js/directives/convert_Json/convertJson.js @@ -5,7 +5,7 @@ app.directive('jsXls', function () { template: '', replace: true, link: function (scope, element, attrs) { - + function handleSelect() { var files = this.files; for (var i = 0, f = files[i]; i != files.length; ++i) { @@ -38,7 +38,7 @@ app.directive('jsXls', function () { } // Clear input file - element.val(''); + // element.val(''); }; //extend FileReader From bf228ea52f52f8e1325aa93fe21136bb38f69795 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 12:39:05 +0530 Subject: [PATCH 3/6] changes for file upload js,html and api --- .../js/controllers/student_university_fee_compare.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index d56ff7d1..2640de49 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -203,7 +203,6 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil } $scope.receiveEnrolmentDetails = function (details,uploadForDetails) { - var updateUniversityEnrolment = { method: 'POST', url: apiPoint.url + 'receiveEnrolmentFromUniv/', @@ -213,14 +212,14 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil data: { localDetails: localDetail, details: details, - universityID: uploadForDetails.UniversityID, - universityName: uploadForDetails.UniversityName, + universityID: angular.fromJson(uploadForDetails.university).UniversityID, + universityName: angular.fromJson(uploadForDetails.university).UniversityName, } }; $http(updateUniversityEnrolment).then(function (response) { - if (response.data.branchListStatus == true) { + if (response.data.status == true) { swal("", "Updated Successfully", "success"); } else { swal("", "Failed", "error"); From ebca18af0c299354483257930d22e40bf834e1a7 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 12:42:35 +0530 Subject: [PATCH 4/6] changes for file upload js,html and api --- .../Receive_Enrolment_Fees_Univ_Controller.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 a664853e..203c33b0 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -44,12 +44,19 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { public function receiveEnrolmentFromUniv_post() { + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); $enrolmentDetails = $this->post('details'); $localDetails = $this->post('localDetails'); - $updatedDetails = $this->receive_model->updateEnrolmentDetails($enrolmentDetails,$localDetails);// Check if the users data store contains users (in case the database result returns NULL) + $fromDetails['CreatedOn'] = $now->format('Y-m-d H:i:s'); + $fromDetails['CreatedBy'] = $localDetails['localUserID']; + $fromDetails['UniversityCode']=$this->post('universityID'); + $fromDetails['UniversityName']=$this->post('universityName'); + $fromDetails['BranchCode']=$localDetails['localBranchID']; + $updatedDetails = $this->receive_model->updateEnrolmentDetails($enrolmentDetails,$fromDetails);// Check if the users data store contains users (in case the database result returns NULL) if ($updatedDetails['status']) { - $updatedDetails['status'] = REST_Controller::HTTP_OK; + $updatedDetails['status'] = true; // Set the response and exit $this->response($updatedDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code } From 000f368a7ef3e3a69cc38fea448cce447747ff80 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 12:46:15 +0530 Subject: [PATCH 5/6] changes for file upload js,html and api --- Apollo/assets/js/controllers/student_university_fee_compare.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 2640de49..2ab31354 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -221,6 +221,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $http(updateUniversityEnrolment).then(function (response) { if (response.data.status == true) { swal("", "Updated Successfully", "success"); + $state.go($state.current, {}, {reload: true}); } else { swal("", "Failed", "error"); } From 56328c57945fbf7d2c4c9fb071d721f6396a0b65 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 12:46:58 +0530 Subject: [PATCH 6/6] changes for file upload js,html and api --- .../models/Receive_Enrolment_Fees_Univ_model.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 ef67760c..eba28a5d 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -118,12 +118,14 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { else{ $insert['Category'] = ""; } + if(array_key_exists('Course_Code',$checkRow)) { $insert['CourseCode'] = $checkRow['Course_Code']; } else{ $insert['CourseCode'] = ""; } + if(array_key_exists('Course_Name',$checkRow)) { $insert['CourseName'] = $checkRow['Course_Name']; } @@ -219,6 +221,12 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { else{ $insert['ApprovedDate'] = ""; } + $insert['UniversityCode'] = $local['UniversityCode']; + $insert['UniversityName'] = $local['UniversityName']; + $insert['BranchCode'] = $local['BranchCode']; + $insert['CreatedBy'] = $local['CreatedBy']; + $insert['CreatedOn'] = $local['CreatedOn']; + $get_data[count($get_data)]=array( 'FormID' => $insert['FormID'], 'EnrolmentNo' => $insert['EnrolmentNo'], @@ -236,6 +244,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { 'PresentAddress' => $insert['PresentAddress'], 'AadharNumber' => $insert['AadharNumber'], 'Category' => $insert['Category'], + 'UniversityCode'=>$insert['UniversityCode'], + 'UniversityName'=>$insert['UniversityName'], 'CourseCode' => $insert['CourseCode'], 'CourseName' => $insert['CourseName'], 'Specialization' => $insert['Specialization'], @@ -253,6 +263,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { 'CreatedDate' => $insert['CreatedDate'], 'ApprovedByName' => $insert['ApprovedByName'], 'ApprovedDate' => $insert['ApprovedDate'], + 'BranchCode' => $insert['BranchCode'], + 'CreatedBy' => $insert['CreatedBy'], + 'CreatedOn' => $insert['CreatedOn'], ); }