add null mat option where it needs

This commit is contained in:
CITE\amentis 2024-09-16 16:34:51 +03:00
parent f3e439094b
commit 94a23c0ee0
15 changed files with 154 additions and 52 deletions

View File

@ -54,6 +54,7 @@
<mat-label>{{'ANNOTATION-SERVICE.STATUS-EDITOR.FIELDS.INTERNAL-STATUS' | translate}}</mat-label> <mat-label>{{'ANNOTATION-SERVICE.STATUS-EDITOR.FIELDS.INTERNAL-STATUS' | translate}}</mat-label>
<mat-select [formControl]="formGroup.get('internalStatus')"> <mat-select [formControl]="formGroup.get('internalStatus')">
<mat-option *ngFor="let internalStatus of internalStatusEnum" [value]="internalStatus">{{enumUtils.toInternalStatusString(internalStatus)}}</mat-option> <mat-option *ngFor="let internalStatus of internalStatusEnum" [value]="internalStatus">{{enumUtils.toInternalStatusString(internalStatus)}}</mat-option>
<mat-option [value]="null">{{'ANNOTATION-SERVICE.STATUS-EDITOR.DEFAULT-VALUE.NONE' | translate}}</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="formGroup.get('internalStatus').hasError('backendError')">{{formGroup.get('internalStatus').getError('backendError').message}}</mat-error> <mat-error *ngIf="formGroup.get('internalStatus').hasError('backendError')">{{formGroup.get('internalStatus').getError('backendError').message}}</mat-error>
<mat-error *ngIf="formGroup.get('internalStatus').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> <mat-error *ngIf="formGroup.get('internalStatus').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>

View File

@ -39,6 +39,7 @@
<mat-label>{{'DESCRIPTION-STATUS-EDITOR.FIELDS.INTERNAL-STATUS' | translate}}</mat-label> <mat-label>{{'DESCRIPTION-STATUS-EDITOR.FIELDS.INTERNAL-STATUS' | translate}}</mat-label>
<mat-select [formControl]="formGroup.controls.internalStatus"> <mat-select [formControl]="formGroup.controls.internalStatus">
<mat-option *ngFor="let internalStatus of internalStatusEnum" [value]="internalStatus">{{enumUtils.toDescriptionStatusString(internalStatus)}}</mat-option> <mat-option *ngFor="let internalStatus of internalStatusEnum" [value]="internalStatus">{{enumUtils.toDescriptionStatusString(internalStatus)}}</mat-option>
<mat-option [value]="null">{{'DESCRIPTION-STATUS-EDITOR.DEFAULT-VALUE.NONE' | translate}}</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="formGroup.controls.internalStatus.hasError('backendError')">{{formGroup.controls.internalStatus.getError('backendError').message}}</mat-error> <mat-error *ngIf="formGroup.controls.internalStatus.hasError('backendError')">{{formGroup.controls.internalStatus.getError('backendError').message}}</mat-error>
</mat-form-field> </mat-form-field>

View File

@ -42,7 +42,7 @@
class="status-chip" class="status-chip"
[class.status-chip-finalized]="row.internalStatus === DescriptionStatusEnum.Finalized" [class.status-chip-finalized]="row.internalStatus === DescriptionStatusEnum.Finalized"
[class.status-chip-draft]="row.internalStatus === DescriptionStatusEnum.Draft" [class.status-chip-draft]="row.internalStatus === DescriptionStatusEnum.Draft"
[class.status-chip-cancelled]="row.internalStatus === DescriptionStatusEnum.Canceled" [class.status-chip-error]="row.internalStatus === DescriptionStatusEnum.Canceled"
> >
{{enumUtils.toDescriptionStatusString(row.internalStatus)}} {{enumUtils.toDescriptionStatusString(row.internalStatus)}}
</div> </div>

View File

@ -39,6 +39,7 @@
<mat-label>{{'PLAN-STATUS-EDITOR.FIELDS.INTERNAL-STATUS' | translate}}</mat-label> <mat-label>{{'PLAN-STATUS-EDITOR.FIELDS.INTERNAL-STATUS' | translate}}</mat-label>
<mat-select [formControl]="formGroup.controls.internalStatus"> <mat-select [formControl]="formGroup.controls.internalStatus">
<mat-option *ngFor="let internalStatus of internalStatusEnum" [value]="internalStatus">{{enumUtils.toPlanStatusString(internalStatus)}}</mat-option> <mat-option *ngFor="let internalStatus of internalStatusEnum" [value]="internalStatus">{{enumUtils.toPlanStatusString(internalStatus)}}</mat-option>
<mat-option [value]="null">{{'PLAN-STATUS-EDITOR.DEFAULT-VALUE.NONE' | translate}}</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="formGroup.controls.internalStatus.hasError('backendError')">{{formGroup.controls.internalStatus.getError('backendError').message}}</mat-error> <mat-error *ngIf="formGroup.controls.internalStatus.hasError('backendError')">{{formGroup.controls.internalStatus.getError('backendError').message}}</mat-error>
</mat-form-field> </mat-form-field>

View File

