From cf911771b2c810fcd20ec02a6dd4d034d503f6d0 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 6 Sep 2018 12:22:45 +0530 Subject: [PATCH] common files changes university enrolment details --- .../Receive_Enrolment_Fees_Univ_model.php | 6 ++-- Apollo/assets/i18n/en.json | 1 + Apollo/assets/js/config.router.js | 10 +++++- .../student_university_fee_compare.js | 33 ++++++++++++++++--- Apollo/assets/views/partials/nav.html | 5 +++ .../student/studentUnivFeeCompareDetails.html | 2 +- 6 files changed, 48 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 da11fcf0..e1cb468c 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -760,7 +760,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $universityResult=array(); if($universityDetails->result()){ $universityResult['status']=true; - foreach ($universityDetails->result() as $row){ + /* foreach ($universityDetails->result() as $row){ $this->db->select('SM.SessionID,SM.SessionName'); $this->db->order_by('SM.SessionID','DESC'); $this->db->where('SM.IsActive','1'); @@ -778,8 +778,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $fetchArray['SessionDetails']=""; } $getResult[]=$fetchArray; - } - $universityResult['details']=$getResult; + }*/ + $universityResult['details']=$universityDetails->result(); } else{ $universityResult['status']=false; diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 5d2ab428..d1d9fb29 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -108,6 +108,7 @@ "STUDENTDETAILSADDEDIT": "Manage Details", "STUDENTFEEDETAILCOMPARE": "University Form Enrolment", "STUDENTFROMIDFEEDETAILS": "Student FormId Fee Details", + "UNIVERSITYFORMPAYMENT": "University Form Payment", "status" : { "MAIN": "Update Status", "STUDYMATERIAL": "Study Material", diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index fd27f560..75e18043 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -308,7 +308,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'Manage Details' } }).state('app.student.UnivFormEnroment', { - url: '/UnivFormEnrolment', + url: '/univformenrolment', templateUrl: "assets/views/student/studentUnivFeeCompareDetails.html", resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'student_university_fee_compareCtrl', 'ngTable'), title: 'University Form Enrolment', @@ -323,6 +323,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'Student FormId Fees Details' } + }).state('app.student.universityformpayment', { + url: '/univformpayment', + templateUrl: "assets/views/student/UnivFormPaymentDetails.html", + resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'univFormPaymentCtrl', 'ngTable'), + title: 'University Form Payment Details', + ncyBreadcrumb: { + label: 'University Form Payment Details' + } }).state('app.student.status', { url: '/status', template: '
STUDENT STATUS UPDATE
', diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 848243ce..75647605 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -35,6 +35,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil if (localDetails.localType === 'R004') { // $scope.getUniversityList(); $scope.getUniversitySearchList(); + $scope.getFileUploadUniversity(); } else { ipCookie.remove('cookiechk'); $window.localStorage.clear(); @@ -43,9 +44,33 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil } else { } } + /*get university details for file upload + * */ + // get University List + $scope.fileUploadUniversityData = ''; + $scope.getFileUploadUniversity = function () { + var univreq = { + method: 'POST', + url: apiPoint.url + 'getUniversitySessionDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails + } + }; + $http(univreq).then(function (response) { + if (response.data.status) { + $scope.fileUploadUniversityData = response.data.details; + } else { + $scope.fileUploadUniversityData=""; + } + }); + }; - /* get json sem details for serach - * */ + + /* get json sem details for serach + * */ $scope.semDetails=["1","2","3","4","5","6","7","8"]; // get University List @@ -227,8 +252,8 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil data: { localDetails: localDetail, details: details, - universityID: angular.fromJson(uploadForDetails.university).univCode, - universityName: angular.fromJson(uploadForDetails.university).univName, + universityID: angular.fromJson(uploadForDetails.university).UniversityID, + universityName: angular.fromJson(uploadForDetails.university).UniversityName, } }; diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 0eb85f73..a05d13dc 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -226,6 +226,11 @@ STUDENT FORMID FEE DETAILS --> +