mz/DiunaBI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

R1/R2 fix

Browse Source
This commit is contained in:
Michał Zieliński
2024-12-31 17:25:02 +01:00
parent a8cc63b6d3
commit 97141d1e4c
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
WebAPI/Controllers/LayersController.cs
View File

@@ -451,15 +451,15 @@ public class LayersController : Controller
string[] processTypes = string[] processTypes =
[ [
"T3-SingleSource", //"T3-SingleSource",
"T3-SourceYearSummary", //"T3-SourceYearSummary",
"T3-MultiSourceSummary", // AA //"T3-MultiSourceSummary", // AA
"T3-MultiSourceYearSummary", // AA/13 //"T3-MultiSourceYearSummary", // AA/13
"T4-SingleSource", //"T4-SingleSource",
"T5-LastValues", //"T5-LastValues",
//"T1-R1_OLD", //"T1-R1_OLD",
"T1-R1", //"T1-R1",
"T4-R2", //"T4-R2",
"T1-R3" "T1-R3"
]; ];
@@ -481,6 +481,7 @@ public class LayersController : Controller
x.Records!.Any(y => y.Code == "Type" && y.Desc1 == "ProcessWorker") && x.Records!.Any(y => y.Code == "Type" && y.Desc1 == "ProcessWorker") &&
x.Records!.Any(y => y.Code == "IsEnabled" && y.Desc1 == "True") && x.Records!.Any(y => y.Code == "IsEnabled" && y.Desc1 == "True") &&
x.Records!.Any(y => y.Code == "ProcessType" && y.Desc1 == type) x.Records!.Any(y => y.Code == "ProcessType" && y.Desc1 == type)
&& x.Number == 4175
) )
.OrderBy(x => x.CreatedAt) .OrderBy(x => x.CreatedAt)
.ToList(); .ToList();

2
WebAPI/dataProcessors/t1.r1.processor.cs
View File

@@ -59,7 +59,7 @@ public class T1R1Processor(
for (var month = 1; month <= 14; month++) for (var month = 1; month <= 14; month++)
{ {
if (month > DateTime.UtcNow.Month && month != 13) if (year != DateTime.UtcNow.Year || (month > DateTime.UtcNow.Month && month != 13))
{ {
continue; continue;
} }

2
WebAPI/dataProcessors/t4.r2.processor.cs
View File

@@ -75,7 +75,7 @@ public class T4R2Processor(
for (var month = 1; month <= 12; month++) for (var month = 1; month <= 12; month++)
{ {
if (month <= DateTime.UtcNow.Month) if (year == DateTime.UtcNow.Year && month <= DateTime.UtcNow.Month)
{ {
var monthCopy = month; var monthCopy = month;
var dataSource = db.Layers.Where(x => var dataSource = db.Layers.Where(x =>