diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 281f4e89..102629fe 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -104,6 +104,7 @@ "ENROLLMENT": "Enrollment", "STUDENTDETAILS": "Manage", "STUDENTDETAILSADDEDIT": "Manage Details", + "STUDENTFEEDETAILCOMPARE": "Student University Fee", "status" : { "MAIN": "Update Status", "STUDYMATERIAL": "Study Material", diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index ec23adc5..e6b6307a 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -231,6 +231,14 @@ app.constant('JS_REQUIRES', { 'report_examfeeCtrl':'assets/js/controllers/report_examfeeCtrl.js', 'report_balfeeCtrl':'assets/js/controllers/report_balfeeCtrl.js', 'report_leadCtrl':'assets/js/controllers/report_leadCtrl.js', + + /** + * univesity sutdent fee compare details + */ + + 'student_university_fee_compareCtrl':'assets/js/controllers/student_university_fee_compare.js', + + }, //*** angularJS Modules modules: [{ diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 5db70383..0f8f2460 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -307,6 +307,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'Manage Details' } + }).state('app.student.studentUnivFeeCompareDetails', { + url: '/studentUnivFeeCompare', + 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: 'Student University Fee Compare', + ncyBreadcrumb: { + label: 'Student University Fee Compare' + } }).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 new file mode 100644 index 00000000..4b032cb1 --- /dev/null +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -0,0 +1,148 @@ +'use strict'; +/** + * controllers for ng-table + * Simple table with sorting and filtering on AngularJS + */ + +app.controller('student_university_fee_compareCtrl', ["$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 + 'getUniveCourseBratch/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: localDetails + } + }; + $http(empListreq).then(function (response) { + if (response.data.univList) { + $scope.universitySearchData = response.data.university_details; + // alert() + } else { + } + }); + }; + + + $scope.searchData = { + "University": "", + "Course": "", + "Status": "" + } + $scope.myUnivSearch = ""; + $scope.getUniveId = function (univ) { + if (univ === '') { + $scope.myUnivSearch = ""; + $scope.searchData.University = ''; + $scope.searchData.Course = ''; + $scope.searchData.Batch = ''; + $scope.courseData = name.Course; + $scope.batchData = name.Batch; + $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.OpenWindowStatus = false; + } + + }; + + $scope.onSubmit = function(){ + if($scope.searchData.University !== '' && $scope.searchData.Course !==''){ + $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.studentList) { + $scope.Searchloader = false; + $scope.studentData = true; + $scope.data = response.data.student_details; + $scope.studentListLength = $scope.data.length; + } else { + $scope.Searchloader = false; + $scope.studentData = false; + } + }); + }else { + + } + } + +}]); diff --git a/Apollo/assets/views/hallticket/semcoursemap.html b/Apollo/assets/views/hallticket/semcoursemap.html index 3defc8b1..e8936189 100755 --- a/Apollo/assets/views/hallticket/semcoursemap.html +++ b/Apollo/assets/views/hallticket/semcoursemap.html @@ -25,9 +25,9 @@
-

{{ mainTitle }}

+

{{ mainTitle }}

- Allocate Courses to Corresponding Semesters + Allocate Courses to Corresponding Subjects
diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 669fca63..9379fd73 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -216,6 +216,11 @@ +
  • + + STUDENT UNIV FEE COMPARE DETAILS + +
    • +
    +
    +
    +

    {{ mainTitle }}

    + Student University Fee Compare Details. +
    +
    +
    +
    + + +
    + + + + +
    +
    + +
    + + + + +
    +
    +
    +
    + + + +
    + + +
    + + + +
    + +
    +
    + + + +
    +
    +
    + +
    +
    +     + + + + +     +
    +
    +
    + + \ No newline at end of file