Merge pull request #276 from rpbouman/dev

fix titals and export
rpbouman · Dec 3, 2024 · c9814d5 · c9814d5
2 parents 27ccae2 + a428f1c
commit c9814d5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/src/ExportUi/ExportDialog.js b/src/ExportUi/ExportDialog.js
@@ -147,7 +147,7 @@ class ExportUi {
             "ESCAPE": `'${escape.replace('\'', "''")}'`,
             "DATEFORMAT": `'${dateFormat.replace('\'', "''")}'`,
             "TIMESTAMPFORMAT": `'${timestampFormat.replace('\'', "''")}'`,
-            "COMPRESSION": compression,
+            "COMPRESSION": compression.value,
           };
           mimeType = 'text/csv';
           fileExtension = 'csv';
@@ -161,7 +161,7 @@ class ExportUi {
             "FORMAT": 'JSON',
             "DATEFORMAT": `'${dateFormat.replace('\'', "''")}'`,
             "TIMESTAMPFORMAT": `'${timestampFormat.replace('\'', "''")}'`,
-            "COMPRESSION": compression,
+            "COMPRESSION": compression.value,
             "ARRAY": rowDelimiter.toUpperCase()
           };
           mimeType = 'application/json';
@@ -171,7 +171,7 @@ class ExportUi {
           compression = exportSettings[exportType + 'Compression'];
           copyStatementOptions = {
             "FORMAT": 'PARQUET',
-            "COMPRESSION": compression,
+            "COMPRESSION": compression.value,
           };
           mimeType = 'application/vnd.apache.parquet';
           fileExtension = 'parquet';
@@ -202,12 +202,12 @@ class ExportUi {
         data = sql;
       }
 
-      if (compression && compression !== 'UNCOMPRESSED'){
+      if (compression && compression.value !== 'UNCOMPRESSED'){
         if (exportType === 'exportParquet'){
-          fileExtension = `${compression.toLowerCase()}.${fileExtension}`;
+          fileExtension = `${compression.value.toLowerCase()}.${fileExtension}`;
         }
         else {
-          switch (compression){
+          switch (compression.value){
             case 'GZIP':
               mimeType = 'application/gzip';
               break;
@@ -217,7 +217,7 @@ class ExportUi {
             default:
               mimeType = 'application/octet-stream';
           }
-          fileExtension += `.${compression.toLowerCase()}`;
+          fileExtension += `.${compression.value.toLowerCase()}`;
         }
       }
 
@@ -396,7 +396,7 @@ class ExportDialog {
                 valueProperty = 'value';
             }
             var value = control[valueProperty];
-            exportSettings[id] = value;
+            exportSettings[id] = control.tagName === 'SELECT' ? {value: value} : value;
             return;
           case 'object':
             if (setting instanceof Array) {

diff --git a/src/PivotTableUi/PivotTableUi.css b/src/PivotTableUi/PivotTableUi.css
@@ -181,20 +181,21 @@
     text-align: right;
   }
 
-  .pivotTableUiCell[data-value-type^=Decimal][data-totals=true] > .pivotTableUiCellLabel,
-  .pivotTableUiCell[data-value-type^=Float][data-totals=true] > .pivotTableUiCellLabel,
-  .pivotTableUiCell[data-value-type^=Int][data-totals=true] > .pivotTableUiCellLabel,
-  .pivotTableUiCell[data-value-type^="List<Decimal>"][data-totals=true] > .pivotTableUiCellLabel,
-  .pivotTableUiCell[data-value-type^="List<Float>"][data-totals=true] > .pivotTableUiCellLabel,
-  .pivotTableUiCell[data-value-type^="List<Int>"][data-totals=true] > .pivotTableUiCellLabel {
+  .pivotTableUiCell[data-axis=rows][data-value-type^=Decimal][data-totals=true] > .pivotTableUiCellLabel,
+  .pivotTableUiCell[data-axis=columns][data-value-type^=Decimal][data-totals=true] > .pivotTableUiCellLabel,
+  .pivotTableUiCell[data-axis=columns][data-value-type^=Float][data-totals=true] > .pivotTableUiCellLabel,
+  .pivotTableUiCell[data-axis=columns][data-value-type^=Float][data-totals=true] > .pivotTableUiCellLabel,
+  .pivotTableUiCell[data-axis=columns][data-value-type^=Int][data-totals=true] > .pivotTableUiCellLabel,
+  .pivotTableUiCell[data-axis=columns][data-value-type^=Int][data-totals=true] > .pivotTableUiCellLabel,
+  .pivotTableUiCell[data-axis=columns][data-value-type^="List<Decimal>"][data-totals=true] > .pivotTableUiCellLabel,
+  .pivotTableUiCell[data-axis=columns][data-value-type^="List<Decimal>"][data-totals=true] > .pivotTableUiCellLabel,
+  .pivotTableUiCell[data-axis=columns][data-value-type^="List<Float>"][data-totals=true] > .pivotTableUiCellLabel,
+  .pivotTableUiCell[data-axis=columns][data-value-type^="List<Float>"][data-totals=true] > .pivotTableUiCellLabel,
+  .pivotTableUiCell[data-axis=columns][data-value-type^="List<Int>"][data-totals=true] > .pivotTableUiCellLabel,
+  .pivotTableUiCell[data-axis=columns][data-value-type^="List<Int>"][data-totals=true] > .pivotTableUiCellLabel {
     font-family: unset
   }
 
-  .pivotTableUiCell[data-value-type^=Decimal][data-totals=true] > .pivotTableUiCellLabel,
-  .pivotTableUiCell[data-value-type^=Float][data-totals=true] > .pivotTableUiCellLabel,
-  .pivotTableUiCell[data-value-type^=Int][data-totals=true] > .pivotTableUiCellLabel {
-    text-align: unset;
-  }
 }
 
 

diff --git a/src/index.html b/src/index.html
@@ -15,8 +15,8 @@
     </style>
 
     <script>
-    var hueyVersionNumber = '0.0.8';
-    var hueyVersionName = 'Ancona';
+    var hueyVersionNumber = '0.0.9';
+    var hueyVersionName = 'Antigua';
     // see: https://cdn.jsdelivr.net/npm/@tabler/[email protected]/
     var tablerIconsFontVersion = '3.23.0';
     var tablerIconsFontUrl = `https://cdn.jsdelivr.net/npm/@tabler/icons-webfont@${tablerIconsFontVersion}/dist/fonts/tabler-icons.woff2?v${tablerIconsFontVersion}`;