diff --git a/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.html b/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.html index d77a0bd..cd4b433 100644 --- a/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.html +++ b/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.html @@ -1,7 +1,11 @@
- - Layer details + + + Layer details + + +   @@ -21,15 +25,16 @@
- + Created - +
- +
@@ -41,7 +46,7 @@ - + diff --git a/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.ts b/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.ts index abcff40..18127f9 100644 --- a/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.ts +++ b/Frontend/src/app/modules/layers/layer-detail/layer-detail.component.ts @@ -13,7 +13,6 @@ import { MatInputModule } from '@angular/material/input'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatButtonModule } from '@angular/material/button'; -import { MatToolbarModule } from '@angular/material/toolbar'; import { MatCardModule } from '@angular/material/card'; @Component({ @@ -21,7 +20,7 @@ import { MatCardModule } from '@angular/material/card'; templateUrl: './layer-detail.component.html', styleUrls: ['./layer-detail.component.scss'], standalone: true, - imports: [FormsModule, ReactiveFormsModule, MatCardModule, MatToolbarModule, + imports: [FormsModule, ReactiveFormsModule, MatCardModule, MatButtonModule, MatGridListModule, MatFormFieldModule, MatInputModule, NgIf, MatTableModule, MatSortModule, DecimalPipe, JsonPipe], providers: [DatePipe] 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 10669c4..d457d55 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 @@ -59,9 +59,6 @@ export class LayersListComponent implements OnInit { this.start = this.end; this.end = this.limit + this.start; } - trackByUid(index : number, item : Layer) { - return item.id; - } async removeCode(code: string) { const index = this.codes.indexOf(code); if (index >= 0) { diff --git a/Frontend/src/app/views/main/main-view.component.html b/Frontend/src/app/views/main/main-view.component.html index 9eee333..72642c6 100644 --- a/Frontend/src/app/views/main/main-view.component.html +++ b/Frontend/src/app/views/main/main-view.component.html @@ -12,6 +12,10 @@ + +  {{appVersion}} + +
 © DiunaBI {{currentDate | date: 'yyyy'}} @@ -21,7 +25,6 @@ menu {{environment.appName}} -  {{appVersion}}
account_circle diff --git a/Frontend/src/app/views/main/main-view.component.scss b/Frontend/src/app/views/main/main-view.component.scss index 566232c..643821e 100644 --- a/Frontend/src/app/views/main/main-view.component.scss +++ b/Frontend/src/app/views/main/main-view.component.scss @@ -39,29 +39,11 @@ flex: 1; } -.fill-to-right { - flex: 1 1 auto; -} - .logo { height: 4vh; margin: 5px; } -.sidenav-content { - flex-direction: column; -} - -.mat-toolbar.mat-primary { - color: white; -} - -.app-content { - flex: 1; - margin: 0 auto; - padding: 2em; -} - .profile-photo-small { border-radius: 50%; } diff --git a/Frontend/src/environments/environment.ts b/Frontend/src/environments/environment.ts index b437f72..bfda47e 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 59992ec..0ad9fcb 100644 --- a/WebAPI/Controllers/LayersController.cs +++ b/WebAPI/Controllers/LayersController.cs @@ -112,10 +112,10 @@ namespace WebAPI.Controllers public IActionResult ExportToGoogleSheet(Guid id) { Layer layer = db.Layers - .Include(x => x.Records) + .Include(x => x.Records!.OrderByDescending(x => x.Code)) .Where(x => x.Id == id && !x.IsDeleted).First(); - var export = new googleSheetExport(googleDriveHelper, googleSheetValues); + var export = new googleSheetExport(googleDriveHelper, googleSheetValues, configuration); export.export(layer); return Ok(true); } diff --git a/WebAPI/Exports/googleSheet.export.cs b/WebAPI/Exports/googleSheet.export.cs index 2b50f4e..1fc61ce 100644 --- a/WebAPI/Exports/googleSheet.export.cs +++ b/WebAPI/Exports/googleSheet.export.cs @@ -1,4 +1,5 @@ -using Google.Apis.Drive.v3.Data; +using System.Globalization; +using Google.Apis.Drive.v3.Data; using Google.Apis.Sheets.v4; using Google.Apis.Sheets.v4.Data; using WebAPI.Models; @@ -10,10 +11,15 @@ namespace WebAPI.Exports { private GoogleDriveHelper googleDriveHelper; private SpreadsheetsResource.ValuesResource googleSheetValues; - public googleSheetExport(GoogleDriveHelper _googleDriveHelper, SpreadsheetsResource.ValuesResource _googleSheetValues) + private readonly IConfiguration configuration; + public googleSheetExport( + GoogleDriveHelper _googleDriveHelper, + SpreadsheetsResource.ValuesResource _googleSheetValues, + IConfiguration _configuration) { googleDriveHelper = _googleDriveHelper; googleSheetValues = _googleSheetValues; + configuration = _configuration; } public void export(Layer layer) { @@ -26,9 +32,9 @@ namespace WebAPI.Exports } Google.Apis.Drive.v3.Data.File body = new Google.Apis.Drive.v3.Data.File(); - body.Name = $"export-{DateTime.Now}"; + body.Name = $"{DateTime.Now.ToString(new CultureInfo("pl-PL"))}"; body.MimeType = "application/vnd.google-apps.spreadsheet"; - body.Parents = new List { "1c5GBQmsIoj6a9L-JYFTaLEZ3EfkbQHPt" }; + body.Parents = new List { configuration["exportDirectory"] }; CreateRequest request = googleDriveHelper.Service.Files.Create(body); var file = request.Execute(); diff --git a/WebAPI/appsettings.Development.json b/WebAPI/appsettings.Development.json index c383e23..9f39862 100644 --- a/WebAPI/appsettings.Development.json +++ b/WebAPI/appsettings.Development.json @@ -13,6 +13,7 @@ "GoogleClientId": "107631825312-bkfe438ehr9k9ecb2h76g802tj6advma.apps.googleusercontent.com", "Secret": "8393AF8EAEF8478CB738D44858690F9C7E2D19F65896DD9FBAA3EB2A6F493E80", "apiKey": "10763478CB738D4ecb2h76g803478CB738D4e", + "exportDirectory": "1eTyCUzYbzVQB8f8sbNmvnebFXyW2-axt", "Kestrel": { "Endpoints": { "Http": { diff --git a/WebAPI/appsettings.json b/WebAPI/appsettings.json index 4e04811..5d559f2 100644 --- a/WebAPI/appsettings.json +++ b/WebAPI/appsettings.json @@ -13,6 +13,7 @@ "GoogleClientId": "#{google-backend-login-client-id}#", "Secret": "#{google-backend-login-secret}#", "apiKey": "#{api-key}#", + "exportDirectory": "#{export-directory}#", "Kestrel": { "Endpoints": { "Http": {
Code {{row.code}} {{row.value1 | number:'1.2-2'}} {{valueSum | number:'1.2-2'}}