@colijnit/sharedcomponents 255.1.10 → 255.1.12

package/fesm2015/colijnit-sharedcomponents.js

@@ -37,6 +37,7 @@ import { Report } from '@colijnit/mainapi/build/model/report.bo';
 import { Work } from '@colijnit/mainapi/build/model/work.bo';
 import { Remark } from '@colijnit/mainapi/build/model/remark.bo';
 import { Task } from '@colijnit/mainapi/build/model/task.bo';
+import { ActivityWorkflow } from '@colijnit/mainapi/build/model/activity-workflow';
 import { PrintStockStickers } from '@colijnit/sharedapi/build/model/print-stock-stickers';
 import { ArticleExtended } from '@colijnit/articleapi/build/model/article-extended.bo';
 import { ArticleStock as ArticleStock$1 } from '@colijnit/articleapi/build/model/article-stock';
@@ -818,6 +819,20 @@ class SharedConnectorService {
             });
         });
     }
+    getWorkflowStatusForActivity(table, key, component) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                return this.mainConnector.getWorkflowStatusForActivity(table, key, component).then((result) => __awaiter(this, void 0, void 0, function* () {
+                    if (result && result.validationResult && result.validationResult.success) {
+                        resolve(this._boFactory.makeWithRawBackendData(ActivityWorkflow, result.resultObject));
+                    }
+                    else {
+                        reject(result.validationMessagesAsString);
+                    }
+                }));
+            });
+        });
+    }
     insertActivity(activity) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
@@ -2726,6 +2741,11 @@ class SharedService {
             return yield this.connector.getRelationSmallObject(relationId);
         });
     }
+    getWorkflowStatusForActivity(table, key, component) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.connector.getWorkflowStatusForActivity(table, key, component);
+        });
+    }
     insertActivity(activity) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.connector.insertActivity(activity);
