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

Update Records model

Browse Source
This commit is contained in:
Michał Zieliński
2023-10-30 15:22:57 +01:00
parent 1d1229685e
commit a0d3ae8d72
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
WebAPI/Controllers/LayersController.cs
View File

@@ -192,7 +192,9 @@ namespace WebAPI.Controllers
{ {
processWorkerLayers = db.Layers processWorkerLayers = db.Layers
.Include(x => x.Records) .Include(x => x.Records)
.Where(x => x.Records!.Any(x => x.Code == "Type" && x.Desc1 == "ProcessWorker")) .Where(x =>
x.Records!.Any(x => x.Code == "Type" && x.Desc1 == "ProcessWorker") &&
x.Records!.Any(x => x.Code == "IsEnabled" && x.Desc1 == "True"))
.ToList(); .ToList();
layersToProcess = new List<Layer>(); layersToProcess = new List<Layer>();
@@ -251,13 +253,12 @@ namespace WebAPI.Controllers
switch (processType) switch (processType)
{ {
case "Copy": case "Copy":
CopyProcessor cp = new CopyProcessor(db, googleSheetValues, this); //CopyProcessor cp = new CopyProcessor(db, googleSheetValues, this);
cp.process(sourceLayer, processWorker?.Id); //cp.process(sourceLayer, processWorker?.Id);
break; break;
case "Deaggregation": case "Deaggregation":
DeaggregationProcessor dp = new DeaggregationProcessor(db, googleSheetValues, this); //DeaggregationProcessor dp = new DeaggregationProcessor(db, googleSheetValues, this);
dp.process(sourceLayer, processWorker?.Id); //dp.process(sourceLayer, processWorker?.Id);
break; break;
} }
logsController.AddEntry(new LogEntry logsController.AddEntry(new LogEntry

1
WebAPI/Models/Record.cs
View File

@@ -40,6 +40,7 @@ namespace WebAPI.Models
public float? Value29 { get; set; } public float? Value29 { get; set; }
public float? Value30 { get; set; } public float? Value30 { get; set; }
public float? Value31 { get; set; } public float? Value31 { get; set; }
public float? Value32 { get; set; }
//Description fields //Description fields
public string? Desc1 { get; set; } public string? Desc1 { get; set; }
public string? Desc2 { get; set; } public string? Desc2 { get; set; }

7
WebAPI/dataProcessors/deaggregation.processor.cs
View File

@@ -190,10 +190,6 @@ namespace WebAPI.dataProcessors
} }
private void setValue(Record record, int number, float? value) private void setValue(Record record, int number, float? value)
{ {
if (record.Code == "500")
{
Console.WriteLine("SetValue " + number + " | " + value);
}
switch (number) switch (number)
{ {
case 1: case 1:
@@ -289,6 +285,9 @@ namespace WebAPI.dataProcessors
case 31: case 31:
record.Value31 = value; record.Value31 = value;
break; break;
case 32:
record.Value32 = value;
break;
} }
} }
} }