@ -917,6 +917,9 @@
"ALLOW-ANONYMOUS": "Allow anonymous users", "ALLOW-ANONYMOUS": "Allow anonymous users",
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
},
"DEFAULT-VALUE": {
"NONE": "None"
} }
}, },
"PLAN-STATUS-LISTING": { "PLAN-STATUS-LISTING": {
@ -942,8 +945,8 @@
}, },
"PLAN-STATUS-EDITOR": { "PLAN-STATUS-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "New Plan Blueprint", "NEW": "New Plan Status",
"EDIT": "Edit Plan Blueprint" "EDIT": "Edit Plan Status"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Name", "NAME": "Name",
@ -957,6 +960,9 @@
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",
@ -1468,6 +1474,9 @@
"LABEL": "Label", "LABEL": "Label",
"INTERNAL-STATUS":"Internal Status" "INTERNAL-STATUS":"Internal Status"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",

View File

@ -917,6 +917,9 @@
"ALLOW-ANONYMOUS": "Allow anonymous users", "ALLOW-ANONYMOUS": "Allow anonymous users",
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
},
"DEFAULT-VALUE": {
"NONE": "None"
} }
}, },
"PLAN-STATUS-LISTING": { "PLAN-STATUS-LISTING": {
@ -942,8 +945,8 @@
}, },
"PLAN-STATUS-EDITOR": { "PLAN-STATUS-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "New Plan Blueprint", "NEW": "New Plan Status",
"EDIT": "Edit Plan Blueprint" "EDIT": "Edit Plan Status"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Name", "NAME": "Name",
@ -957,6 +960,9 @@
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",
@ -1468,6 +1474,9 @@
"LABEL": "Label", "LABEL": "Label",
"INTERNAL-STATUS":"Internal Status" "INTERNAL-STATUS":"Internal Status"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",

View File

@ -916,6 +916,9 @@
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",
@ -963,6 +966,9 @@
"ALLOW-ANONYMOUS": "Allow anonymous users", "ALLOW-ANONYMOUS": "Allow anonymous users",
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
},
"DEFAULT-VALUE": {
"NONE": "None"
} }
}, },
"DESCRIPTION-OVERVIEW": { "DESCRIPTION-OVERVIEW": {
@ -1468,6 +1474,9 @@
"LABEL": "Label", "LABEL": "Label",
"INTERNAL-STATUS":"Internal Status" "INTERNAL-STATUS":"Internal Status"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",

View File

@ -917,6 +917,9 @@
"ALLOW-ANONYMOUS": "Allow anonymous users", "ALLOW-ANONYMOUS": "Allow anonymous users",
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
},
"DEFAULT-VALUE": {
"NONE": "None"
} }
}, },
"PLAN-STATUS-LISTING": { "PLAN-STATUS-LISTING": {
@ -942,8 +945,8 @@
}, },
"PLAN-STATUS-EDITOR": { "PLAN-STATUS-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "New Plan Blueprint", "NEW": "New Plan Status",
"EDIT": "Edit Plan Blueprint" "EDIT": "Edit Plan Status"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Name", "NAME": "Name",
@ -957,6 +960,9 @@
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",
@ -1468,6 +1474,9 @@
"LABEL": "Label", "LABEL": "Label",
"INTERNAL-STATUS":"Internal Status" "INTERNAL-STATUS":"Internal Status"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",

View File

@ -917,6 +917,9 @@
"ALLOW-ANONYMOUS": "Allow anonymous users", "ALLOW-ANONYMOUS": "Allow anonymous users",
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
},
"DEFAULT-VALUE": {
"NONE": "None"
} }
}, },
"PLAN-STATUS-LISTING": { "PLAN-STATUS-LISTING": {
@ -942,8 +945,8 @@
}, },
"PLAN-STATUS-EDITOR": { "PLAN-STATUS-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "New Plan Blueprint", "NEW": "New Plan Status",
"EDIT": "Edit Plan Blueprint" "EDIT": "Edit Plan Status"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Name", "NAME": "Name",
@ -957,6 +960,9 @@
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",
@ -1468,6 +1474,9 @@
"LABEL": "Label", "LABEL": "Label",
"INTERNAL-STATUS":"Internal Status" "INTERNAL-STATUS":"Internal Status"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",

View File

@ -917,6 +917,9 @@
"ALLOW-ANONYMOUS": "Allow anonymous users", "ALLOW-ANONYMOUS": "Allow anonymous users",
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
},
"DEFAULT-VALUE": {
"NONE": "None"
} }
}, },
"PLAN-STATUS-LISTING": { "PLAN-STATUS-LISTING": {
@ -942,8 +945,8 @@
}, },
"PLAN-STATUS-EDITOR": { "PLAN-STATUS-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "New Plan Blueprint", "NEW": "New Plan Status",
"EDIT": "Edit Plan Blueprint" "EDIT": "Edit Plan Status"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Name", "NAME": "Name",
@ -957,6 +960,9 @@
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",
@ -1468,6 +1474,9 @@
"LABEL": "Label", "LABEL": "Label",
"INTERNAL-STATUS":"Internal Status" "INTERNAL-STATUS":"Internal Status"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",

View File

@ -917,6 +917,9 @@
"ALLOW-ANONYMOUS": "Allow anonymous users", "ALLOW-ANONYMOUS": "Allow anonymous users",
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
},
"DEFAULT-VALUE": {
"NONE": "None"
} }
}, },
"PLAN-STATUS-LISTING": { "PLAN-STATUS-LISTING": {
@ -942,8 +945,8 @@
}, },
"PLAN-STATUS-EDITOR": { "PLAN-STATUS-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "New Plan Blueprint", "NEW": "New Plan Status",
"EDIT": "Edit Plan Blueprint" "EDIT": "Edit Plan Status"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Name", "NAME": "Name",
@ -957,6 +960,9 @@
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",
@ -1468,6 +1474,9 @@
"LABEL": "Label", "LABEL": "Label",
"INTERNAL-STATUS":"Internal Status" "INTERNAL-STATUS":"Internal Status"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",

View File

@ -917,6 +917,9 @@
"ALLOW-ANONYMOUS": "Allow anonymous users", "ALLOW-ANONYMOUS": "Allow anonymous users",
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
},
"DEFAULT-VALUE": {
"NONE": "None"
} }
}, },
"PLAN-STATUS-LISTING": { "PLAN-STATUS-LISTING": {
@ -942,8 +945,8 @@
}, },
"PLAN-STATUS-EDITOR": { "PLAN-STATUS-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "New Plan Blueprint", "NEW": "New Plan Status",
"EDIT": "Edit Plan Blueprint" "EDIT": "Edit Plan Status"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Name", "NAME": "Name",
@ -957,6 +960,9 @@
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",
@ -1468,6 +1474,9 @@
"LABEL": "Label", "LABEL": "Label",
"INTERNAL-STATUS":"Internal Status" "INTERNAL-STATUS":"Internal Status"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",

View File

@ -917,6 +917,9 @@
"ALLOW-ANONYMOUS": "Allow anonymous users", "ALLOW-ANONYMOUS": "Allow anonymous users",
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
},
"DEFAULT-VALUE": {
"NONE": "None"
} }
}, },
"PLAN-STATUS-LISTING": { "PLAN-STATUS-LISTING": {
@ -942,8 +945,8 @@
}, },
"PLAN-STATUS-EDITOR": { "PLAN-STATUS-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "New Plan Blueprint", "NEW": "New Plan Status",
"EDIT": "Edit Plan Blueprint" "EDIT": "Edit Plan Status"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Name", "NAME": "Name",
@ -957,6 +960,9 @@
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",
@ -1468,6 +1474,9 @@
"LABEL": "Label", "LABEL": "Label",
"INTERNAL-STATUS":"Internal Status" "INTERNAL-STATUS":"Internal Status"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",

View File

@ -917,6 +917,9 @@
"ALLOW-ANONYMOUS": "Allow anonymous users", "ALLOW-ANONYMOUS": "Allow anonymous users",
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
},
"DEFAULT-VALUE": {
"NONE": "None"
} }
}, },
"PLAN-STATUS-LISTING": { "PLAN-STATUS-LISTING": {
@ -942,8 +945,8 @@
}, },
"PLAN-STATUS-EDITOR": { "PLAN-STATUS-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "New Plan Blueprint", "NEW": "New Plan Status",
"EDIT": "Edit Plan Blueprint" "EDIT": "Edit Plan Status"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Name", "NAME": "Name",
@ -957,6 +960,9 @@
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",
@ -1468,6 +1474,9 @@
"LABEL": "Label", "LABEL": "Label",
"INTERNAL-STATUS":"Internal Status" "INTERNAL-STATUS":"Internal Status"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",

View File

@ -917,6 +917,9 @@
"ALLOW-ANONYMOUS": "Allow anonymous users", "ALLOW-ANONYMOUS": "Allow anonymous users",
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
},
"DEFAULT-VALUE": {
"NONE": "None"
} }
}, },
"PLAN-STATUS-LISTING": { "PLAN-STATUS-LISTING": {
@ -942,8 +945,8 @@
}, },
"PLAN-STATUS-EDITOR": { "PLAN-STATUS-EDITOR": {
"TITLE": { "TITLE": {
"NEW": "New Plan Blueprint", "NEW": "New Plan Status",
"EDIT": "Edit Plan Blueprint" "EDIT": "Edit Plan Status"
}, },
"FIELDS": { "FIELDS": {
"NAME": "Name", "NAME": "Name",
@ -957,6 +960,9 @@
"ROLES": "User roles", "ROLES": "User roles",
"PLAN-ROLES": "User plan roles" "PLAN-ROLES": "User plan roles"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",
@ -1468,6 +1474,9 @@
"LABEL": "Label", "LABEL": "Label",
"INTERNAL-STATUS":"Internal Status" "INTERNAL-STATUS":"Internal Status"
}, },
"DEFAULT-VALUE": {
"NONE": "None"
},
"ACTIONS": { "ACTIONS": {
"SAVE": "Save", "SAVE": "Save",
"CANCEL": "Cancel", "CANCEL": "Cancel",