qms-angular 1.1.45 → 1.1.46
Sign up to get free protection for your applications and to get access to all the features.
- package/bundles/qms-angular.umd.js +27 -18
- package/bundles/qms-angular.umd.js.map +1 -1
- package/esm2015/lib/model/en.js +2 -1
- package/esm2015/lib/model/no.js +2 -1
- package/esm2015/lib/qms-ckeditor-components/components/qms-ckeditor-bpmn/qms-ckeditor-bpmn.component.js +7 -4
- package/esm2015/lib/qms-ckeditor-components/components/qms-ckeditor-imagemap/qms-ckeditor-imagemap.component.js +2 -2
- package/esm2015/lib/qms-ckeditor-components/components/qms-ckeditor-link/qms-ckeditor-link.component.js +2 -2
- package/esm2015/lib/qms-ckeditor-components/components/qms-ckeditor-tooltip/qms-ckeditor-tooltip.component.js +2 -2
- package/esm2015/lib/qms-ckeditor-components/services/qms-ckeditor-bpmn-connection.service.js +3 -3
- package/esm2015/lib/qms-ckeditor-components/services/qms-ckeditor-bpmn.service.js +11 -8
- package/esm2015/lib/qms-ckeditor-components/services/qms-ckeditor-tree.service.js +4 -4
- package/fesm2015/qms-angular.js +26 -18
- package/fesm2015/qms-angular.js.map +1 -1
- package/lib/model/en.d.ts +1 -0
- package/lib/model/no.d.ts +1 -0
- package/lib/qms-ckeditor-components/services/qms-ckeditor-bpmn-connection.service.d.ts +1 -1
- package/package.json +1 -1
- package/qms-angular.metadata.json +1 -1
@@ -532,6 +532,7 @@
|
|
532
532
|
"LINK_TO_FOLDER": "Link to folder",
|
533
533
|
"LINK_TO_DEVIATION": "Link to deviation",
|
534
534
|
"LINK_TO_CHECKLIST": "Link to checklist",
|
535
|
+
"LINK_TO_INTERCONNECTED_PROCESS": "Link to Interconnected Process"
|
535
536
|
},
|
536
537
|
"QMSCKEDITOR_MESSAGE": {
|
537
538
|
"CONFIRM_DELETE_TEMPLATE": "Are you sure you want to delete this template?",
|
@@ -1090,6 +1091,7 @@
|
|
1090
1091
|
"LINK_TO_FOLDER": "Lenke til mappe",
|
1091
1092
|
"LINK_TO_DEVIATION": "Link to avvik",
|
1092
1093
|
"LINK_TO_CHECKLIST": "Link to sjekkliste",
|
1094
|
+
"LINK_TO_INTERCONNECTED_PROCESS": " Lenke til Sammenkoblet Prosess"
|
1093
1095
|
},
|
1094
1096
|
"QMSCKEDITOR_MESSAGE": {
|
1095
1097
|
"CONFIRM_DELETE_TEMPLATE": "Er du sikker på at du vil slette denne malen?",
|
@@ -12006,16 +12008,16 @@
|
|
12006
12008
|
return [2 /*return*/, new Promise(function (resolve) {
|
12007
12009
|
var getSearchResult = {};
|
12008
12010
|
if (getSearchOption.isGetProcess) {
|
12009
|
-
getSearchResult[exports.DataType.process.toString()] = _this.searchProcess(keyword);
|
12011
|
+
getSearchResult[exports.DataType.process.toString()] = _this.searchProcess(keyword, false);
|
12010
12012
|
}
|
12011
12013
|
if (getSearchOption.isGetDocument || getSearchOption.isGetFolder) {
|
12012
12014
|
getSearchResult[exports.DataType.document.toString()] = _this.searchDocument(keyword);
|
12013
12015
|
}
|
12014
12016
|
if (getSearchOption.isGetInterconnected) {
|
12015
|
-
getSearchResult[exports.DataType.processInterconnected.toString()] = _this.searchProcessInterconnected(keyword);
|
12017
|
+
getSearchResult[exports.DataType.processInterconnected.toString()] = _this.searchProcessInterconnected(keyword, false);
|
12016
12018
|
}
|
12017
12019
|
if (getSearchOption.isGetArea) {
|
12018
|
-
getSearchResult[exports.DataType.area.toString()] = _this.searchProcessArea(keyword);
|
12020
|
+
getSearchResult[exports.DataType.area.toString()] = _this.searchProcessArea(keyword, false);
|
12019
12021
|
}
|
12020
12022
|
if (!Object.keys(getSearchResult).length)
|
12021
12023
|
resolve(null);
|
@@ -12400,7 +12402,7 @@
|
|
12400
12402
|
data.moduleId = exports.ModuleType.documentProcess;
|
12401
12403
|
data.moduleName = this.LANG.QMSCKEDITOR.DOCUMENT_PROCESS;
|
12402
12404
|
if (!!isOnlyDocument) return [3 /*break*/, 2];
|
12403
|
-
return [4 /*yield*/, this.treeService.getProcessAreaContents().toPromise()];
|
12405
|
+
return [4 /*yield*/, this.treeService.getProcessAreaContents('', true, this.data.enabledInterconnected).toPromise()];
|
12404
12406
|
case 1:
|
12405
12407
|
treeProcessData = _a.sent();
|
12406
12408
|
data.treeData1 = (treeProcessData === null || treeProcessData === void 0 ? void 0 : treeProcessData.areas.map(function (x) {
|
@@ -16930,7 +16932,7 @@
|
|
16930
16932
|
var inputs = InspectorFunction$1.getInspectorConfiguration(bpmn2, LANG, shapeImages);
|
16931
16933
|
var freeTransform = null;
|
16932
16934
|
if (!toolbarConfiguration)
|
16933
|
-
toolbarConfig = ToolbarFunction$1.getToolbarConfiguration(
|
16935
|
+
toolbarConfig = ToolbarFunction$1.getToolbarConfiguration(LANG);
|
16934
16936
|
else
|
16935
16937
|
toolbarConfig = toolbarConfiguration;
|
16936
16938
|
/* QMS-1404: Customization: Add template list */
|
@@ -17785,25 +17787,28 @@
|
|
17785
17787
|
var connectionName = '';
|
17786
17788
|
if (shapeDetail.connectionTypeId === ShapeFlowChartConnectionType.Activity) {
|
17787
17789
|
list[i]["style"].cursor = 'pointer';
|
17788
|
-
connectionName =
|
17790
|
+
connectionName = LANG.BPMN.LINK_TO_ACTIVITY;
|
17789
17791
|
}
|
17790
17792
|
else if (shapeDetail.connectionTypeId === ShapeFlowChartConnectionType.Link) {
|
17791
|
-
connectionName =
|
17793
|
+
connectionName = LANG.BPMN.LINK;
|
17792
17794
|
}
|
17793
17795
|
else if (shapeDetail.connectionTypeId === ShapeFlowChartConnectionType.DocumentOrProcess) {
|
17794
17796
|
// eslint-disable-next-line default-case
|
17795
17797
|
switch (shapeDetail.documentModel.relatedItems[0].itemType) {
|
17796
17798
|
case exports.RelatedItemType.document:
|
17797
|
-
connectionName =
|
17799
|
+
connectionName = LANG.BPMN.LINK_TO_DOCUMENT;
|
17798
17800
|
break;
|
17799
17801
|
case exports.RelatedItemType.process:
|
17800
|
-
connectionName =
|
17802
|
+
connectionName = LANG.BPMN.LINK_TO_PROCESS;
|
17801
17803
|
break;
|
17802
17804
|
case exports.RelatedItemType.area:
|
17803
|
-
connectionName =
|
17805
|
+
connectionName = LANG.BPMN.LINK_TO_AREA;
|
17804
17806
|
break;
|
17805
17807
|
case exports.RelatedItemType.handbook:
|
17806
|
-
connectionName =
|
17808
|
+
connectionName = LANG.BPMN.LINK_TO_FOLDER;
|
17809
|
+
break;
|
17810
|
+
case exports.RelatedItemType.processInterconnected:
|
17811
|
+
connectionName = LANG.BPMN.LINK_TO_INTERCONNECTED_PROCESS;
|
17807
17812
|
break;
|
17808
17813
|
}
|
17809
17814
|
}
|
@@ -18827,8 +18832,9 @@
|
|
18827
18832
|
QMSCKEditorBPMNConnectionService.prototype.getProcessAreasRootDetails = function (isOnlyApproved) {
|
18828
18833
|
return this.get('processAreas/GetProcessAreasRootDetails', { isOnlyApproved: isOnlyApproved });
|
18829
18834
|
};
|
18830
|
-
QMSCKEditorBPMNConnectionService.prototype.getAreaChildrenNode = function (areaId, showProcessesInTree, isOnlyApproved) {
|
18831
|
-
|
18835
|
+
QMSCKEditorBPMNConnectionService.prototype.getAreaChildrenNode = function (areaId, showProcessesInTree, isOnlyApproved, isInterconnectedProcess) {
|
18836
|
+
if (isInterconnectedProcess === void 0) { isInterconnectedProcess = false; }
|
18837
|
+
return this.get('processAreas/GetProcessNodes', { areaId: areaId, showProcessesInTree: showProcessesInTree, isOnlyApproved: isOnlyApproved, isInterconnectedProcess: isInterconnectedProcess });
|
18832
18838
|
};
|
18833
18839
|
QMSCKEditorBPMNConnectionService.prototype.getParentFolders = function (itemId, itemType) {
|
18834
18840
|
return this.get('Items/GetParentFolders', { itemId: itemId, itemType: itemType });
|
@@ -19374,7 +19380,7 @@
|
|
19374
19380
|
onlyFolder: false
|
19375
19381
|
};
|
19376
19382
|
this.loadingRelatedData = true;
|
19377
|
-
rxjs.forkJoin(this.relatedService.getAreaChildrenNode(null, !this.splitView, false), this.relatedService.getFolderChildren(null, !this.splitView, false)).pipe(operators.takeUntil(this.ngUnsubcribe))
|
19383
|
+
rxjs.forkJoin(this.relatedService.getAreaChildrenNode(null, !this.splitView, false, this.data.enabledInterconnected), this.relatedService.getFolderChildren(null, !this.splitView, false)).pipe(operators.takeUntil(this.ngUnsubcribe))
|
19378
19384
|
.subscribe(function (_c) {
|
19379
19385
|
var _d = __read(_c, 2), res1 = _d[0], res2 = _d[1];
|
19380
19386
|
if (res1) {
|
@@ -19445,7 +19451,7 @@
|
|
19445
19451
|
}); });
|
19446
19452
|
dialogRef.componentInstance.onExpandProcessArea.subscribe(function (folder) {
|
19447
19453
|
_this.relatedService
|
19448
|
-
.getAreaChildrenNode(folder.id, !_this.splitView, false)
|
19454
|
+
.getAreaChildrenNode(folder.id, !_this.splitView, false, _this.data.enabledInterconnected)
|
19449
19455
|
.pipe(operators.takeUntil(_this.ngUnsubcribe))
|
19450
19456
|
.subscribe(function (res) {
|
19451
19457
|
if (res) {
|
@@ -19457,7 +19463,8 @@
|
|
19457
19463
|
expandable: x.type === ProcessNodeType.Area,
|
19458
19464
|
statusId: x.status,
|
19459
19465
|
statusName: x.statusName,
|
19460
|
-
displayId: x.type === ProcessNodeType.Area ? 0 : x.itemNumberId
|
19466
|
+
displayId: x.type === ProcessNodeType.Area ? 0 : x.itemNumberId,
|
19467
|
+
itemType: x.type === ProcessNodeType.Area ? exports.DataType.area : x.type === ProcessNodeType.Process ? exports.DataType.process : exports.DataType.processInterconnected
|
19461
19468
|
};
|
19462
19469
|
});
|
19463
19470
|
_this.selectProcessDocumentGlobalService.setProcessAreaChildren(areas);
|
@@ -19602,6 +19609,8 @@
|
|
19602
19609
|
case exports.DataType.folder:
|
19603
19610
|
shapeModel.relatedItem.linkUrl = "/folder/" + shapeModel.relatedItem.displayId;
|
19604
19611
|
break;
|
19612
|
+
case exports.DataType.processInterconnected:
|
19613
|
+
shapeModel.relatedItem.linkUrl = "/process-interconnected/" + shapeModel.relatedItem.displayId;
|
19605
19614
|
default:
|
19606
19615
|
break;
|
19607
19616
|
}
|
@@ -22369,7 +22378,7 @@
|
|
22369
22378
|
data.moduleId = exports.ModuleType.documentProcess;
|
22370
22379
|
data.moduleName = this.LANG.QMSCKEDITOR.DOCUMENT_PROCESS;
|
22371
22380
|
if (!!isOnlyDocument) return [3 /*break*/, 2];
|
22372
|
-
return [4 /*yield*/, this.treeService.getProcessAreaContents().toPromise()];
|
22381
|
+
return [4 /*yield*/, this.treeService.getProcessAreaContents('', true, this.data.enabledInterconnected).toPromise()];
|
22373
22382
|
case 1:
|
22374
22383
|
treeProcessData = _a.sent();
|
22375
22384
|
data.treeData1 = (treeProcessData === null || treeProcessData === void 0 ? void 0 : treeProcessData.areas.map(function (x) {
|
@@ -22696,7 +22705,7 @@
|
|
22696
22705
|
_this.language = res;
|
22697
22706
|
}
|
22698
22707
|
});
|
22699
|
-
this.editorConfig = CKEditorCommonFunctions.getCKEditorConfiguration('heading,|,fontsize,fontfamily,fontColor,fontBackgroundColor,|,bold,italic,underline,strikethrough,|,alignment,|,bulletedList,numberedList,|,outdent,indent,|,subscript,superscript,|,undo,redo,|,specialCharacters,blockQuote,insertTable,|,
|
22708
|
+
this.editorConfig = CKEditorCommonFunctions.getCKEditorConfiguration('heading,|,fontsize,fontfamily,fontColor,fontBackgroundColor,|,bold,italic,underline,strikethrough,|,alignment,|,bulletedList,numberedList,|,outdent,indent,|,subscript,superscript,|,undo,redo,|,specialCharacters,blockQuote,insertTable,|,removeformat', this.LANG, this.language);
|
22700
22709
|
};
|
22701
22710
|
QMSCKEditorTooltipComponent.prototype.ngAfterViewChecked = function () {
|
22702
22711
|
this.cdr.detectChanges();
|