@@ -12950,8 +12970,7 @@ class ComponentActivityListComponent extends BaseActivityListComponent {
             if (this.table && this.key) {
                 const allActivities = yield this.sharedService.getComponentActivitiesWithoutRelationFiltering(this.table, this.key);
                 if (allActivities) {
-                    this.activities = this.noFreeTasks ? allActivities.filter(aa => !aa.task && aa.activityType !== ActivityType.WorkflowTask) :
-                        allActivities.filter(aa => aa.activityType !== ActivityType.WorkflowTask);
+                    this.activities = this.noFreeTasks ? allActivities.filter(aa => !aa.task) : allActivities;
                 }
                 else {
                     this.activities = [];
@@ -12963,8 +12982,7 @@ class ComponentActivityListComponent extends BaseActivityListComponent {
     set activitiesList(allActivities) {
         this._activitiesList = allActivities;
         if (allActivities) {
-            this.activities = this.noFreeTasks ? allActivities.filter(aa => !aa.task && aa.activityType !== ActivityType.WorkflowTask) :
-                allActivities.filter(aa => aa.activityType !== ActivityType.WorkflowTask);
+            this.activities = this.noFreeTasks ? allActivities.filter(aa => !aa.task) : allActivities;
         }
         else {
             this.activities = [];
@@ -13207,63 +13225,74 @@ ComponentActivityOverviewComponent.decorators = [
                 selector: "co-component-activity-overview",
                 template: `
         <div class="overview-wrapper">
+          <div class="overview-current">
             <div class="overview-wrapper-icons">
-                <co-icon *ngIf="userIsSupervisor && (!isTask || firstTriggerToCloseWF === undefined)" icon="supervisor"
-                      class="supervisor-icon big dark"
-                      [title]="'MY_TASKS_SUPERVISOR' | localize"></co-icon>
+              <co-icon *ngIf="userIsSupervisor && (!isTask || firstTriggerToCloseWF === undefined)" icon="supervisor"
+                       class="supervisor-icon big dark"
+                       [title]="'MY_TASKS_SUPERVISOR' | localize"></co-icon>
             </div>
             <div class="overview-wrapper-labels">
-                <div class="activity-title" [textContent]="activityTitle"></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 class="activity-label">
+                <span class="label" [textContent]="'CURRENT_STATE' | localize"></span>
+              </div>
+              <div class="activity-title" [textContent]="activityTitle"></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>
+          <div class="overview-main">
+            <div class="label-date-activity">
+              <div class="activity-label">
+                <span class="label" [textContent]="'NEXT_STATE' | localize"></span>
+              </div>
+              <div class="overview-wrapper-date">
                 <div class="date-wrapper" [class.overdue]="overDue">
-                    <ng-container *ngIf="!sameDates">
-                        <div class="date" [textContent]="targetDate | date:'dd-MM-YYYY'"></div>
-                        <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>
+                  <ng-container *ngIf="!sameDates">
+                    <div class="date" [textContent]="targetDate | date:'dd-MM-YYYY'"></div>
+                    <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>
-        </div>
-        <div class="overview-main">
-            <ng-container *ngIf="isTask && firstTriggerToCloseWF !== undefined">
-                <co-button class="trans-green custom-text button-trigger no-margin" [label]="firstTriggerToCloseWF.description"
-                               (click)="handleButtonEndClick()"></co-button>
-            </ng-container>
-            <ng-container *ngIf="openButtonLabel">
-                <co-button class="trans-green default-bg custom-text button-trigger-icon action-hover no-margin"
-                               iconClass="custom small" [iconData]="iconCacheService.getIcon(icon.DetailView)" [label]="openButtonLabel | localize"
-                               (click)="handleOpenLink($event)"></co-button>
-            </ng-container>
-            <!--TODO reinstate this when we figure out how to trigger a screen change. -->
-            <!--<ng-container *ngIf="urls && urls.length > 0">
-                <button-colijn *ngFor="let url of urls"
-                               class="trans-green custom-text button-trigger-icon action-hover no-margin"
-                               [icon]="icon.DetailView"
-                               [label]="'OPEN_LINK' | localize"
-                               iconClass="custom small"
-                               (click)="handleOpenLink($event, url)"></button-colijn>
-            </ng-container>-->
-            <ng-container *ngIf="!isTask && hasTriggers">
-                <co-button     class="trans-green custom-text action-hover button-trigger no-margin" *ngFor="let trigger of workFlow.manualGenericTriggers"
-                               [class.button-trigger-icon]="trigger.isTaskTrigger"
-                               [label]="trigger.triggerButtonName"
-                               [iconData]="trigger.isTaskTrigger ? iconCacheService.getIcon(icon.Account): null"
-                               iconClass="custom small"
-                               (click)="handleGenericTriggerClick(trigger)"
-                ></co-button>
-                <co-button     class="trans-green custom-text action-hover button-trigger no-margin" *ngFor="let trigger of workFlow.manualTriggers"
-                               [class.high-prio]="trigger.overDue"
-                               [class.button-trigger-icon]="trigger.isTaskTrigger"
-                               [label]="trigger.triggerButtonName"
-                               [iconData]="trigger.isTaskTrigger ? iconCacheService.getIcon(icon.DetailView): null"
-                               iconClass="custom small"
-                               (click)="handleTriggerClick(trigger)"
-                ></co-button >
-            </ng-container>
+
+              <ng-container *ngIf="isTask && firstTriggerToCloseWF !== undefined">
+                  <co-button class="trans-green custom-text button-trigger no-margin" [label]="firstTriggerToCloseWF.description"
+                                 (click)="handleButtonEndClick()"></co-button>
+              </ng-container>
+              <ng-container *ngIf="openButtonLabel">
+                  <co-button class="trans-green default-bg custom-text button-trigger-icon action-hover no-margin"
+                                 iconClass="custom small" [iconData]="iconCacheService.getIcon(icon.DetailView)" [label]="openButtonLabel | localize"
+                                 (click)="handleOpenLink($event)"></co-button>
+              </ng-container>
+              <!--TODO reinstate this when we figure out how to trigger a screen change. -->
+              <!--<ng-container *ngIf="urls && urls.length > 0">
+                  <button-colijn *ngFor="let url of urls"
+                                 class="trans-green custom-text button-trigger-icon action-hover no-margin"
+                                 [icon]="icon.DetailView"
+                                 [label]="'OPEN_LINK' | localize"
+                                 iconClass="custom small"
+                                 (click)="handleOpenLink($event, url)"></button-colijn>
+              </ng-container>-->
+              <ng-container *ngIf="!isTask && hasTriggers">
+                  <co-button     class="trans-green custom-text action-hover button-trigger no-margin" *ngFor="let trigger of workFlow.manualGenericTriggers"
+                                 [class.button-trigger-icon]="trigger.isTaskTrigger"
+                                 [label]="trigger.triggerButtonName"
+                                 [iconData]="trigger.isTaskTrigger ? iconCacheService.getIcon(icon.Account): null"
+                                 iconClass="custom small"
+                                 (click)="handleGenericTriggerClick(trigger)"
+                  ></co-button>
+                  <co-button     class="trans-green custom-text action-hover button-trigger no-margin" *ngFor="let trigger of workFlow.manualTriggersWithoutTaskTriggers"
+                                 [class.high-prio]="trigger.overDue"
+                                 [class.button-trigger-icon]="trigger.isTaskTrigger"
+                                 [label]="trigger.triggerButtonName"
+                                 [iconData]="trigger.isTaskTrigger ? iconCacheService.getIcon(icon.DetailView): null"
+                                 iconClass="custom small"
+                                 (click)="handleTriggerClick(trigger)"
+                  ></co-button>
+              </ng-container>
+          </div>
         </div>
         <!--TODO reinstate this when we figure out how to trigger a screen change. -->
         <!-- <formbuilder-user-form *ngIf="showCreateForm"
@@ -13324,7 +13353,6 @@ class BaseActivitySummaryComponent {
         this.expanded = false;
         this.noBorder = false;
         this.readonly = false;
-        this.prepareWorkflowOperation = OperationWithAlwaysSuccessCallback;
         this.loadTaskOperation = OperationWithAlwaysSuccessCallback;
         this.activityChange = new EventEmitter();
         this.showWorkLog = new EventEmitter();
@@ -13373,7 +13401,7 @@ class BaseActivitySummaryComponent {
                     return;
                 }
             }
-            const result = yield this._sharedService.fireTrigger(this.workFlow.workflowId, this.workFlow.sequence, trigger.triggerId);
+            const result = yield this._sharedService.fireTrigger(this.workFlow.workflowProcessId, this.workFlow.sequence, trigger.triggerId);
             if (result.success) {
                 yield this.updateActivityTask(this.editActivity.task);
                 yield this.prepareWorkflow();
@@ -13395,7 +13423,8 @@ class BaseActivitySummaryComponent {
     prepareWorkflow() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.table && this.key) {
-                yield this.prepareWorkflowOperation({ table: this.table, key: this.key });
+                this.workFlow = yield this._sharedService.getWorkflowStatusForActivity(this.table, this.key, "Taak");
+                this.readonly = this.readonly || (this.workFlow && this.workFlow.ended);
             }
         });
     }
@@ -13429,7 +13458,6 @@ BaseActivitySummaryComponent.propDecorators = {
     expanded: [{ type: Input }],
     noBorder: [{ type: HostBinding, args: ["class.no-border",] }, { type: Input }],
     readonly: [{ type: Input }],
-    prepareWorkflowOperation: [{ type: Input }],
     loadTaskOperation: [{ type: Input }],
     triggerToFireOnSave: [{ type: Input }],
     activityChange: [{ type: Output }],