Skip to content

P
PERFORMA_REPLICA
Commit 6b1b1b34 by GD-A-150752
Options

padding-fix

parent 6db877d0
Showing with 51 additions and 25 deletions
frontend/angular/src/app/components/edit-message-template/edit-message-template.component.html
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</app-select-2> </app-select-2>
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row" *ngIf="emailTemplateType()">
<div class="col-md-6"> <div class="col-md-6">
<label for="subjectInputId">Subject</label> <label for="subjectInputId">Subject</label>
<input id="subjectInputId" [(ngModel)]="messageTemplate.Subject" <input id="subjectInputId" [(ngModel)]="messageTemplate.Subject"
......
frontend/angular/src/app/components/edit-workflow-template/edit-workflow-template.component.html
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
</div> </div>
</div> </div>
<div class="ui-g ui-fluid"> <div class="ui-g ui-fluid">
<p-dialog #messageTemplateDialog [(visible)]="displayNewMessageTemplate" header="Message Template"> <p-dialog #messageTemplateDialog [(visible)]="displayNewMessageTemplate" header="Message Template"
positionLeft="0" [modal]="true" [blockScroll]="true" [responsive]="true">
<app-edit-message-template (closeModal)="closeDialog($event)" <app-edit-message-template (closeModal)="closeDialog($event)"
*ngIf="displayNewMessageTemplate" *ngIf="displayNewMessageTemplate"
[objectID]="selectedTemplateID"></app-edit-message-template> [objectID]="selectedTemplateID"></app-edit-message-template>
...@@ -110,11 +111,11 @@ ...@@ -110,11 +111,11 @@
tabindex="7" type="text"> tabindex="7" type="text">
</div> </div>
<div class="form-group ui-g-12"> <div class="form-group ui-g-12">
<div class="ui-g flex-center"> <div class="ui-g">
<div class="ui-g-2"> <div class="ui-g-2">
<label class="mb-0">Action</label> <label class="mb-0">Action</label>
</div> </div>
<div class="ui-g-10"> <div class="ui-g-6">
<p-selectButton [(ngModel)]="workflow.ApplicationResponseAction" <p-selectButton [(ngModel)]="workflow.ApplicationResponseAction"
[options]="responseActions" [options]="responseActions"
name="ApplicationResponseAction" name="ApplicationResponseAction"
...@@ -277,7 +278,7 @@ ...@@ -277,7 +278,7 @@
class="form-control" id="Variance{{message.ObjectID}}" class="form-control" id="Variance{{message.ObjectID}}"
name="Variance{{message.ObjectID}}" type="text"> name="Variance{{message.ObjectID}}" type="text">
</div> </div>
<div class="col-md-1"> <div class="col-md-2">
<label title="Business Hours only" class="mb-0">Business Hours <label title="Business Hours only" class="mb-0">Business Hours
only</label> only</label>
<p-checkbox [(ngModel)]="message.BusinessHoursOnly" <p-checkbox [(ngModel)]="message.BusinessHoursOnly"
...@@ -285,16 +286,19 @@ ...@@ -285,16 +286,19 @@
name="BusinessHoursOnly{{message.ObjectID}}"> name="BusinessHoursOnly{{message.ObjectID}}">
</p-checkbox> </p-checkbox>
</div> </div>
<div class="col-md-4"> <div class="col-md-3">
<label>Send</label> <label>Send</label>
<p-dropdown [(ngModel)]="message.MessageTemplate" <p-dropdown (onChange)="showMessageTemplateDialog($event, message)"
[(ngModel)]="message.MessageTemplate"
[autoDisplayFirst]="false"
[options]="messageTemplates" [options]="messageTemplates"
filter="true" filter="true"
name="messageTemplate{{message.ObjectID}}" name="messageTemplate{{message.ObjectID}}"
optionLabel="TemplateName"> optionLabel="TemplateName">
<ng-template let-message pTemplate="selectedItem"> <ng-template let-message pTemplate="selectedItem">
<i class="{{getMessageClass(message.value)}}"></i> <i class="{{getMessageClass(message.value)}}"></i>
<span class="dropdown-text">{{message.label}}</span> <span
class="dropdown-text">{{message.label}}</span>
</ng-template> </ng-template>
<ng-template let-selectedMsg pTemplate="item"> <ng-template let-selectedMsg pTemplate="item">
<div class="ui-helper-clearfix" <div class="ui-helper-clearfix"
...@@ -353,7 +357,7 @@ ...@@ -353,7 +357,7 @@
dndEffectAllowed="copy" dndEffectAllowed="copy"
toggler="header"> toggler="header">
<p-panel [toggleable]="true" #panel [collapsed]="true"> <p-panel [toggleable]="true" #panel [collapsed]="true" toggler="header">
<p-header> <p-header>
<span (click)="toggleInput($event, 'StageName'+stage.SortOrder, true)" <span (click)="toggleInput($event, 'StageName'+stage.SortOrder, true)"
*ngIf="showLabel('StageName'+stage.SortOrder)" *ngIf="showLabel('StageName'+stage.SortOrder)"
...@@ -486,7 +490,7 @@ ...@@ -486,7 +490,7 @@
name="BusinessHoursOnly{{message.ObjectID}}"> name="BusinessHoursOnly{{message.ObjectID}}">
</p-checkbox> </p-checkbox>
</div> </div>
<div class="col-md-5"> <div class="col-md-4">
<label>Send</label> <label>Send</label>
<p-dropdown (onChange)="showMessageTemplateDialog($event, message)" <p-dropdown (onChange)="showMessageTemplateDialog($event, message)"
[(ngModel)]="message.MessageTemplate" [(ngModel)]="message.MessageTemplate"
...@@ -510,7 +514,7 @@ ...@@ -510,7 +514,7 @@
</ng-template> </ng-template>
</p-dropdown> </p-dropdown>
</div> </div>
<div class="col-md-1 text-center"> <div class="col-md-2 text-center">
<button (click)="configureMessageTemplate(message)" <button (click)="configureMessageTemplate(message)"
[disabled]="showLoader" icon="ui-icon-settings" [disabled]="showLoader" icon="ui-icon-settings"
pButton pButton
...@@ -544,7 +548,7 @@ ...@@ -544,7 +548,7 @@
<div class="ui-g-12"> <div class="ui-g-12">
<!-- Start Post Stages --> <!-- Start Post Stages -->
<p-panel *ngFor="let stage of postStages" [toggleable]="true" toggler="header" <p-panel *ngFor="let stage of postStages" [toggleable]="true" toggler="header"
[collapsed]="true"> [collapsed]="true" class="postStage">
<p-header> <p-header>
<span class="ui-panel-title"> <span class="ui-panel-title">
{{getStageHeader(stage)}} {{getStageHeader(stage)}}
...@@ -615,23 +619,26 @@ ...@@ -615,23 +619,26 @@
[id]="'Variance'+message.ObjectID" class="form-control" [id]="'Variance'+message.ObjectID" class="form-control"
name="Variance{{message.ObjectID}}" type="text"> name="Variance{{message.ObjectID}}" type="text">
</div> </div>
<div class="col-md-5"> <div class="col-md-2">
<label>Business Hours only</label> <label>Business Hours only</label>
<p-checkbox [(ngModel)]="message.BusinessHoursOnly" <p-checkbox [(ngModel)]="message.BusinessHoursOnly"
binary="true" binary="true"
name="BusinessHoursOnly{{message.ObjectID}}"> name="BusinessHoursOnly{{message.ObjectID}}">
</p-checkbox> </p-checkbox>
</div> </div>
<div class="col-md-5"> <div class="col-md-4">
<label>Send</label> <label>Send</label>
<p-dropdown [(ngModel)]="message.MessageTemplate" <p-dropdown (onChange)="showMessageTemplateDialog($event, message)"
[(ngModel)]="message.MessageTemplate"
[autoDisplayFirst]="false"
[options]="messageTemplates" [options]="messageTemplates"
filter="true" filter="true"
name="messageTemplate{{message.ObjectID}}" name="messageTemplate{{message.ObjectID}}"
optionLabel="TemplateName"> optionLabel="TemplateName">
<ng-template let-message pTemplate="selectedItem"> <ng-template let-message pTemplate="selectedItem">
<i class="{{getMessageClass(message.value)}}"></i> <i class="{{getMessageClass(message.value)}}"></i>
<span class="dropdown-text">{{message.label}}</span> <span
class="dropdown-text">{{message.label}}</span>
</ng-template> </ng-template>
<ng-template let-selectedMsg pTemplate="item"> <ng-template let-selectedMsg pTemplate="item">
<div class="ui-helper-clearfix" <div class="ui-helper-clearfix"
...@@ -643,7 +650,7 @@ ...@@ -643,7 +650,7 @@
</ng-template> </ng-template>
</p-dropdown> </p-dropdown>
</div> </div>
<div class="col-md-1 text-center"> <div class="col-md-2 text-center">
<button (click)="configureMessageTemplate(message)" <button (click)="configureMessageTemplate(message)"
[disabled]="showLoader" icon="ui-icon-settings" [disabled]="showLoader" icon="ui-icon-settings"
pButton pButton
......
frontend/angular/src/app/components/edit-workflow-template/edit-workflow-template.component.ts
...@@ -93,7 +93,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -93,7 +93,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
this.subscriptions.push( this.subscriptions.push(
combineLatest( combineLatest(
this.appService.getTypes('StageTypes'), this.appService.getTypes('StageTypes'),
this.appService.getTypes('StepTypes', true, 'Please Select'), this.appService.getTypes('StepTypes', true, 'Add Step'),
this.appService.getTypes('ResponseActions'), this.appService.getTypes('ResponseActions'),
this.appService.getTypes('ApplicantSources') this.appService.getTypes('ApplicantSources')
) )
...@@ -140,9 +140,13 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -140,9 +140,13 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
addDefaultStages(): void { addDefaultStages(): void {
this.workflow.WorkFlowStages = []; this.workflow.WorkFlowStages = [];
let topIndex = 1;
this.stageTypes.forEach(stage => { this.stageTypes.forEach(stage => {
const index = (!stage.IsPostStage && !stage.IsPreStage) ? topIndex++ : -1;
if (!stage.IsPreStage && !stage.IsPostStage) {
return;
}
const index = -1;
const stageObject = new WorkflowStageModel(`${stage.Description} Stage`, false, stage, index, const stageObject = new WorkflowStageModel(`${stage.Description} Stage`, false, stage, index,
false, this.workflow.ObjectID); false, this.workflow.ObjectID);
this.utilsService.addMultiRefObject(stageObject, this.workflow, 'WorkFlowStages', this.createdObjs); this.utilsService.addMultiRefObject(stageObject, this.workflow, 'WorkFlowStages', this.createdObjs);
...@@ -577,6 +581,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -577,6 +581,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
list.forEach((item, i) => { list.forEach((item, i) => {
item.SortOrder = i; item.SortOrder = i;
}); });
console.log(this.workflow.WorkFlowStages);
} }
// tslint:disable-next-line:max-file-line-count // tslint:disable-next-line:max-file-line-count
......
frontend/angular/src/app/components/select-2/select-2.component.html
<div class="header-select custom-dropdown w-100"> <div class="header-select custom-dropdown w-100">
<select2 #mySelect [data]="_items" [value]="_value" (valueChanged)="valueChanged($event)" <select2 #mySelect [data]="_items" [value]="_value" (valueChanged)="valueChanged($event)"
[options]="options"> [options]="options" class="normalDropDown">
</select2> </select2>
</div> </div>
frontend/angular/src/app/components/select-2/select-2.component.ts
import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
import { Select2Component, Select2OptionData } from "ng2-select2"; import { Select2Component, Select2OptionData } from 'ng2-select2';
@Component({ @Component({
selector: 'app-select-2', selector: 'app-select-2',
...@@ -22,12 +22,13 @@ export class SelectTwoComponent { ...@@ -22,12 +22,13 @@ export class SelectTwoComponent {
id: elem.ObjectID ? elem.ObjectID : index, id: elem.ObjectID ? elem.ObjectID : index,
text: elem[this.fieldLabel] text: elem[this.fieldLabel]
}; };
return item; return item;
}); });
setTimeout(() => { setTimeout(() => {
this.ignoreChange = false; this.ignoreChange = false;
}) });
} }
@Input() set value(value) { @Input() set value(value) {
...@@ -47,7 +48,7 @@ export class SelectTwoComponent { ...@@ -47,7 +48,7 @@ export class SelectTwoComponent {
this.options = {minimumResultsForSearch: Infinity}; this.options = {minimumResultsForSearch: Infinity};
} }
valueChanged(event) { valueChanged(event): void {
if (this.ignoreChange) { if (this.ignoreChange) {
return; return;
} }
......
frontend/angular/src/assets/css/custom.scss
...@@ -118,6 +118,12 @@ ...@@ -118,6 +118,12 @@
} }
} }
.postStage {
.ui-panel {
margin-bottom: 10px;
}
}
.ui-panel { .ui-panel {
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
...@@ -140,7 +146,7 @@ ...@@ -140,7 +146,7 @@
.ui-panel-content { .ui-panel-content {
background-color: white; background-color: white;
padding: 65px 10.5% !important; /*padding: 65px 10.5% !important;*/
} }
} }
...@@ -222,6 +228,13 @@ ...@@ -222,6 +228,13 @@
width: 75% !important; width: 75% !important;
} }
.normalDropDown {
.select2-container .select2-selection .select2-selection__rendered {
background: none;
padding-left: 10px;
}
}
.h-80 { .h-80 {
height: 80px; height: 80px;
} }
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