diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 6cf50f12..dc1ce976 100644 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -59,7 +59,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com }).state('app.dashboard', { url: "/dashboard", templateUrl: "assets/views/dashboard.html", - resolve: loadSequence('jquery-sparkline', 'dashboardCtrl'), + resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'dashboardCtrl','ngTable'), title: 'Dashboard', ncyBreadcrumb: { label: 'Dashboard' diff --git a/Apollo/assets/js/controllers/batchCtrl.js b/Apollo/assets/js/controllers/batchCtrl.js index 3dc68394..a517b823 100644 --- a/Apollo/assets/js/controllers/batchCtrl.js +++ b/Apollo/assets/js/controllers/batchCtrl.js @@ -195,7 +195,7 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl } else { $scope.emptyData=false; - $scope.loader=false; + $scope.loader=true; $scope.university=response.data.universityDetails; } diff --git a/Apollo/assets/js/controllers/branchCtrl.js b/Apollo/assets/js/controllers/branchCtrl.js index defe2582..597a85a7 100644 --- a/Apollo/assets/js/controllers/branchCtrl.js +++ b/Apollo/assets/js/controllers/branchCtrl.js @@ -218,7 +218,6 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A $scope.loader=true; // var data = response.data.details; $scope.data = response.data.details; - console.log(data); // this for search box // $scope.search = {BranchCode: ''}; // $scope.tableParams = new ngTableParams({ @@ -235,7 +234,7 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A // }); } else { $scope.emptyData=false; - $scope.loader=false; + $scope.loader=true; $scope.branchInfo=''; diff --git a/Apollo/assets/js/controllers/courseCtrl.js b/Apollo/assets/js/controllers/courseCtrl.js index 291c8016..44103141 100644 --- a/Apollo/assets/js/controllers/courseCtrl.js +++ b/Apollo/assets/js/controllers/courseCtrl.js @@ -157,7 +157,6 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab * created by kms * */ $scope.updateCourse = function (myModel, form, loading) { - console.log(form); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -223,7 +222,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab $rootScope.init = function () { $scope.loader=''; - var getBranch = { + var getCourse = { method: 'POST', url: apiPoint.url + 'getCourseDetails/', headers: { @@ -233,7 +232,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID } }; - $http(getBranch).then(function (response) { + $http(getCourse).then(function (response) { if (response.data.status==200 && response.data.courseStatus) { $scope.emptyData=true; $scope.loader=true; @@ -246,9 +245,13 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab } else { + $scope.emptyData=false; - $scope.loader=false; + $scope.loader=true; $scope.university=response.data.universityDetails; + $scope.feesDetails=response.data.feesDetails; + $scope.myModel.ListName=$scope.feesDetails[0]; + $scope.myModel.programListName=$scope.myModel.ListName.programType[0].ListCode; } }); diff --git a/Apollo/assets/views/editBatchDetails.html b/Apollo/assets/views/editBatchDetails.html new file mode 100644 index 00000000..6a121de5 --- /dev/null +++ b/Apollo/assets/views/editBatchDetails.html @@ -0,0 +1,102 @@ +
+
+
+
+
+ + Update Batch Details + + +
+
+ + + + Batch Code is required + Invalid batch Code + +
+ + +
+ + + + Batch Code is required + Invalid Batch Code + +
+ +
+ + + University is required +
+ +
+ +
+ + + +
+
+ + +
+ +
+ +
+ +
+
+
+
+ + + + + +
+
+
+ +
+
+ + +
+ + + + + \ No newline at end of file