Revize 9fb55c71

re #8840 Update commit - start/endTime in method Parse in DataParser can now be null

Server/ServerApp/Parser/Parsers/DataParser.cs

@@ -67 +67 @@
         /// <param name="startTime">Start time of related data</param>
         override public bool Parse(DateTime startTime, DateTime endTime, int interval = 1, bool wholeDay = true)
         {
-
             var cultureInfo = CultureInfo.GetCultureInfo("en-GB");
             Thread.CurrentThread.CurrentCulture = cultureInfo;
             Thread.CurrentThread.CurrentUICulture = cultureInfo;
 
             // get path to folder w/ datafiles
-            string pathWeather = downloader.DataSubDirectories[DataType.POCASI]; // path + "weather";
-            string pathJis = downloader.DataSubDirectories[DataType.JIS]; // path + "jis";
-            string pathLogIn = downloader.DataSubDirectories[DataType.STROJE]; // path + "login";
+            string pathWeather = downloader.DataSubDirectories[DataType.POCASI];
+            string pathJis = downloader.DataSubDirectories[DataType.JIS];
+            string pathLogIn = downloader.DataSubDirectories[DataType.STROJE];
 
             // get all files that should be parsed
-            Date start = new Date((uint)startTime.Month, (uint)startTime.Year);
-            Date end = new Date((uint)endTime.Month, (uint)endTime.Year);
+            Date start = null;
+            Date end = null;
+            if (startTime != null || endTime != null)
+            {
+                start = new Date((uint)startTime.Month, (uint)startTime.Year);
+                end = new Date((uint)endTime.Month, (uint)endTime.Year);
+            }
+
             var weatherFiles = downloader.GetData(pathWeather, start, end);
             var jisFiles = downloader.GetData(pathJis, start, end);
             var loginFiles = downloader.GetData(pathLogIn, start, end);
@@ -90 +95 @@
 
             //Console.WriteLine("WEATHER");
             //WriteToConsole(weatherList);
-            Console.WriteLine("JIS");
-            WriteToConsole(jisList);
+            //Console.WriteLine("JIS");
+            //WriteToConsole(jisList);
             //Console.WriteLine("LOGIN");
             //WriteToConsole(loginList);
 
@@ -99 +104 @@
 
             MergeAttendance();
 
-            Console.WriteLine("MERGED IN ONE LIST");
-            WriteToConsole(attendanceList);
+            //Console.WriteLine("MERGED IN ONE LIST");
+            //WriteToConsole(attendanceList);
 
             if (weatherList.Count == 0 || attendanceList.Count == 0)
                 return false;

Server/ServerApp/ServerApp.csproj

@@ -166 +166 @@
     <Compile Include="Parser\InputData\LogInInstance.cs" />
     <Compile Include="Parser\InputData\WeatherInstance.cs" />
     <Compile Include="Parser\OutputInfo\ActivityInfo.cs" />
+    <Compile Include="Parser\OutputInfo\ValueToConditions.cs" />
     <Compile Include="Parser\OutputInfo\WeatherConditions.cs" />
     <Compile Include="Parser\OutputInfo\WeatherInfo.cs" />
     <Compile Include="Parser\Parsers\DataParser.cs" />
     <Compile Include="Parser\Parsers\IDataParser.cs" />
     <Compile Include="Parser\Parsers\JisParser.cs" />
+    <Compile Include="WeatherPredictionParser\IJsonParser.cs" />
     <Compile Include="WeatherPredictionParser\JsonParser.cs" />
     <Compile Include="Parser\Parsers\LogInParser.cs" />
     <Compile Include="Parser\Parsers\TagInfo.cs" />

Server/ServerApp/WeatherPredictionParser/JsonParser.cs

@@ -87 +87 @@
                             current = ParseCurrentWeather(currentWeather);
 
                             break;
-
                         }
                     // weather prediction
                     case "weather":
@@ -103 +102 @@
             // sunrise + sunset into data
             EncompassSunRiseSetTimes();
 
-            TestConsoleOutput();
+            //TestConsoleOutput();
         }
 
         /// <summary>