From 8f906885e2e4bc92dd466f96fcc8be1254beaa56 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Tue, 6 Aug 2024 18:34:30 +0200 Subject: [PATCH 01/17] filter and multiselect dialog fix --- .../app/filter-dialog/filter-dialog.component.css | 13 ++++++------- .../multiselect-autocomplete.component.css | 11 +---------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.css b/frontend/src/app/filter-dialog/filter-dialog.component.css index a5c6bd0..b8af782 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.css +++ b/frontend/src/app/filter-dialog/filter-dialog.component.css @@ -1,5 +1,4 @@ .container { - width: 100%; display: flex; flex-direction: row; justify-content: center; @@ -10,8 +9,8 @@ } .filterBox { - width: 90%; align-self: center; + padding: 30px; } .buttonBox { @@ -23,10 +22,10 @@ .dot-badge { background-color: #00a79d; color: #00a79d; - width: 10px; - /* Breite des Punkts */ - height: 10px; - /* Höhe des Punkts */ + margin-left: 2px; + margin-bottom: 2px; + padding: 4px; border-radius: 50%; /* Rundung des Punkts */ -} \ No newline at end of file +} + diff --git a/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.css b/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.css index 6a868f0..6fbf9b8 100644 --- a/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.css +++ b/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.css @@ -6,11 +6,6 @@ min-height: 3em; } -.custom-form-field { - height: 56px; - align-items: center; -} - .custom-form-field .form-field-container { display: flex; align-items: center; @@ -18,10 +13,6 @@ } .custom-form-field input[matInput] { - flex: 1; - margin-left: 8px; -} -.custom-form-field mat-checkbox { - margin-right: 8px; + line-height: 1; } From 6534ddb5e702ed8971f14fb741a001b167b77521 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 7 Aug 2024 11:51:24 +0200 Subject: [PATCH 02/17] intervall filter lokalisiert --- .../app/filter-dialog/filter-dialog.component.html | 7 +++---- frontend/src/app/language.service.ts | 13 ++++++++++--- .../multiselect-autocomplete.component.css | 10 ++++++++++ .../multiselect-autocomplete.component.html | 4 ++-- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.html b/frontend/src/app/filter-dialog/filter-dialog.component.html index 2e60ff8..80d98b3 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.html +++ b/frontend/src/app/filter-dialog/filter-dialog.component.html @@ -108,13 +108,12 @@ - Intervall{{this.languageService.lMap.get('filterDilogIntervalTitle')}} - Pakete mit Intervall > ein Jahr + {{this.languageService.lMap.get('filterDialogInterval')}} - Zeige nur Pakete - mit Intervall > 1 Jahr! + {{this.languageService.lMap.get('filterDialogIntervalCheck')}} diff --git a/frontend/src/app/language.service.ts b/frontend/src/app/language.service.ts index 71d6215..28d0593 100644 --- a/frontend/src/app/language.service.ts +++ b/frontend/src/app/language.service.ts @@ -124,6 +124,7 @@ export class LanguageService { this.deMap.set('filterDilogPaketTypeText', 'einen oder mehrere, exakte Eingabe'); this.deMap.set('filterDilogDate', 'Datum'); this.deMap.set('filterDilogDateText', 'Geplantes Start-Datum: Von / Bis'); + this.deMap.set('filterDilogIntervalTitle', 'Intervall'); this.deMap.set('filterDilogSearchText', 'Text durchsuchen'); this.deMap.set('filterDialogSearchSg', 'Supportgruppe suchen & auswählen'); @@ -134,17 +135,18 @@ export class LanguageService { this.deMap.set('filterDilogSearchTo', 'Bis'); this.enMap.set('filterDialogShortDesc', 'Short description'); - this.enMap.set('filterDialogShortDescText', 'entering a text part filters all matching packages'); + this.enMap.set('filterDialogShortDescText', 'Entering a text part filters all matching packages'); this.enMap.set('filterDilogSg', 'Support group'); - this.enMap.set('filterDilogSgText', 'in the role of planning IH or cost manager (one)'); + this.enMap.set('filterDilogSgText', 'In the role of planning IH or cost manager (one)'); this.enMap.set('filterDilogState', 'State'); - this.enMap.set('filterDilogStateText', '(one or more) of the package'); + this.enMap.set('filterDilogStateText', '(One or more) of the package'); this.enMap.set('filterDilogContract', 'Contract'); this.enMap.set('filterDilogContractText', 'Contract / provider cluster (one or more)'); this.enMap.set('filterDilogPaketType', 'Package type'); this.enMap.set('filterDilogPaketTypeText', 'one or more, exact input'); this.enMap.set('filterDilogDate', 'Date'); this.enMap.set('filterDilogDateText', 'Planned start date: from / to'); + this.enMap.set('filterDilogIntervalTitle', 'Interval'); this.enMap.set('filterDilogSearchText', 'Text search'); this.enMap.set('filterDialogSearchSg', 'Search & select support group'); @@ -154,6 +156,11 @@ export class LanguageService { this.enMap.set('filterDilogSearchFrom', 'From'); this.enMap.set('filterDilogSearchTo', 'Until'); + this.enMap.set('filterDialogInterval', 'Packages with interval > one year'); + this.deMap.set('filterDialogInterval', 'Pakete mit Intervall > ein Jahr'); + this.enMap.set('filterDialogIntervalCheck', 'Show only packages with interval > one year!'); + this.deMap.set('filterDialogIntervalCheck', 'Zeige nur Pakete mit Intervall > ein Jahr!'); + this.enMap.set('filterDilogButton', 'Apply Filters'); this.deMap.set('filterDilogButton', 'Filter anwenden'); this.deMap.set('filterDialogCancel', 'Abbrechen'); diff --git a/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.css b/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.css index 6fbf9b8..86bb7e3 100644 --- a/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.css +++ b/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.css @@ -16,3 +16,13 @@ line-height: 1; } + +mat-chip { + display: flex; + align-items: center; + vertical-align: middle; + line-height: 1; +} +mat-icon { + vertical-align: middle; +} \ No newline at end of file diff --git a/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.html b/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.html index ce3ede5..54bb84f 100644 --- a/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.html +++ b/frontend/src/app/multiselect-autocomplete/multiselect-autocomplete.component.html @@ -1,12 +1,12 @@
- + {{ select.item }} cancel - ... + ... {{selectData.length-20}} weitere From cad1e6f1710233248adcc976a36d84c33390bc2d Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 7 Aug 2024 17:47:26 +0200 Subject: [PATCH 03/17] saved --- .../src/app/filter-dialog/filter-dialog.component.css | 4 ++-- .../app/filter-dialog/filter-dialog.component.html | 11 +++++++---- frontend/src/theme.scss | 6 +++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.css b/frontend/src/app/filter-dialog/filter-dialog.component.css index b8af782..a655c0f 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.css +++ b/frontend/src/app/filter-dialog/filter-dialog.component.css @@ -1,7 +1,7 @@ .container { - display: flex; + /* display: flex; flex-direction: row; - justify-content: center; + justify-content: center; */ } .filterHeading { diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.html b/frontend/src/app/filter-dialog/filter-dialog.component.html index 80d98b3..88bbb60 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.html +++ b/frontend/src/app/filter-dialog/filter-dialog.component.html @@ -173,10 +173,13 @@

-->
- - + + +
\ No newline at end of file diff --git a/frontend/src/theme.scss b/frontend/src/theme.scss index 73af48a..f9d0384 100644 --- a/frontend/src/theme.scss +++ b/frontend/src/theme.scss @@ -13,4 +13,8 @@ $my-theme: mat-light-theme($my-primary, $my-accent, $my-warn); background-color: blue !important; /* Use !important as a last resort */ color: white; } - \ No newline at end of file + + +* { + font-family: 'Helvetica'; +} \ No newline at end of file From 4b2c1e6bbc1500ce9126fa5ba67f0762a7a5efbb Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 7 Aug 2024 17:56:11 +0200 Subject: [PATCH 04/17] placement fixes, fonts adjustment --- .../src/app/ntt-gantt/ntt-gantt.component.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 7bf256e..4882447 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -1,6 +1,6 @@ -
+
-

W&I Kalender

+

W&I Kalender

@@ -30,7 +30,7 @@ --> - -
+

+ style="font-weight: 100; display: flex; align-items: center; gap: 5px; color: rgba(0, 0, 0, 0.845);"> verified_user{{this.userId}}

verified_user RSSO Auth Failed

verified_user RSSO: initializing

From 0adfa94f7b091ae0301414e8e6946c88adf59006 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 7 Aug 2024 18:17:17 +0200 Subject: [PATCH 05/17] removed fonts --- .../delete-preset-dialog.component.html | 2 +- .../filter-dialog/filter-dialog.component.css | 1 - .../implementer-dialog.component.html | 2 +- .../src/app/ntt-gantt/ntt-gantt.component.css | 5 ---- .../app/ntt-gantt/ntt-gantt.component.html | 8 +++---- .../rename-preset-dialog.component.html | 2 +- .../save-preset-under-dialog.component.html | 2 +- .../state-dialog/state-dialog.component.html | 2 +- frontend/src/styles.css | 24 +++++++++++++------ 9 files changed, 26 insertions(+), 22 deletions(-) diff --git a/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html b/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html index 571b31f..d3ac287 100644 --- a/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html +++ b/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html @@ -1,4 +1,4 @@ -

Möchten Sie das Preset {{preset.name}} wirklich löschen?

+

Möchten Sie das Preset {{preset.name}} wirklich löschen?

diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.css b/frontend/src/app/filter-dialog/filter-dialog.component.css index a655c0f..dbdcc8d 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.css +++ b/frontend/src/app/filter-dialog/filter-dialog.component.css @@ -5,7 +5,6 @@ } .filterHeading { - font-family: Roboto; } .filterBox { diff --git a/frontend/src/app/implementer-dialog/implementer-dialog.component.html b/frontend/src/app/implementer-dialog/implementer-dialog.component.html index f2ccd70..fd2c65f 100644 --- a/frontend/src/app/implementer-dialog/implementer-dialog.component.html +++ b/frontend/src/app/implementer-dialog/implementer-dialog.component.html @@ -1,4 +1,4 @@ -

{{this.languageService.lMap.get('implementerDialogHeading')}}

+

{{this.languageService.lMap.get('implementerDialogHeading')}}

{{this.languageService.lMap.get('implementerDialogLabel')}} diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.css b/frontend/src/app/ntt-gantt/ntt-gantt.component.css index 05edb88..afb6461 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.css +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.css @@ -15,7 +15,6 @@ color: rgba(41, 46, 50, 0.8); padding-left: 10px; padding-right: 10px; - font-family: Arial, Helvetica, sans-serif; display: flex; justify-content: space-between; align-items: center; @@ -199,8 +198,6 @@ justify-content: center; height: 70%; font-weight: 500; - font-size: 13px; - font-family: Arial, Helvetica, sans-serif; gap: 8px; user-select: none; padding-left: 10px; @@ -456,8 +453,6 @@ .legend { width: 100%; - font-family: Arial, sans-serif; - font-size: 13px; gap: 4px; background-color: rgb(210, 217, 224); padding: 10px; diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 4882447..a1298c7 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -3,7 +3,7 @@

W&I Kalender

-
+
@@ -107,7 +107,7 @@
- @@ -117,8 +117,8 @@
-
+
diff --git a/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html b/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html index 149dc62..027c42e 100644 --- a/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html +++ b/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html @@ -1,4 +1,4 @@ -

Preset {{preset.name}} umbenennen?

+

Preset {{preset.name}} umbenennen?

Preset Name diff --git a/frontend/src/app/save-preset-under-dialog/save-preset-under-dialog.component.html b/frontend/src/app/save-preset-under-dialog/save-preset-under-dialog.component.html index f0746af..dac9260 100644 --- a/frontend/src/app/save-preset-under-dialog/save-preset-under-dialog.component.html +++ b/frontend/src/app/save-preset-under-dialog/save-preset-under-dialog.component.html @@ -1,4 +1,4 @@ -

Als neues Preset speichern?

+

Als neues Preset speichern?

Preset Name diff --git a/frontend/src/app/state-dialog/state-dialog.component.html b/frontend/src/app/state-dialog/state-dialog.component.html index af37600..4dbbf1f 100644 --- a/frontend/src/app/state-dialog/state-dialog.component.html +++ b/frontend/src/app/state-dialog/state-dialog.component.html @@ -1,4 +1,4 @@ -

{{this.languageService.lMap.get('stateDialogStateTransition')}} ({{data.changes.length}} {{data.changes.length > 1 ? 'Pakete' : 'Paket'}})

+

{{this.languageService.lMap.get('stateDialogStateTransition')}} ({{data.changes.length}} {{data.changes.length > 1 ? 'Pakete' : 'Paket'}})

{{this.languageService.lMap.get('stateDialogSelectState')}} diff --git a/frontend/src/styles.css b/frontend/src/styles.css index 84b8b28..c9cf489 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -16,27 +16,37 @@ @import "~@angular/material/prebuilt-themes/indigo-pink.css"; .green-snackbar { - background: green!important; + background: green !important; color: white; } + .green-snackbar button { - background-color: green!important; + background-color: green !important; color: white; border: none; } + .red-snackbar { - background: #F44336!important; - color: white!important; + background: #F44336 !important; + color: white !important; } + .red-snackbar button { background-color: #F44336; color: white !important; border: none; } -html, body { +html, +body { /* overflow: hidden !important; */ } -html, body { height: 100%; } -body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; } +html, +body { + height: 100%; +} + +body { + margin: 0; +} \ No newline at end of file From 0d28f190adb47b6285e7d5f05f3f9de4f4ff6e5c Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 7 Aug 2024 18:20:12 +0200 Subject: [PATCH 06/17] date picker width --- frontend/src/app/ntt-gantt/ntt-gantt.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index a1298c7..6648f50 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -118,7 +118,7 @@
-
From e0f13e18b0189fbe89f67417f8800bff8ebaa381 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 7 Aug 2024 18:33:02 +0200 Subject: [PATCH 07/17] fixed toggle --- frontend/src/app/ntt-gantt/ntt-gantt.component.css | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.css b/frontend/src/app/ntt-gantt/ntt-gantt.component.css index afb6461..c99c1e9 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.css +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.css @@ -196,7 +196,6 @@ display: flex; align-items: center; justify-content: center; - height: 70%; font-weight: 500; gap: 8px; user-select: none; From dc83c1de529a1232350c3cef68b3dfd215d4fa07 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Wed, 7 Aug 2024 19:53:36 +0200 Subject: [PATCH 08/17] fixed presets --- frontend/src/app/ntt-gantt/ntt-gantt.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 6648f50..6f7262a 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -3,10 +3,10 @@

W&I Kalender

-
+
- - + + {{preset.name}} From 7886227123a217a734ad44c0bfb20f73299eb3b2 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 8 Aug 2024 15:28:58 +0200 Subject: [PATCH 09/17] delete preset dialog --- .../delete-preset-dialog.component.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html b/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html index d3ac287..5b24c38 100644 --- a/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html +++ b/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html @@ -1,5 +1,7 @@ -

Möchten Sie das Preset {{preset.name}} wirklich löschen?

- - - - +
+

Möchten Sie das Preset {{preset.name}} wirklich löschen?

+ + + + +
From 1a7da02f180238f126d928d53d00d77d6b07eb42 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 8 Aug 2024 15:31:07 +0200 Subject: [PATCH 10/17] rename preset dialog --- .../rename-preset-dialog.component.html | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html b/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html index 027c42e..461dd27 100644 --- a/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html +++ b/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html @@ -1,9 +1,12 @@ -

Preset {{preset.name}} umbenennen?

- - Preset Name - - - - - - +
+

Preset {{preset.name}} umbenennen?

+ + Preset Name + + + + + + +
\ No newline at end of file From 8582a3e66ec531ba27d3678582d4c95fca28f849 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 8 Aug 2024 15:58:16 +0200 Subject: [PATCH 11/17] buttons --- frontend/src/app/ntt-gantt/ntt-gantt.component.css | 13 +++++++++++++ frontend/src/app/ntt-gantt/ntt-gantt.component.html | 7 ++----- frontend/src/theme.scss | 4 ++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.css b/frontend/src/app/ntt-gantt/ntt-gantt.component.css index c99c1e9..4c6b881 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.css +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.css @@ -104,6 +104,19 @@ } } + +mat-button-toggle-group { + .mat-button-toggle-checked { + background-color: #ef6c00 !important; /* Orange background */ + color: white !important; /* Text color */ + } + + .mat-button-toggle-checked:hover { + background-color: darken(#ef6c00, 10%) !important; /* Darker orange on hover */ + } +} + + .restartButton { background-color: white; border: none; diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 6f7262a..037382a 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -30,11 +30,8 @@ --> - - + + {{lang}} diff --git a/frontend/src/theme.scss b/frontend/src/theme.scss index f9d0384..eb91b94 100644 --- a/frontend/src/theme.scss +++ b/frontend/src/theme.scss @@ -7,7 +7,7 @@ $my-warn: mat-palette($mat-red, 600); $my-theme: mat-light-theme($my-primary, $my-accent, $my-warn); -@include angular-material-theme($my-theme); +// @include angular-material-theme($my-theme); .dateButton.mat-button { background-color: blue !important; /* Use !important as a last resort */ @@ -17,4 +17,4 @@ $my-theme: mat-light-theme($my-primary, $my-accent, $my-warn); * { font-family: 'Helvetica'; -} \ No newline at end of file +} From b606ab2096243b5c58b609ffc8a718618b52f35a Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 8 Aug 2024 16:01:15 +0200 Subject: [PATCH 12/17] details button --- .../src/app/ntt-gantt/ntt-gantt.component.css | 26 +++++++++++++++++++ frontend/src/theme.scss | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.css b/frontend/src/app/ntt-gantt/ntt-gantt.component.css index 4c6b881..ec1a472 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.css +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.css @@ -116,6 +116,32 @@ mat-button-toggle-group { } } +.detailsButton { + display: flex; + align-items: center; + + mat-slide-toggle.mat-primary .mat-slide-toggle-thumb { + background-color: #ef6c00 !important; /* Orange thumb */ + } + + mat-slide-toggle.mat-primary .mat-slide-toggle-bar { + background-color: rgba(239, 108, 0, 0.5) !important; /* Lighter orange bar */ + } + + mat-slide-toggle.mat-primary.mat-checked .mat-slide-toggle-thumb { + background-color: #ef6c00 !important; /* Orange thumb when checked */ + } + + mat-slide-toggle.mat-primary.mat-checked .mat-slide-toggle-bar { + background-color: #ef6c00 !important; /* Orange bar when checked */ + } + + mat-slide-toggle.mat-primary.mat-checked .mat-slide-toggle-content { + color: #ef6c00 !important; /* Text color */ + } +} + + .restartButton { background-color: white; diff --git a/frontend/src/theme.scss b/frontend/src/theme.scss index eb91b94..05fe092 100644 --- a/frontend/src/theme.scss +++ b/frontend/src/theme.scss @@ -7,7 +7,7 @@ $my-warn: mat-palette($mat-red, 600); $my-theme: mat-light-theme($my-primary, $my-accent, $my-warn); -// @include angular-material-theme($my-theme); +@include angular-material-theme($my-theme); .dateButton.mat-button { background-color: blue !important; /* Use !important as a last resort */ From 7dfb86a1e2209244f3aca163d32163f0a19711d3 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 8 Aug 2024 16:04:33 +0200 Subject: [PATCH 13/17] removed hidden overflow --- frontend/src/app/ntt-gantt/ntt-gantt.component.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.css b/frontend/src/app/ntt-gantt/ntt-gantt.component.css index ec1a472..d25700b 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.css +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.css @@ -2,7 +2,7 @@ margin: 0; padding: 0; box-sizing: border-box; - overflow: hidden; + /* overflow: hidden; */ } .splitter { @@ -104,6 +104,17 @@ } } +.detailsButton { + display: flex; + align-items: center; + padding: 8px; /* Adjust padding as needed */ + height: 40px; /* Ensure enough height for the slide toggle */ +} + +mat-slide-toggle { + margin-bottom: 0; /* Prevent margin collapse */ +} + mat-button-toggle-group { .mat-button-toggle-checked { From 0d12b0cb8a418e8e32663789dabf8ce88564198a Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 8 Aug 2024 16:17:41 +0200 Subject: [PATCH 14/17] fixed fonts in dialogs --- .../delete-preset-dialog.component.html | 6 +++--- .../rename-preset-dialog.component.html | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html b/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html index 5b24c38..c9c7aef 100644 --- a/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html +++ b/frontend/src/app/delete-preset-dialog/delete-preset-dialog.component.html @@ -1,7 +1,7 @@
-

Möchten Sie das Preset {{preset.name}} wirklich löschen?

+

Möchten Sie das Preset {{preset.name}} wirklich löschen?

- - + +
diff --git a/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html b/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html index 461dd27..5ce6bc9 100644 --- a/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html +++ b/frontend/src/app/rename-preset-dialog/rename-preset-dialog.component.html @@ -1,12 +1,11 @@
-

Preset {{preset.name}} umbenennen?

+

Preset {{preset.name}} umbenennen?

Preset Name - - + +
\ No newline at end of file From 4cc3021a471b66d68f70b3f484735bcd302e96bf Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 8 Aug 2024 16:26:39 +0200 Subject: [PATCH 15/17] font size --- frontend/src/styles.css | 2 ++ frontend/src/theme.scss | 1 + 2 files changed, 3 insertions(+) diff --git a/frontend/src/styles.css b/frontend/src/styles.css index c9cf489..29065f2 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -40,6 +40,8 @@ html, body { /* overflow: hidden !important; */ + font-family: 'Helvetica'; + font-size: 14px; } html, diff --git a/frontend/src/theme.scss b/frontend/src/theme.scss index 05fe092..6eedaa1 100644 --- a/frontend/src/theme.scss +++ b/frontend/src/theme.scss @@ -17,4 +17,5 @@ $my-theme: mat-light-theme($my-primary, $my-accent, $my-warn); * { font-family: 'Helvetica'; + font-size: 14px; } From 39d7267681bac585c47d0f37ecf132bd9038cd66 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 8 Aug 2024 18:00:38 +0200 Subject: [PATCH 16/17] adjusted padding --- frontend/src/app/ntt-gantt/ntt-gantt.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 037382a..0947b14 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -3,7 +3,7 @@

W&I Kalender

-
+
From 43714bd1b44b65a0c9b354cfae4c36e7a0e1858f Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 8 Aug 2024 18:17:13 +0200 Subject: [PATCH 17/17] state dialog fix --- .../state-dialog/state-dialog.component.html | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/frontend/src/app/state-dialog/state-dialog.component.html b/frontend/src/app/state-dialog/state-dialog.component.html index 4dbbf1f..f9e9626 100644 --- a/frontend/src/app/state-dialog/state-dialog.component.html +++ b/frontend/src/app/state-dialog/state-dialog.component.html @@ -1,17 +1,20 @@ -

{{this.languageService.lMap.get('stateDialogStateTransition')}} ({{data.changes.length}} {{data.changes.length > 1 ? 'Pakete' : 'Paket'}})

- - {{this.languageService.lMap.get('stateDialogSelectState')}} - - - {{state.viewValue}} - - - - +
+

{{this.languageService.lMap.get('stateDialogStateTransition')}} ({{data.changes.length}} {{data.changes.length > 1 ? 'Pakete' : 'Paket'}})

+ + {{this.languageService.lMap.get('stateDialogSelectState')}} + + + {{state.viewValue}} + + + + + + + + + + +
- - - - -