diff --git a/Frontend/src/app/main-view/main-view.component.html b/Frontend/src/app/main-view/main-view.component.html index 99239e5..17772b5 100644 --- a/Frontend/src/app/main-view/main-view.component.html +++ b/Frontend/src/app/main-view/main-view.component.html @@ -12,7 +12,7 @@ -

DiunaBI {{environment.appTitle}}

+

DiunaBI {{environment.appEnvironment}}

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 07e4e99..067aab4 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 @@ -42,6 +42,11 @@ {{item.value | number:'1.2-2'}} + + Konto + {{item.desc1}} + + 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 d8000fc..ecc7286 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 @@ -10,6 +10,7 @@ import { Router, ActivatedRoute } from '@angular/router'; import { AuthService } from 'src/app/auth/auth.service'; import { Layer } from 'src/app/models/layer.model'; import { Record } from 'src/app/models/record.model'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-layer-detail', @@ -21,7 +22,7 @@ export class LayerDetailComponent implements OnInit { public form!: UntypedFormGroup; public document!: Layer; - displayedColumns = ['code', 'value']; + displayedColumns = environment.views.layers.recordColumns.split("|"); dataSource!: MatTableDataSource; @ViewChild(MatSort) sort!: MatSort; diff --git a/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.ts b/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.ts index 24896a0..87c2225 100644 --- a/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.ts +++ b/Frontend/src/app/modules/layers/layer-edit/layer-edit.component.ts @@ -9,6 +9,7 @@ import moment from 'moment'; import { AuthService } from 'src/app/auth/auth.service'; import { Layer } from 'src/app/models/layer.model'; import { Record } from 'src/app/models/record.model'; +import { environment } from 'src/environments/environment'; import { v4 as uuidv4 } from 'uuid'; @Component({ @@ -21,7 +22,7 @@ export class LayerEditComponent implements OnInit { public form!: UntypedFormGroup; private document!: Layer; - displayedColumns = ['code', 'value', 'desc1']; + displayedColumns = environment.views.layers.recordColumns.split("|"); dataSource!: MatTableDataSource; @ViewChild(MatSort) sort!: MatSort; diff --git a/Frontend/src/environments/environment.prod.ts b/Frontend/src/environments/environment.prod.ts index df4a7da..ebb13a2 100644 --- a/Frontend/src/environments/environment.prod.ts +++ b/Frontend/src/environments/environment.prod.ts @@ -1,10 +1,15 @@ export const environment = { - appTitle: "#{appTitle}#", + appEnvironment: "#{app-environment}#", production: true, api: { - url: "https://diunabi.bim-it.pl/api" + url: "#{api-url}#" }, google: { - clientId: "107631825312-bkfe438ehr9k9ecb2h76g802tj6advma.apps.googleusercontent.com" + clientId: "#{google-frontend-client-id}#" + }, + views: { + layers: { + recordColumns: "#{views-layers-recordColumns}#" + } } -}; +}; \ No newline at end of file diff --git a/Frontend/src/environments/environment.ts b/Frontend/src/environments/environment.ts index 4f5d823..a1bc68a 100644 --- a/Frontend/src/environments/environment.ts +++ b/Frontend/src/environments/environment.ts @@ -3,7 +3,7 @@ // The list of file replacements can be found in `angular.json`. export const environment = { - appTitle: "DEV", + appEnvironment: "local", production: false, api: { //url: "http://localhost:5400/api" @@ -11,6 +11,11 @@ export const environment = { }, google: { clientId: "107631825312-bkfe438ehr9k9ecb2h76g802tj6advma.apps.googleusercontent.com" + }, + views: { + layers: { + recordColumns: "code|value|desc1" + } } }; diff --git a/WebAPI/DiunaBI-WebAPI.csproj b/WebAPI/DiunaBI-WebAPI.csproj index 6e91ac7..baefb4e 100644 --- a/WebAPI/DiunaBI-WebAPI.csproj +++ b/WebAPI/DiunaBI-WebAPI.csproj @@ -22,4 +22,12 @@ + + + PreserveNewest + true + PreserveNewest + + +