Revize a53b1de8
Přidáno uživatelem Alex Konig před více než 3 roky(ů)
Server/ServerApp/Parser/Parsers/DataParser.cs | ||
---|---|---|
34 | 34 |
/// <summary> ActivityInfo representing login activity</summary> |
35 | 35 |
List<ActivityInfo> loginList; |
36 | 36 |
|
37 |
|
|
38 | 37 |
/// <summary> |
39 | 38 |
/// Constructor |
40 | 39 |
/// </summary> |
... | ... | |
70 | 69 |
string pathLogIn = downloader.DataSubDirectories[DataType.STROJE]; |
71 | 70 |
|
72 | 71 |
// get all files that should be parsed |
73 |
Date start = null;
|
|
74 |
Date end = null;
|
|
75 |
if (startTime != null || endTime != null)
|
|
72 |
Date start = new Date((uint)startTime.Month, (uint)startTime.Year);
|
|
73 |
Date end = new Date((uint)endTime.Month, (uint)endTime.Year);
|
|
74 |
if (startTime == DateTime.MinValue || endTime == DateTime.MaxValue)
|
|
76 | 75 |
{ |
77 |
start = new Date((uint)startTime.Month, (uint)startTime.Year);
|
|
78 |
end = new Date((uint)endTime.Month, (uint)endTime.Year);
|
|
76 |
start = null;
|
|
77 |
end = null;
|
|
79 | 78 |
} |
80 | 79 |
|
81 | 80 |
var weatherFiles = downloader.GetData(pathWeather, start, end); |
... | ... | |
183 | 182 |
|
184 | 183 |
|
185 | 184 |
if (indexLogin < loginList.Count) |
186 |
res.AddRange(jisList.GetRange(indexLogin, loginList.Count - indexLogin));
|
|
185 |
res.AddRange(loginList.GetRange(indexLogin, loginList.Count - indexLogin));
|
|
187 | 186 |
|
188 | 187 |
return res; |
189 | 188 |
} |
Také k dispozici: Unified diff
re #8933 Testing DataParser, JisParser and WeatherParser