diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/newEduPrfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/newEduPrfrmMngList.jsp index 8b041b26..f6b7c0ec 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/newEduPrfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/newEduPrfrmMngList.jsp @@ -328,10 +328,19 @@ -
-
+
- - - - -
-
-
- diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/stts/sttsEduCnt.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/stts/sttsEduCnt.jsp index 3ad0ff48..60c69972 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/stts/sttsEduCnt.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/stts/sttsEduCnt.jsp @@ -168,11 +168,20 @@ , '${eduCntVO.oct}' , '${eduCntVO.nov}' , '${eduCntVO.decm}' - , '${eduCntVO.tot}' ]; + ]; var dataNOTSum = 0; + var maxNOT = Number(dataNOT[0]); for(var i = 0; i<12; i++){ + var NOTs = Number(dataNOT[i]); + if(!isNaN(NOTs)){ + if(NOTs > maxNOT){ + maxNOT = NOTs + } + + } dataNOTSum += parseInt(dataNOT[i]); } + maxNOT = Math.ceil(maxNOT / 10) * 10; if(isNaN(dataNOTSum)){ dataNOTSum = 0; } @@ -189,87 +198,117 @@ , '${eduPrsnlCntVO.oct}' , '${eduPrsnlCntVO.nov}' , '${eduPrsnlCntVO.decm}' - , '${eduPrsnlCntVO.tot}' - ]; var dataNOPSum = 0; + var maxNOP = Number(dataNOP[0]); for(var x = 0; x<12; x++){ + var NOPs = Number(dataNOP[x]); + if(!isNaN(NOPs)){ + if(NOPs > maxNOP){ + maxNOP = NOPs + } + + } dataNOPSum += parseInt(dataNOP[x]); } + maxNOP = Math.ceil(maxNOP / 10) * 10; if(isNaN(dataNOPSum)){ dataNOPSum = 0; }
-
+
- - - - -
-
-
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp index af0d7a47..eed2bcc0 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/newEduPrfrmMngList.jsp @@ -322,10 +322,19 @@