diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index a4b605a6..f543d7f5 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -106,6 +106,7 @@ "STUDENTDETAILS": "Manage", "STUDENTDETAILSADDEDIT": "Manage Details", "STUDENTFEEDETAILCOMPARE": "Student University Fee", + "STUDENTFROMIDFEEDETAILS": "Student FormId Fee Details", "status" : { "MAIN": "Update Status", "STUDYMATERIAL": "Study Material", diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 0239a568..b8c0e32b 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -238,7 +238,7 @@ app.constant('JS_REQUIRES', { */ 'student_university_fee_compareCtrl':'assets/js/controllers/student_university_fee_compare.js', - + 'studentUnivFormIdFeeDetailsCtrl': 'assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js', }, //*** angularJS Modules diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 9d81c71c..9c4188dd 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -315,6 +315,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'Student University Fee Compare' } + }).state('app.student.studentUnivFormIdFeeDetails', { + url: '/studentUnivFormIdFeeDetails', + templateUrl: "assets/views/student/studentUnivFormIdFeeDetails.html", + resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'studentUnivFormIdFeeDetailsCtrl', 'ngTable'), + title: 'Student FormId Fees Details', + ncyBreadcrumb: { + label: 'Student FormId Fees Details' + } }).state('app.student.status', { url: '/status', template: '
STUDENT STATUS UPDATE
', diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js new file mode 100644 index 00000000..e9f6ee38 --- /dev/null +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -0,0 +1,374 @@ +'use strict'; +/** + * controllers for ng-table + * Simple table with sorting and filtering on AngularJS + */ + +app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$http", "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', '$timeout', '$window', "flowFactory", "$interval", 'SweetAlert', function ($scope, toaster, $filter, ngTableParams, $http, apiPoint, $state, $rootScope, $cookies, md5, ipCookie, $timeout, $window, flowFactory, $interval, SweetAlert) { + /** + * student university fee details compare + */ + + // get local client details + var localDetail = JSON.parse(localStorage.getItem('localObj')); + var localDetails = ipCookie('cookiechk'); + + // load when html page load + $scope.init = function () { + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + console.log("else else"); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + if (localDetail != null) { + if (localDetails.localType === 'R004') { + // $scope.getUniversityList(); + $scope.getUniversitySearchList(); + } else { + ipCookie.remove('cookiechk'); + $window.localStorage.clear(); + $state.go('login.signin'); + } + } else { + } + } + + + /*$scope.universityData = ''; + $scope.getUniversityList = function () { + var empListreq = { + method: 'POST', + url: apiPoint.url + 'getStudentUniversity/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails + } + }; + $http(empListreq).then(function (response) { + if (response.data.univList) { + $scope.universityData = response.data.university_details; + } else { + } + }); + }*/ + // get University List + $scope.universitySearchData = ''; + $scope.getUniversitySearchList = function () { + var empListreq = { + method: 'POST', + url: apiPoint.url + 'getUniversitySessionDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails + } + }; + $http(empListreq).then(function (response) { + if (response.data.status) { + $scope.universitySearchData = response.data.details; + } else { + $scope.universitySearchData=""; + } + }); + }; + + + $scope.searchData = { + "University": "", + "Session": "", + "Status": "" + } + $scope.myUnivSearch = ""; + $scope.sessionData=""; + $scope.getUniveId = function (univ) { + $scope.sessionData=""; + if (univ === '') { + $scope.myUnivSearch = ""; + $scope.searchData.University = ''; + // $scope.searchData.Course = ''; + // $scope.searchData.Batch = ''; + // $scope.courseData = name.Course; + // $scope.batchData = name.Batch; + $scope.searchData.Session = ''; + + $scope.OpenWindowStatus = false; + } else { + let name = JSON.parse(univ); + $scope.searchData.University = name.UniversityID; + // $scope.searchData.Course = ''; + // $scope.searchData.Batch = ''; + // $scope.courseData = name.Course; + // $scope.batchData = name.Batch; + $scope.searchData.Session = ''; + $scope.sessionData = name.SessionDetails; + $scope.OpenWindowStatus = false; + } + + }; + //For session dropdown + $scope.filterSessionDetails=""; + $scope.$watch('searchData.University', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterSessionDetails=""; + } + else{ + if(angular.isString(newValue)){ + $scope.filterSessionDetails=angular.fromJson(newValue); + } + } + + }); + + + $scope.Searchloader = false; + $scope.studentData = false; + + $scope.onSubmit = function(){ + $scope.Searchloader = true; + if($scope.searchData.University !== '' && $scope.searchData.Session !==''){ + $scope.Searchloader = true; + var empListreq = { + method: 'POST', + url: apiPoint.url + 'getStudentUnivFeeCompareDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails, + search: $scope.searchData, + } + }; + $http(empListreq).then(function (response) { + if (response.data.formTypeStatus) { + $scope.Searchloader = false; + $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 { + + } + } + + $scope.editId = -1; + $scope.setEditId=function(id){ + $scope.editId = id; + } + + /*upload model*/ + $scope.uploadModel = { + university: "", + uploadFor: "", + } + /* + * upload options json + * */ + $scope.uploadOptions=[{ + id: 1, + name: 'Received Enrolment From University', + }, + { + id: 2, + name: 'Received Fees From University' + }, + ]; + /* + watch upload model for enable upload options + */ + $scope.showFile="0"; + $scope.$watchCollection('uploadModel', function (newValue,oldValue) { + + if(newValue.university!='' && newValue.university!=null && newValue.uploadFor!='' && newValue.uploadFor=='1'){ + $scope.showFile="1"; + + } + else if(newValue.university!='' && newValue.university!=null && newValue.uploadFor!='' && newValue.uploadFor=='2'){ + $scope.showFile="2"; + } + else{ + $scope.showFile="0"; + } + + }); + + /* update received enrolment from university + * created by kms + * */ + $scope.extractDetails=""; + $scope.readXlsxDetails = function (workbook) { + /* DO SOMETHING WITH workbook HERE */ + for (var sheetName in workbook.Sheets) { + var jsonData = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]); + if(jsonData.length!=0){ + $scope.extractDetails=jsonData; + } + + } + $scope.error = function (e) { + /* DO SOMETHING WHEN ERROR IS THROWN */ + //console.log(e); + } + + } + + $scope.receiveEnrolmentDetails = function (details,uploadForDetails) { + var updateUniversityEnrolment = { + method: 'POST', + url: apiPoint.url + 'receiveEnrolmentFromUniv/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + details: details, + universityID: angular.fromJson(uploadForDetails.university).UniversityID, + universityName: angular.fromJson(uploadForDetails.university).UniversityName, + + } + }; + + $http(updateUniversityEnrolment).then(function (response) { + if (response.data.status == true) { + swal("", "Updated Successfully", "success"); + $state.go($state.current, {}, {reload: true}); + } else { + swal("", "Failed", "error"); + } + }); + } + // end + + $scope.extractFormIDDetails=""; + $scope.readXlsxFormDetails = function (workbook) { + $scope.extractFormIDDetails=""; + /* DO SOMETHING WITH workbook HERE */ + for (var sheetName in workbook.Sheets) { + var jsonData = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]); + if(jsonData.length!=0){ + $scope.extractFormIDDetails=jsonData; + } + + } + $scope.error = function (e) { + /* DO SOMETHING WHEN ERROR IS THROWN */ + //console.log(e); + } + + } + + $scope.receiveFormIdFeeDetails = function(details) { + console.log(details); + + var updateUniversityEnrolment = { + method: 'POST', + url: apiPoint.url + 'insertFormIdUnivFeeDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + details: details + } + }; + + $http(updateUniversityEnrolment).then(function (response) { + if (response.data.stuFeeList == true) { + swal("", "Updated Successfully", "success"); + $state.go($state.current, {}, {reload: true}); + } else { + swal("", "Failed", "error"); + } + }); + } + + $scope.popupLoad = false; + $scope.popupLoadData = false; + $scope.formPaymentDetails=""; + + // Fee compare details get + + $scope.getFeeCompareDetails = function(formId, enrolmentId){ + $scope.popupLoadData = false; + $scope.formPaymentDetails=""; + $scope.popupLoad = true; + var getFeeCompareDetailsList = { + method: 'POST', + url: apiPoint.url + 'formIDFeeCompareDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + formId: formId, + enrolmentId: enrolmentId + } + }; + + $http(getFeeCompareDetailsList).then(function (response) { + 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; + } + }); + } + + $scope.unMatchedLoadingStatus = false; + // Get unmached details + $scope.getUnmatchedRecord = function(ss){ + $scope.unMatchedRecordDetails = ''; + $scope.unMatchedNoRecordFound = false; + $scope.unMatchedLoadingStatus = true; + var getDetailsFor = ss == 1 ? 'EnrolmentIDFile' : 'FormIDFile'; + var getFeeCompareDetailsList = { + method: 'POST', + url: apiPoint.url + 'getUnmatchedRecordDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + getDetailsFor: getDetailsFor + } + }; + $http(getFeeCompareDetailsList).then(function (response) { + if (response.data.unMatchedRecordStatus == true) { + $scope.unMatchedLoadingStatus = false; + $scope.unMatchedNoRecordFound = false; + $scope.unMatchedRecordDetails=response.data.unMatchedRecordDetails; + $scope.unMatchedRecordDetailsType= response.data.unMatchedRecordFor; + } else { + $scope.unMatchedLoadingStatus = false; + $scope.unMatchedNoRecordFound = true; + $scope.unMatchedRecordDetails=response.data.unMatchedRecordDetails; + } + }); + } + +}]); diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 251b04dd..5be3dd7c 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -221,6 +221,11 @@ STUDENT UNIV FEE COMPARE DETAILS +
  • + + STUDENT FORMID FEE DETAILS + +
    • +
    +
    +
    +

    {{ mainTitle }}

    + Student University FormId Fees Details. +
    +
    +
    +
    + + +
    + + + + +
    +
    + +
    + + + + +
    +
    +
    +
    + + + +
    + + +
    + + + +
    + +
    +
    + + + +
    +
    +
    + +
    +
    +
    + +
    +
    +

    Loading...

    +

    {{statusMessage}}

    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    FormID + Form Type + Student Name + Father Name + University + Course + Sem/Year + Enrolment ID + University Paid + Student Paid +
    + {{p.FormID}} + + {{p.FormType}} + + + {{p.Firstname}} {{p.Lastname}} + + + {{p.Fathername}}{{p.UniversityName}}{{p.CourseName}}{{p.SemesterYear}}{{p.EnrolmentNo}}{{p.UniversityPaidAmount}}{{p.StudentPaidAmount}}
    + + + +
    +
    +     + +
    +
    +
    + + +
    +
    + + + + +
    +
    +
    + + + +
    +
    +
    +
    + + + +
    +
    + +
    +
    +     + + +
    +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    +
    Loading...
    +
    +
    +
    No Record Found ...
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    FormIDEnrolmentNoRollNoCentreCodeCentreStateMobileNumberStudentNameFatherNameMotherNameEmailIDUniversityCodeUniversityNameCourseCodeCourseNameSemesterYear
    {{p.FormID}}{{p.EnrolmentNo}}{{p.RollNo}}{{p.CentreCode}}{{p.CentreState}}{{p.MobileNumber}}{{p.StudentName}}{{p.FatherName}}{{p.MotherName}}{{p.EmailID}}{{p.UniversityCode}}{{p.UniversityName}}{{p.CourseCode}}{{p.CourseName}}{{p.SemesterYear}}
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    FormIDFormTypeCentreCodeCourseCodeActualCourseFeeCourseFeeAmount
    {{p.FormID}}{{p.FormType}}{{p.CentreCode}}{{p.CourseCode}}{{p.ActualCourseFee}}{{p.CourseFee}}{{p.Amount}}
    + + +
    +
    +     + +     +
    +
    +
    + + \ No newline at end of file