padding-fix

frontend/angular/src/app/components/edit-message-template/edit-message-template.component.html

@@ -28,7 +28,7 @@
                         </app-select-2>
                     </div>
                 </div>
-                <div class="form-group row">
+                <div class="form-group row" *ngIf="emailTemplateType()">
                     <div class="col-md-6">
                         <label for="subjectInputId">Subject</label>
                         <input id="subjectInputId" [(ngModel)]="messageTemplate.Subject"

frontend/angular/src/app/components/edit-workflow-template/edit-workflow-template.component.ts

@@ -93,7 +93,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
                 this.subscriptions.push(
                     combineLatest(
                         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('ApplicantSources')
                     )
@@ -140,9 +140,13 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
 
     addDefaultStages(): void {
         this.workflow.WorkFlowStages = [];
-        let topIndex = 1;
         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,
                 false, this.workflow.ObjectID);
             this.utilsService.addMultiRefObject(stageObject, this.workflow, 'WorkFlowStages', this.createdObjs);
@@ -577,6 +581,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
         list.forEach((item, i) => {
             item.SortOrder = i;
         });
+        console.log(this.workflow.WorkFlowStages);
     }
 
 // 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">
     <select2 #mySelect [data]="_items" [value]="_value" (valueChanged)="valueChanged($event)"
-             [options]="options">
+             [options]="options" class="normalDropDown">
     </select2>
 </div>

frontend/angular/src/app/components/select-2/select-2.component.ts

 import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
-import { Select2Component, Select2OptionData } from "ng2-select2";
+import { Select2Component, Select2OptionData } from 'ng2-select2';
 
 @Component({
     selector: 'app-select-2',
@@ -22,12 +22,13 @@ export class SelectTwoComponent {
                 id: elem.ObjectID ? elem.ObjectID : index,
                 text: elem[this.fieldLabel]
             };
+
             return item;
         });
 
         setTimeout(() => {
             this.ignoreChange = false;
-        })
+        });
     }
 
     @Input() set value(value) {
@@ -47,7 +48,7 @@ export class SelectTwoComponent {
         this.options = {minimumResultsForSearch: Infinity};
     }
 
-    valueChanged(event) {
+    valueChanged(event): void {
         if (this.ignoreChange) {
             return;
         }

frontend/angular/src/assets/css/custom.scss

@@ -118,6 +118,12 @@
     }
 }
 
+.postStage {
+    .ui-panel {
+        margin-bottom: 10px;
+    }
+}
+
 .ui-panel {
     margin-right: auto;
     margin-left: auto;
@@ -140,7 +146,7 @@
 
     .ui-panel-content {
         background-color: white;
-        padding: 65px 10.5% !important;
+        /*padding: 65px 10.5% !important;*/
     }
 }
 
@@ -222,6 +228,13 @@
     width: 75% !important;
 }
 
+.normalDropDown {
+    .select2-container .select2-selection .select2-selection__rendered {
+        background: none;
+        padding-left: 10px;
+    }
+}
+
 .h-80 {
     height: 80px;
 }