Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

course details changes done

Browse Source
This commit is contained in:
gandhimathi 2018-02-23 10:48:30 +05:30
parent 9a0bd5b0a2
commit 7943009106
1 changed files with 93 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -887,16 +887,17 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
var dayDiff = moment().diff(bDate, 'days'); var dayDiff = moment().diff(bDate, 'days');
var todatlFineAmt = 0; var todatlFineAmt = 0;
var fineAmt1 = 0; var fineAmt1 = 0;
var fineAmt2 = 0; // var fineAmt2 = 0;
var fineAmt3 = 0; // var fineAmt3 = 0;
var fineAmt4 = 0; // var fineAmt4 = 0;
var fineAmt5 = 0; // var fineAmt5 = 0;
var fineAmt6 = 0; // var fineAmt6 = 0;
var fineAmt7 = 0; // var fineAmt7 = 0;
var fineAmt8 = 0; // var fineAmt8 = 0;
var fineAmt9 = 0; // var fineAmt9 = 0;
var fineAmt10 = 0; // var fineAmt10 = 0;
var fineAmt11 = 0; var fineAmt11 = 0;
var countDays = 0;
for (var k = 1; k <= dayDiff; k++) { for (var k = 1; k <= dayDiff; k++) {
if (k <= 90) { if (k <= 90) {
@ -913,7 +914,23 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
} }
} }
else if (k > 90) { else {
countDays = countDays+1;
if (countDays<30) {
if(countDays==1){
fineAmt11 = parseInt(fineAmt11)+300;
}
// foo++;
}
else{
countDays=0;
}
}
/*else if (k > 90) {
if (k > 90 && k <= 120) { if (k > 90 && k <= 120) {
fineAmt2 = 300; fineAmt2 = 300;
@ -956,10 +973,12 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
} }
} }*/
} }
todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt2) + parseInt(fineAmt3) + parseInt(fineAmt4) + parseInt(fineAmt5) + parseInt(fineAmt6) + parseInt(fineAmt7) + parseInt(fineAmt8) + parseInt(fineAmt9) + parseInt(fineAmt10) + parseInt(fineAmt11); // todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt2) + parseInt(fineAmt3) + parseInt(fineAmt4) + parseInt(fineAmt5) + parseInt(fineAmt6) + parseInt(fineAmt7) + parseInt(fineAmt8) + parseInt(fineAmt9) + parseInt(fineAmt10) + parseInt(fineAmt11);
todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt11);
if(type=='1'){ if(type=='1'){
$scope.setTotalAmount = Math.round(parseInt(totAmt) + parseInt(todatlFineAmt)-parseInt(other)); $scope.setTotalAmount = Math.round(parseInt(totAmt) + parseInt(todatlFineAmt)-parseInt(other));
$scope.setModel.feesType.Others = Math.round(parseInt(todatlFineAmt)); $scope.setModel.feesType.Others = Math.round(parseInt(todatlFineAmt));
@ -1089,20 +1108,25 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
var dayDiff = exDatenew1.diff(exBatchDate, 'days'); var dayDiff = exDatenew1.diff(exBatchDate, 'days');
dayDiff = dayDiff+1; dayDiff = dayDiff+1;
alert(dayDiff);
var todatlFineAmt = 0; var todatlFineAmt = 0;
var fineAmt1 = 0; var fineAmt1 = 0;
var fineAmt2 = 0; // var fineAmt2 = 0;
var fineAmt3 = 0; // var fineAmt3 = 0;
var fineAmt4 = 0; // var fineAmt4 = 0;
var fineAmt5 = 0; // var fineAmt5 = 0;
var fineAmt6 = 0; // var fineAmt6 = 0;
var fineAmt7 = 0; // var fineAmt7 = 0;
var fineAmt8 = 0; // var fineAmt8 = 0;
var fineAmt9 = 0; // var fineAmt9 = 0;
var fineAmt10 = 0; // var fineAmt10 = 0;
var fineAmt11 = 0; var fineAmt11 = 0;
var countDays = 0;
for (var k = 1; k <= dayDiff; k++) { for (var k = 1; k <= dayDiff; k++) {
if (k <= 90) { if (k <= 90) {
if (exitPayAmt <= 10000) { if (exitPayAmt <= 10000) {
@ -1117,7 +1141,23 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
} }
} }
else if (k > 90) { else {
countDays = countDays+1;
if (countDays<30) {
if(countDays==1){
fineAmt11 = parseInt(fineAmt11)+300;
}
// foo++;
}
else{
countDays=0;
}
}
/* else if (k > 90) {
if (k > 90 && k <= 120) { if (k > 90 && k <= 120) {
fineAmt2 = 300; fineAmt2 = 300;
@ -1156,14 +1196,28 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
} }
else { else {
fineAmt11 = 300; countDays = countDays+1;
if (countDays<30) {
if(countDays==1){
fineAmt11 = parseInt(fineAmt11)+300;
}
// foo++;
}
else{
countDays=0;
}
} }
} }*/
} }
todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt2) + parseInt(fineAmt3) + parseInt(fineAmt4) + parseInt(fineAmt5) + parseInt(fineAmt6) + parseInt(fineAmt7) + parseInt(fineAmt8) + parseInt(fineAmt9) + parseInt(fineAmt10) + parseInt(fineAmt11); // todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt2) + parseInt(fineAmt3) + parseInt(fineAmt4) + parseInt(fineAmt5) + parseInt(fineAmt6) + parseInt(fineAmt7) + parseInt(fineAmt8) + parseInt(fineAmt9) + parseInt(fineAmt10) + parseInt(fineAmt11);
todatlFineAmt = parseInt(fineAmt1) + parseInt(fineAmt11);
if(type1=='2'){ if(type1=='2'){
$scope.setTotalAmount = Math.round(parseInt(totAmt) -parseInt(other) + parseInt(todatlFineAmt)); $scope.setTotalAmount = Math.round(parseInt(totAmt) -parseInt(other) + parseInt(todatlFineAmt));
$scope.setModel.feesType.Others = Math.round(parseInt(todatlFineAmt)); $scope.setModel.feesType.Others = Math.round(parseInt(todatlFineAmt));
@ -1245,19 +1299,28 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
} }
/*
/* $scope.$watch('updateMoreItems', function (newValue, oldValue) { $scope.$watch('updateMoreItems', function (newValue, oldValue) {
for (var i = 0; i < newValue.length; i++) { for (var i = 0; i < newValue.length; i++) {
if (newValue[i].Amount != oldValue[i].Amount) { if (newValue[i].Amount != oldValue[i].Amount) {
var currentValue=0;
var pastValue=0;
if(newValue[i].Amount>oldValue[i].Amount){ if(newValue[i].Amount>oldValue[i].Amount){
var currentValue = parseInt(newValue[i].Amount)-oldValue[i].Amount; currentValue = parseInt(newValue[i].Amount)-oldValue[i].Amount;
} }
else{ else if(newValue[i].Amount<oldValue[i].Amount){
var currentValue = oldValue[i].Amount-parseInt(newValue[i].Amount); pastValue = oldValue[i].Amount-parseInt(newValue[i].Amount);
} }
else{
currentValue=0
pastValue=0;
}
console.log(currentValue);
console.log(pastValue);
} }