Revize 1db865ce

re #8610 Parsing in stable intervals

Server/ServerApp/Parser/Parsers/JisParser.cs

@@ -147 +147 @@
 
             // first day
             DateTime lastStartTime = new DateTime(list[0].dateTime.Year, list[0].dateTime.Month, list[0].dateTime.Day, minmaxHour[0], 0, 0);
+            int endtime = from[0];
+            int startTime = minmaxHour[0];
+            int index = 0;
             for (int i = 0; i < list.Count; i++)
             {
                 int currHour = list[i].dateTime.Hour;
@@ -157 +160 @@
                 string place = list[i].placeTag;
                 bool trigger = false;
                 DateTime date = new DateTime(list[i].dateTime.Year, list[i].dateTime.Month, list[i].dateTime.Day, list[i].dateTime.Hour, 0, 0);
-               
+
                 // end of the day
                 if (!(date.Year == lastStartTime.Year && date.Month == lastStartTime.Month && date.Day == lastStartTime.Day))
+                {
+                    endtime = from[0];
+                    startTime = minmaxHour[0];
                     trigger = true;
+                    index = 0;
+                }
 
                 // end of interval period
-                if ( (date.Hour - lastStartTime.Hour) >= interval || trigger)
+                if ( date.Hour >= endtime || trigger) // date.Hour > endTime (date.Hour - lastStartTime.Hour) >= interval 
                 {
+                    // start time of last interval
+                    DateTime stTime = new DateTime(lastStartTime.Year, lastStartTime.Month, lastStartTime.Day, startTime, 0, 0);
+                    
+                    // end of interval, not end of day -> need to find appropriate start and end times
+                    if (!trigger)
+                    {
+                        index += 1;
+                        while (from[index] < date.Hour)
+                            index++;
+
+                        endtime = from[index];
+                        startTime = from[index - 1];
+                    }
+
                     // data for each faculty separate
                     for (int k = 0; k < TagInfo.faculties.Length; k++)
                     {
-                        ActivityInfo dayInfo = new ActivityInfo(TagInfo.faculties[k], recordedAmount[k], lastStartTime, interval);
+                        ActivityInfo dayInfo = new ActivityInfo(TagInfo.faculties[k], recordedAmount[k], stTime, interval);
                         jisInfo.Add(dayInfo);
                     }
 
@@ -179 +201 @@
                 // aggregate data
                 if (TagInfo.jisPlaces.ContainsKey(place))
                 {
-                    int index = TagInfo.jisPlaces[place];
-                    if (index == -1)
+                    int faculty = TagInfo.jisPlaces[place];
+                    if (faculty == -1)
                         for (int l = 0; l < TagInfo.faculties.Length; l++)
                             recordedAmount[l] += list[i].amount;
                     else
-                        recordedAmount[index] += list[i].amount;
+                        recordedAmount[faculty] += list[i].amount;
 
                 }
                 else