Commit 812d5215 by GD-A-150752

Bug-Fix S52625662 #Ui - Alphabetically order the drop down

parent d3b643f5
...@@ -380,7 +380,7 @@ ...@@ -380,7 +380,7 @@
<label>{{message.DelayString}}</label> <label>{{message.DelayString}}</label>
</div> </div>
</div> </div>
<div class="col-md-1"> <div class="col-md-{{stage.StageType.IsPreStage ? '1' : '2'}}">
<label for="Variance{{message.ObjectID}}">+/-</label> <label for="Variance{{message.ObjectID}}">+/-</label>
<input [(ngModel)]="message.Variance" <input [(ngModel)]="message.Variance"
[disabled]="showLoader" [disabled]="showLoader"
...@@ -389,14 +389,14 @@ ...@@ -389,14 +389,14 @@
(focusin)="toggleInput($event, 'Variance'+message.ObjectID, true)" (focusin)="toggleInput($event, 'Variance'+message.ObjectID, true)"
class="form-control" id="Variance{{message.ObjectID}}" 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="text"> name="Variance{{message.ObjectID}}" type="number">
<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">
<label>{{message.VarianceString}}</label> <label>{{message.VarianceString}}</label>
</div> </div>
</div> </div>
<div class="col-md-2 business-hours"> <div class="col-md-{{stage.StageType.IsPreStage ? '2' : '3'}} business-hours">
<p-checkbox [(ngModel)]="message.BusinessHoursOnly" <p-checkbox [(ngModel)]="message.BusinessHoursOnly"
binary="true" binary="true"
name="BusinessHoursOnly{{message.ObjectID}}"> name="BusinessHoursOnly{{message.ObjectID}}">
...@@ -404,7 +404,7 @@ ...@@ -404,7 +404,7 @@
<label title="Business Hours only" class="mb-0">Business Hours <label title="Business Hours only" class="mb-0">Business Hours
only</label> only</label>
</div> </div>
<div class="col-md-3"> <div class="col-md-{{stage.StageType.IsPreStage ? '3' : '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"
...@@ -419,11 +419,15 @@ ...@@ -419,11 +419,15 @@
class="dropdown-text">{{message.label}}</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 *ngIf="selectedMsg.value.id !== '-2'" class="ui-helper-clearfix"
style="position: relative;height: 25px;"> style="position: relative;height: 25px;">
<i class="{{getMessageClass(selectedMsg.value)}}"></i> <i class="{{getMessageClass(selectedMsg.value)}}"></i>
<div class="dropdown-text">{{selectedMsg.label}}</div> <div class="dropdown-text">{{selectedMsg.label}}</div>
</div> </div>
<div *ngIf="selectedMsg.value.id === '-2'" class="ui-helper-clearfix"
style="position: relative;height: 5px;">
<div class="separator"></div>
</div>
</ng-template> </ng-template>
</p-dropdown> </p-dropdown>
</div> </div>
...@@ -476,7 +480,7 @@ ...@@ -476,7 +480,7 @@
(focusin)="toggleInput($event, 'Variance'+message.ObjectID, true)" (focusin)="toggleInput($event, 'Variance'+message.ObjectID, true)"
class="form-control" id="Variance{{message.ObjectID}}" 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="text"> name="Variance{{message.ObjectID}}" type="number">
<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">
...@@ -506,11 +510,14 @@ ...@@ -506,11 +510,14 @@
class="dropdown-text">{{message.label}}</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 *ngIf="selectedMsg.value.id !== '-2'" class="ui-helper-clearfix"
style="position: relative;height: 25px;"> style="position: relative;height: 25px;">
<i class="{{getMessageClass(selectedMsg.value)}}"></i> <i class="{{getMessageClass(selectedMsg.value)}}"></i>
<div <div class="dropdown-text">{{selectedMsg.label}}</div>
class="dropdown-text">{{selectedMsg.label}}</div> </div>
<div *ngIf="selectedMsg.value.id === '-2'" class="ui-helper-clearfix"
style="position: relative;height: 5px;">
<div class="separator"></div>
</div> </div>
</ng-template> </ng-template>
</p-dropdown> </p-dropdown>
......
...@@ -124,6 +124,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -124,6 +124,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
if (!this.isGlobalHT && !this.adminPortalLayoutService.getHiringTeamID().HasDiversity) { if (!this.isGlobalHT && !this.adminPortalLayoutService.getHiringTeamID().HasDiversity) {
this.stepTypeOptions = this.stepTypeOptions.filter(type => type.Value !== 'DIVERSITY'); this.stepTypeOptions = this.stepTypeOptions.filter(type => type.Value !== 'DIVERSITY');
} }
this.responseActions = response[2]; this.responseActions = response[2];
this.applicantSources = response[3]; this.applicantSources = response[3];
...@@ -366,7 +367,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -366,7 +367,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
attribsByName: 'Autocomplete', attribsByName: 'Autocomplete',
HiringTeam: this.adminPortalLayoutService.getHiringTeamID().ObjectID HiringTeam: this.adminPortalLayoutService.getHiringTeamID().ObjectID
}; };
this.subscriptions.push( this.subscriptions.push(
combineLatest( combineLatest(
this.editWorkflowTemplateService.getMessageTemplates([], myMsgParams), this.editWorkflowTemplateService.getMessageTemplates([], myMsgParams),
...@@ -410,7 +411,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -410,7 +411,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') { if (template.id === '-1' || template.id === '-2') {
delete message.MessageTemplate; delete message.MessageTemplate;
} 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
......
...@@ -93,25 +93,6 @@ a { ...@@ -93,25 +93,6 @@ a {
fill: #fff; fill: #fff;
} }
} }
&.clicked {
background-color: #cff5b3;
border: 2px solid #cff5b3;
color: #6AAA3B;
padding-right: 6px;
animation: bounce-in .3s;
cursor: default;
svg {
animation: flyaway 1.3s linear;
top: -80px;
right: -1000px;
path {
fill: #6AAA3B;
}
}
}
} }
@keyframes flyaway { @keyframes flyaway {
......
...@@ -378,6 +378,12 @@ body .ui-dropdown-panel .ui-dropdown-filter-container { ...@@ -378,6 +378,12 @@ body .ui-dropdown-panel .ui-dropdown-filter-container {
} }
} }
.panel-header-input {
background: white !important;
font-size: 20px !important;
padding-left: 40px !important;
}
.ui-dropdown { .ui-dropdown {
background: transparent no-repeat; background: transparent no-repeat;
background-image: linear-gradient(to bottom, rgba(3, 160, 231, 0.5), rgba(3, 160, 231, 0.5)), linear-gradient(to bottom, #bdbdbd, #bdbdbd) !important; background-image: linear-gradient(to bottom, rgba(3, 160, 231, 0.5), rgba(3, 160, 231, 0.5)), linear-gradient(to bottom, #bdbdbd, #bdbdbd) !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