diff --git a/Frontend/src/app/main-view/main-view.component.scss b/Frontend/src/app/main-view/main-view.component.scss index f184863..8632981 100644 --- a/Frontend/src/app/main-view/main-view.component.scss +++ b/Frontend/src/app/main-view/main-view.component.scss @@ -20,12 +20,7 @@ mat-nav-list.menu-sublist { mat-nav-list.menu-sublist > a { font-size: small; } -div.footer { - text-align: right; - font-size: smaller; - color: gray; - padding-right: 5px; -} + .fill-to-right { flex: 1 1 auto; } @@ -38,45 +33,6 @@ h1.topbar-app-name { mat-sidenav { width: 200px; } -.list-container { - display: flex; - flex-direction: column; - min-width: 300px; - height: 98%; -} -.top-list-container { - display: flex; - flex-direction: column; - min-width: 30vh; - height: 54vh; -} -.bottom-list-container { - display: flex; - flex-direction: column; - height: 35vh; -} -.table { - overflow: auto; - height: 100%; -} -.list-header { - min-height: 50px; - padding: 4px 12px 0; -} -.mat-mdc-form-field { - font-size: 14px; - width: 100%; -} -mat-form-field.detail-input { - width: 90%; - text-align: left; - color: black; -} -mat-form-field.detail-input-full-width { - width: 96%; - text-align: left; - color: black; -} input[disabled] { color: black; -webkit-text-fill-color: black; 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 e5495f1..d55fa7c 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,56 +1,60 @@ -
-
- - - Layer details - - - - - - - Name - - - + + + + Layer details + + +
+
+ + Name + + +
+
+ + Source + + +
+
+
+
+ + Created + + +
+
+
- - - Source - - - - - - Created - - - -
+ + + Code + {{item.code}} + - + + Value + {{item.value1 | number:'1.2-2'}} + + - - Code - {{item.code}} - + + Account + {{item.desc1}} + - - Value - {{item.value | number:'1.2-2'}} - + + + + - - Account - {{item.desc1}} - - - - - - Checksum: {{valueSum}} -
-
-
-
\ No newline at end of file + + + \ No newline at end of file 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 58f6f49..4e160c6 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 @@ -2,7 +2,7 @@ import { DatePipe, NgIf, DecimalPipe } from '@angular/common'; import { HttpClient } from '@angular/common/http'; import { Component, OnInit, ViewChild } from '@angular/core'; import { UntypedFormGroup, UntypedFormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MatSort, MatSortable, MatSortModule } from '@angular/material/sort'; +import { MatSort, MatSortModule } from '@angular/material/sort'; import { MatTableDataSource, MatTableModule } from '@angular/material/table'; import { ActivatedRoute } from '@angular/router'; import { Layer } from 'src/app/models/layer.model'; @@ -54,7 +54,7 @@ export class LayerDetailComponent implements OnInit { this.document.fillForm(this.form); this.form.disable(); this.document.created = `${this.datePipe.transform(this.document.createdAt?.toDate(), 'short')}, ${this.document.createdBy?.userName}`; - this.dataSource.sort.sort({ id: 'code', start: 'desc' } as MatSortable); + // this.dataSource.sort.sort({ id: 'code', start: 'desc' } as MatSortable); this.valueSum = this.document.records.map(t => t.value1 || 0).reduce((acc, value) => acc + value, 0); } private async load(): Promise { diff --git a/Frontend/src/environments/environment.ts b/Frontend/src/environments/environment.ts index bd5c6e0..de9ded8 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/Frontend/src/styles.scss b/Frontend/src/styles.scss index 4e60916..b266c9e 100644 --- a/Frontend/src/styles.scss +++ b/Frontend/src/styles.scss @@ -56,4 +56,27 @@ body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; } width: var(--avatar-size); vertical-align: middle; margin-right: 10px; + } + + .form-card { + min-width: 120px; + margin: 20px auto; + } + + .full-width { + width: 100%; + } + + .row { + display: flex; + flex-direction: row; + } + + .col { + flex: 1; + margin-right: 20px; + } + + .col:last-child { + margin-right: 0; } \ No newline at end of file