diff --git a/Utils/SQL_HELPERS.sql b/Utils/SQL_HELPERS.sql index 6ff5c95..c3069d6 100644 --- a/Utils/SQL_HELPERS.sql +++ b/Utils/SQL_HELPERS.sql @@ -4,25 +4,24 @@ --DELETE FROM [diunabi-morska].[dbo].[Records] WHERE [LayerId] = (SELECT @LayerId); --DELETE FROM [diunabi-morska].[dbo].[Layers] WHERE [Id] = (SELECT @LayerId); - -- ADD IMPORT LAYER --DECLARE @LayerId UNIQUEIDENTIFIER; ---SET @LayerId = 'cc9cfb8d-21fe-4361-9e4c-3c598ed803cb'; +--SET @LayerId = 'a1ef2933-d277-447f-a941-adaa5ac07e7e'; -- --INSERT INTO [diunabi-morska].[dbo].[Layers] --([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], --[CreatedById], [ModifiedById], [Type]) ---VALUES ((SELECT @LayerId),983, 'Manual', 'L983-A-IW_M7-2024/04-202403301123', +--VALUES ((SELECT @LayerId),1152, 'Manual', 'L1152-A-IW_K5-2024/05-202404302253', --GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2); -- --INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ((SELECT NEWID()), 'StartDate', '2024.03.29', +--VALUES ((SELECT NEWID()), 'StartDate', '2024.04.29', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); -- --INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ((SELECT NEWID()), 'EndDate', '2024.05.05', +--VALUES ((SELECT NEWID()), 'EndDate', '2024.06.05', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); -- --INSERT INTO [diunabi-morska].[dbo].[Records] @@ -32,17 +31,17 @@ -- --INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ((SELECT NEWID()), 'SheetTabName', 'Kwiecien_2024', +--VALUES ((SELECT NEWID()), 'SheetTabName', 'Maj_2024', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); -- --INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ((SELECT NEWID()), 'SheetId', '1epk7AdNNvTyN4TKIIOqan-h5A8HYGbRVM_OS-Ns-Qlg', +--VALUES ((SELECT NEWID()), 'SheetId', '1ZzndU8HjYqz5VKCcrVHBOFW8fqpYfwquclznX9q39Yk', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); -- --INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ((SELECT NEWID()), 'DataRange', 'D4:BS5', +--VALUES ((SELECT NEWID()), 'DataRange', 'D4:BT5', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); -- --INSERT INTO [diunabi-morska].[dbo].[Records] @@ -79,22 +78,22 @@ --ADD PROCESS LAYERS -- T3-SingleSource --DECLARE @LayerId UNIQUEIDENTIFIER; ---SET @LayerId = 'cfda856b-58f5-43c2-a035-1226553ca7bf'; +--SET @LayerId = '07e4f45b-5cef-4830-b21b-3f8babc767ac'; -- --INSERT INTO [diunabi-morska].[dbo].[Layers] --([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], --[CreatedById], [ModifiedById], [Type]) ---VALUES ((SELECT @LayerId), 987, 'Manual', 'L987-A-PW_M7-2024/04-202403301130', +--VALUES ((SELECT @LayerId), 1164, 'Manual', 'L1164-A-PW_K5-2024/05-202404302314', --GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2); -- --INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ((SELECT NEWID()), 'Source', 'M7', +--VALUES ((SELECT NEWID()), 'Source', 'K5', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); -- --INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ((SELECT NEWID()), 'SourceLayer', 'L983-A-IW_M7-2024/04-202403301123', +--VALUES ((SELECT NEWID()), 'SourceLayer', 'L1152-A-IW_K5-2024/05-202404302253', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); -- --INSERT INTO [diunabi-morska].[dbo].[Records] @@ -119,17 +118,18 @@ -- --INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ((SELECT NEWID()), 'Month', '04', +--VALUES ((SELECT NEWID()), 'Month', '05', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); -- + -- T3-MultiSourceSummary --DECLARE @LayerId UNIQUEIDENTIFIER; ---SET @LayerId = '5f1e69cb-1e1b-441a-bb6e-26e100d44974'; +--SET @LayerId = '010265e5-ac2e-4f32-a659-416063ec5112'; -- --INSERT INTO [diunabi-morska].[dbo].[Layers] --([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], --[CreatedById], [ModifiedById], [Type]) ---VALUES ((SELECT @LayerId), 988, 'Manual', 'L988-A-PW_AA-2024/04-202403301133', +--VALUES ((SELECT @LayerId), 1165, 'Manual', 'L1165-A-PW_AA-2024/05-202404302315', --GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2); -- --INSERT INTO [diunabi-morska].[dbo].[Records] @@ -174,18 +174,18 @@ -- --INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ((SELECT NEWID()), 'Month', '04', +--VALUES ((SELECT NEWID()), 'Month', '05', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); -- --- + -- T3-MultiSourceCopySelectedCodes --DECLARE @LayerId UNIQUEIDENTIFIER; ---SET @LayerId = 'fca497bb-8bd5-4611-93b0-32dce72e9add'; +--SET @LayerId = 'a6cf0ace-f3f7-4450-b5a3-ee85696baeac'; -- --INSERT INTO [diunabi-morska].[dbo].[Layers] --([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], --[CreatedById], [ModifiedById], [Type]) ---VALUES ((SELECT @LayerId), 989, 'Manual', 'L989-A-PW_AB-2024/04-202403311142', +--VALUES ((SELECT @LayerId), 1166, 'Manual', 'L1166-A-PW_AB-2024/05-202404302317', --GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2); -- --INSERT INTO [diunabi-morska].[dbo].[Records] @@ -230,7 +230,7 @@ -- --INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ((SELECT NEWID()), 'Month', '04', +--VALUES ((SELECT NEWID()), 'Month', '05', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); -- --INSERT INTO [diunabi-morska].[dbo].[Records] diff --git a/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs b/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs index 619ff0e..46dea33 100644 --- a/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs +++ b/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs @@ -139,6 +139,11 @@ namespace WebAPI.dataProcessors .Include(x => x.Records) .FirstOrDefault(); + Layer? may = db.Layers + .Where(x => x.Number == 1172) + .Include(x => x.Records) + .FirstOrDefault(); + Layer? sum = db.Layers .Where(x => x.Number == 955) .Include(x => x.Records) @@ -165,6 +170,11 @@ namespace WebAPI.dataProcessors .Include(x => x.Records) .FirstOrDefault(); + Layer? mayAA = db.Layers + .Where(x => x.Number == 1171) + .Include(x => x.Records) + .FirstOrDefault(); + Layer? sumAA = db.Layers .Where(x => x.Number == 570) .Include(x => x.Records) @@ -174,6 +184,7 @@ namespace WebAPI.dataProcessors List februaryValues = new List(); List marchValues = new List(); List aprilValues = new List(); + List mayValues = new List(); List sumValues = new List(); var codesRow = response.Values[0]; @@ -183,6 +194,7 @@ namespace WebAPI.dataProcessors Record? februaryRecord = february!.Records?.SingleOrDefault(x => x.Code == code); Record? marchRecord = march!.Records?.SingleOrDefault(x => x.Code == code); Record? aprilRecord = april!.Records?.SingleOrDefault(x => x.Code == code); + Record? mayRecord = may!.Records?.SingleOrDefault(x => x.Code == code); Record? sumRecord = sum!.Records?.SingleOrDefault(x => x.Code == code); if (januaryRecord != null) @@ -261,6 +273,25 @@ namespace WebAPI.dataProcessors } } + if (mayRecord != null) + { + double? mayValue = ProcessHelper.getValue(mayRecord, 32); + mayValues.Add(mayValue!.Value); + } + else + { + mayRecord = mayAA!.Records?.SingleOrDefault(x => x.Code == code); + if (mayRecord != null) + { + double? mayValue = ProcessHelper.getValue(mayRecord, 32); + mayValues.Add(mayValue!.Value); + } + else + { + mayValues.Add(""); + } + } + if (sumRecord != null) { double? sumValue = ProcessHelper.getValue(sumRecord, 32); @@ -278,7 +309,7 @@ namespace WebAPI.dataProcessors { sumValues.Add(""); } - } + } } ValueRange januaryValueRange = new ValueRange @@ -309,15 +340,23 @@ namespace WebAPI.dataProcessors { Values = new List> { aprilValues } }; - SpreadsheetsResource.ValuesResource.UpdateRequest aprilMarch = googleSheetValues.Update(aprilValueRange, sheetId, $"{sheetName}!D10:EX10"); - aprilMarch.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; - aprilMarch.Execute(); + SpreadsheetsResource.ValuesResource.UpdateRequest updateApril = googleSheetValues.Update(aprilValueRange, sheetId, $"{sheetName}!D10:EX10"); + updateApril.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; + updateApril.Execute(); + + ValueRange mayValueRange = new ValueRange + { + Values = new List> { mayValues } + }; + SpreadsheetsResource.ValuesResource.UpdateRequest updateMay = googleSheetValues.Update(mayValueRange, sheetId, $"{sheetName}!D11:EX11"); + updateMay.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; + updateMay.Execute(); ValueRange sumValueRange = new ValueRange { Values = new List> { sumValues } }; - SpreadsheetsResource.ValuesResource.UpdateRequest updateSum = googleSheetValues.Update(sumValueRange, sheetId, $"{sheetName}!D12:XZ12"); + SpreadsheetsResource.ValuesResource.UpdateRequest updateSum = googleSheetValues.Update(sumValueRange, sheetId, $"{sheetName}!D13:XZ13"); updateSum.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; updateSum.Execute();