diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index a72f7096..504285e2 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -1729,7 +1729,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS" }); } else { - swal("Failed!", "This student is not registerd", "warning"); + swal("Failed!", "This student is not registered", "warning"); $scope.courseEditLoading = false; $scope.studentDetails = ""; $scope.courseDetails = ""; diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 5bb02971..30cf6788 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -552,7 +552,19 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n * createdcby kms * */ $scope.changeBatch = function (Details) { - $scope.setFeesTotalAmount(Details,'2','2'); + + + + if(Details.InstallmentDetails != ''){ + $scope.setFeesTotalAmount(Details,'2','2'); + } + else{ + $rootScope.updateMoreItems=[]; + $scope.setModel.feesType.Others = ''; + + $scope.setFeesTotalAmount(Details,'1','1'); + + } } @@ -649,7 +661,6 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n * change installment values * */ $scope.changeInstallemt = function (model,form) { - if(model.Sem_Year!='TC' && model.Sem_Year!='PC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){ $scope.BatchDetails=[]; $rootScope.updateMoreItems=[]; @@ -1042,10 +1053,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n * created by kms * */ $scope.calculateInstallemntsExist = function (model,totAmt,other,type,type1) { - - var exBatchDate = moment($scope.BatchDate); - if(type==2 || type==1){ if($rootScope.updateMoreItems.length>0){ var exDatenew1; @@ -1059,9 +1067,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n else{ exDatenew1 = moment($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].DueDate); } - if (exDatenew1 <= exBatchDate) { - if(type=='1'){ $scope.setTotalAmount = Math.round(parseInt(totAmt)-parseInt(other)); // $scope.setModel.feesType.Others = Math.round(parseInt(other)); diff --git a/Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html b/Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html index 48df2df5..47da9048 100644 --- a/Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html +++ b/Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html @@ -24,7 +24,7 @@ @@ -37,7 +37,7 @@ diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html index fa050887..5001b3a0 100755 --- a/Apollo/assets/views/status-update/setFeesForStudent.html +++ b/Apollo/assets/views/status-update/setFeesForStudent.html @@ -25,7 +25,7 @@ ng-model="setModel.feesType" ng-options="fees.Sem_Year for fees in feesStructureInfo" required> - + Fees type is required @@ -39,7 +39,7 @@ ng-model="setModel.feesType.BatchCode" ng-options="batch.BatchCode as batch.BatchName for batch in BatchDetails" ng-click="changeBatch(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" required> - + Batch is required diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index bf2a1512..9a8258cf 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -53,7 +53,7 @@ ng-model="updateModel.feesType" ng-options="fees.Sem_Year for fees in studentFeesInfo" required ng-change="changeTotalFees(updateModel.feesType);"> - + Fees type is required @@ -413,7 +413,8 @@ - + + {{p.FeesName}} {{p.CourseName}} @@ -532,8 +533,8 @@ - - + diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html index 7238e830..83bfe1ec 100755 --- a/Apollo/assets/views/student/student_details.html +++ b/Apollo/assets/views/student/student_details.html @@ -11,7 +11,9 @@
+