@colijnit/sharedcomponents 255.1.5 → 255.1.6

package/fesm2015/colijnit-sharedcomponents.js

@@ -1340,16 +1340,13 @@ class SharedConnectorService {
     }
     emailReport(emailJob) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                return this.mainConnector.emailReport(emailJob).then((result) => {
-                    if (result.validationResult && result.validationResult.success) {
-                        resolve(result.resultObject);
-                    }
-                    else {
-                        reject(result.validationMessagesAsString);
-                    }
-                });
-            });
+            const result = yield this.mainConnector.emailReport(emailJob);
+            if (result && result.validationResult && result.validationResult.success) {
+                return Promise.resolve(true);
+            }
+            else {
+                return Promise.resolve(false);
+            }
         });
     }
     insertEmailHistoryForRemark(remarkId, history) {
@@ -12048,6 +12045,7 @@ class ModifyTaskFormComponent {
         this.table = TableName$1.Tasks;
         this.expandActivities = false;
         this.showTagPopup = false;
+        this.allTags = [];
     }
     /* @ViewChild(ActivityActivitiesComponent, { static: true })
      public activityActivities: ActivityActivitiesComponent;*/
@@ -14142,7 +14140,7 @@ class RoleEmailSelectorComponent {
     }
     removeOptionFromModel(email) {
         if (this.model.indexOf(email) > -1) {
-            this.model.splice(email.indexOf(email), 1);
+            this.model.splice(this.model.indexOf(email), 1);
         }
     }
 }
@@ -14155,7 +14153,7 @@ RoleEmailSelectorComponent.decorators = [
                          (modelChange)="roleChosen($event)">
       </co-list-of-values>
       <co-input-text #inp [placeholder]="extraLabel | localize"
-                     [rightIconData]="iconService.getIcon(icons.PaperPlaneTopSolid)"
+                     [rightIconData]="iconService.getIcon(icons.CheckSolid)"
                      (rightIconClick)="addEmail(inp.model)"></co-input-text>
 
       <div class="chips-wrapper">
@@ -15286,10 +15284,13 @@ class TaskCreatorComponent {
         ];
         this.showFilesDialog = false;
         this.documents = [];
+        this.oldDocuments = [];
         this.showEmailDialog = false;
         this.senderAddress = '';
         this.emailAddresses = [];
         this.bccEmailAddresses = [];
+        this.oldEmailAddresses = [];
+        this.oldBccEmailAddresses = [];
         this.emailRequest = null;
         this.remarkText = "";
         this.workDescription = "";
@@ -15308,6 +15309,17 @@ class TaskCreatorComponent {
     itemSelected(item) {
         this.chosenActivityType = item;
     }
+    openAttachmentDialog() {
+        this.oldDocuments = this.documents.slice();
+        this.showFilesDialog = true;
+    }
+    attachmentDialogClosed() {
+        this.showFilesDialog = false;
+    }
+    attachmentDialogCancelled() {
+        this.documents = this.oldDocuments.slice();
+        this.showFilesDialog = false;
+    }
     addedDocument(docs) {
         return __awaiter(this, void 0, void 0, function* () {
             this.documents = this.documents.concat(docs);
@@ -15318,20 +15330,10 @@ class TaskCreatorComponent {
             ArrayUtils.RemoveElement(doc, this.documents);
         });
     }
-    createRemarkClicked() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._formMasterService.submitSlaves();
-            if (this.createForm.isValid()) {
-                let remark = this.createRemark();
-                let activity = new Activity();
-                activity.activityType = ActivityType.Remark;
-                activity.remark = remark;
-                this.createdRemark = yield this.sharedService.insertRemark(activity);
-                if (this.createdRemark) {
-                    this.handleAfterCreation();
-                }
-            }
-        });
+    openEmailDialog() {
+        this.showEmailDialog = true;
+        this.oldEmailAddresses = this.emailAddresses.slice();
+        this.oldBccEmailAddresses = this.bccEmailAddresses.slice();
     }
     emailDialogClosed() {
         if (this.emailAddresses.length >= 0) {
@@ -15347,6 +15349,26 @@ class TaskCreatorComponent {
         }
         this.showEmailDialog = false;
     }
+    emailDialogCancelled() {
+        this.emailAddresses = this.oldEmailAddresses.slice();
+        this.bccEmailAddresses = this.oldBccEmailAddresses.slice();
+        this.showEmailDialog = false;
+    }
+    createRemarkClicked() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this._formMasterService.submitSlaves();
+            if (this.createForm.isValid()) {
+                let remark = this.createRemark();
+                let activity = new Activity();
+                activity.activityType = ActivityType.Remark;
+                activity.remark = remark;
+                this.createdRemark = yield this.sharedService.insertRemark(activity);
+                if (this.createdRemark) {
+                    yield this.handleAfterCreation();
+                }
+            }
+        });
+    }
     createWorkClicked() {
         return __awaiter(this, void 0, void 0, function* () {
             this._formMasterService.submitSlaves();
@@ -15357,9 +15379,7 @@ class TaskCreatorComponent {
                 activity.work = work;
                 this.createdWork = yield this.sharedService.insertWork(activity);
                 if (this.createdWork) {
-                    this.activityCreated.emit();
-                    yield this.sendEmailIfNeccesary();
-                    this.clearFields();
+                    yield this.handleAfterCreation();
                 }
             }
         });
@@ -15374,9 +15394,7 @@ class TaskCreatorComponent {
                 activity.task = task;
                 this.createdTask = yield this.sharedService.insertTask(activity);
                 if (this.createdTask) {
-                    this.activityCreated.emit();
-                    yield this.sendEmailIfNeccesary();
-                    this.clearFields();
+                    yield this.handleAfterCreation();
                 }
             }
         });
