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/OutputInfo/ActivityInfo.cs

@@ -9 +9 @@
     /// <author>Alex Konig</author>
     class ActivityInfo
     {
-        /// <summary> Faculty </summary>
-        public string faculty;
+        /// <summary> Building </summary>
+        public string building;
         /// <summary> Number of events </summary>
         public int amount;
         /// <summary> Start of interval </summary>
@@ -27 +27 @@
         /// <param name="intervalLength">Length of recorded interval</param>
         public ActivityInfo(string faculty, int amount, DateTime startTime, int intervalLength)
         {
-            this.faculty = faculty;
+            this.building = faculty;
             this.amount = amount;
             this.startTime = startTime;
             this.intervalLength = intervalLength;
@@ -39 +39 @@
         /// <returns>"start time    faculty     number of events"</returns>
         public override string ToString()
         {
-            return $"{startTime.ToString()} \t {faculty} \t {amount}";
+            return $"{startTime} \t {building} \t {amount}";
         }
     }
 }