diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index b3c0d4c9..e590fdf9 100644 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -276,6 +276,7 @@ $scope.generateButtonStatus = false; 'Content-Type': 'application/json' }, data: { + university: university, course:course, batch:batch, @@ -287,7 +288,8 @@ $scope.generateButtonStatus = false; }; $http(getStudents).then(function (response) { if (response.data.status == 200 && response.data.studentStatus) { - // $scope.studentInfo = response.data.studentDetails; + swal("success!"); + $scope.studentInfo = response.data.studentDetails; $scope.isLoaderShow = false; $scope.isTblShow = true; diff --git a/Apollo/assets/js/controllers/semcoursemapCtrl.js b/Apollo/assets/js/controllers/semcoursemapCtrl.js index 2e928982..b86bf2d9 100755 --- a/Apollo/assets/js/controllers/semcoursemapCtrl.js +++ b/Apollo/assets/js/controllers/semcoursemapCtrl.js @@ -618,20 +618,20 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter", var universityID = UniversityID; var courseID = CourseID; - var sem1 = $scope.selectedSubjetcsSem1ViewPage.list; - var sem2 = $scope.selectedSubjetcsSem2ViewPage.list; - var sem3 = $scope.selectedSubjetcsSem3ViewPage.list; - var sem4 = $scope.selectedSubjetcsSem4ViewPage.list; - var sem5 = $scope.selectedSubjetcsSem5ViewPage.list; - var sem6 = $scope.selectedSubjetcsSem6ViewPage.list; - var sem7 = $scope.selectedSubjetcsSem7ViewPage.list; - var sem8 = $scope.selectedSubjetcsSem8ViewPage.list; + var sem1 = $scope.selectedSubjetcsSem1ViewPage.list ? $scope.selectedSubjetcsSem1ViewPage.list : []; + var sem2 = $scope.selectedSubjetcsSem2ViewPage.list ? $scope.selectedSubjetcsSem2ViewPage.list : []; + var sem3 = $scope.selectedSubjetcsSem3ViewPage.list ? $scope.selectedSubjetcsSem3ViewPage.list : []; + var sem4 = $scope.selectedSubjetcsSem4ViewPage.list ? $scope.selectedSubjetcsSem4ViewPage.list : []; + var sem5 = $scope.selectedSubjetcsSem5ViewPage.list ? $scope.selectedSubjetcsSem5ViewPage.list : []; + var sem6 = $scope.selectedSubjetcsSem6ViewPage.list ? $scope.selectedSubjetcsSem6ViewPage.list : []; + var sem7 = $scope.selectedSubjetcsSem7ViewPage.list ? $scope.selectedSubjetcsSem7ViewPage.list : []; + var sem8 = $scope.selectedSubjetcsSem8ViewPage.list ? $scope.selectedSubjetcsSem8ViewPage.list : []; var semestersArray = []; for(var i = 1; i<= 8 ;i++) { var s = 'sem'+i; - + // semestersArray.push(eval(s)); if(Array.isArray(eval(s))) { semestersArray.push(eval(s)); @@ -643,7 +643,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter", } - + if(universityID == null|| universityID == undefined){ swal("Select University"); return false; } if(courseID == ''){ swal("Select Course"); return false; } if(sem1.length == 0 && sem2.length == 0 && sem3.length == 0 && sem4.length == 0 && sem5.length == 0 && sem6.length == 0 && sem7.length == 0 && sem8.length == 0){ @@ -681,7 +681,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter", } },function(error){ - swal('Some Thing Went Wrong!','Try Later','error') + swal('Some Thing Went Wrong!','Try Later','error') $state.go($state.current, {}, {reload: true}); }); diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index ca3ba8f4..ed5ff568 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -1034,6 +1034,11 @@ BATCHSCHEDULE + +
  • + + GENERATE STUDENT +