@@ -15469,7 +15487,7 @@ class TaskCreatorComponent {
     }
     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());
+            const emailsSent = yield this.sharedService.emailViaTemplate(template, this.createEmailAddressString(this.emailAddresses), this.createEmailAddressString(this.bccEmailAddresses), this.senderAddress, this.createEmailSubject(), "", [], this.createEmailParams());
             if (emailsSent) {
                 let history = new ActivityEmailHistory();
                 history.emailAddresses = this.createEmailAddressString(this.emailAddresses);
@@ -15487,15 +15505,6 @@ class TaskCreatorComponent {
             }
         });
     }
-    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 '';
@@ -15584,19 +15593,42 @@ TaskCreatorComponent.decorators = [
         </div>
       </co-form>
       <div class="extras-buttons">
-        <co-button [iconData]="iconService.getIcon(icons.EmailRegular)"  (click)="showEmailDialog = true"></co-button>
-        <co-button [iconData]="iconService.getIcon(icons.PaperclipRegular)"  (click)="showFilesDialog = true"
+        <co-button [iconData]="iconService.getIcon(icons.EmailRegular)"  (click)="openEmailDialog()"></co-button>
+        <co-button [iconData]="iconService.getIcon(icons.PaperclipRegular)"  (click)="openAttachmentDialog()"
                    [label]="documents.length === 0 ? '' : documents.length.toString()" ></co-button>
       </div>
 
-      <co-dialog *ngIf="showFilesDialog" (closeClick)="showFilesDialog = false">
+      <co-dialog *ngIf="showFilesDialog" (closeClick)="attachmentDialogCancelled()"
+                 [headerTemplate]="attachmentHeaderTemplate"
+                 [footerTemplate]="attachmentFooterTemplate">
+
+        <ng-template #attachmentHeaderTemplate>
+          <div class="co-dialog-wrapper-popup-title">
+            <co-icon [iconData]="iconService.getIcon(icons.PaperclipRegular)"></co-icon>
+            <div class="co-dialog-header-title" [textContent]="'ATTACHMENTS' | localize"></div>
+          </div>
+        </ng-template>
         <co-files-upload (documentsAdded)="addedDocument($event)" (documentDeleted)="deletedDocument"
                          [documents]="documents" [useWithoutSettingProps]="true"></co-files-upload>
       </co-dialog>
+
+
+      <ng-template #attachmentFooterTemplate>
+        <div class="co-dialog-footer-button-wrapper">
+          <co-button class="save-button"
+                     [iconData]="iconService.getIcon(icons.CheckDuotone)"
+                     (click)="attachmentDialogClosed()"></co-button>
+          <co-button class="close-button"
+                     [iconData]="iconService.getIcon(icons.CrossSkinny)"
+                     (click)="attachmentDialogCancelled()"></co-button>
+        </div>
+      </ng-template>
+
+
       <co-dialog *ngIf="showEmailDialog" (closeClick)="emailDialogClosed()"
-                 [footerTemplate]="footerTemplate"
-                 [headerTemplate]="headerTemplate">
-        <ng-template #headerTemplate>
+                 [footerTemplate]="emailFooterTemplate"
+                 [headerTemplate]="emailheaderTemplate">
+        <ng-template #emailheaderTemplate>
           <div class="co-dialog-wrapper-popup-title">
             <co-icon [iconData]="iconService.getIcon(icons.EmailRegular)"></co-icon>
             <div class="co-dialog-header-title" [textContent]="'SEND_EMAIL' | localize"></div>
@@ -15609,14 +15641,14 @@ TaskCreatorComponent.decorators = [
 
       </co-dialog>
 
-      <ng-template #footerTemplate>
+      <ng-template #emailFooterTemplate>
         <div class="co-dialog-footer-button-wrapper">
           <co-button class="save-button"
                      [iconData]="iconService.getIcon(icons.CheckDuotone)"
                      (click)="emailDialogClosed()"></co-button>
           <co-button class="close-button"
                      [iconData]="iconService.getIcon(icons.CrossSkinny)"
-                     (click)="emailDialogClosed()"></co-button>
+                     (click)="emailDialogCancelled()"></co-button>
         </div>
       </ng-template>
     `,