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

AB-AA: excel name fix

Browse Source
This commit is contained in:
Michał Zieliński
2024-04-03 13:29:13 +02:00
parent f85d14c31c
commit 0be7f3282e
3 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
Utils/SQL_HELPERS.sql
View File

@@ -7,22 +7,22 @@
-- ADD IMPORT LAYER
--DECLARE @LayerId UNIQUEIDENTIFIER;
--SET @LayerId = 'a2883b74-be6d-4491-93cc-3681d65ba1bf';
--SET @LayerId = 'cc9cfb8d-21fe-4361-9e4c-3c598ed803cb';
--
--INSERT INTO [diunabi-morska].[dbo].[Layers]
--([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted],
--[CreatedById], [ModifiedById], [Type])
--VALUES ((SELECT @LayerId),794, 'Manual', 'L794-A-IW_M7-2024/03-202402292014',
--VALUES ((SELECT @LayerId),983, 'Manual', 'L983-A-IW_M7-2024/04-202403301123',
--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.02.29',
--VALUES ((SELECT NEWID()), 'StartDate', '2024.03.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.04.05',
--VALUES ((SELECT NEWID()), 'EndDate', '2024.05.05',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
--INSERT INTO [diunabi-morska].[dbo].[Records]
@@ -32,7 +32,7 @@
--
--INSERT INTO [diunabi-morska].[dbo].[Records]
--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
--VALUES ((SELECT NEWID()), 'SheetTabName', 'Marzec_2024',
--VALUES ((SELECT NEWID()), 'SheetTabName', 'Kwiecien_2024',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
--INSERT INTO [diunabi-morska].[dbo].[Records]
@@ -75,25 +75,26 @@
--VALUES ((SELECT NEWID()), 'IsEnabled', 'True',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
--
--ADD PROCESS LAYERS
-- T3-SingleSource
--DECLARE @LayerId UNIQUEIDENTIFIER;
--SET @LayerId = 'ab6d7105-f593-4a0b-a601-5ff9efbdd557';
--SET @LayerId = 'cfda856b-58f5-43c2-a035-1226553ca7bf';
--
--INSERT INTO [diunabi-morska].[dbo].[Layers]
--([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted],
--[CreatedById], [ModifiedById], [Type])
--VALUES ((SELECT @LayerId), 798, 'Manual', 'L798-A-PW_FK-2024/03-202402292021',
--VALUES ((SELECT @LayerId), 987, 'Manual', 'L987-A-PW_M7-2024/04-202403301130',
--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', 'FK',
--VALUES ((SELECT NEWID()), 'Source', 'M7',
--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', 'L791-A-IW_FK-2024/03-202402292008',
--VALUES ((SELECT NEWID()), 'SourceLayer', 'L983-A-IW_M7-2024/04-202403301123',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
--INSERT INTO [diunabi-morska].[dbo].[Records]
@@ -118,18 +119,17 @@
--
--INSERT INTO [diunabi-morska].[dbo].[Records]
--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
--VALUES ((SELECT NEWID()), 'Month', '03',
--VALUES ((SELECT NEWID()), 'Month', '04',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
-- T3-MultiSourceSummary
--DECLARE @LayerId UNIQUEIDENTIFIER;
--SET @LayerId = 'd8be7a0c-b2fe-4ce4-8d77-13f89ea5045a';
--SET @LayerId = '5f1e69cb-1e1b-441a-bb6e-26e100d44974';
--
--INSERT INTO [diunabi-morska].[dbo].[Layers]
--([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted],
--[CreatedById], [ModifiedById], [Type])
--VALUES ((SELECT @LayerId), 799, 'Manual', 'L799-A-PW_AA-2024/03-202402292024',
--VALUES ((SELECT @LayerId), 988, 'Manual', 'L988-A-PW_AA-2024/04-202403301133',
--GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2);
--
--INSERT INTO [diunabi-morska].[dbo].[Records]
@@ -174,67 +174,67 @@
--
--INSERT INTO [diunabi-morska].[dbo].[Records]
--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
--VALUES ((SELECT NEWID()), 'Month', '03',
--VALUES ((SELECT NEWID()), 'Month', '04',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
--
-- T3-MultiSourceCopySelectedCodes
DECLARE @LayerId UNIQUEIDENTIFIER;
SET @LayerId = '76a86f96-5d3b-41aa-96fe-ae5c647a060c';
INSERT INTO [diunabi-morska].[dbo].[Layers]
([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted],
[CreatedById], [ModifiedById], [Type])
VALUES ((SELECT @LayerId), 800, 'Manual', 'L800-A-PW_AB-2024/03-202402292027',
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', '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()), 'Source', 'M7',
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()), 'Source', 'PU',
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()), 'Source', 'FK',
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()), 'Type', 'ProcessWorker',
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()), 'ProcessType', 'T3-MultiSourceCopySelectedCodes',
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()), 'IsEnabled', 'True',
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()), 'Year', '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()), 'Month', '03',
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()), 'Codes', '5000-5003;5005;5081-5095;6000-6003;6005;6081-6095;7000-7003;7005;7081-7095;8000-8003;8005;8081-8095',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--DECLARE @LayerId UNIQUEIDENTIFIER;
--SET @LayerId = 'fca497bb-8bd5-4611-93b0-32dce72e9add';
--
--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',
--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', '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()), 'Source', 'M7',
--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()), 'Source', 'PU',
--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()), 'Source', 'FK',
--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()), 'Type', 'ProcessWorker',
--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()), 'ProcessType', 'T3-MultiSourceCopySelectedCodes',
--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()), 'IsEnabled', 'True',
--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()), 'Year', '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()), 'Month', '04',
--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()), 'Codes', '5000-5003;5005;5081-5095;6000-6003;6005;6081-6095;7000-7003;7005;7081-7095;8000-8003;8005;8081-8095',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--

11
WebAPI/Controllers/LayersController.cs
View File

@@ -253,11 +253,11 @@ namespace WebAPI.Controllers
string[] processTypes = new string[] {
"T3-SingleSource",
"T3-MultiSourceSummary",
"T3-SourceYearSummary",
"T3-MultiSourceYearSummary",
"T3-MultiSourceCopySelectedCodes",
"T3-MultiSourceCopySelectedCodesYearSummary"
//"T3-MultiSourceSummary",
//"T3-SourceYearSummary",
//"T3-MultiSourceYearSummary",
//"T3-MultiSourceCopySelectedCodes",
//"T3-MultiSourceCopySelectedCodesYearSummary"
};
foreach (string type in processTypes)
@@ -278,6 +278,7 @@ namespace WebAPI.Controllers
x.Records!.Any(x => x.Code == "Type" && x.Desc1 == "ProcessWorker") &&
x.Records!.Any(x => x.Code == "IsEnabled" && x.Desc1 == "True") &&
x.Records!.Any(x => x.Code == "ProcessType" && x.Desc1 == type)
&& x.Number == 984
)
.OrderBy(x => x.CreatedAt)
.ToList();

2
WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs
View File

@@ -115,7 +115,7 @@ namespace WebAPI.dataProcessors
public void updateReport()
{
string sheetId = "1pph-XowjlK5CIaCEV_A5buK4ceJ0Z0YoUlDI4VMkhhA";
string sheetName = "Raport_AB_Eksport";
string sheetName = "Raport_AB-AA_Eksport";
SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "C4:CH4");
var response = request.Execute();