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;
         }