Revize 4cb8ae48

re #8842 Fixing MergeAttendance

Server/ServerApp/Parser/Parsers/DataParser.cs

@@ -128 +128 @@
             int indexJis = 0, indexLogin = 0;
             while (true)
             {
-                if (indexJis >= jisList.Count && indexLogin >= loginList.Count)
+                if (indexJis >= jisList.Count || indexLogin >= loginList.Count)
                     break;
 
                 ActivityInfo jis = jisList[indexJis];
@@ -177 +177 @@
 
             }
 
+            // add all not yet processed
+            if (indexJis < jisList.Count)
+                res.AddRange(jisList.GetRange(indexJis, jisList.Count - indexJis));
+                    
+                    
+            if (indexLogin < loginList.Count)
+                res.AddRange(jisList.GetRange(indexLogin, loginList.Count - indexLogin));
+
             return res;
         }
 

Server/ServerApp/Program.cs

@@ -84 +84 @@
 
 			// TODO nastavit čas
 			IDataParser p = new DataParser(dd);
-			DateTime startT = new DateTime(2018, 6, 5);
-			DateTime endT = new DateTime(2019, 10, 30);
+			DateTime startT = new DateTime(2019, 10, 5);
+			DateTime endT = new DateTime(2020, 12, 23);
 			p.Parse(startT, endT, wholeDay: false, interval: 3);
 
-			Console.WriteLine(p.WeatherList.Count);
+			//parse(new DateTime(2019, 10, 5), , interval = 1, wholeDay = true)
+
 
 			// test - connection:
 			//ConnectionListener cl = new ConnectionListener(int.Parse(args[0])/*8000*//*int.Parse(config.Port)*/);