diff --git a/WebAPI/Controllers/LayersController.cs b/WebAPI/Controllers/LayersController.cs index d129aa8..3f1ab16 100644 --- a/WebAPI/Controllers/LayersController.cs +++ b/WebAPI/Controllers/LayersController.cs @@ -252,11 +252,11 @@ namespace WebAPI.Controllers } string[] processTypes = new string[] { - "T3-SingleSource", - "T3-MultiSourceSummary", - "T3-SourceYearSummary", - "T3-MultiSourceYearSummary", - "T3-MultiSourceCopySelectedCodes", + //"T3-SingleSource", + //"T3-MultiSourceSummary", + //"T3-SourceYearSummary", + //"T3-MultiSourceYearSummary", + //"T3-MultiSourceCopySelectedCodes", "T3-MultiSourceCopySelectedCodesYearSummary" }; diff --git a/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs b/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs index db20076..619ff0e 100644 --- a/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs +++ b/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs @@ -116,7 +116,7 @@ namespace WebAPI.dataProcessors { string sheetId = "1pph-XowjlK5CIaCEV_A5buK4ceJ0Z0YoUlDI4VMkhhA"; string sheetName = "Raport_AB-AA_Eksport"; - SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "C4:CH4"); + SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "D4:EX4"); var response = request.Execute(); Layer? january = db.Layers @@ -144,11 +144,36 @@ namespace WebAPI.dataProcessors .Include(x => x.Records) .FirstOrDefault(); + //AA + Layer? januaryAA = db.Layers + .Where(x => x.Number == 568) + .Include(x => x.Records) + .FirstOrDefault(); + + Layer? februaryAA = db.Layers + .Where(x => x.Number == 741) + .Include(x => x.Records) + .FirstOrDefault(); + + Layer? marchAA = db.Layers + .Where(x => x.Number == 813) + .Include(x => x.Records) + .FirstOrDefault(); + + Layer? aprilAA = db.Layers + .Where(x => x.Number == 1017) + .Include(x => x.Records) + .FirstOrDefault(); + + Layer? sumAA = db.Layers + .Where(x => x.Number == 570) + .Include(x => x.Records) + .FirstOrDefault(); + List januaryValues = new List(); List februaryValues = new List(); List marchValues = new List(); List aprilValues = new List(); - List sumValues = new List(); var codesRow = response.Values[0]; @@ -159,6 +184,7 @@ namespace WebAPI.dataProcessors Record? marchRecord = march!.Records?.SingleOrDefault(x => x.Code == code); Record? aprilRecord = april!.Records?.SingleOrDefault(x => x.Code == code); Record? sumRecord = sum!.Records?.SingleOrDefault(x => x.Code == code); + if (januaryRecord != null) { double? januaryValue = ProcessHelper.getValue(januaryRecord, 32); @@ -166,8 +192,18 @@ namespace WebAPI.dataProcessors } else { - januaryValues.Add(""); + januaryRecord = januaryAA!.Records?.SingleOrDefault(x => x.Code == code); + if (januaryRecord != null) + { + double? januaryValue = ProcessHelper.getValue(januaryRecord, 32); + januaryValues.Add(januaryValue!.Value); + } + else + { + januaryValues.Add(""); + } } + if (februaryRecord != null) { double? februaryValue = ProcessHelper.getValue(februaryRecord, 32); @@ -175,8 +211,18 @@ namespace WebAPI.dataProcessors } else { - februaryValues.Add(""); + februaryRecord = februaryAA!.Records?.SingleOrDefault(x => x.Code == code); + if (februaryRecord != null) + { + double? februaryValue = ProcessHelper.getValue(februaryRecord, 32); + februaryValues.Add(februaryValue!.Value); + } + else + { + februaryValues.Add(""); + } } + if (marchRecord != null) { double? marchValue = ProcessHelper.getValue(marchRecord, 32); @@ -184,8 +230,18 @@ namespace WebAPI.dataProcessors } else { - marchValues.Add(""); + marchRecord = marchAA!.Records?.SingleOrDefault(x => x.Code == code); + if (marchRecord != null) + { + double? marchValue = ProcessHelper.getValue(marchRecord, 32); + marchValues.Add(marchValue!.Value); + } + else + { + marchValues.Add(""); + } } + if (aprilRecord != null) { double? aprilValue = ProcessHelper.getValue(aprilRecord, 32); @@ -193,8 +249,18 @@ namespace WebAPI.dataProcessors } else { - aprilValues.Add(""); + aprilRecord = aprilAA!.Records?.SingleOrDefault(x => x.Code == code); + if (aprilRecord != null) + { + double? aprilValue = ProcessHelper.getValue(aprilRecord, 32); + aprilValues.Add(aprilValue!.Value); + } + else + { + aprilValues.Add(""); + } } + if (sumRecord != null) { double? sumValue = ProcessHelper.getValue(sumRecord, 32); @@ -202,15 +268,24 @@ namespace WebAPI.dataProcessors } else { - sumValues.Add(""); - } + sumRecord = sumAA!.Records?.SingleOrDefault(x => x.Code == $"1{code}"); + if (sumRecord != null) + { + double? sumValue = ProcessHelper.getValue(sumRecord, 32); + sumValues.Add(sumValue!.Value); + } + else + { + sumValues.Add(""); + } + } } ValueRange januaryValueRange = new ValueRange { Values = new List> { januaryValues } }; - SpreadsheetsResource.ValuesResource.UpdateRequest updateJanuary = googleSheetValues.Update(januaryValueRange, sheetId, $"{sheetName}!C7:CH7"); + SpreadsheetsResource.ValuesResource.UpdateRequest updateJanuary = googleSheetValues.Update(januaryValueRange, sheetId, $"{sheetName}!D7:EX7"); updateJanuary.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; updateJanuary.Execute(); @@ -218,7 +293,7 @@ namespace WebAPI.dataProcessors { Values = new List> { februaryValues } }; - SpreadsheetsResource.ValuesResource.UpdateRequest updateFebruary = googleSheetValues.Update(februaryValueRange, sheetId, $"{sheetName}!C8:CH8"); + SpreadsheetsResource.ValuesResource.UpdateRequest updateFebruary = googleSheetValues.Update(februaryValueRange, sheetId, $"{sheetName}!D8:EX8"); updateFebruary.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; updateFebruary.Execute(); @@ -226,7 +301,7 @@ namespace WebAPI.dataProcessors { Values = new List> { marchValues } }; - SpreadsheetsResource.ValuesResource.UpdateRequest updateMarch = googleSheetValues.Update(marchValueRange, sheetId, $"{sheetName}!C9:CH9"); + SpreadsheetsResource.ValuesResource.UpdateRequest updateMarch = googleSheetValues.Update(marchValueRange, sheetId, $"{sheetName}!D9:EX9"); updateMarch.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; updateMarch.Execute(); @@ -234,7 +309,7 @@ namespace WebAPI.dataProcessors { Values = new List> { aprilValues } }; - SpreadsheetsResource.ValuesResource.UpdateRequest aprilMarch = googleSheetValues.Update(aprilValueRange, sheetId, $"{sheetName}!C10:CH10"); + SpreadsheetsResource.ValuesResource.UpdateRequest aprilMarch = googleSheetValues.Update(aprilValueRange, sheetId, $"{sheetName}!D10:EX10"); aprilMarch.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; aprilMarch.Execute(); @@ -242,10 +317,10 @@ namespace WebAPI.dataProcessors { Values = new List> { sumValues } }; - SpreadsheetsResource.ValuesResource.UpdateRequest updateSum = googleSheetValues.Update(sumValueRange, sheetId, $"{sheetName}!C12:CH12"); + SpreadsheetsResource.ValuesResource.UpdateRequest updateSum = googleSheetValues.Update(sumValueRange, sheetId, $"{sheetName}!D12:XZ12"); updateSum.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; + updateSum.Execute(); } - } }