add custom columns (incl. text variables) in column picker #359

Rello · Aug 14, 2023 · ee4b95d · ee4b95d
1 parent b9a3a9a
commit ee4b95d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/css/style.css b/css/style.css
@@ -313,6 +313,12 @@ table.dataTable tbody tr {
     filter: var(--background-invert-if-dark);
 }
 
+.icon-analytics-gripLines {
+    background-image: url(../img/gripLines.svg);
+    filter: var(--background-invert-if-dark);
+    margin: 10px;
+}
+
 .filterVisualizationItem {
     background-color: var(--color-background-dark);
     padding: 5px;

diff --git a/css/style.scss b/css/style.scss
@@ -312,6 +312,11 @@ table.dataTable tbody tr {
   @include icon-color('column', 'analytics', $color-black, 1);
 }
 
+.icon-analytics-gripLines {
+  @include icon-color('gripLines', 'analytics', $color-black, 1);
+  margin: 10px;
+}
+
 .filterVisualizationItem {
     background-color: var(--color-background-dark);
     padding: 5px;

diff --git a/img/gripLines.svg b/img/gripLines.svg
diff --git a/js/app.js b/js/app.js
@@ -1465,6 +1465,9 @@ OCA.Analytics.Datasource = {
         li.addEventListener("dragover", OCA.Analytics.Notification.handleDragOver);
         li.addEventListener("drop", OCA.Analytics.Notification.handleDrop);
 
+        const gripLines = document.createElement('div')
+        gripLines.classList.add('icon-analytics-gripLines', 'sidebarPointer');
+
         const checkbox = document.createElement("input");
         checkbox.type = "checkbox";
         checkbox.id = item.id;
@@ -1478,6 +1481,7 @@ OCA.Analytics.Datasource = {
         spanContent.style.marginLeft = '10px';
         spanContent.style.color = 'var(--color-text-maxcontrast)';
         item.contenteditable === true ? spanContent.contentEditable = 'true' : false;
+        li.appendChild(gripLines);
         li.appendChild(checkbox);
         li.appendChild(span);
         li.appendChild(spanContent);

diff --git a/js/filter.js b/js/filter.js
@@ -289,7 +289,7 @@ OCA.Analytics.Filter = {
         } catch (e) {
             dataOptions = '';
         }
-        let distinctCategories = OCA.Analytics.Core.getDistinctValues(OCA.Analytics.currentReportData.data);
+        let distinctCategories = OCA.Analytics.Core.getDistinctValues(OCA.Analytics.currentReportData.data, 0);
         if (dataOptions === null) dataOptions = {};
 
         // check if defined dataoptions don´t match the number of dataseries anymore