Commit 2b1f009a by GD-A-150752

Bug-Fix +S52544923

parent 72eb28a7
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
toggler="header" [collapsed]="true"> toggler="header" [collapsed]="true">
<p-header> <p-header>
<span class="ui-panel-title"> <span class="ui-panel-title">
{{getStageHeader(stage)}} {{stage.Name + getMessageCount(stage)}}
</span> </span>
</p-header> </p-header>
<div class="form-group ui-g"> <div class="form-group ui-g">
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
*ngIf="showLabel('StageName'+stage.ObjectID)" *ngIf="showLabel('StageName'+stage.ObjectID)"
id="StageName{{stage.ObjectID}}" id="StageName{{stage.ObjectID}}"
class="ui-panel-title"> class="ui-panel-title">
{{getStageHeader(stage)}} {{stage.Name + getMessageCount(stage)}}
</span> </span>
<input (blur)="toggleInput($event, 'StageName'+stage.ObjectID, false)" <input (blur)="toggleInput($event, 'StageName'+stage.ObjectID, false)"
*ngIf="!showLabel('StageName'+stage.ObjectID)" *ngIf="!showLabel('StageName'+stage.ObjectID)"
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
[collapsed]="true" class="postStage"> [collapsed]="true" class="postStage">
<p-header> <p-header>
<span class="ui-panel-title"> <span class="ui-panel-title">
{{getStageHeader(stage)}} {{stage.Name + getMessageCount(stage)}}
</span> </span>
</p-header> </p-header>
<div class="ui-g form-group"> <div class="ui-g form-group">
...@@ -333,7 +333,7 @@ ...@@ -333,7 +333,7 @@
</div> </div>
</div> </div>
<p-panel [collapsed]="!stage.UseMessaging" *ngIf="stage.UseMessaging" [toggleable]="stage.UseMessaging" <p-panel [collapsed]="!stage.UseMessaging" *ngIf="stage.UseMessaging" [toggleable]="stage.UseMessaging"
header="{{stageMessagesCount(stage)}}" toggler="header" class="messaging"> header="Message Schedule{{getMessageCount(stage)}}" toggler="header" class="messaging">
<div class="form-group row"> <div class="form-group row">
<div class="col-md-offset-9 col-md-3"> <div class="col-md-offset-9 col-md-3">
<button (click)="addMessage(stage)" *ngIf="stage.UseMessaging" <button (click)="addMessage(stage)" *ngIf="stage.UseMessaging"
......
...@@ -224,8 +224,8 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -224,8 +224,8 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
return false; return false;
} }
getStageHeader(stage: WorkflowStageModel): string { getMessageCount(stage: WorkflowStageModel): string {
return `${stage.Name} (${stage.WorkFlowMessages ? return ` (${stage.WorkFlowMessages ?
stage.WorkFlowMessages.filter(msg => msg.Delay && msg.MessageTemplate).length : 0})`; stage.WorkFlowMessages.filter(msg => msg.Delay && msg.MessageTemplate).length : 0})`;
} }
...@@ -418,10 +418,6 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -418,10 +418,6 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
this.displayNewMessageTemplate = false; this.displayNewMessageTemplate = false;
} }
stageMessagesCount(stage: WorkflowStageModel): string {
return `Message Schedule (${(stage && stage.WorkFlowMessages) ? stage.WorkFlowMessages.length : 0})`;
}
addStep($event, stage: WorkflowStageModel): void { addStep($event, stage: WorkflowStageModel): void {
const selectedStepType = this.stepTypeOptions.find(step => step.Value === $event.Value); const selectedStepType = this.stepTypeOptions.find(step => step.Value === $event.Value);
const step = new WorkflowStepModel(stage.Steps.length + 1, selectedStepType, stage.ObjectID); const step = new WorkflowStepModel(stage.Steps.length + 1, selectedStepType, stage.ObjectID);
......
...@@ -4,6 +4,7 @@ import { ActivatedRoute, Params, Router } from '@angular/router'; ...@@ -4,6 +4,7 @@ import { ActivatedRoute, Params, Router } from '@angular/router';
import { Subscription } from 'rxjs/Subscription'; import { Subscription } from 'rxjs/Subscription';
import { AppService } from '../../app.service'; import { AppService } from '../../app.service';
import { IframeMsgHandlingService } from "../../oneit/services/iframe-msg-handling.service";
import { SaveService } from '../../oneit/services/save.service'; import { SaveService } from '../../oneit/services/save.service';
import { UtilsService } from '../../oneit/services/utils.service'; import { UtilsService } from '../../oneit/services/utils.service';
import { BaseComponent } from '../admin-portal/base/base.component'; import { BaseComponent } from '../admin-portal/base/base.component';
...@@ -32,13 +33,13 @@ export class MessageEngineApplicantViewComponent extends BaseComponent implement ...@@ -32,13 +33,13 @@ export class MessageEngineApplicantViewComponent extends BaseComponent implement
private utilsService: UtilsService, private utilsService: UtilsService,
private saveService: SaveService, private saveService: SaveService,
private appService: AppService, private appService: AppService,
private messageEngineApplicantViewService: MessageEngineApplicantViewService private messageEngineApplicantViewService: MessageEngineApplicantViewService,
private iframeMsgHandlingService: IframeMsgHandlingService
) { ) {
super(utilsService); super(utilsService);
} }
ngOnInit(): void { ngOnInit(): void {
this.utilsService.resetCounter(); this.utilsService.resetCounter();
this.subscriptions.push(this.activatedRoute.params this.subscriptions.push(this.activatedRoute.params
......
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