MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

fix on blueprint-editor required system fields

This commit is contained in:
CITE\spapacharalampous 2024-09-09 12:45:38 +03:00
parent 3fdb4f58da
commit ec1410c23e
19 changed files with 91 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html
View File

@ -187,9 +187,18 @@
</mat-form-field>
</div>
<div class="col-auto col-xl-2 section-field">
@if (isMandatorySystemField(field?.value)) {
<app-noop-checkbox
[control]="field.get('required')"
label="{{'PLAN-BLUEPRINT-EDITOR.FIELDS.FIELD-REQUIRED' | translate}}"
tooltipText="{{'PLAN-BLUEPRINT-EDITOR.FIELDS.SYSTEM-FIELD-REQUIRED' | translate}}"
></app-noop-checkbox>
}
@else {
<mat-checkbox [formControl]="field.get('required')"><span>{{'PLAN-BLUEPRINT-EDITOR.FIELDS.FIELD-REQUIRED' | translate}}</span></mat-checkbox>
<mat-error *ngIf="field.get('required').hasError('backendError')">{{field.get('required').getError('backendError').message}}</mat-error>
<mat-error *ngIf="field.get('required').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
}
<mat-error *ngIf="field.get('required').hasError('backendError')">{{field.get('required').getError('backendError').message}}</mat-error>
<mat-error *ngIf="field.get('required').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
</div>
}
<div class="col-auto col-xl-2">

6
frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.ts
View File

