From 7d69929f787b5457c77a033a30877b7f2632d666 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 13 Feb 2018 17:51:36 +0530 Subject: [PATCH] course details changes done --- Apollo/assets/js/controllers/courseCtrl.js | 30 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/js/controllers/courseCtrl.js b/Apollo/assets/js/controllers/courseCtrl.js index 530fa905..7d4efb5f 100755 --- a/Apollo/assets/js/controllers/courseCtrl.js +++ b/Apollo/assets/js/controllers/courseCtrl.js @@ -85,13 +85,37 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab } }); + // get inactive university id + + + var result = $filter('filter')($scope.university, {'UniversityID':p.UniversityID}) ; + + if(result.length==0){ + $scope.university.push({ + "UniversityID":p.UniversityID, + "UniversityName":p.UniversityName, + }); + } + // get exist subject details $scope.editSubject = []; + + angular.forEach(p.existSubjects, function (values, keys) { + var subresult = $filter('filter')($scope.subjectDetails, values); + if(subresult.length==0){ + $scope.subjectDetails.push({ + "SubjectID":values.SubjectID, + "SubjectName":values.SubjectCode +'-'+values.SubjectName, + }); + } $scope.editSubject.push(values.SubjectID); - }) + + + + }); $scope.viewSubject = { list: $scope.editSubject, } @@ -324,7 +348,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab $scope.loader=true; $scope.data = response.data.details; - + // $scope.university=response.data.universityDetails; // $scope.feesDetails=response.data.feesDetails; // $scope.myModel.ListName=$scope.feesDetails[0]; @@ -401,7 +425,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab }; $http(getCourseUnivFee).then(function (response) { if (response.data.status==200 && response.data.courseStatus) { - + $scope.university=response.data.universityDetails; $scope.subjectDetails=[]; $scope.feesDetails=response.data.feesDetails;