Revize 99e5517e

re #8842 Start testing

Server/ServerApp/Parser/Parsers/DataParser.cs

@@ -17 +17 @@
     /// Data parsed from 7am (included) to 18pm (included)
     /// </summary>
     /// <author>A. Konig</author>
-    class DataParser : IDataParser
+    public class DataParser : IDataParser
     {
         /// <summary> Data downloader </summary>
         DataDownloader downloader;
@@ -29 +29 @@
         /// <summary> Login data parser </summary>
         LogInParser loginParser;
 
-        /// <summary> WeatherInfo </summary>
-        List<WeatherInfo> weatherList;
-        public new List<WeatherInfo> WeatherList { get => weatherList; }
-        /// <summary> ActivityInfo repersenting overall activity </summary>
-        List<ActivityInfo> attendanceList;
-        public new List<ActivityInfo> AttendanceList { get => attendanceList; }
-
         /// <summary> ActivityInfo representing jis activity </summary>
         List<ActivityInfo> jisList;
         /// <summary> ActivityInfo representing login activity</summary>
@@ -89 +82 @@
             var jisFiles = downloader.GetData(pathJis, start, end);
             var loginFiles = downloader.GetData(pathLogIn, start, end);
 
-            weatherList = weatherParser.ParseWeatherData(weatherFiles, startTime, endTime, wholeDay, interval);
+            WeatherList = weatherParser.ParseWeatherData(weatherFiles, startTime, endTime, wholeDay, interval);
             jisList = jisParser.ParseJisData(jisFiles, startTime, endTime, wholeDay, interval);
             loginList = loginParser.ParseLogInData(loginFiles, startTime, endTime, wholeDay, interval);
 
@@ -102 +95 @@
 
             //WriteToConsole(AddListToOne(jisList));
 
-            MergeAttendance();
+            AttendanceList = MergeAttendance(jisList, loginList);
 
             //Console.WriteLine("MERGED IN ONE LIST");
             //WriteToConsole(attendanceList);
 
-            if (weatherList.Count == 0 || attendanceList.Count == 0)
+            if (WeatherList.Count == 0 || AttendanceList.Count == 0)
                 return false;
 
             return true;
         }
 
+
         /// <summary>
-        /// Merges ActivityInfo lists with jis and login activity into one
+        /// Merges two lists into one
         /// Adds information from the same time period together, doesn't change the rest
         /// </summary>
-        private void MergeAttendance()
+        /// <param name="jisList">List to merge</param>
+        /// <param name="loginList">List to merge</param>
+        /// <returns>Merged list</returns>
+        private List<ActivityInfo> MergeAttendance(List<ActivityInfo> jisList, List<ActivityInfo> loginList)
         {
-            attendanceList = new List<ActivityInfo>();
+            List<ActivityInfo> res = new List<ActivityInfo>();
+
+            if (jisList == null && loginList == null)
+                return res;
+            else if (jisList == null)
+                return loginList;
+            else if (loginList == null)
+                return jisList;
 
             int indexJis = 0, indexLogin = 0;
             while (true)
@@ -139 +143 @@
                     if (jisTag == loginTag)
                     {
                         jis.amount += login.amount;
-                        attendanceList.Add(jis);
+                        res.Add(jis);
                         indexJis++; indexLogin++;
                     }
 
-                    if (jisTag < loginTag)
+                    else if (jisTag < loginTag)
                     {
                         indexJis++;
-                        attendanceList.Add(jis);
+                        res.Add(jis);
                     }
 
-                    if (jisTag > loginTag)
+                    else if (jisTag > loginTag)
                     {
                         indexLogin++;
-                        attendanceList.Add(login);
+                        res.Add(login);
                     }
 
                 }
 
                 // if jis time is smaller -> add jis and move
-                if (jis.startTime < login.startTime)
+                else if (jis.startTime < login.startTime)
                 {
                     indexJis++;
-                    attendanceList.Add(jis);
+                    res.Add(jis);
                 }
 
                 // if login time is smaller -> add login and move
-                if (login.startTime < jis.startTime)
+                else if (login.startTime < jis.startTime)
                 {
                     indexLogin++;
-                    attendanceList.Add(login);
+                    res.Add(login);
                 }
 
             }
 
+            return res;
         }
 
         /// <summary>