Commit d4bfb2a1 by GD-A-150752

Message Schedule Sent Pre-selected

parent 15010cd1
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
class="ui-g ui-fluid" dndDropzone> class="ui-g ui-fluid" dndDropzone>
<div [hidden]="draggingId !== 000" dndPlaceholderRef <div [hidden]="draggingId !== 000" dndPlaceholderRef
style="background: #CCCCCC; border: 1px dashed #000; width: 100%; height: 53px"></div> style="background: #CCCCCC; border: 1px dashed #000; width: 100%; height: 53px"></div>
<div (dndEnd)="onDragEnd($event)" <div (dndEnd)="onDragEnd()"
(dndStart)="onDragStart(stage, genericStages, 000)" (dndStart)="onDragStart(stage, genericStages, 000)"
*ngFor="let stage of genericStages" *ngFor="let stage of genericStages"
[dndDraggable]="stage" [dndDraggable]="stage"
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
<div [hidden]="draggingId !== stage.ObjectID" dndPlaceholderRef <div [hidden]="draggingId !== stage.ObjectID" dndPlaceholderRef
style="background: #CCCCCC; border: 1px dashed #000; width: 50%; height: 53px"></div> style="background: #CCCCCC; border: 1px dashed #000; width: 50%; height: 53px"></div>
<div *ngFor="let step of stage.Steps" class="ui-g"> <div *ngFor="let step of stage.Steps" class="ui-g">
<div (dndEnd)="onDragEnd($event)" <div (dndEnd)="onDragEnd()"
(dndStart)="onDragStart(step, stage.Steps, stage.ObjectID)" (dndStart)="onDragStart(step, stage.Steps, stage.ObjectID)"
[dndDraggable]="step" [dndDraggable]="step"
class="ui-g-6" class="ui-g-6"
...@@ -409,7 +409,6 @@ ...@@ -409,7 +409,6 @@
<label>Send</label> <label>Send</label>
<p-dropdown (onChange)="showMessageTemplateDialog($event, message)" <p-dropdown (onChange)="showMessageTemplateDialog($event, message)"
[(ngModel)]="message.MessageTemplate" [(ngModel)]="message.MessageTemplate"
[autoDisplayFirst]="true"
[options]="messageTemplates" [options]="messageTemplates"
filter="true" filter="true"
name="messageTemplate{{message.ObjectID}}" name="messageTemplate{{message.ObjectID}}"
...@@ -502,7 +501,6 @@ ...@@ -502,7 +501,6 @@
<label>Send</label> <label>Send</label>
<p-dropdown (onChange)="showMessageTemplateDialog($event, message)" <p-dropdown (onChange)="showMessageTemplateDialog($event, message)"
[(ngModel)]="message.MessageTemplate" [(ngModel)]="message.MessageTemplate"
[autoDisplayFirst]="true"
[options]="messageTemplates" [options]="messageTemplates"
filter="true" filter="true"
name="messageTemplate{{message.ObjectID}}" name="messageTemplate{{message.ObjectID}}"
......
...@@ -622,8 +622,12 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -622,8 +622,12 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
this.utilsService.resetCounter(); this.utilsService.resetCounter();
this.utilsService.clearErrorMessages(); this.utilsService.clearErrorMessages();
const assoc = [ASSOCS.WORKFLOW_STAGE, [ASSOCS.WORKFLOW_STAGE, ASSOCS.WORKFLOW_MESSAGE, ASSOCS.MESSAGE_TEMPLATE].join('.'), const assoc = [
[ASSOCS.WORKFLOW_STAGE, ASSOCS.WORKFLOW_MESSAGE].join('.'), [ASSOCS.WORKFLOW_STAGE, ASSOCS.WORKFLOW_STEP].join('.')]; ASSOCS.WORKFLOW_STAGE,
[ASSOCS.WORKFLOW_STAGE, ASSOCS.WORKFLOW_MESSAGE, ASSOCS.MESSAGE_TEMPLATE].join('.'),
[ASSOCS.WORKFLOW_STAGE, ASSOCS.WORKFLOW_MESSAGE].join('.'),
[ASSOCS.WORKFLOW_STAGE, ASSOCS.WORKFLOW_STEP].join('.')
];
this.subscriptions.push(this.editWorkflowTemplateService.getWorkflowTemplateByID(id, assoc) this.subscriptions.push(this.editWorkflowTemplateService.getWorkflowTemplateByID(id, assoc)
.subscribe( .subscribe(
...@@ -712,7 +716,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -712,7 +716,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
this.draggingId = listId; this.draggingId = listId;
} }
onDragEnd(event): void { onDragEnd(): void {
setTimeout(() => { setTimeout(() => {
this.draggingItem = null; this.draggingItem = null;
this.draggingId = null; this.draggingId = null;
......
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