diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index ccbb00f0..2724609d 100755 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -338,15 +338,11 @@ $scope.dayBookApprovalAccess = ''; $scope.deleted = function (id) { - // swal({ - // title: "Enter Reason For Delete", + var id=id; var a=prompt("Enter for the Delete Reason!",""); $scope.deleEditEntry(a,id); - // html: true, - // text: "Reason:" -// }); - + } diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index f0833abe..b5e3bc39 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -14,6 +14,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.futureDate=new Date(); // end $rootScope.userType = JSON.parse(localStorage.getItem('localObj')).localType; + $rootScope.financeType = JSON.parse(localStorage.getItem('localObj')).is_DayBookApproval_Access; /* * updateModel default value @@ -93,11 +94,13 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.init = function () { $scope.isTrainee = false; var localUserType = JSON.parse(localStorage.getItem('localObj')).localType; + if(localUserType === 'R005') { $scope.isTrainee = true; } + var getUniv = { method: 'POST', url: apiPoint.url + 'getUniversityCourseForFees/', @@ -110,6 +113,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n } }; + $http(getUniv).then(function (response) { if (response.data.status==200 && response.data.universityStatus) { $scope.university=response.data.univerSityDetails; @@ -170,6 +174,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $http(getStudent).then(function (response) { if (response.data.status==200 && response.data.studentStatus) { $scope.studentInfo=response.data.details; + console.log($scope.studentInfo); } else { $scope.studentInfo=""; @@ -189,7 +194,16 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $scope.viewId=-1 $scope.getStudentFeesStructure(p.ID,p.CourseID,p.StudentID); $scope.editId=p.ID; - + var localUserType = JSON.parse(localStorage.getItem('localObj')).localType; + if(localUserType === 'R004' || localUserType === 'R003' ) + { + $scope.show = true; + } + else + { + + $scope.show = false; + } } @@ -762,6 +776,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n $http(getFees).then(function (response) { if (response.data.status==200 && response.data.feesStatus) { $scope.studentFeesInfo=response.data.feesDetails; + //console.log( $scope.studentFeesInfo); $scope.existStudentFeesDetails = response.data.getExistStudentFeesDetails; $scope.getFeesUpdateStatus = response.data.getFeesUpdateStatus; diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 97e9a170..72fdbaa9 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -9,6 +9,7 @@ +
diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index 49bc3b14..a3004bba 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -231,7 +231,7 @@ Sem/Year is required
-
+