added legend for single series charts and fixed file uploads (#35)

eclipse-basyx · Sep 23, 2024 · 1054b85 · 1054b85
1 parent 135a327
commit 1054b85
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/aas-web-ui/src/components/AppNavigation/UploadAAS.vue b/aas-web-ui/src/components/AppNavigation/UploadAAS.vue
@@ -91,7 +91,7 @@
                 let path = this.uploadURL;
                 var headers = new Headers();
                 var formData = new FormData();
-                formData.append('file', this.aasFile[0]);
+                formData.append('file', this.aasFile);
                 // Send Request to upload the file
                 this.postRequest(path, formData, headers, context, disableMessage).then((response: any) => {
                     if (response.success) {

diff --git a/aas-web-ui/src/components/SubmodelElements/Blob.vue b/aas-web-ui/src/components/SubmodelElements/Blob.vue
@@ -200,7 +200,7 @@
                 // console.log("Upload File: ", this.newFile);
                 // check if a file is selected
                 if (this.newFile.length == 0) return;
-                let file = this.newFile[0];
+                let file = this.newFile;
                 let contentType = file.type;
                 // decode the file to base64
                 let reader = new FileReader();

diff --git a/aas-web-ui/src/components/SubmodelElements/File.vue b/aas-web-ui/src/components/SubmodelElements/File.vue
@@ -197,7 +197,6 @@
                 // console.log("Upload File: ", this.newFile);
                 // check if a file is selected
                 if (this.newFile.length == 0) return;
-                // let mimeType = this.newFile[0].type;
                 let context =
                     'uploading ' +
                     this.fileObject.modelType +
@@ -206,10 +205,10 @@
                     this.fileObject.idShort +
                     '"';
                 let disableMessage = false;
-                let path = this.SelectedNode.path + '/attachment?fileName=' + this.newFile[0].name;
+                let path = this.SelectedNode.path + '/attachment?fileName=' + this.newFile.name;
                 var headers = new Headers();
                 var formData = new FormData();
-                formData.append('file', this.newFile[0]);
+                formData.append('file', this.newFile);
                 // Send Request to upload the file
                 this.putRequest(path, formData, headers, context, disableMessage).then((response: any) => {
                     // TODO: Add success response handling including updating the File SubmodelElement -> mimeType (+ value)

diff --git a/aas-web-ui/src/components/Widgets/AreaChart.vue b/aas-web-ui/src/components/Widgets/AreaChart.vue
@@ -69,6 +69,10 @@
                         height: 350,
                         background: '#ffffff00',
                     },
+                    legend: {
+                        show: true,
+                        showForSingleSeries: true,
+                    },
                     dataLabels: {
                         enabled: false,
                     },

diff --git a/aas-web-ui/src/components/Widgets/LineChart.vue b/aas-web-ui/src/components/Widgets/LineChart.vue
@@ -69,6 +69,10 @@
                         height: 350,
                         background: '#ffffff00',
                     },
+                    legend: {
+                        show: true,
+                        showForSingleSeries: true,
+                    },
                     dataLabels: {
                         enabled: false,
                     },
@@ -158,6 +162,7 @@
                 // console.log('initializeSeries: ', this.chartData, this.timeVariable, this.yVariables);
                 // Prepare new series values
                 let newSeries = this.prepareSeriesValues(this.chartData, this.yVariables);
+                console.log('newSeries: ', newSeries);
                 // prepare the tooltip for the y-axis
                 let tooltip_y = this.prepareYValueTooltip(this.chartData, this.yVariables);
                 // prepare the legend for the series

diff --git a/aas-web-ui/src/components/Widgets/ScatterChart.vue b/aas-web-ui/src/components/Widgets/ScatterChart.vue
@@ -64,6 +64,10 @@
                         height: 350,
                         background: '#ffffff00',
                     },
+                    legend: {
+                        show: true,
+                        showForSingleSeries: true,
+                    },
                     dataLabels: {
                         enabled: false,
                     },