@colijnit/sharedcomponents 254.1.5 → 254.1.7

package/fesm2015/colijnit-sharedcomponents.js

@@ -84,6 +84,7 @@ import { RelationRequest } from '@colijnit/relationapi/build/model/relation-requ
 import { Period } from '@colijnit/mainapi/build/enum/period.enum';
 import { activityEmailRequestData } from '@colijnit/mainapi/build/model/activity-email-request-data';
 import { ReportType } from '@colijnit/mainapi/build/enum/report-type.enum';
+import { ActivityEmailHistory } from '@colijnit/mainapi/build/model/activity-email-history.bo';
 import { StringUtils as StringUtils$1 } from '@colijnit/ioneconnector/build/utils/string-utils';
 
 class DocsignComponent {
@@ -1577,9 +1578,11 @@ var Icon;
     Icon["DeleteLeftRegular"] = "delete_left_regular";
     Icon["DeliveryTruck"] = "delivery_truck";
     Icon["DetailView"] = "detail_view";
+    Icon["DiagramProjectRegular"] = "diagram_project_regular";
     Icon["Dropzone"] = "dropzone";
     Icon["EditPenRegular"] = "edit_pen_regular";
     Icon["Email"] = "email";
+    Icon["EmailRegular"] = "email_regular";
     Icon["Employee"] = "employee";
     Icon["EnvelopeRegular"] = "envelope_regular";
     Icon["EyeRegular"] = "eye_regular";
@@ -1638,9 +1641,11 @@ const IconSvg = {
     "delete_left_regular": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 576 512\"><path d=\"M432.1 208.1L385.9 256L432.1 303C442.3 312.4 442.3 327.6 432.1 336.1C423.6 346.3 408.4 346.3 399 336.1L352 289.9L304.1 336.1C295.6 346.3 280.4 346.3 271 336.1C261.7 327.6 261.7 312.4 271 303L318.1 256L271 208.1C261.7 199.6 261.7 184.4 271 175C280.4 165.7 295.6 165.7 304.1 175L352 222.1L399 175C408.4 165.7 423.6 165.7 432.1 175C442.3 184.4 442.3 199.6 432.1 208.1V208.1zM512 64C547.3 64 576 92.65 576 128V384C576 419.3 547.3 448 512 448H205.3C188.3 448 172 441.3 160 429.3L9.372 278.6C3.371 272.6 0 264.5 0 256C0 247.5 3.372 239.4 9.372 233.4L160 82.75C172 70.74 188.3 64 205.3 64L512 64zM528 128C528 119.2 520.8 112 512 112H205.3C201 112 196.9 113.7 193.9 116.7L54.63 256L193.9 395.3C196.9 398.3 201 400 205.3 400H512C520.8 400 528 392.8 528 384V128z\"/></svg>",
     "delivery_truck": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><rect x=\"15.35\" y=\"16.56\" width=\"15.14\" height=\"10.94\" transform=\"translate(-1.83 2.08) rotate(-5)\" fill=\"#484f60\"/><path d=\"M38.5,18.1l-6.9.61L32.41,28l-7.63.67a3.76,3.76,0,0,1,1.43,2.25l7.25-.63A3.83,3.83,0,0,1,41,29.6l1-.1-.52-6Zm.29,5.84-3.91.34a.51.51,0,0,1-.55-.46L34,20.1a.49.49,0,0,1,.45-.54l2.27-.2a.5.5,0,0,1,.48.25l2,3.59A.5.5,0,0,1,38.79,23.94Z\" fill=\"#484f60\"/><path d=\"M19.66,29.09a3.8,3.8,0,0,0-1,2.46l-.74.07-1.82-.94L16,29.41Z\" fill=\"#484f60\"/><path d=\"M34.56,30.62a2.74,2.74,0,1,0,2.49-3A2.73,2.73,0,0,0,34.56,30.62Z\" fill=\"#484f60\"/><path d=\"M19.74,31.91a2.74,2.74,0,1,0,2.49-3A2.74,2.74,0,0,0,19.74,31.91Z\" fill=\"#484f60\"/><rect x=\"7.96\" y=\"17.63\" width=\"5\" height=\"1\" transform=\"translate(-1.54 0.98) rotate(-5)\" fill=\"#484f60\"/><rect x=\"11.02\" y=\"29.71\" width=\"3\" height=\"1\" transform=\"translate(-2.59 1.21) rotate(-5)\" fill=\"#484f60\"/><rect x=\"9.48\" y=\"23.53\" width=\"4\" height=\"1\" transform=\"matrix(1, -0.09, 0.09, 1, -2.05, 1.09)\" fill=\"#484f60\"/></svg>",
     "detail_view": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\"><g ><g><polygon points=\"24.55 16.18 24.55 27.49 2.44 27.49 2.44 5.38 14.69 5.38 15.59 4.48 14.04 2.94 0 2.94 0 29.93 26.99 29.93 26.99 15.88 25.92 14.81 24.55 16.18\" fill=\"#484f60\"/><polygon points=\"30 .4 17.92 .4 22 4.48 12.24 16.23 14.16 18.15 25.92 8.4 30 12.48 30 .4\" fill=\"#484f60\"/></g></g></svg>",
+    "diagram_project_regular": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 576 512\"><path d=\"M136 80c4.4 0 8 3.6 8 8v80c0 4.4-3.6 8-8 8H56c-4.4 0-8-3.6-8-8V88c0-4.4 3.6-8 8-8h80zM56 32C25.1 32 0 57.1 0 88v80c0 30.9 25.1 56 56 56h80c5.6 0 11.1-.8 16.2-2.4l75.9 101.2c-2.7 6.5-4.1 13.7-4.1 21.2v80c0 30.9 25.1 56 56 56h80c30.9 0 56-25.1 56-56V344c0-30.9-25.1-56-56-56H280c-5.6 0-11.1 .8-16.2 2.4L187.9 189.2c2.7-6.5 4.1-13.7 4.1-21.2V152H384v16c0 30.9 25.1 56 56 56h80c30.9 0 56-25.1 56-56V88c0-30.9-25.1-56-56-56H440c-30.9 0-56 25.1-56 56v16H192V88c0-30.9-25.1-56-56-56H56zM360 336c4.4 0 8 3.6 8 8v80c0 4.4-3.6 8-8 8H280c-4.4 0-8-3.6-8-8V344c0-4.4 3.6-8 8-8h80zM440 80h80c4.4 0 8 3.6 8 8v80c0 4.4-3.6 8-8 8H440c-4.4 0-8-3.6-8-8V88c0-4.4 3.6-8 8-8z\"/></svg>",
     "dropzone": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\"><g ><g><rect x=\"2\" y=\"1.67\" width=\"14\" height=\"6\" rx=\"2\" ry=\"2\" fill=\"#484f60\" opacity=\".5\"/><path d=\"M16.52,13.16l-.94-.47-1.61-2.53-1.23-1.62-.65-.85-1.53-1.59-2.06-1.17h-1.15l-.7,.7,.41,.91,2.47,2.2,.56,1.2,1.7,2.71,.82,2.26,.06,.74,.09,2.38-.23-.85-.97-.94-.79-.97-1.76-1.76-1.06-.35-.88,.24-.7,.62,1.32,1.44,1.56,1.97,2.14,3.73,2.2,2,1.82,1.14,2.44,1.06,1.91,1,2,1.03,.23,1.29,6.02-5.99v-.91s-.91-1-1-1.03c-.09-.03-.82-1.65-.82-1.65l-.47-1.91-.35-.97-1.32-1.67-.85-1.12-.5-.82-.88-1.14-.79-.77-1.33-.86-.22,.42,1.39,2.12-.94-.47-.86-1.48-1.33-1.38-1.06-.16-.03,.6,2.1,3.09-.94-.47-1.8-2.9-1.21-.86-1.29,.12,.18,.56,2.85,4.14Z\" fill=\"#484f60\"/><path d=\"M16,1.67h-1c1.1,0,2,.9,2,2v2c0,1.1-.9,2-2,2h1c1.1,0,2-.9,2-2V3.67c0-1.1-.9-2-2-2Z\" fill=\"#484f60\" opacity=\".5\"/><path d=\"M18,1.67h-1c1.1,0,2,.9,2,2v2c0,1.1-.9,2-2,2h1c1.1,0,2-.9,2-2V3.67c0-1.1-.9-2-2-2Z\" fill=\"#484f60\" opacity=\".25\"/><path d=\"M20,1.67h-1c1.1,0,2,.9,2,2v2c0,1.1-.9,2-2,2h1c1.1,0,2-.9,2-2V3.67c0-1.1-.9-2-2-2Z\" fill=\"#484f60\" opacity=\".1\"/></g></g></svg>",
     "edit_pen_regular": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><path d=\"M441 58.9L453.1 71c9.4 9.4 9.4 24.6 0 33.9L424 134.1 377.9 88 407 58.9c9.4-9.4 24.6-9.4 33.9 0zM209.8 256.2L344 121.9 390.1 168 255.8 302.2c-2.9 2.9-6.5 5-10.4 6.1l-58.5 16.7 16.7-58.5c1.1-3.9 3.2-7.5 6.1-10.4zM373.1 25L175.8 222.2c-8.7 8.7-15 19.4-18.3 31.1l-28.6 100c-2.4 8.4-.1 17.4 6.1 23.6s15.2 8.5 23.6 6.1l100-28.6c11.8-3.4 22.5-9.7 31.1-18.3L487 138.9c28.1-28.1 28.1-73.7 0-101.8L474.9 25C446.8-3.1 401.2-3.1 373.1 25zM88 64C39.4 64 0 103.4 0 152V424c0 48.6 39.4 88 88 88H360c48.6 0 88-39.4 88-88V312c0-13.3-10.7-24-24-24s-24 10.7-24 24V424c0 22.1-17.9 40-40 40H88c-22.1 0-40-17.9-40-40V152c0-22.1 17.9-40 40-40H200c13.3 0 24-10.7 24-24s-10.7-24-24-24H88z\"/></svg>",
     "email": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\"><path d=\"M31.79,38.45A17.82,17.82,0,0,1,23.86,40,13.09,13.09,0,0,1,10.41,26.42C10.41,17.63,16.83,10,26.53,10c7.63,0,13.06,5.21,13.06,12.46,0,6.33-3.53,10.3-8.19,10.3a3.42,3.42,0,0,1-3.71-3.32h-.08A6.5,6.5,0,0,1,22,32.76c-2.75,0-4.82-2.11-4.82-5.65a9.85,9.85,0,0,1,10.13-10,12.89,12.89,0,0,1,5.13,1l-1.3,8c-.43,2.54-.13,3.71,1.08,3.75,1.85.09,4.18-2.28,4.18-7.28,0-5.65-3.62-10-10.3-10S13.73,17.76,13.73,26c0,7.25,4.57,11.3,11,11.3A14.81,14.81,0,0,0,31,36ZM28,20.65a5.34,5.34,0,0,0-1.33-.18c-2.85,0-5.09,2.81-5.09,6.12,0,1.64.73,2.68,2.16,2.68,1.59,0,3.27-2,3.66-4.53Z\" fill=\"#484f60\"/></svg>",
+    "email_regular": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><path d=\"M256 64C150 64 64 150 64 256s86 192 192 192c17.7 0 32 14.3 32 32s-14.3 32-32 32C114.6 512 0 397.4 0 256S114.6 0 256 0S512 114.6 512 256v32c0 53-43 96-96 96c-29.3 0-55.6-13.2-73.2-33.9C320 371.1 289.5 384 256 384c-70.7 0-128-57.3-128-128s57.3-128 128-128c27.9 0 53.7 8.9 74.7 24.1c5.7-5 13.1-8.1 21.3-8.1c17.7 0 32 14.3 32 32v80 32c0 17.7 14.3 32 32 32s32-14.3 32-32V256c0-106-86-192-192-192zm64 192a64 64 0 1 0 -128 0 64 64 0 1 0 128 0z\"/></svg>",
     "employee": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\"><g ><path d=\"M15,2c-3.59,0-6.5,2.91-6.5,6.5s2.91,6.5,6.5,6.5,6.5-2.91,6.5-6.5-2.91-6.5-6.5-6.5Zm-.68,20.92l-3.58-5.37c-4.04,.67-7.12,4.18-7.12,8.41v.41c0,.9,.73,1.62,1.62,1.62H24.75c.9,0,1.62-.73,1.62-1.62v-.41c0-4.23-3.08-7.74-7.12-8.41l-3.58,5.37c-.32,.48-1.03,.48-1.35,0Z\" fill=\"#484f60\"/></g></svg>",
     "envelope_regular": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><path d=\"M64 112c-8.8 0-16 7.2-16 16v22.1L220.5 291.7c20.7 17 50.4 17 71.1 0L464 150.1V128c0-8.8-7.2-16-16-16H64zM48 212.2V384c0 8.8 7.2 16 16 16H448c8.8 0 16-7.2 16-16V212.2L322 328.8c-38.4 31.5-93.7 31.5-132 0L48 212.2zM0 128C0 92.7 28.7 64 64 64H448c35.3 0 64 28.7 64 64V384c0 35.3-28.7 64-64 64H64c-35.3 0-64-28.7-64-64V128z\"/></svg>",
     "eye_regular": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 576 512\"><path d=\"M288 80c-65.2 0-118.8 29.6-159.9 67.7C89.6 183.5 63 226 49.4 256c13.6 30 40.2 72.5 78.6 108.3C169.2 402.4 222.8 432 288 432s118.8-29.6 159.9-67.7C486.4 328.5 513 286 526.6 256c-13.6-30-40.2-72.5-78.6-108.3C406.8 109.6 353.2 80 288 80zM95.4 112.6C142.5 68.8 207.2 32 288 32s145.5 36.8 192.6 80.6c46.8 43.5 78.1 95.4 93 131.1c3.3 7.9 3.3 16.7 0 24.6c-14.9 35.7-46.2 87.7-93 131.1C433.5 443.2 368.8 480 288 480s-145.5-36.8-192.6-80.6C48.6 356 17.3 304 2.5 268.3c-3.3-7.9-3.3-16.7 0-24.6C17.3 208 48.6 156 95.4 112.6zM288 336c44.2 0 80-35.8 80-80s-35.8-80-80-80c-.7 0-1.3 0-2 0c1.3 5.1 2 10.5 2 16c0 35.3-28.7 64-64 64c-5.5 0-10.9-.7-16-2c0 .7 0 1.3 0 2c0 44.2 35.8 80 80 80zm0-208a128 128 0 1 1 0 256 128 128 0 1 1 0-256z\"/></svg>",
@@ -2779,7 +2784,7 @@ class SharedService {
         emailJob.reply = reply;
         emailJob.subject = subject;
         emailJob.message = message;
-        emailJob.attachments = attachments;
+        //emailJob.attachments = attachments;
         emailJob.reportId = report.reportId;
         emailJob.parameterValues = parameters;
         emailJob.locale = this.locale;
@@ -11452,13 +11457,23 @@ class ActivityListComponent {
         this.RelationKind = RelationKind;
         this.ActivityType = ActivityType;
         this.TimeUtils = TimeUtils;
-        this.activities = [];
         this.remarkIcon = Icon.CommentRegular;
         this.workIcon = Icon.PersonDiggingRegular;
+        this.statusIcon = Icon.DiagramProjectRegular;
+        this.taskIcon = Icon.Task;
     }
     showClass() {
         return true;
     }
+    set activities(value) {
+        if (value && value.length > 0) {
+            value.sort((a, b) => a.lastActionDateTime < b.lastActionDateTime ? 1 : -1);
+        }
+        this._activities = value;
+    }
+    get activities() {
+        return this._activities;
+    }
     ngOnInit() {
         return __awaiter(this, void 0, void 0, function* () {
         });
@@ -11482,13 +11497,15 @@ class ActivityListComponent {
         switch (activity.activityType) {
             case ActivityType.Remark:
                 return this.remarkIcon;
-            case ActivityType.StateChange:
             case ActivityType.WorkflowStatus:
             case ActivityType.Work:
-            case ActivityType.Task:
             case ActivityType.WorkflowTask:
             case ActivityType.Form:
                 return this.workIcon;
+            case ActivityType.StateChange:
+                return this.statusIcon;
+            case ActivityType.Task:
+                return this.taskIcon;
         }
     }
     showAttachments(activity) {
@@ -11532,13 +11549,17 @@ ActivityListComponent.decorators = [
           </div>
           <div class="activity-display-content" [class.customer-reply-content]="(getRelationKind(activity.author) === RelationKind.Customer)">
             <div class="activity-display-body">
-              <span>{{activity.subDescription}}</span>
+              <span *ngIf="activity.activityType !== ActivityType.StateChange">{{activity.subDescription}}</span>
+              <span *ngIf="activity.activityType === ActivityType.StateChange">{{activity.activityTitle}}</span>
             </div>
             <div class="activity-display-footer">
               <!--TODO discuss with Rob is we can gather the info needed to see which workflow triggers have previously been activated for this trigger-->
-              <!--<div *ngIf="showState(activity)" class="activity-state">
-                <span *ngIf="showAttachments(activity)">{{activity.documents.length}}</span>
-              </div>-->
+              <div class="activity-fired-triggers" *ngIf="activity.activityType === ActivityType.StateChange && activity.stateChange.firedTriggerNames &&
+                                                                    activity.stateChange.firedTriggerNames.length > 0" >
+                <div *ngFor="let triggerName of activity.stateChange?.firedTriggerNames">
+                  <span>{{triggerName}}</span>
+                </div>
+              </div>
               <co-icon *ngIf="showAttachments(activity)" [iconData]="iconCacheService.getIcon(Icon.PaperclipRegular)" (click)="openActivityPopup(activity)"></co-icon>
               <span *ngIf="showAttachments(activity)">{{activity.documents.length}}</span>
               <co-icon *ngIf="showWorkedTime(activity)"
@@ -11566,7 +11587,9 @@ ActivityListComponent.propDecorators = {
     showClass: [{ type: HostBinding, args: ["class.co-activity-list",] }],
     activities: [{ type: Input }],
     remarkIcon: [{ type: Input }],
-    workIcon: [{ type: Input }]
+    workIcon: [{ type: Input }],
+    statusIcon: [{ type: Input }],
+    taskIcon: [{ type: Input }]
 };
 
 class ActivityListModule {
@@ -13021,10 +13044,29 @@ class ComponentActivityOverviewComponent extends BaseActivityOverviewComponent {
         this.dictionaryService = dictionaryService;
         this.sharedService = sharedService;
         this.Icon = Icon;
+        this.remarkIcon = Icon.CommentRegular;
+        this.workIcon = Icon.PersonDiggingRegular;
+        this.statusIcon = Icon.DiagramProjectRegular;
+        this.taskIcon = Icon.Task;
     }
     showClass() {
         return true;
     }
+    getActivityIcon(activity) {
+        switch (activity.activityType) {
+            case ActivityType.Remark:
+                return this.remarkIcon;
+            case ActivityType.WorkflowStatus:
+            case ActivityType.Work:
+            case ActivityType.WorkflowTask:
+            case ActivityType.Form:
+                return this.workIcon;
+            case ActivityType.StateChange:
+                return this.statusIcon;
+            case ActivityType.Task:
+                return this.taskIcon;
+        }
+    }
 }
 ComponentActivityOverviewComponent.decorators = [
     { type: Component, args: [{
@@ -13038,7 +13080,8 @@ ComponentActivityOverviewComponent.decorators = [
             </div>
             <div class="overview-wrapper-labels">
                 <div class="activity-title" [textContent]="activityTitle"></div>
-                <div class="activity-context-title" [textContent]="activityContextTitle"></div>
+                <!--seems unessecary for current usecases, but left in case this needs an input to switch on or off-->
+                <!--<div class="activity-context-title" [textContent]="activityContextTitle"></div>-->
             </div>
             <div class="overview-wrapper-date">
                 <div class="date-wrapper" [class.overdue]="overDue">
@@ -13047,6 +13090,7 @@ ComponentActivityOverviewComponent.decorators = [
                         <div class="date-divider" [textContent]="'-'"></div>
                     </ng-container>
                     <div class="date" [textContent]="deadlineDate | date:'dd-MM-YYYY'"></div>
+                    <co-icon class="activity-type-icon"[iconData]="iconCacheService.getIcon(getActivityIcon(activity))"></co-icon>
                 </div>
             </div>
         </div>
@@ -13131,6 +13175,10 @@ ComponentActivityOverviewComponent.ctorParameters = () => [
     { type: SharedService }
 ];
 ComponentActivityOverviewComponent.propDecorators = {
+    remarkIcon: [{ type: Input }],
+    workIcon: [{ type: Input }],
+    statusIcon: [{ type: Input }],
+    taskIcon: [{ type: Input }],
     showClass: [{ type: HostBinding, args: ["class.co-component-activity-overview",] }]
 };
 
@@ -14936,10 +14984,11 @@ WorkflowInfoTilesModule.decorators = [
 ];
 
 class TaskCreatorComponent {
-    constructor(iconService, dictionaryService, sharedService) {
+    constructor(iconService, dictionaryService, sharedService, _dialogService) {
         this.iconService = iconService;
         this.dictionaryService = dictionaryService;
         this.sharedService = sharedService;
+        this._dialogService = _dialogService;
         this.icons = Icon;
         this.table = TableName$1.Transactions;
         this.activityCreated = new EventEmitter();
@@ -14972,6 +15021,16 @@ class TaskCreatorComponent {
     itemSelected(item) {
         this.chosenActivityType = item;
     }
+    addedDocument(docs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.documents = this.documents.concat(docs);
+        });
+    }
+    deletedDocument(doc) {
+        return __awaiter(this, void 0, void 0, function* () {
+            ArrayUtils.RemoveElement(doc, this.documents);
+        });
+    }
     createRemarkClicked() {
         return __awaiter(this, void 0, void 0, function* () {
             this.createForm.submit();
@@ -14987,6 +15046,20 @@ class TaskCreatorComponent {
             }
         });
     }
+    emailDialogClosed() {
+        if (this.emailAddresses.length >= 0) {
+            this.emailRequest = new activityEmailRequestData;
+            this.emailRequest.table = this.table;
+            this.emailRequest.key = this.remarkAndWorkKey;
+            this.emailRequest.senderAddress = this.senderAddress;
+            this.emailRequest.sendAddresses = this.emailAddresses;
+            this.emailRequest.ccAddresses = this.bccEmailAddresses;
+        }
+        else {
+            this.emailRequest = null;
+        }
+        this.showEmailDialog = false;
+    }
     createWorkClicked() {
         return __awaiter(this, void 0, void 0, function* () {
             this.createForm.submit();
@@ -15021,30 +15094,6 @@ class TaskCreatorComponent {
             }
         });
     }
-    addedDocument(docs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.documents = this.documents.concat(docs);
-        });
-    }
-    deletedDocument(doc) {
-        return __awaiter(this, void 0, void 0, function* () {
-            ArrayUtils.RemoveElement(doc, this.documents);
-        });
-    }
-    emailDialogClosed() {
-        if (this.emailAddresses.length >= 0) {
-            this.emailRequest = new activityEmailRequestData;
-            this.emailRequest.table = this.table;
-            this.emailRequest.key = this.remarkAndWorkKey;
-            this.emailRequest.senderAddress = this.senderAddress;
-            this.emailRequest.sendAddresses = this.emailAddresses;
-            this.emailRequest.ccAddresses = this.bccEmailAddresses;
-        }
-        else {
-            this.emailRequest = null;
-        }
-        this.showEmailDialog = false;
-    }
     createRemark() {
         let remark = new Remark();
         remark.author = this.author;
@@ -15095,19 +15144,6 @@ class TaskCreatorComponent {
             this.clearFields();
         });
     }
-    clearFields() {
-        this.remarkText = "";
-        this.workDescription = "";
-        this.taskName = "";
-        this.taskDescription = "";
-        this.senderAddress = "";
-        this.emailAddresses = [];
-        this.bccEmailAddresses = [];
-        this.emailRequest = null;
-        this.createdWork = undefined;
-        this.createdRemark = undefined;
-        this.createdTask = undefined;
-    }
     sendEmailIfNeccesary() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.emailAddresses.length > 0) {
@@ -15115,17 +15151,15 @@ class TaskCreatorComponent {
                 if (templates.length != 0) {
                     let template = this.findDefault(templates);
                     if (template) {
-                        this.startEmailing(template);
+                        yield this.startEmailing(template);
+                    }
+                    else {
+                        this._dialogService.showError('NO_DEFAULT_EMAIL_TEMPLATE_FOR_REPORT');
                     }
                 }
             }
         });
     }
-    startEmailing(template) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.sharedService.emailViaTemplate(template, this.createEmailAddressString(this.emailAddresses), this.createEmailAddressString(this.bccEmailAddresses), this.senderAddress, this.createEmailSubject(), "", this.createAttachmentsStringArray(), this.createEmailParams());
-        });
-    }
     findReportType() {
         if (this.chosenActivityType === this.optionCollection[0]) {
             return ReportType.RemarkMessage;
@@ -15146,15 +15180,29 @@ class TaskCreatorComponent {
         });
         return defaultTemplate;
     }
-    createEmailParams() {
-        if (this.createdRemark) {
-            return { opmerking_id: this.createdRemark.remarkId + "" };
-        }
-        else if (this.createdWork) {
-            return { werkzh_id: this.createdWork.workId + "" };
+    startEmailing(template) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const emailsSent = yield this.sharedService.emailViaTemplate(template, this.createEmailAddressString(this.emailAddresses), this.createEmailAddressString(this.bccEmailAddresses), this.senderAddress, this.createEmailSubject(), "", null /*this.createAttachmentsStringArray()*/, this.createEmailParams());
+            if (emailsSent) {
+                //registerSentEmails
+            }
+        });
+    }
+    registerSentEmails() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let history = new ActivityEmailHistory();
+            history.emailAddresses = this.createEmailAddressString(this.emailAddresses) + ';' + this.createEmailAddressString(this.bccEmailAddresses);
+            //history.attachments =  this.createAttachmentsStringArray();
+            history.message = '';
+            history.emailDateTime = new Date();
+        });
+    }
+    createEmailAddressString(addresses) {
+        if (addresses.length === 0) {
+            return '';
         }
-        else if (this.createdTask) {
-            return { taak_id: this.createdTask.taskId + "" };
+        else {
+            return addresses.join(';');
         }
     }
     createEmailSubject() {
@@ -15171,26 +15219,49 @@ class TaskCreatorComponent {
         }
         return subject;
     }
-    createEmailAddressString(addresses) {
-        if (addresses.length === 0) {
-            return '';
-        }
-        else {
-            return addresses.join(';');
-        }
-    }
-    createAttachmentsStringArray() {
+    createAttachmentsArray() {
+        let attachments = [];
         if (this.documents.length === 0) {
-            return [];
+            return;
         }
         else {
-            let attachments = [];
             this.documents.forEach(d => {
-                attachments.push(d.documentBody);
+                /*let attachment: CoEmailAttachment = new CoEmailAttachment();
+                attachment.filename = d.fileName;
+                if (d.fileName.split(".").length > 1) {
+                  const str: string[] = d.fileName.split(".");
+                  attachment.extension = str[str.length - 1];
+                }
+                const textEncoder = new TextEncoder();
+                attachment.body = textEncoder.encode("Your string here");*/
             });
             return attachments;
         }
     }
+    createEmailParams() {
+        if (this.createdRemark) {
+            return { opmerking_id: this.createdRemark.remarkId + "" };
+        }
+        else if (this.createdWork) {
+            return { werkzh_id: this.createdWork.workId + "" };
+        }
+        else if (this.createdTask) {
+            return { taak_id: this.createdTask.taskId + "" };
+        }
+    }
+    clearFields() {
+        this.remarkText = "";
+        this.workDescription = "";
+        this.taskName = "";
+        this.taskDescription = "";
+        this.senderAddress = "";
+        this.emailAddresses = [];
+        this.bccEmailAddresses = [];
+        this.emailRequest = null;
+        this.createdWork = undefined;
+        this.createdRemark = undefined;
+        this.createdTask = undefined;
+    }
 }
 TaskCreatorComponent.decorators = [
     { type: Component, args: [{
@@ -15214,7 +15285,7 @@ TaskCreatorComponent.decorators = [
         </div>
       </co-form>
       <div class="extras-buttons">
-        <co-button [iconData]="iconService.getIcon(icons.Email)"  (click)="showEmailDialog = true"></co-button>
+        <co-button [iconData]="iconService.getIcon(icons.EmailRegular)"  (click)="showEmailDialog = true"></co-button>
         <co-button [iconData]="iconService.getIcon(icons.PaperclipRegular)"  (click)="showFilesDialog = true"
                    [label]="documents.length === 0 ? '' : documents.length.toString()" ></co-button>
       </div>
@@ -15226,7 +15297,7 @@ TaskCreatorComponent.decorators = [
       <co-dialog *ngIf="showEmailDialog" (closeClick)="emailDialogClosed()">
         <co-role-email-selector [(model)]="emailAddresses" [key]="remarkAndWorkKey" [workflowCategoryType]="workflowCategoryType"></co-role-email-selector>
         <co-role-email-selector [(model)]="bccEmailAddresses" [key]="remarkAndWorkKey" [workflowCategoryType]="workflowCategoryType"></co-role-email-selector>
-        <co-input-text [readonly]="false" [label]="'SENDER' | localize" [model]="senderAddress"></co-input-text>-->
+        <co-input-text [readonly]="false" [label]="'SENDER' | localize" [(model)]="senderAddress"></co-input-text>
       </co-dialog>
 
     `
@@ -15235,7 +15306,8 @@ TaskCreatorComponent.decorators = [
 TaskCreatorComponent.ctorParameters = () => [
     { type: IconCacheService },
     { type: DictionaryService },
-    { type: SharedService }
+    { type: SharedService },
+    { type: CoreDialogService }
 ];
 TaskCreatorComponent.propDecorators = {
     createForm: [{ type: ViewChild, args: [FormComponent,] }],