@ -409,6 +409,12 @@ export class PlanBlueprintEditorComponent extends BaseEditor<PlanBlueprintEditor
(this.formGroup.get('definition').get('sections') as FormArray).at(sectionIndex).get('fields').markAsDirty();
}
isMandatorySystemField(field: FieldInSectionEditorModel): boolean {
return field != null &&
field.category == this.planBlueprintSectionFieldCategory.System &&
this.alwaysRequiredSystemFieldTypes.includes(field.systemFieldType);
}
//Description Templates
isDescriptionTemplateSelected(descriptionTemplateId: number): boolean {

1
frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.model.ts
View File

@ -393,7 +393,6 @@ export class FieldInSectionEditorModel implements FieldInSectionPersist {
const required = formGroup.get('required');
if(systemFieldType != null && FieldInSectionEditorModel.alwaysRequiredSystemFieldTypes.includes(systemFieldType)){
required.setValue(true);
required.disable();
} else {
if(required.disabled){
required.enable();

4
frontend/src/app/ui/admin/plan-blueprint/plan-blueprint.module.ts
View File

@ -15,6 +15,7 @@ import { PlanBlueprintListingComponent } from './listing/plan-blueprint-listing.
import { PlanBlueprintListingFiltersComponent } from "./listing/filters/plan-blueprint-listing-filters.component";
import { ImportPlanBlueprintDialogComponent } from './listing/import-plan-blueprint/import-plan-blueprint.dialog.component';
import { DescriptionTemplatePreviewDialogModule } from '../description-template/description-template-preview/description-template-preview-dialog.module';
import { CheckboxFieldModule } from '@common/modules/checkbox-field/checkbox-field.module';
@NgModule({
imports: [
@ -29,7 +30,8 @@ import { DescriptionTemplatePreviewDialogModule } from '../description-template/
TextFilterModule,
UserSettingsModule,
CommonFormattingModule,
DescriptionTemplatePreviewDialogModule
DescriptionTemplatePreviewDialogModule,
CheckboxFieldModule,
],
declarations: [
PlanBlueprintEditorComponent,

3
frontend/src/assets/i18n/baq.json
View File

@ -1816,7 +1816,8 @@
"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
"PREFILLING-SOURCES": "Prefilling Sources",
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources"
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources",
"SYSTEM-FIELD-REQUIRED": "This is a required system field"
},
"ACTIONS": {
"ADD-FIELD": "Add Field",

3
frontend/src/assets/i18n/de.json
View File

@ -1816,7 +1816,8 @@
"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
"PREFILLING-SOURCES": "Prefilling Sources",
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources"
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources",
"SYSTEM-FIELD-REQUIRED": "This is a required system field"
},
"ACTIONS": {
"ADD-FIELD": "Add Field",

3
frontend/src/assets/i18n/en.json
View File

@ -1816,7 +1816,8 @@
"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
"PREFILLING-SOURCES": "Prefilling Sources",
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources"
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources",
"SYSTEM-FIELD-REQUIRED": "This is a required system field"
},
"ACTIONS": {
"ADD-FIELD": "Add Field",

3
frontend/src/assets/i18n/es.json
View File

@ -1816,7 +1816,8 @@
"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
"PREFILLING-SOURCES": "Prefilling Sources",
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources"
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources",
"SYSTEM-FIELD-REQUIRED": "This is a required system field"
},
"ACTIONS": {
"ADD-FIELD": "Add Field",

3
frontend/src/assets/i18n/gr.json
View File

@ -1816,7 +1816,8 @@
"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
"PREFILLING-SOURCES": "Prefilling Sources",
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources"
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources",
"SYSTEM-FIELD-REQUIRED": "This is a required system field"
},
"ACTIONS": {
"ADD-FIELD": "Add Field",

3
frontend/src/assets/i18n/hr.json
View File

@ -1816,7 +1816,8 @@
"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
"PREFILLING-SOURCES": "Prefilling Sources",
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources"
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources",
"SYSTEM-FIELD-REQUIRED": "This is a required system field"
},
"ACTIONS": {
"ADD-FIELD": "Add Field",

3
frontend/src/assets/i18n/pl.json
View File

@ -1816,7 +1816,8 @@
"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
"PREFILLING-SOURCES": "Prefilling Sources",
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources"
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources",
"SYSTEM-FIELD-REQUIRED": "This is a required system field"
},
"ACTIONS": {
"ADD-FIELD": "Add Field",

3
frontend/src/assets/i18n/pt.json
View File

@ -1816,7 +1816,8 @@
"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
"PREFILLING-SOURCES": "Prefilling Sources",
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources"
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources",
"SYSTEM-FIELD-REQUIRED": "This is a required system field"
},
"ACTIONS": {
"ADD-FIELD": "Add Field",

3
frontend/src/assets/i18n/sk.json
View File

@ -1816,7 +1816,8 @@
"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
"PREFILLING-SOURCES": "Prefilling Sources",
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources"
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources",
"SYSTEM-FIELD-REQUIRED": "This is a required system field"
},
"ACTIONS": {
"ADD-FIELD": "Add Field",

3
frontend/src/assets/i18n/sr.json
View File

@ -1816,7 +1816,8 @@
"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
"PREFILLING-SOURCES": "Prefilling Sources",
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources"
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources",
"SYSTEM-FIELD-REQUIRED": "This is a required system field"
},
"ACTIONS": {
"ADD-FIELD": "Add Field",

3
frontend/src/assets/i18n/tr.json
View File

@ -1816,7 +1816,8 @@
"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
"PREFILLING-SOURCES": "Prefilling Sources",
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources"
"ENABLE-PREFILLING-SOURCES": "Prefilling Sources",
"SYSTEM-FIELD-REQUIRED": "This is a required system field"
},
"ACTIONS": {
"ADD-FIELD": "Add Field",

21
frontend/src/common/modules/checkbox-field/checkbox-field.module.ts Normal file
View File

@ -0,0 +1,21 @@
import { NgModule } from "@angular/core";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { CommonUiModule } from "@common/ui/common-ui.module";
import { NoopCheckboxComponent } from "./noop-checkbox/noop-checkbox.component";
@NgModule({
imports: [
CommonUiModule,
FormsModule,
ReactiveFormsModule,
],
declarations: [
NoopCheckboxComponent,
],
exports: [
NoopCheckboxComponent,
]
})
export class CheckboxFieldModule {
constructor() { }
}

5
frontend/src/common/modules/checkbox-field/noop-checkbox/noop-checkbox.component.html Normal file
View File

@ -0,0 +1,5 @@
<mat-checkbox *ngIf="control" color="secondary"
[formControl]="control"
[matTooltip]="tooltipText"
[matTooltipPosition]="tooltipPosition"
>{{label}}</mat-checkbox>

0
frontend/src/common/modules/checkbox-field/noop-checkbox/noop-checkbox.component.scss Normal file
View File

23
frontend/src/common/modules/checkbox-field/noop-checkbox/noop-checkbox.component.ts Normal file
View File

@ -0,0 +1,23 @@
import { Component, Input } from "@angular/core";
import { FormControl } from "@angular/forms";
import { MAT_CHECKBOX_DEFAULT_OPTIONS } from "@angular/material/checkbox";
import { TooltipPosition } from "@angular/material/tooltip";
@Component({
selector: 'app-noop-checkbox',
templateUrl: 'noop-checkbox.component.html',
styleUrls: ['noop-checkbox.component.scss'],
providers: [
{
provide: MAT_CHECKBOX_DEFAULT_OPTIONS,
useValue: { clickAction: 'noop' },
}
]
})
export class NoopCheckboxComponent {
@Input() control: FormControl;
@Input() checked: boolean;
@Input() label: string;
@Input() tooltipText: string | null = null;
@Input() tooltipPosition: TooltipPosition = 'right';
}