diff --git a/WebAPI/Controllers/LayersController.cs b/WebAPI/Controllers/LayersController.cs index b6537bf..78d9d5e 100644 --- a/WebAPI/Controllers/LayersController.cs +++ b/WebAPI/Controllers/LayersController.cs @@ -192,7 +192,9 @@ namespace WebAPI.Controllers { processWorkerLayers = db.Layers .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(); layersToProcess = new List(); @@ -251,13 +253,12 @@ namespace WebAPI.Controllers switch (processType) { case "Copy": - CopyProcessor cp = new CopyProcessor(db, googleSheetValues, this); - cp.process(sourceLayer, processWorker?.Id); + //CopyProcessor cp = new CopyProcessor(db, googleSheetValues, this); + //cp.process(sourceLayer, processWorker?.Id); break; case "Deaggregation": - DeaggregationProcessor dp = new DeaggregationProcessor(db, googleSheetValues, this); - dp.process(sourceLayer, processWorker?.Id); - + //DeaggregationProcessor dp = new DeaggregationProcessor(db, googleSheetValues, this); + //dp.process(sourceLayer, processWorker?.Id); break; } logsController.AddEntry(new LogEntry diff --git a/WebAPI/Models/Record.cs b/WebAPI/Models/Record.cs index 453bfe6..86cdcf9 100644 --- a/WebAPI/Models/Record.cs +++ b/WebAPI/Models/Record.cs @@ -40,6 +40,7 @@ namespace WebAPI.Models public float? Value29 { get; set; } public float? Value30 { get; set; } public float? Value31 { get; set; } + public float? Value32 { get; set; } //Description fields public string? Desc1 { get; set; } public string? Desc2 { get; set; } diff --git a/WebAPI/dataProcessors/deaggregation.processor.cs b/WebAPI/dataProcessors/deaggregation.processor.cs index c1aa43c..e792b06 100644 --- a/WebAPI/dataProcessors/deaggregation.processor.cs +++ b/WebAPI/dataProcessors/deaggregation.processor.cs @@ -190,10 +190,6 @@ namespace WebAPI.dataProcessors } private void setValue(Record record, int number, float? value) { - if (record.Code == "500") - { - Console.WriteLine("SetValue " + number + " | " + value); - } switch (number) { case 1: @@ -289,6 +285,9 @@ namespace WebAPI.dataProcessors case 31: record.Value31 = value; break; + case 32: + record.Value32 = value; + break; } } }