Revize d39750f3

re #8682 Modified parser to aggregate data according to buildings. Also added a method that merges information about jis and webauth activity into one list.

Server/ServerApp/Parser/Parsers/DataParser.cs

@@ -24 +24 @@
         LogInParser loginParser;
 
         /// <summary> WeatherInfo </summary>
-        public List<WeatherInfo> weatherList;
+        List<WeatherInfo> weatherList;
+        public List<WeatherInfo> WeatherList { get => weatherList; }
+        /// <summary> ActivityInfo repersenting overall activity </summary>
+        List<ActivityInfo> attendanceList;
+        public List<ActivityInfo> AttendanceList { get => attendanceList; }
+
         /// <summary> ActivityInfo representing jis activity </summary>
-        public List<ActivityInfo> jisList;
+        List<ActivityInfo> jisList;
         /// <summary> ActivityInfo representing login activity</summary>
-        public List<ActivityInfo> loginList;
+        List<ActivityInfo> loginList;
 
         /// <summary>
         /// Constructor
@@ -37 +42 @@
         {
             TagInfo.CreateDictionaries();
 
-            // TODO ask for data folder?
+            // TODO ask for data folder
             this.path = path;
             DataLoader loader = new CsvDataLoader();
 
@@ -51 +56 @@
         /// </summary>
         /// <param name="interval">Length of an interval</param>
         /// <param name="wholeDay">Parse data as one instance per day</param>
-        public void Parse(int interval = 1, bool wholeDay = true)
+        public bool Parse(DateTime startTime, DateTime endTime, int interval = 1, bool wholeDay = true)
         {
+            // TODO start and end time -> ask for files from this span, plus validate if the data really is from this span (issue with 00 files)
+
             var cultureInfo = CultureInfo.GetCultureInfo("en-GB");
             Thread.CurrentThread.CurrentCulture = cultureInfo;
             Thread.CurrentThread.CurrentUICulture = cultureInfo;
@@ -61 +68 @@
             string pathJis = path + "jis";
             string pathLogIn = path + "login";
 
-            weatherList = weatherParser.ParseWeatherData(pathWeather, false, 2); // wholeDay, interval);
-            jisList = jisParser.ParseJisData(pathJis, false, 2); // wholeDay, interval);
-            loginList = loginParser.ParseLogInData(pathLogIn, false, 2); // wholeDay, interval);
+            weatherList = weatherParser.ParseWeatherData(pathWeather, wholeDay, interval);
+            jisList = jisParser.ParseJisData(pathJis, wholeDay, interval);
+            loginList = loginParser.ParseLogInData(pathLogIn, wholeDay, interval);
 
             //Console.WriteLine("WEATHER");
             //WriteToConsole(weatherList);
-            Console.WriteLine("JIS");
-            WriteToConsole(jisList);
+            //Console.WriteLine("JIS");
+            //WriteToConsole(jisList);
             //Console.WriteLine("LOGIN");
             //WriteToConsole(loginList);
+
+            //WriteToConsole(AddListToOne(jisList));
+
+            MergeAttendance();
+
+            //Console.WriteLine("MERGED IN ONE LIST");
+            //WriteToConsole(attendanceList);
+
+            if (weatherList.Count == 0 || attendanceList.Count == 0)
+                return false;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Merges ActivityInfo lists with jis and login activity into one
+        /// Adds information from the same time period together, doesn't change the rest
+        /// </summary>
+        private void MergeAttendance()
+        {
+            attendanceList = new List<ActivityInfo>();
+
+            int indexJis = 0, indexLogin = 0;
+            while (true)
+            {
+                if (indexJis >= jisList.Count && indexLogin >= loginList.Count)
+                    break;
+
+                ActivityInfo jis = jisList[indexJis];
+                int jisTag = TagInfo.IndexOfBuilding(jis.building);
+                ActivityInfo login = loginList[indexLogin];
+                int loginTag = TagInfo.IndexOfBuilding(login.building);
+
+                // if same time times -> add to one info
+                if (jis.startTime == login.startTime)
+                {
+                    // need to have same building tags
+                    if (jisTag == loginTag)
+                    {
+                        jis.amount += login.amount;
+                        attendanceList.Add(jis);
+                        indexJis++; indexLogin++;
+                    }
+
+                    if (jisTag < loginTag)
+                    {
+                        indexJis++;
+                        attendanceList.Add(jis);
+                    }
+
+                    if (jisTag > loginTag)
+                    {
+                        indexLogin++;
+                        attendanceList.Add(login);
+                    }
+
+                }
+
+                // if jis time is smaller -> add jis and move
+                if (jis.startTime < login.startTime)
+                {
+                    indexJis++;
+                    attendanceList.Add(jis);
+                }
+
+                // if login time is smaller -> add login and move
+                if (login.startTime < jis.startTime)
+                {
+                    indexLogin++;
+                    attendanceList.Add(login);
+                }
+
+            }
+
+        }
+
+        /// <summary>
+        /// Sum all info for separate intervals in the list to the appropriate day
+        /// </summary>
+        /// <param name="list">List with activity info, info separated into buildings and intervals</param>
+        /// <returns></returns>
+        private List<ActivityInfo> AddListToOne(List<ActivityInfo> list)
+        {
+            List<ActivityInfo> a2 = new List<ActivityInfo>();
+            for (int i = 0; i < list.Count; i+=TagInfo.buildings.Length)
+            {
+                int amount = 0;
+                for (int j = 0; j < TagInfo.buildings.Length; j++)
+                {
+                    amount += list[i + j].amount;
+                }
+                ActivityInfo info = new ActivityInfo("ALL", amount, list[i].startTime, list[i].intervalLength);
+                a2.Add(info);
+            }
+            return a2;
+        }
+
+        /// <summary>
+        /// Debug method - writing lists to console
+        /// </summary>
+        private void WriteToConsole(List<ActivityInfo> list)
+        {
+            // TODO useless in finished app
+            if (list == null)
+            {
+                Console.WriteLine("Unsuccessful parsing");
+                return;
+            }
+            Console.WriteLine(list.Count);
+
+            for (int i = 0; i < list.Count; i++)
+                Console.WriteLine(list[i].ToString());
         }
 
         /// <summary>
         /// Debug method - writing lists to console
         /// </summary>
-        private void WriteToConsole<T>(List<T> list)
+        private void WriteToConsole(List<WeatherInfo> list)
         {
             // TODO useless in finished app
             if (list == null)