Skip to content

P
PERFORMA_REPLICA
Commit 2d99d6ab by GD-A-150752
Options

bug-fixes

parent 1aa5ca70
Showing with 32 additions and 35 deletions
frontend/angular/src/app/components/admin-portal/edit-message-template/edit-message-template.component.html
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<div class="col-md-6" <div class="col-md-6"
*ngIf="this.messageTemplateTypes.length && this.messageTemplate && this.messageTemplate.TemplateType"> *ngIf="this.messageTemplateTypes.length && this.messageTemplate && this.messageTemplate.TemplateType">
<label for="select">Message Template Type</label> <label for="select">Message Template Type</label>
<app-select-2 [data]="messageTemplateTypes" [value]="messageTemplateTypes[0]" <app-select-2 [data]="messageTemplateTypes" [value]="this.messageTemplate.TemplateType"
fieldLabel="Description" id="select" fieldLabel="Description" id="select"
(valChange)="storeMessageContent($event)"> (valChange)="storeMessageContent($event)">
</app-select-2> </app-select-2>
......
frontend/angular/src/app/components/admin-portal/edit-message-template/edit-message-template.component.ts
...@@ -43,7 +43,6 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni ...@@ -43,7 +43,6 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
temporaryMessageContent = ''; temporaryMessageContent = '';
linkText = ''; linkText = '';
options = {minimumResultsForSearch: Infinity}; options = {minimumResultsForSearch: Infinity};
templateTypeId = 0;
showLoader = false; showLoader = false;
editMode = false; editMode = false;
...@@ -60,6 +59,7 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni ...@@ -60,6 +59,7 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
} }
ngOnInit(): void { ngOnInit(): void {
window.scrollTo(0, 0);
this.createdObjs = {}; this.createdObjs = {};
this.updatedObjs = {}; this.updatedObjs = {};
this.deletedObjs = {}; this.deletedObjs = {};
...@@ -176,6 +176,7 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni ...@@ -176,6 +176,7 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
if (editor[0]) { if (editor[0]) {
editor[0].classList.add('form-control'); editor[0].classList.add('form-control');
editor[0].classList.add('editor');
} }
['keyup', 'click'].forEach(event => { ['keyup', 'click'].forEach(event => {
...@@ -243,10 +244,12 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni ...@@ -243,10 +244,12 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
* This function is called only once before saving the template to re-assign value of content in ngModel. * This function is called only once before saving the template to re-assign value of content in ngModel.
*/ */
assignContent(): void { assignContent(): void {
const editor = this.messageContentEditor.getQuill().container; if (this.emailTemplateType()) {
if (editor) { const editor = this.messageContentEditor.getQuill().container;
const editElement = editor.getElementsByClassName('ql-editor')[0]; if (editor) {
this.messageTemplate.MessageContent = editElement.innerHTML; const editElement = editor.getElementsByClassName('ql-editor')[0];
this.messageTemplate.MessageContent = editElement.innerHTML;
}
} }
} }
...@@ -369,8 +372,6 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni ...@@ -369,8 +372,6 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
data => { data => {
this.messageTemplate = data; this.messageTemplate = data;
this.updatedObjs[this.messageTemplate.ObjectID] = this.messageTemplate; this.updatedObjs[this.messageTemplate.ObjectID] = this.messageTemplate;
this.templateTypeId =
this.messageTemplateTypes.find(elem => elem.Value === this.messageTemplate.TemplateType.Value).id;
this.showLoader = false; this.showLoader = false;
// Significance of setTimeout is to call the function at the end of browser stack // Significance of setTimeout is to call the function at the end of browser stack
// in order to make sure that UI has been updated prior to calling its view-child // in order to make sure that UI has been updated prior to calling its view-child
......
frontend/angular/src/app/components/admin-portal/edit-workflow-template/edit-workflow-template.component.html
...@@ -40,10 +40,13 @@ ...@@ -40,10 +40,13 @@
</span> </span>
</p-header> </p-header>
<div class="form-group ui-g"> <div class="form-group ui-g">
<div class="work-belonging ui-g-12 mb-0"> <div class="work-belonging ui-g-6 mb-0">
<span class="calcField">Landing Page</span> <span class="calcField">Landing Page</span>
</div> </div>
<div class="form-group ui-g-12"> <div class="work-belonging ui-g-6 mb-0">
<span class="calcField">Verification Page</span>
</div>
<div class="form-group ui-g-6">
<label for="LandingButtonText">Button Text</label> <label for="LandingButtonText">Button Text</label>
<input [(ngModel)]="workflow.LandingButtonText" [disabled]="showLoader" <input [(ngModel)]="workflow.LandingButtonText" [disabled]="showLoader"
class="form-control" class="form-control"
...@@ -52,10 +55,7 @@ ...@@ -52,10 +55,7 @@
required required
tabindex="1" type="text"> tabindex="1" type="text">
</div> </div>
<div class="work-belonging ui-g-12 mb-0"> <div class="form-group ui-g-6">
<span class="calcField">Verification Page</span>
</div>
<div class="form-group ui-g-12">
<label for="VerificationHeaderText">Header Text</label> <label for="VerificationHeaderText">Header Text</label>
<input [(ngModel)]="workflow.VerificationHeaderText" [disabled]="showLoader" <input [(ngModel)]="workflow.VerificationHeaderText" [disabled]="showLoader"
class="form-control" class="form-control"
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group ui-g-12"> <div class="form-group ui-g-6">
<label for="VerificationHeaderText">Button Text</label> <label for="VerificationHeaderText">Button Text</label>
<input [(ngModel)]="workflow.ApplicationButtonText" [disabled]="showLoader" <input [(ngModel)]="workflow.ApplicationButtonText" [disabled]="showLoader"
class="form-control" class="form-control"
...@@ -110,19 +110,13 @@ ...@@ -110,19 +110,13 @@
required required
tabindex="7" type="text"> tabindex="7" type="text">
</div> </div>
<div class="form-group ui-g-12"> <div class="form-group ui-g-6">
<div class="ui-g"> <label class="mb-0">Action</label>
<div class="ui-g-2"> <p-selectButton [(ngModel)]="workflow.ApplicationResponseAction"
<label class="mb-0">Action</label> [options]="responseActions"
</div> name="ApplicationResponseAction"
<div class="ui-g-6"> optionLabel="Description" class="mt-10">
<p-selectButton [(ngModel)]="workflow.ApplicationResponseAction" </p-selectButton>
[options]="responseActions"
name="ApplicationResponseAction"
optionLabel="Description">
</p-selectButton>
</div>
</div>
</div> </div>
<div *ngIf="emailResponseSelected()" class="form-group ui-g-12"> <div *ngIf="emailResponseSelected()" class="form-group ui-g-12">
<div class="ui-g"> <div class="ui-g">
...@@ -161,7 +155,8 @@ ...@@ -161,7 +155,8 @@
<ng-container *ngTemplateOutlet="stepsTemplate; context:{stage: stage}"></ng-container> <ng-container *ngTemplateOutlet="stepsTemplate; context:{stage: stage}"></ng-container>
<!-- End steps section --> <!-- End steps section -->
<!-- Start messaging section --> <!-- Start messaging section -->
<ng-container *ngTemplateOutlet="messageTemplate; context:{stage: stage}"></ng-container> <ng-container
*ngTemplateOutlet="messageTemplate; context:{stage: stage}"></ng-container>
<!-- End messaging section --> <!-- End messaging section -->
</div> </div>
</p-panel> </p-panel>
...@@ -210,7 +205,8 @@ ...@@ -210,7 +205,8 @@
<ng-container *ngTemplateOutlet="stepsTemplate; context:{stage: stage}"></ng-container> <ng-container *ngTemplateOutlet="stepsTemplate; context:{stage: stage}"></ng-container>
<!-- End steps section --> <!-- End steps section -->
<!-- Start messaging section --> <!-- Start messaging section -->
<ng-container *ngTemplateOutlet="messageTemplate; context:{stage: stage}"></ng-container> <ng-container
*ngTemplateOutlet="messageTemplate; context:{stage: stage}"></ng-container>
<!-- End messaging section --> <!-- End messaging section -->
</div> </div>
</p-panel> </p-panel>
...@@ -229,7 +225,8 @@ ...@@ -229,7 +225,8 @@
</p-header> </p-header>
<div class="ui-g form-group"> <div class="ui-g form-group">
<!-- Start messaging section --> <!-- Start messaging section -->
<ng-container *ngTemplateOutlet="messageTemplate; context:{stage: stage}"></ng-container> <ng-container
*ngTemplateOutlet="messageTemplate; context:{stage: stage}"></ng-container>
<!-- End messaging section --> <!-- End messaging section -->
</div> </div>
</p-panel> </p-panel>
...@@ -446,8 +443,8 @@ ...@@ -446,8 +443,8 @@
<div *ngFor="let message of stage.WorkFlowMessages" class="form-group row"> <div *ngFor="let message of stage.WorkFlowMessages" class="form-group row">
<div *ngIf="stage.UseMessaging && message.IsWithdrawalMessage" <div *ngIf="stage.UseMessaging && message.IsWithdrawalMessage"
class="col-lg-12 col-md-12"> class="ui-g ui-g-3">
<h4>Withdrawal Process</h4> <h4 class="ui-g-offset-1">Withdrawal Process</h4>
</div> </div>
<div *ngIf="stage.UseMessaging && message.IsWithdrawalMessage" <div *ngIf="stage.UseMessaging && message.IsWithdrawalMessage"
class="col-lg-12 col-md-12 mb-10"> class="col-lg-12 col-md-12 mb-10">
......
frontend/angular/src/app/components/admin-portal/list-work-flows/list-work-flows.component.html
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="shorting-dropdown"> <div class="shorting-dropdown">
<div class="order-label">order by</div> <div class="order-label">order by</div>
<app-select-2 [data]="sortOptions" [value]="sortOptions[0]" fieldLabel="description" <app-select-2 [data]="sortOptions" [value]="sortOptions[0]" fieldLabel="description"
(valChange)="sortWorkFlowTemplates($event)" fieldValue="ObjectID"> (valChange)="sortWorkFlowTemplates($event)">
</app-select-2> </app-select-2>
</div> </div>
</div> </div>
......
frontend/angular/src/app/components/select-2/select-2.component.ts
...@@ -13,7 +13,6 @@ export class SelectTwoComponent { ...@@ -13,7 +13,6 @@ export class SelectTwoComponent {
ignoreChange = false; ignoreChange = false;
@Input() fieldLabel: string; @Input() fieldLabel: string;
@Input() fieldValue: string;
@Input() set data(items) { @Input() set data(items) {
this._originalItems = items; this._originalItems = items;
......
frontend/angular/src/assets/css/common.css
This source diff could not be displayed because it is too large. You can view the blob instead.
frontend/angular/src/assets/css/custom.scss
This source diff could not be displayed because it is too large. You can view the blob instead.
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