Просмотр исходного кода

Added some statistics for students

Dmitry Yu Okunev лет назад: 6
Родитель
Сommit
44ff49123d
2 измененных файлов с 10 добавлено и 3 удалено
  1. 9 2
      js/common.js
  2. 1 1
      person.html

+ 9 - 2
js/common.js

@@ -188,6 +188,8 @@ function calculateStatistics(person, events, timesheetInfo, prodCalendar, formul
 		}
 	}
 
+	knownDays = Object.keys(perDayInfo).length;
+
 	if (events != null) {
 		var eventsLength = events.length;
 
@@ -281,10 +283,10 @@ function calculateStatistics(person, events, timesheetInfo, prodCalendar, formul
 			continue;
 		}
 
-		if (dayInfo.skipped) {
+		if (dayInfo.skipped && knownDays > 0) {
 			continue;
 		}
-		if (prodCalendar[date].cps_isfilled == 0) {
+		if (prodCalendar[date].cps_isfilled == 0 && knownDays > 0) {
 			continue;
 		}
 
@@ -351,6 +353,11 @@ function calculateStatistics(person, events, timesheetInfo, prodCalendar, formul
 
 	//console.log('perDayInfo', perDayInfo);
 
+	if (knownDays == 0) {
+		visitsExpected = NaN;
+		secondsExpected = NaN;
+	}
+
 	return result = {
 		days: days,
 		visits: visits,

+ 1 - 1
person.html

@@ -157,7 +157,7 @@
 <script src="https://voip.mephi.ru/public/3rdparty/jquery-ui-1.11.4.custom/jquery-ui.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="https://dyo2.voip.mephi.ru/public/js/misc.js" type="text/javascript" charset="utf-8"></script>
 <script src="https://dyo2.voip.mephi.ru/public/js/misc-3rdparty.js" type="text/javascript" charset="utf-8"></script>
-<script src="/js/common.js?v=2.16" type="text/javascript" charset="utf-8"></script>
+<script src="/js/common.js?v=2.18" type="text/javascript" charset="utf-8"></script>
 <script src="/js/3rdparty/alasql/dist/alasql.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/js/3rdparty/xlsx.js/dist/xlsx.full.min.js" type="text/javascript" charset="utf-8"></script>
 <link rel="stylesheet" type="text/css" href="https://voip.mephi.ru/public/css/voip.css">