Commit 78c6229e by GD-A-150752

hiringTeamId added

parent 6b1b1b34
<div class="dashboard-content-area second-part"> <div class="dashboard-content-area second-part {{objectID ? 'openedFromWorkflow' : '' }}">
<app-error-message></app-error-message> <app-error-message></app-error-message>
<form #form="ngForm"> <form #form="ngForm">
<div class="ui-g ui-fluid"> <div class="ui-g ui-fluid">
......
...@@ -90,7 +90,18 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni ...@@ -90,7 +90,18 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
.subscribe( .subscribe(
(params: Params) => { (params: Params) => {
if ((params.id && params.id !== '0') || this.templateUpdateFromWorkflow()) { if (this.templateCreationFromWorkflow()) {
this.messageTemplate.HiringTeam = this.adminPortalLayoutService.getHiringTeamID().ObjectID;
if (this.messageTemplateTypes) {
this.messageTemplate.TemplateType = this.messageTemplateTypes[0];
}
this.utilsService.createObject(this.messageTemplate, this.createdObjs);
this.setInputListener();
this.showLoader = false;
} else if (this.templateUpdateFromWorkflow() || (params.id && params.id !== '0')) {
this.editMode = true; this.editMode = true;
this.getMessageTemplateByID(this.templateUpdateFromWorkflow() ? this.objectID : params.id); this.getMessageTemplateByID(this.templateUpdateFromWorkflow() ? this.objectID : params.id);
...@@ -130,8 +141,11 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni ...@@ -130,8 +141,11 @@ export class EditMessageTemplateComponent extends BaseComponent implements OnIni
} }
showSaveCopyBtn(): boolean { showSaveCopyBtn(): boolean {
return this.messageTemplate && this.messageTemplate.ObjectID ? if (this.messageTemplate && this.messageTemplate.ObjectID) {
(!!this.messageTemplate.HiringTeam) : false; return this.messageTemplate.HiringTeam === null;
}
return false;
} }
setInputListener(): void { setInputListener(): void {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</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"> [positionLeft]="0" [modal]="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>
......
...@@ -83,7 +83,6 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -83,7 +83,6 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
} }
initComponent(): void { initComponent(): void {
this.subscriptions.push(this.activatedRoute.params this.subscriptions.push(this.activatedRoute.params
.subscribe((params: Params) => { .subscribe((params: Params) => {
if (params.id && params.id !== '0') { if (params.id && params.id !== '0') {
...@@ -284,7 +283,8 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -284,7 +283,8 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
}; };
const myMsgParams = { const myMsgParams = {
OnlyGlobalTemplate: false, OnlyGlobalTemplate: false,
attribsByName: 'Autocomplete' attribsByName: 'Autocomplete',
HiringTeam: this.adminPortalLayoutService.getHiringTeamID().ObjectID
}; };
this.subscriptions.push( this.subscriptions.push(
...@@ -333,6 +333,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -333,6 +333,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
configureMessageTemplate(message: WorkflowMessageModel): void { configureMessageTemplate(message: WorkflowMessageModel): void {
if (message.MessageTemplate && typeof message.MessageTemplate !== 'string') { if (message.MessageTemplate && typeof message.MessageTemplate !== 'string') {
this.selectedTemplateID = message.MessageTemplate.ObjectID; this.selectedTemplateID = message.MessageTemplate.ObjectID;
this.selectedMessageTemplate = message.ObjectID;
this.displayNewMessageTemplate = true; this.displayNewMessageTemplate = true;
} }
} }
...@@ -340,7 +341,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn ...@@ -340,7 +341,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
closeDialog(value): void { closeDialog(value): void {
if (value === -1) { if (value === -1) {
// Cancel button is clicked // Cancel button is clicked
} else if (this.selectedTemplateID === 'NEW' && this.selectedMessageTemplate !== null) { } else if (this.selectedMessageTemplate !== null) {
// When new value is created, assign it to the current WorkFlowMessage // When new value is created, assign it to the current WorkFlowMessage
this.showLoader = true; this.showLoader = true;
this.getMessageTemplates(() => { this.getMessageTemplates(() => {
......
...@@ -60,7 +60,8 @@ export class ListMessageTemplateComponent extends BaseComponent implements OnIni ...@@ -60,7 +60,8 @@ export class ListMessageTemplateComponent extends BaseComponent implements OnIni
OnlyGlobalTemplate: true OnlyGlobalTemplate: true
}; };
const myMsgParams = { const myMsgParams = {
OnlyGlobalTemplate: false OnlyGlobalTemplate: false,
HiringTeam: this.adminPortalLayoutService.getHiringTeamID().ObjectID
}; };
this.subscriptions.push( this.subscriptions.push(
...@@ -70,8 +71,7 @@ export class ListMessageTemplateComponent extends BaseComponent implements OnIni ...@@ -70,8 +71,7 @@ export class ListMessageTemplateComponent extends BaseComponent implements OnIni
) )
.subscribe( .subscribe(
(response: [Array<MessageTemplateModel>, Array<MessageTemplateModel>]) => { (response: [Array<MessageTemplateModel>, Array<MessageTemplateModel>]) => {
this.myTemplates = response[0].filter(message => message.HiringTeam === this.myTemplates = response[0];
this.adminPortalLayoutService.getHiringTeamID().ObjectID);
this.sharedTemplates = response[1]; this.sharedTemplates = response[1];
this.sortSpecificTemplate('myTemplates'); this.sortSpecificTemplate('myTemplates');
......
...@@ -56,7 +56,8 @@ export class ListWorkFlowsComponent extends BaseComponent implements OnInit { ...@@ -56,7 +56,8 @@ export class ListWorkFlowsComponent extends BaseComponent implements OnInit {
OnlyGlobalTemplates: true OnlyGlobalTemplates: true
}; };
const myParams = { const myParams = {
OnlyGlobalTemplates: false OnlyGlobalTemplates: false,
HiringTeam: this.adminPortalLayoutService.getHiringTeamID().ObjectID
}; };
this.subscriptions.push( this.subscriptions.push(
...@@ -66,8 +67,7 @@ export class ListWorkFlowsComponent extends BaseComponent implements OnInit { ...@@ -66,8 +67,7 @@ export class ListWorkFlowsComponent extends BaseComponent implements OnInit {
) )
.subscribe( .subscribe(
(response: [Array<WorkflowTemplateModel>, Array<WorkflowTemplateModel>]) => { (response: [Array<WorkflowTemplateModel>, Array<WorkflowTemplateModel>]) => {
this.myTemplates = response[0].filter(wf => wf.HiringTeam === this.myTemplates = response[0];
this.adminPortalLayoutService.getHiringTeamID().ObjectID);
this.sharedTemplates = response[1]; this.sharedTemplates = response[1];
this.sortSpecificTemplate('myTemplates'); this.sortSpecificTemplate('myTemplates');
......
...@@ -146,7 +146,8 @@ ...@@ -146,7 +146,8 @@
.ui-panel-content { .ui-panel-content {
background-color: white; background-color: white;
/*padding: 65px 10.5% !important;*/ padding-left: 3em;
padding-right: 3em;
} }
} }
...@@ -238,3 +239,14 @@ ...@@ -238,3 +239,14 @@
.h-80 { .h-80 {
height: 80px; height: 80px;
} }
.openedFromWorkflow {
margin-top: 0 !important;
width: 100% !important;
}
.ui-dialog {
left: 100px !important;
overflow-y: scroll;
height: 80% !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