From 31cf1ac0b2cbc5d99b264de542dbbb68c4fe6ce0 Mon Sep 17 00:00:00 2001 From: mike cullerton Date: Fri, 3 Sep 2021 10:50:10 -0400 Subject: [PATCH 1/4] New section for adding DMN from spreadsheet --- src/app/modeler/modeler.component.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/app/modeler/modeler.component.ts b/src/app/modeler/modeler.component.ts index bf9614a..5f9cdaf 100644 --- a/src/app/modeler/modeler.component.ts +++ b/src/app/modeler/modeler.component.ts @@ -133,8 +133,23 @@ export class ModelerComponent implements AfterViewInit { onSubmitFileToOpen() { this.expandToolbar = false; + if (this.diagramFile && this.diagramFile.type.toLowerCase() === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') { + this.api.createDMNFromSS(this.diagramFile).subscribe(file => { + let fileMeta = { + id: 0, + content_type: 'text/xml', + name: 'new_dmn', + type: FileType.DMN, + } + this.diagramFile = newFileFromResponse(fileMeta, file); + console.log(this.diagramFile); + console.log(file); + this.readFile(this.diagramFile); + }); - if (this.diagramFile && ModelerComponent.isXmlFile(this.diagramFile)) { + } + + else if (this.diagramFile && ModelerComponent.isXmlFile(this.diagramFile)) { this.readFile(this.diagramFile); } else { this.handleImported({ From 3fa72309881479d896446524ac1962ccc72cc627 Mon Sep 17 00:00:00 2001 From: mike cullerton Date: Fri, 3 Sep 2021 10:50:32 -0400 Subject: [PATCH 2/4] Allow XLSX files in the upload dialog box --- src/app/modeler/modeler.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/modeler/modeler.component.html b/src/app/modeler/modeler.component.html index d6c040d..e4fffd4 100644 --- a/src/app/modeler/modeler.component.html +++ b/src/app/modeler/modeler.component.html @@ -86,4 +86,4 @@ - + From b56a5adc1e7915821c79a7f91aa60da7dfcfa424 Mon Sep 17 00:00:00 2001 From: mike cullerton Date: Tue, 7 Sep 2021 16:28:28 -0400 Subject: [PATCH 3/4] New library version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e047a7c..784fa86 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "ngx-markdown": "^12.0.1", "protractor": "^7.0.0", "rxjs": "^6.5.3", - "sartography-workflow-lib": "^0.0.547", + "sartography-workflow-lib": "^0.0.555", "tslib": "^2.3.0", "uuid": "^8.3.2", "zone.js": "^0.11.4" From a05a69291cc228b62f3a20d0a030ba0828d75fef Mon Sep 17 00:00:00 2001 From: mike cullerton Date: Tue, 7 Sep 2021 16:28:41 -0400 Subject: [PATCH 4/4] Added a comment --- src/app/modeler/modeler.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/modeler/modeler.component.ts b/src/app/modeler/modeler.component.ts index 5f9cdaf..b4b5822 100644 --- a/src/app/modeler/modeler.component.ts +++ b/src/app/modeler/modeler.component.ts @@ -133,6 +133,7 @@ export class ModelerComponent implements AfterViewInit { onSubmitFileToOpen() { this.expandToolbar = false; + /** If it is a spreadsheet, create a DMN from it */ if (this.diagramFile && this.diagramFile.type.toLowerCase() === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') { this.api.createDMNFromSS(this.diagramFile).subscribe(file => { let fileMeta = {