diff --git a/frontend/src/app/core/services/font-accessibility.service.ts b/frontend/src/app/core/services/font-accessibility.service.ts index b78d0e269..db92eaf4d 100644 --- a/frontend/src/app/core/services/font-accessibility.service.ts +++ b/frontend/src/app/core/services/font-accessibility.service.ts @@ -1,17 +1,16 @@ -import { Injectable, Signal, signal } from '@angular/core'; +import { computed, Injectable, Signal, signal } from '@angular/core'; @Injectable() export class FontAccessibilityService { private _accessibleFontSignal = signal(false); - get accessibleFontSignal(): Signal { - return this._accessibleFontSignal; + public accessibleFontSignal = computed(() => this._accessibleFontSignal()) + + constructor() { + this._accessibleFontSignal.set(localStorage.getItem('largeText') === 'true'); } - - constructor() { } - public isLargeText(): boolean { - return this.accessibleFontSignal(); + return this._accessibleFontSignal(); } public toggleFontSize(){ diff --git a/frontend/src/app/ui/dashboard/dashboard.component.html b/frontend/src/app/ui/dashboard/dashboard.component.html index d6057ade9..b9bd19de1 100644 --- a/frontend/src/app/ui/dashboard/dashboard.component.html +++ b/frontend/src/app/ui/dashboard/dashboard.component.html @@ -172,7 +172,7 @@ close
-

{{'DASHBOARD.TITLE' | translate}}

+

{{'DASHBOARD.TITLE' | translate}}

{{'DASHBOARD.INFO-TEXT' | translate}}

diff --git a/frontend/src/app/ui/dashboard/dashboard.component.scss b/frontend/src/app/ui/dashboard/dashboard.component.scss index 4b28f6550..e54aaf194 100644 --- a/frontend/src/app/ui/dashboard/dashboard.component.scss +++ b/frontend/src/app/ui/dashboard/dashboard.component.scss @@ -363,3 +363,7 @@ mat-tab-group.my-mat-tab .mat-mdc-tab-header .mat-mdc-tab-label-container .mat-m right: 0; bottom: 0; } + +.dashboard-title { + font-size: 1.125rem; //h4 +} \ No newline at end of file diff --git a/frontend/src/app/ui/description/editor/description-editor.component.html b/frontend/src/app/ui/description/editor/description-editor.component.html index 1ce734102..17bcb9417 100644 --- a/frontend/src/app/ui/description/editor/description-editor.component.html +++ b/frontend/src/app/ui/description/editor/description-editor.component.html @@ -130,7 +130,7 @@
-
+
diff --git a/frontend/src/app/ui/description/editor/description-editor.component.scss b/frontend/src/app/ui/description/editor/description-editor.component.scss index 71d388d94..18201658f 100644 --- a/frontend/src/app/ui/description/editor/description-editor.component.scss +++ b/frontend/src/app/ui/description/editor/description-editor.component.scss @@ -206,7 +206,7 @@ .stepper-options { flex: 1; - max-height: calc(100vh - 32rem); + max-height: calc(100vh - 38rem); overflow-y: auto; .main-info { color: var(--dark-gray)94; diff --git a/frontend/src/app/ui/description/editor/description-form/description-form.component.scss b/frontend/src/app/ui/description/editor/description-form/description-form.component.scss index 65fd9b975..5741291c5 100644 --- a/frontend/src/app/ui/description/editor/description-form/description-form.component.scss +++ b/frontend/src/app/ui/description/editor/description-form/description-form.component.scss @@ -15,7 +15,7 @@ letter-spacing: 0px; color: var(--dark-gray); opacity: 1; - margin: 3rem 0rem 3rem 0rem; + margin: 2rem 0rem 2rem 0rem; } .dynamic-form-editor { diff --git a/frontend/src/app/ui/description/editor/description-form/visibility-rules/visibility-rules.service.ts b/frontend/src/app/ui/description/editor/description-form/visibility-rules/visibility-rules.service.ts index 519ba968e..a4d38c0f8 100644 --- a/frontend/src/app/ui/description/editor/description-form/visibility-rules/visibility-rules.service.ts +++ b/frontend/src/app/ui/description/editor/description-form/visibility-rules/visibility-rules.service.ts @@ -649,7 +649,7 @@ export class VisibilityRulesService { for (let j = 0; j < propertyDefinitionFieldSet.items.length; j++) { const definitionFieldSetItem = propertyDefinitionFieldSet.items[j]; const fieldKey = this.buildVisibilityKey(fieldSetEntity.id, definitionFieldSetItem.ordinal); - const isCurrentHidden = !this._isVisibleMap[fieldKey] ?? false; + const isCurrentHidden = !this._isVisibleMap[fieldKey]; isHidden = isHidden && isCurrentHidden; } } diff --git a/frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.html b/frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.html index a11813ee4..b87d33283 100644 --- a/frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.html +++ b/frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.html @@ -34,7 +34,7 @@ . {{ 'PLAN-LISTING.GRANT' | translate }}: {{referenceService.getReferencesForTypesFirstSafe(plan?.planReferences, [this.referenceTypeService.getGrantReferenceType()])?.reference?.label}}
-
{{'PLAN-LISTING.CONTAINED-DESCRIPTIONS' | translate}}: ({{ plan.descriptions?.length }}) +
{{'PLAN-LISTING.CONTAINED-DESCRIPTIONS' | translate}}: ({{ plan.descriptions?.length ?? 0 }})
diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html index 43440c71a..e31a196d5 100644 --- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html +++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html @@ -102,13 +102,16 @@ {{'PLAN-EDITOR.FIELDS.BLUEPRINT' | translate}} - + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} +
-
diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts index 1d7ce273c..d5754036a 100644 --- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts +++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts @@ -568,6 +568,10 @@ export class PlanEditorComponent extends BaseEditor imple // // selectBlueprint() { + if(!(this.formGroup.get('blueprint').value && this.formGroup.get('label').value)){ + this.formGroup.markAllAsTouched(); + return; + } this.planBlueprintService.getSingle(this.formGroup.get('blueprint').value, PlanEditorEntityResolver.blueprintLookupFields()).pipe(takeUntil(this._destroyed)) .subscribe(data => { this.selectedBlueprint = data;