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

notification template UI small changes

This commit is contained in:
amentis 2024-01-05 18:02:06 +02:00
parent e8553b1605
commit 043b43b9be
2 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
dmp-frontend/src/app/ui/admin/notification-template/editor/notification-template-editor.component.html
View File

@ -326,7 +326,7 @@
<div class="col-4" > <div class="col-4" >
<mat-form-field class="chip-list"> <mat-form-field class="chip-list">
<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CC' | translate}}</mat-label> <mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.CC' | translate}}</mat-label>
<mat-chip-grid #chipGrid [formControl]="formGroup.get('value').get('cc')"> <mat-chip-grid #cc [formControl]="formGroup.get('value').get('cc')">
<mat-chip-row *ngFor="let field of ccValues" <mat-chip-row *ngFor="let field of ccValues"
(removed)="removeChipListValues('cc', field)" (removed)="removeChipListValues('cc', field)"
[editable]="true" [editable]="true"
@ -337,7 +337,7 @@
</button> </button>
</mat-chip-row> </mat-chip-row>
<input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}" <input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}"
[matChipInputFor]="chipGrid" [matChipInputFor]="cc"
[matChipInputSeparatorKeyCodes]="separatorKeysCodes" [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
[matChipInputAddOnBlur]="true" [matChipInputAddOnBlur]="true"
(matChipInputTokenEnd)="addChipListValues('cc',$event)"/> (matChipInputTokenEnd)="addChipListValues('cc',$event)"/>
@ -355,61 +355,60 @@
<mat-error *ngIf="formGroup.get('value').get('ccMode').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> <mat-error *ngIf="formGroup.get('value').get('ccMode').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
</div> <div class="col-4" >
<!-- <div class="col-4" > <mat-form-field class="chip-list">
<mat-form-field class="chip-list"> <mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC' | translate}}</mat-label>
<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC' | translate}}</mat-label> <mat-chip-grid #bcc [formControl]="formGroup.get('value').get('bcc')">
<mat-chip-grid #chipGrid [formControl]="formGroup.get('value').get('bcc')"> <mat-chip-row *ngFor="let field of bccValues"
<mat-chip-row *ngFor="let field of bccValues" (removed)="removeChipListValues('bcc', field)"
(removed)="removeChipListValues('bcc', field)" [editable]="true"
[editable]="true" (edited)="editChipListValues('bcc', $event, field)">
(edited)="editChipListValues('bcc', $event, field)"> {{field}}
{{field}} <button matChipRemove>
<button matChipRemove> <mat-icon>cancel</mat-icon>
<mat-icon>cancel</mat-icon> </button>
</button> </mat-chip-row>
</mat-chip-row> <input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}"
<input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}" [matChipInputFor]="bcc"
[matChipInputFor]="chipGrid" [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
[matChipInputSeparatorKeyCodes]="separatorKeysCodes" [matChipInputAddOnBlur]="true"
[matChipInputAddOnBlur]="true" (matChipInputTokenEnd)="addChipListValues('bcc',$event)"/>
(matChipInputTokenEnd)="addChipListValues('bcc',$event)"/> </mat-chip-grid>
</mat-chip-grid> </mat-form-field>
</mat-form-field> </div>
</div> --> <div class="col-4">
<div class="col-4"> <mat-form-field class="col-auto">
<mat-form-field class="col-auto"> <mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC-MODE' | translate}}</mat-label>
<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.BCC-MODE' | translate}}</mat-label> <mat-select name="bccMode" [formControl]="formGroup.get('value').get('bccMode')">
<mat-select name="bccMode" [formControl]="formGroup.get('value').get('bccMode')"> <mat-option *ngFor="let emailOverrideMode of emailOverrideModeEnum" [value]="emailOverrideMode">
<mat-option *ngFor="let emailOverrideMode of emailOverrideModeEnum" [value]="emailOverrideMode"> {{enumUtils.toEmailOverrideModeString(emailOverrideMode)}}
{{enumUtils.toEmailOverrideModeString(emailOverrideMode)}} </mat-option>
</mat-option> </mat-select>
</mat-select> <mat-error *ngIf="formGroup.get('value').get('bccMode').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
<mat-error *ngIf="formGroup.get('value').get('bccMode').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> </mat-form-field>
</mat-form-field> </div>
</div> <div class="col-4" >
<!-- <div class="col-4" > <mat-form-field class="chip-list">
<mat-form-field class="chip-list"> <mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.EXTRA-DATA-KEYS' | translate}}</mat-label>
<mat-label>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.EXTRA-DATA-KEYS' | translate}}</mat-label> <mat-chip-grid #extraDataKeys [formControl]="formGroup.get('value').get('extraDataKeys')">
<mat-chip-grid #chipGrid [formControl]="formGroup.get('value').get('extraDataKeys')"> <mat-chip-row *ngFor="let field of extraDataKeys"
<mat-chip-row *ngFor="let field of extraDataKeys" (removed)="removeChipListValues('extraDataKeys', field)"
(removed)="removeChipListValues('extraDataKeys', field)" [editable]="true"
[editable]="true" (edited)="editChipListValues('extraDataKeys', $event, field)">
(edited)="editChipListValues('extraDataKeys', $event, field)"> {{field}}
{{field}} <button matChipRemove>
<button matChipRemove> <mat-icon>cancel</mat-icon>
<mat-icon>cancel</mat-icon> </button>
</button> </mat-chip-row>
</mat-chip-row> <input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}"
<input placeholder="{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.FIELDS.MANDATORY-PLACEHOLDER' | translate}}" [matChipInputFor]="extraDataKeys"
[matChipInputFor]="chipGrid" [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
[matChipInputSeparatorKeyCodes]="separatorKeysCodes" [matChipInputAddOnBlur]="true"
[matChipInputAddOnBlur]="true" (matChipInputTokenEnd)="addChipListValues('extraDataKeys',$event)"/>
(matChipInputTokenEnd)="addChipListValues('extraDataKeys',$event)"/> </mat-chip-grid>
</mat-chip-grid> </mat-form-field>
</mat-form-field> </div>
</div> --> </div>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
</form> </form>

2
dmp-frontend/src/assets/i18n/en.json
View File

@ -1357,7 +1357,7 @@
"CC-MODE": "CC Mode", "CC-MODE": "CC Mode",
"BCC": "BCC", "BCC": "BCC",
"BCC-MODE": "BCC Mode", "BCC-MODE": "BCC Mode",
"EXTRA-DATA-KEYS": "EXTRA-DATA-KEYS", "EXTRA-DATA-KEYS": "Extra Data Keys",
"FORMATTING": "Formatting" "FORMATTING": "Formatting"
}, },
"ACTIONS": { "ACTIONS": {