diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js index 6bfdd424..ccfb701a 100644 --- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -70,7 +70,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter $scope.getUniversitySearchList = function () { var empListreq = { method: 'POST', - url: apiPoint.url + 'getUniversitySessionDetails/', + url: apiPoint.url + 'getUnivCourseFromFileDetails/', headers: { 'Content-Type': 'application/json' }, @@ -90,36 +90,26 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter $scope.searchData = { "University": "", - "Session": "", + "Course": "", "Status": "" } $scope.myUnivSearch = ""; - $scope.sessionData = ""; + $scope.courseData = ""; + $scope.getUniveId = function (univ) { $scope.sessionData = ""; if (univ === '') { $scope.myUnivSearch = ""; + $scope.courseData = ""; $scope.searchData.University = ''; - // $scope.searchData.Course = ''; - // $scope.searchData.Batch = ''; - // $scope.courseData = name.Course; - // $scope.batchData = name.Batch; - $scope.searchData.Session = ''; - - $scope.OpenWindowStatus = false; + $scope.searchData.Course = ''; } 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; + $scope.searchData.University = name.univCode; + $scope.courseData = name.univCourseDetails; } - }; + //For session dropdown $scope.filterSessionDetails = ""; $scope.$watch('searchData.University', function (newValue, oldValue) { @@ -140,7 +130,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter $scope.onSubmit = function () { $scope.Searchloader = true; - if ($scope.searchData.University !== '' && $scope.searchData.Session !== '') { + if ($scope.searchData.University !== '' && $scope.searchData.Course !== '') { $scope.Searchloader = true; var empListreq = { method: 'POST', diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 64edd939..e1ed2de3 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -225,7 +225,6 @@ STUDENT FORMID FEE DETAILS - diff --git a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html index 0802ef46..231cf356 100644 --- a/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html +++ b/Apollo/assets/views/student/studentUnivFormIdFeeDetails.html @@ -58,22 +58,22 @@