From f70ba9b701fdf3fea0fa9bf2b884eb256a570ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Zieli=C5=84ski?= Date: Mon, 2 Oct 2023 19:59:43 +0200 Subject: [PATCH] WIP: list scrolling --- .../layers-list/layers-list.component.html | 2 +- .../layers-list/layers-list.component.ts | 4 +- Frontend/src/environments/environment.ts | 4 +- WebAPI/Controllers/LayersController.cs | 145 +++++++++--------- 4 files changed, 78 insertions(+), 77 deletions(-) diff --git a/Frontend/src/app/modules/layers/layers-list/layers-list.component.html b/Frontend/src/app/modules/layers/layers-list/layers-list.component.html index df19dc3..5a564cb 100644 --- a/Frontend/src/app/modules/layers/layers-list/layers-list.component.html +++ b/Frontend/src/app/modules/layers/layers-list/layers-list.component.html @@ -14,6 +14,6 @@ {{LayerType[element.type]}} - + \ No newline at end of file diff --git a/Frontend/src/app/modules/layers/layers-list/layers-list.component.ts b/Frontend/src/app/modules/layers/layers-list/layers-list.component.ts index d457d55..e0208fc 100644 --- a/Frontend/src/app/modules/layers/layers-list/layers-list.component.ts +++ b/Frontend/src/app/modules/layers/layers-list/layers-list.component.ts @@ -29,7 +29,7 @@ export class LayersListComponent implements OnInit { LayerType = LayerType; start = 0; - limit = 50; + limit = 200; end: number = this.limit + this.start; loadingInProgress = false; @@ -40,7 +40,7 @@ export class LayersListComponent implements OnInit { private _http: HttpClient, ) { } - @HostListener('document:scroll', ['$event']) + //@HostListener('document:scroll', ['$event']) // eslint-disable-next-line @typescript-eslint/no-explicit-any public async onScroll(event: any) { console.log('on scrool', event); diff --git a/Frontend/src/environments/environment.ts b/Frontend/src/environments/environment.ts index b4ed8cc..98dcec0 100644 --- a/Frontend/src/environments/environment.ts +++ b/Frontend/src/environments/environment.ts @@ -7,8 +7,8 @@ export const environment = { appName: "LOCAL_DiunaBI", production: false, api: { - url: "http://localhost:5400/api" - //url: "https://diunabi-morska.bim-it.pl/api" + //url: "http://localhost:5400/api" + url: "https://diunabi-morska.bim-it.pl/api" }, google: { clientId: "107631825312-bkfe438ehr9k9ecb2h76g802tj6advma.apps.googleusercontent.com" diff --git a/WebAPI/Controllers/LayersController.cs b/WebAPI/Controllers/LayersController.cs index 7fb6b04..bab01c2 100644 --- a/WebAPI/Controllers/LayersController.cs +++ b/WebAPI/Controllers/LayersController.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using WebAPI.dataParsers; -using WebAPI.dataProcessors; +using WebAPI.dataProcessors; using WebAPI.Exports; using WebAPI.Models; @@ -43,6 +43,7 @@ namespace WebAPI.Controllers { if (codes != null && codes.Length > 0) { + return Ok(db.Layers.Where(x => !x.IsDeleted) .Where(x => codes.Select(Int32.Parse).ToList().Contains(x.Number)) .OrderByDescending(x => x.Number) @@ -173,8 +174,8 @@ namespace WebAPI.Controllers return BadRequest(e.ToString()); } return Ok(); - } - + } + [HttpGet] [Route("AutoProcess/{apiKey}")] [AllowAnonymous] @@ -199,73 +200,73 @@ namespace WebAPI.Controllers foreach (Layer processWorker in processWorkerLayers) { string? sourceName = processWorker?.Records?.Single(x => x.Code == "Source")?.Desc1; - if (sourceName == null) - { - logsController.AddEntry(new LogEntry - { - Title = "Process error", - Type = LogEntryType.error, - LogType = LogType.import, - Message = processWorker?.Name + " Source record not found", - CreatedAt = DateTime.UtcNow - }); - return BadRequest(); - } else + if (sourceName == null) { - Layer sourceLayer = db.Layers.Include(x => x.Records) - .Single(x => x.Name == sourceName); - if (sourceLayer == null) - { - logsController.AddEntry(new LogEntry - { - Title = "Process error", - Type = LogEntryType.error, - LogType = LogType.import, - Message = processWorker?.Name + " Source layer not found " + sourceLayer, - CreatedAt = DateTime.UtcNow - }); - return BadRequest(); - } else - { - string startDate = sourceLayer.Records!.Where(x => x.Code == "StartDate").First().Desc1!; + logsController.AddEntry(new LogEntry + { + Title = "Process error", + Type = LogEntryType.error, + LogType = LogType.import, + Message = processWorker?.Name + " Source record not found", + CreatedAt = DateTime.UtcNow + }); + return BadRequest(); + } else + { + Layer sourceLayer = db.Layers.Include(x => x.Records) + .Single(x => x.Name == sourceName); + if (sourceLayer == null) + { + logsController.AddEntry(new LogEntry + { + Title = "Process error", + Type = LogEntryType.error, + LogType = LogType.import, + Message = processWorker?.Name + " Source layer not found " + sourceLayer, + CreatedAt = DateTime.UtcNow + }); + return BadRequest(); + } else + { + string startDate = sourceLayer.Records!.Where(x => x.Code == "StartDate").First().Desc1!; string endDate = sourceLayer.Records!.Where(x => x.Code == "EndDate").First().Desc1!; - var startDateParsed = DateTime.ParseExact(startDate, "yyyy.MM.dd", null); - var endDateParsed = DateTime.ParseExact(endDate, "yyyy.MM.dd", null); - if (startDateParsed.Date <= DateTime.UtcNow.Date && endDateParsed.Date >= DateTime.UtcNow.Date) - { - string? processType = processWorker?.Records?.Single(x => x.Code == "ProcessType")?.Desc1; - if (processType == null) - { - logsController.AddEntry(new LogEntry - { - Title = "Process error", - Type = LogEntryType.error, - LogType = LogType.import, - Message = processWorker?.Name + " ProcessType record not found", - CreatedAt = DateTime.UtcNow - }); - return BadRequest(); - } else - { - Layer? processedLayer = null; - switch (processType) - { - case "Copy": - CopyProcessor cp = new CopyProcessor(db, googleSheetValues); - processedLayer = cp.process(sourceLayer, processWorker?.Id); - break; - case "Deaggregation": - DeaggregationProcessor dp = new DeaggregationProcessor(db, googleSheetValues); - processedLayer = dp.process(sourceLayer, processWorker?.Id); - break; - } - if (processedLayer != null) - { - AddLayer(processedLayer, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); - } - } - } - } + var startDateParsed = DateTime.ParseExact(startDate, "yyyy.MM.dd", null); + var endDateParsed = DateTime.ParseExact(endDate, "yyyy.MM.dd", null); + if (startDateParsed.Date <= DateTime.UtcNow.Date && endDateParsed.Date >= DateTime.UtcNow.Date) + { + string? processType = processWorker?.Records?.Single(x => x.Code == "ProcessType")?.Desc1; + if (processType == null) + { + logsController.AddEntry(new LogEntry + { + Title = "Process error", + Type = LogEntryType.error, + LogType = LogType.import, + Message = processWorker?.Name + " ProcessType record not found", + CreatedAt = DateTime.UtcNow + }); + return BadRequest(); + } else + { + Layer? processedLayer = null; + switch (processType) + { + case "Copy": + CopyProcessor cp = new CopyProcessor(db, googleSheetValues); + processedLayer = cp.process(sourceLayer, processWorker?.Id); + break; + case "Deaggregation": + DeaggregationProcessor dp = new DeaggregationProcessor(db, googleSheetValues); + processedLayer = dp.process(sourceLayer, processWorker?.Id); + break; + } + if (processedLayer != null) + { + AddLayer(processedLayer, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); + } + } + } + } } } return Ok(); @@ -282,9 +283,9 @@ namespace WebAPI.Controllers }); return BadRequest(e.ToString()); } - } - - + } + + [HttpGet] [Route("checkDates")] public IActionResult checkDates() @@ -420,7 +421,7 @@ namespace WebAPI.Controllers { throw; } - } + } private void SaveSources(ICollection sources) { try