Revize 4b847de5

re #8933 Testing LoginParser

Server/ServerApp/Parser/Parsers/LogInParser.cs

@@ -15 +15 @@
     /// Data parsed from 7am (included) to 18pm (included)
     /// </summary>
     /// <author>A. Konig</author>
-    class LogInParser
+    public class LogInParser
     {
         /// <summary> Datafile loader  </summary>
         IDataLoader loader;
@@ -99 +99 @@
                 // start of the day -> make an instance
                 string place = list[i].building;
                 DateTime date = new DateTime(list[i].date.Year, list[i].date.Month, list[i].date.Day, minmaxHour[0], 0, 0);
+                DateTime dateOfLessonStart = new DateTime(list[i].date.Year, list[i].date.Month, list[i].date.Day, list[i].lessonStart.Hour, list[i].lessonStart.Minute, list[i].lessonStart.Second);
                 if (!date.Equals(lastStartDay))
                 {
                     // data for each faculty separate
                     for (int k = 0; k < TagInfo.buildings.Length; k++)
                     {
                         ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[k], recordedAmount[k], lastStartDay, range); 
-                        loginInfo.Add(dayInfo);
+                        if (recordedAmount[k] != 0)
+                            loginInfo.Add(dayInfo);
                     }
 
                     recordedAmount = new int[TagInfo.buildings.Length];
@@ -113 +115 @@
                 }
 
                 // if not in allowed time window -> discard
-                if (list[i].date < startTime || list[i].date > endTime)
+                if (dateOfLessonStart < startTime || dateOfLessonStart > endTime)
                     continue;
 
                 // aggregate data
@@ -142 +144 @@
             for (int k = 0; k < TagInfo.buildings.Length; k++)
             {
                 ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[k], recordedAmount[k], lastStartDay, range);
-                loginInfo.Add(dayInfo);
+                if (recordedAmount[k] != 0)
+                    loginInfo.Add(dayInfo);
             }
 
             return loginInfo;
@@ -192 +195 @@
                 // start of the day -> make an instance
                 string place = list[i].building;
                 DateTime date = new DateTime(list[i].date.Year, list[i].date.Month, list[i].date.Day, list[i].lessonStart.Hour, 0, 0);
+                DateTime dateOfLessonStart = new DateTime(list[i].date.Year, list[i].date.Month, list[i].date.Day, list[i].lessonStart.Hour, list[i].lessonStart.Minute, list[i].lessonStart.Second);
 
                 // end of the day
                 if (!(date.Year == lastStartTime.Year && date.Month == lastStartTime.Month && date.Day == lastStartTime.Day))
@@ -205 +209 @@
                         for (int l = 0; l < TagInfo.buildings.Length; l++)
                         {
                             ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[l], data[k][l], stTime, interval);
-                            loginInfo.Add(dayInfo);
+                            if (data[k][l] != 0)
+                                loginInfo.Add(dayInfo);
                         }
 
                         data[k] = new int[TagInfo.buildings.Length];
@@ -214 +219 @@
                 }
 
                 // if not in allowed time window -> discard
-                if (list[i].date < startTime || list[i].date > endTime)
+                if (dateOfLessonStart < startTime || dateOfLessonStart > endTime)
                     continue;
 
                 // find index for current instance
@@ -262 +267 @@
                 for (int l = 0; l < TagInfo.buildings.Length; l++)
                 {
                     ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[l], data[k][l], stTime, interval);
-                    loginInfo.Add(dayInfo);
+                    if (data[k][l] != 0)
+                        loginInfo.Add(dayInfo);
                 }
             }