Skip to content

P
PERFORMA_REPLICA
Commit d6c62c89 by GD-A-150752
Options

Bug-Fixes 

S52571964 #Couldn't remove a message template
S52559620 #Time field behavior expectations
parent 432cabb8
Showing with 79 additions and 26 deletions
frontend/angular/src/app/components/admin-portal/edit-message-template/edit-message-template.component.html
...@@ -46,16 +46,14 @@ ...@@ -46,16 +46,14 @@
class="form-control" tabindex="2" class="form-control" tabindex="2"
[disabled]="showLoader" required> [disabled]="showLoader" required>
</div> </div>
<div class="col-md-6" *ngIf="subjectPlaceholderOptions.length"> <div class="col-md-3" *ngIf="subjectPlaceholderOptions.length">
<label>Placeholder for Subject</label> <label>Placeholder for Subject</label>
<app-select-2 [data]="subjectPlaceholderOptions" [value]="subjectPlaceholderOptions[0]" <app-select-2 [data]="subjectPlaceholderOptions" [value]="subjectPlaceholderOptions[0]"
fieldLabel="Description" fieldLabel="Description"
(valChange)="addPlaceholderInSubject($event)"> (valChange)="addPlaceholderInSubject($event)">
</app-select-2> </app-select-2>
</div> </div>
</div> <div class="col-md-3" *ngIf="contentPlaceholderOptions.length">
<div class="form-group row h-80">
<div class="col-md-offset-6 col-md-6" *ngIf="contentPlaceholderOptions.length">
<label>Placeholder for Content</label> <label>Placeholder for Content</label>
<app-select-2 [data]="contentPlaceholderOptions" [value]="contentPlaceholderOptions[0]" <app-select-2 [data]="contentPlaceholderOptions" [value]="contentPlaceholderOptions[0]"
fieldLabel="Description" fieldLabel="Description"
......
frontend/angular/src/app/components/admin-portal/edit-workflow-template/edit-workflow-template.component.html
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
<div class="ui-g ui-fluid"> <div class="ui-g ui-fluid">
<div class="ui-g-12"> <div class="ui-g-12">
<div class="page-title page-title-with-arrow mb-0"> <div class="page-title page-title-with-arrow mb-0">
<a [routerLink]="[isGlobalHT ? '/list-workflow-templates/global' : '/admin/list-workflow-templates']" class="arrow-btn-blue ml-0"> <a [routerLink]="[isGlobalHT ? '/list-workflow-templates/global' : '/admin/list-workflow-templates']"
class="arrow-btn-blue ml-0">
<img src="assets/images/arrow-left-prev_blue.svg"> <img src="assets/images/arrow-left-prev_blue.svg">
</a> </a>
{{editMode ? "Edit" : "Add"}} Workflow Template {{editMode ? "Edit" : "Add"}} Workflow Template
...@@ -370,7 +371,7 @@ ...@@ -370,7 +371,7 @@
*ngIf="!showLabel('Delay'+message.ObjectID) || !message.Delay" *ngIf="!showLabel('Delay'+message.ObjectID) || !message.Delay"
[(ngModel)]="message.Delay" [(ngModel)]="message.Delay"
[disabled]="showLoader" [disabled]="showLoader"
[id]="'Delay'+message.ObjectID" [id]="'Delay'+message.ObjectID+'Id'"
class="form-control" class="form-control"
mask="9?9:99:99" mask="9?9:99:99"
name="Delay{{message.ObjectID}}"> name="Delay{{message.ObjectID}}">
...@@ -381,15 +382,17 @@ ...@@ -381,15 +382,17 @@
</div> </div>
</div> </div>
<div class="col-md-{{stage.StageType.IsPreStage ? '1' : '2'}}"> <div class="col-md-{{stage.StageType.IsPreStage ? '1' : '2'}}">
<label for="Variance{{message.ObjectID}}">+/-</label> <label for="Variance{{message.ObjectID}}Id">+/-</label>
<input [(ngModel)]="message.Variance" <p-inputMask (change)="generateVarianceString(message)"
[disabled]="showLoader" (onBlur)="toggleInput($event, 'Variance'+message.ObjectID, false)"
(change)="generateVarianceString(message)" (onFocus)="toggleInput($event, 'Variance'+message.ObjectID, true)"
(blur)="toggleInput($event, 'Variance'+message.ObjectID, false)"
(focusin)="toggleInput($event, 'Variance'+message.ObjectID, true)"
class="form-control" id="Variance{{message.ObjectID}}"
*ngIf="!showLabel('Variance'+message.ObjectID) || !message.Variance" *ngIf="!showLabel('Variance'+message.ObjectID) || !message.Variance"
name="Variance{{message.ObjectID}}" type="number"> [(ngModel)]="message.Variance"
[disabled]="showLoader"
id="Variance{{message.ObjectID}}Id"
class="form-control"
mask="9?9:99:99" name="Variance{{message.ObjectID}}">
</p-inputMask>
<div <div
(click)="toggleInput($event, 'Variance'+message.ObjectID, true)" (click)="toggleInput($event, 'Variance'+message.ObjectID, true)"
*ngIf="showLabel('Variance'+message.ObjectID) && message.Variance"> *ngIf="showLabel('Variance'+message.ObjectID) && message.Variance">
...@@ -461,7 +464,7 @@ ...@@ -461,7 +464,7 @@
*ngIf="!showLabel('Delay'+message.ObjectID) || !message.Delay" *ngIf="!showLabel('Delay'+message.ObjectID) || !message.Delay"
[(ngModel)]="message.Delay" [(ngModel)]="message.Delay"
[disabled]="showLoader" [disabled]="showLoader"
[id]="'Delay'+message.ObjectID" [id]="'Delay'+message.ObjectID+'Id'"
class="form-control" class="form-control"
mask="9?9:99:99" mask="9?9:99:99"
name="Delay{{message.ObjectID}}"> name="Delay{{message.ObjectID}}">
...@@ -472,15 +475,17 @@ ...@@ -472,15 +475,17 @@
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<label for="Variance{{message.ObjectID}}">+/-</label> <label for="Variance{{message.ObjectID}}Id">+/-</label>
<input [(ngModel)]="message.Variance" <p-inputMask (change)="generateVarianceString(message)"
[disabled]="showLoader" (onBlur)="toggleInput($event, 'Variance'+message.ObjectID, false)"
(change)="generateVarianceString(message)" (onFocus)="toggleInput($event, 'Variance'+message.ObjectID, true)"
(blur)="toggleInput($event, 'Variance'+message.ObjectID, false)"
(focusin)="toggleInput($event, 'Variance'+message.ObjectID, true)"
class="form-control" id="Variance{{message.ObjectID}}"
*ngIf="!showLabel('Variance'+message.ObjectID) || !message.Variance" *ngIf="!showLabel('Variance'+message.ObjectID) || !message.Variance"
name="Variance{{message.ObjectID}}" type="number"> [(ngModel)]="message.Variance"
[disabled]="showLoader"
id="Variance{{message.ObjectID}}Id"
class="form-control"
mask="9?9:99:99" name="Variance{{message.ObjectID}}">
</p-inputMask>
<div <div
(click)="toggleInput($event, 'Variance'+message.ObjectID, true)" (click)="toggleInput($event, 'Variance'+message.ObjectID, true)"
*ngIf="showLabel('Variance'+message.ObjectID) && message.Variance"> *ngIf="showLabel('Variance'+message.ObjectID) && message.Variance">
......
frontend/angular/src/app/components/admin-portal/edit-workflow-template/edit-workflow-template.component.ts
...@@ -288,12 +288,59 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -288,12 +288,59 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
} }
} }
/**
* Whenever Variance value is provided in message schedule section, it changes it into a variance string consisting of
* number of days, hours and minutes.
* If minutes exceed 60, hours are calculated.
* If hours exceed 24, days are calculated.
* Input mask gets values in the form of __:__:__
* Parsing of this value takes place in this function, moreover it sorts the messages as well
* @WorkflowMessageModel message
*/
generateVarianceString(message: WorkflowMessageModel): void { generateVarianceString(message: WorkflowMessageModel): void {
if (!message.Variance) { if (!message.Variance) {
return; return;
} }
message.VarianceString = `${message.Variance}m`;
const delay = message.Variance.replace(/_/g, '')
.split(':');
delay[0] = delay[0] || '';
delay[0] = delay[0] !== '00' ? delay[0] : '';
delay[1] = delay[1] || '';
delay[1] = delay[1] !== '00' ? delay[1] : '';
delay[2] = delay[2] || '';
delay[2] = delay[2] !== '00' ? delay[2] : '';
if (delay[1] === '' && delay[2] === '') {
message.VarianceString = `${delay[0]}m`;
message.Variance = `00:00:${delay[0]}`;
} else if (delay[2] === '') {
const minutes = Math.floor(Number(delay[1]) % 60);
let hours = Math.floor(Number(delay[1]) / 60);
hours += Number(delay[0]);
let days = 0;
if (Math.floor(hours / 24) > 0) {
hours = Math.floor(hours / 24);
days = Math.floor(hours % 24);
}
message.VarianceString = `${this.maskValue(days)}d:${this.maskValue(hours)}h:${this.maskValue(minutes)}m`;
message.Variance = `${this.maskValue(days)}:${this.maskValue(hours)}:${this.maskValue(minutes)}`;
} else {
const minutes = Math.floor(Number(delay[2]) % 60);
let hours = Math.floor(Number(delay[2]) / 60);
hours += Number(delay[1]);
let days = Math.floor(hours / 24);
hours = Math.floor(hours % 24);
days += Number(delay[0]);
message.VarianceString = `${this.maskValue(days)}d:${this.maskValue(hours)}h:${this.maskValue(minutes)}m`;
message.Variance = `${this.maskValue(days)}:${this.maskValue(hours)}:${this.maskValue(minutes)}`;
}
}
maskValue(val: number): string {
return String(val).length > 1 ? String(val) : `0${val}`;
} }
/** /**
...@@ -412,7 +459,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -412,7 +459,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
showMessageTemplateDialog($event, message: WorkflowMessageModel): void { showMessageTemplateDialog($event, message: WorkflowMessageModel): void {
const template = $event.value; const template = $event.value;
if (template.id === '-1' || template.id === '-2') { if (template.id === '-1' || template.id === '-2') {
delete message.MessageTemplate; message.MessageTemplate = null;
} else if (template.id && template.id === '0') { } else if (template.id && template.id === '0') {
// When new template is selected, store it to global variable // When new template is selected, store it to global variable
this.selectedTemplateID = 'NEW'; this.selectedTemplateID = 'NEW';
......
frontend/angular/src/app/components/message-engine-applicant-view/message-engine-applicant-view.component.ts
...@@ -181,7 +181,6 @@ export class MessageEngineApplicantViewComponent extends BaseComponent implement ...@@ -181,7 +181,6 @@ export class MessageEngineApplicantViewComponent extends BaseComponent implement
this.subscriptions.push(this.saveService.saveObjectsWithDefaultSvc(this.createdObjs, this.updatedObjs, this.deletedObjs) this.subscriptions.push(this.saveService.saveObjectsWithDefaultSvc(this.createdObjs, this.updatedObjs, this.deletedObjs)
.subscribe( .subscribe(
() => { () => {
this.utilsService.handleSuccess();
this.showLoader = false; this.showLoader = false;
this.getEngineApplicantViewByID(); this.getEngineApplicantViewByID();
}, },
......
frontend/angular/src/assets/css/custom.scss
...@@ -280,6 +280,10 @@ ...@@ -280,6 +280,10 @@
.ui-dialog-content { .ui-dialog-content {
padding: 0 !important; padding: 0 !important;
.message-template-form {
padding-top: 0 !important;
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment