@colijnit/sharedcomponents 255.1.2 → 255.1.4

package/fesm2015/colijnit-sharedcomponents.js

@@ -9629,7 +9629,7 @@ FileUploadPopupComponent.decorators = [
                 template: `
         <co-dialog *ngIf="!useWithoutSettingProps && documentUnderEdit" cssId="popup_files_upload_content"
                    [headerTemplate]="headerTemplate" contentSize noClickOutside
-                   (close)="onPopupClose()">
+                   (close)="onPopupClose()" (closeClick)="onPopupCancelClick()">
             <div class="co-dialog-wrapper">
                 <div class="file-upload-form-wrapper" fxLayout="column" fxLayoutGap="10px">
                     <co-form class="narrow-scrollbar" (validSubmit)="onValidSubmit()">
@@ -11623,6 +11623,14 @@ class ActivityListComponent {
         }
         return false;
     }
+    showEmailHistory(activity) {
+        if ((activity.remark && activity.remark.emailHistory && activity.remark.emailHistory.length > 0) ||
+            (activity.work && activity.work.emailHistory && activity.work.emailHistory.length > 0) ||
+            (activity.task && activity.task.emailHistory && activity.task.emailHistory.length > 0)) {
+            return true;
+        }
+        return false;
+    }
     showWorkedTime(activity) {
         if ((activity.IsWork && activity.work && activity.work.workedTime) ||
             (activity.IsTask && activity.task && activity.task.workedTime)) {
@@ -11669,6 +11677,7 @@ ActivityListComponent.decorators = [
               </div>
               <div class="icon-indicators">
                 <co-icon *ngIf="showAttachments(activity)" [iconData]="iconCacheService.getIcon(Icon.PaperclipRegular)" (click)="openActivityPopup(activity)"></co-icon>
+                <co-icon *ngIf="showEmailHistory(activity)" [iconData]="iconCacheService.getIcon(Icon.EmailRegular)"></co-icon>
                 <span *ngIf="showAttachments(activity)">{{activity.documents.length}}</span>
                 <co-icon *ngIf="showWorkedTime(activity)"
                          [iconData]="iconCacheService.getIcon(Icon.ClockRegular)"></co-icon>
@@ -15261,11 +15270,12 @@ WorkflowInfoTilesModule.decorators = [
 ];
 
 class TaskCreatorComponent {
-    constructor(iconService, dictionaryService, sharedService, _dialogService) {
+    constructor(iconService, dictionaryService, sharedService, _dialogService, _formMasterService) {
         this.iconService = iconService;
         this.dictionaryService = dictionaryService;
         this.sharedService = sharedService;
         this._dialogService = _dialogService;
+        this._formMasterService = _formMasterService;
         this.icons = Icon;
         this.table = TableName$1.Transactions;
         this.activityCreated = new EventEmitter();
@@ -15310,7 +15320,7 @@ class TaskCreatorComponent {
     }
     createRemarkClicked() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.createForm.submit();
+            this._formMasterService.submitSlaves();
             if (this.createForm.isValid()) {
                 let remark = this.createRemark();
                 let activity = new Activity();
@@ -15339,7 +15349,7 @@ class TaskCreatorComponent {
     }
     createWorkClicked() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.createForm.submit();
+            this._formMasterService.submitSlaves();
             if (this.createForm.isValid()) {
                 let work = this.createWork();
                 let activity = new Activity();
@@ -15356,7 +15366,7 @@ class TaskCreatorComponent {
     }
     createTaskClicked() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.createForm.submit();
+            this._formMasterService.submitSlaves();
             if (this.createForm.isValid()) {
                 const task = this.createTask();
                 let activity = new Activity();
@@ -15601,14 +15611,18 @@ TaskCreatorComponent.decorators = [
                      (click)="emailDialogClosed()"></co-button>
         </div>
       </ng-template>
-    `
+    `,
+                providers: [
+                    FormMasterService
+                ]
             },] }
 ];
 TaskCreatorComponent.ctorParameters = () => [
     { type: IconCacheService },
     { type: DictionaryService },
     { type: SharedService },
-    { type: CoreDialogService }
+    { type: CoreDialogService },
+    { type: FormMasterService }
 ];
 TaskCreatorComponent.propDecorators = {
     createForm: [{ type: ViewChild, args: [FormComponent,] }],