diff --git a/src-modules/module/viz/conf/includes.txt b/src-modules/module/viz/conf/includes.txt
index d0235aa..b191e2d 100644
--- a/src-modules/module/viz/conf/includes.txt
+++ b/src-modules/module/viz/conf/includes.txt
@@ -2,6 +2,8 @@ doku/viz_modul/viz.html
images/icons/more.svg
images/icons/chart-bar.svg
images/information_grey_liberation.svg
+images/plus-circled.svg
+images/minus-circled.svg
style/sx_viz_muster.css
style/bulma-tooltip.min.css
style/LICENSE_bulma_tooltip_1.2.0.txt
diff --git a/src-modules/module/viz/schluesseltabellen/viz_property.unl b/src-modules/module/viz/schluesseltabellen/viz_property.unl
index 392ab53..3f2063a 100644
--- a/src-modules/module/viz/schluesseltabellen/viz_property.unl
+++ b/src-modules/module/viz/schluesseltabellen/viz_property.unl
@@ -46,3 +46,4 @@
86^X: Label^label_x^^ ^1^ ^0^1^18^Label X-Achse^602^^^string^
87^Y: Label^label_y^^ ^1^ ^0^1^21^Label Y-Achse^602^^^string^
88^Punktdicke^r^^ ^1^ ^0^1^5^Punktdicke von Diagrammelementen (relevant für Plot.dot, Plot.tickX/Y)^308^^^string^
+89^Sortierung^sort^^ ^1^ ^0^1^5^ ^608^^^string^
diff --git a/src-modules/module/viz/schluesseltabellen/viz_type_property.unl b/src-modules/module/viz/schluesseltabellen/viz_type_property.unl
index e738154..9dbbb42 100644
--- a/src-modules/module/viz/schluesseltabellen/viz_type_property.unl
+++ b/src-modules/module/viz/schluesseltabellen/viz_type_property.unl
@@ -15,3 +15,8 @@
24^5^8^0^
26^3^76^0^
27^6^88^0^
+28^3^89^0^
+29^6^89^0^
+30^5^89^0^
+31^2^89^0^
+32^1^89^0^
diff --git a/superx/images/minus-circled.svg b/superx/images/minus-circled.svg
new file mode 100644
index 0000000..c4498c6
--- /dev/null
+++ b/superx/images/minus-circled.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/superx/images/plus-circled.svg b/superx/images/plus-circled.svg
new file mode 100644
index 0000000..e8caa17
--- /dev/null
+++ b/superx/images/plus-circled.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/superx/xml/js/viz/viz_functions.js b/superx/xml/js/viz/viz_functions.js
index 7f119ce..39b6a5b 100644
--- a/superx/xml/js/viz/viz_functions.js
+++ b/superx/xml/js/viz/viz_functions.js
@@ -44,6 +44,7 @@ function chartModel(id,name,renderer,datasources)
this.chartElements=new Array();
this.options=new Object;
this.options.marks=new Array();
+ this.options.sort=new Array();
//let globalProperties={};
this.getChartSVG = function () {
@@ -173,7 +174,7 @@ var valueOptions=[];
var optionCounter=0;
//selectionRsMetaData=fillSelectionResultMetaData();
//console.log("felder"+selectionRsMetaData.length);
-var isDefault=true;
+var isDefault=false;
for(var j=0;j < rsColumnMetaData[datasource].length;j++)
{
if(rsColumnMetaData[datasource][j].colcaption.trim() !=""
@@ -341,7 +342,7 @@ function renderChart(chartDiv,currentChartModel)
if(document.getElementById("chartName").value=="")
document.getElementById("chartName").value=vizInitialName;
- if(currentChartModel.chartElements.length>0)
+ if(currentChartModel.chartElements.length>0 && currentChartModel.chartElements[0])
{
var mySVG=currentChartModel.getChartSVG();
if(typeof mySVG === 'object')
@@ -482,18 +483,7 @@ function createChartElementsConfig2Form(renderer)
}
saveBtnDiv.appendChild(saveBtn);
elementDivBox.appendChild(saveBtnDiv);
- //remove:
- const removeBtnDiv = document.createElement("div");
- const removeBtn = document.createElement("input");
- removeBtn.type="BUTTON";
- removeBtn.value="Entfernen";
- removeBtn.classList.add("button");
- removeBtn.classList.add("is-small");
- removeBtn.onclick =function() {
- removeChartElementConfig()
- }
- removeBtnDiv.appendChild(removeBtn);
- elementDivBox.appendChild(removeBtnDiv);
+
formChartElementConfig2Div.appendChild(elementDivBox);
/*columnsDiv.appendChild(columnDiv);
@@ -547,7 +537,7 @@ function saveChartElementConfig()
while (formChartElementConfig2Div.firstChild) {
formChartElementConfig2Div.removeChild(formChartElementConfig2Div.firstChild);
}
-
+ document.getElementById("vizElementCounter").value=myChartModel.chartElements.length;
renderChart('chartDiv',myChartModel);
/*var marksArray=new Array();
@@ -565,15 +555,18 @@ function removeChartElementConfig()
{
var propertyCounter=myChartModel.chartElements.length;
- var elemID=document.getElementById("chartElementID").value;
if(propertyCounter>0)
{
+ var elemID=myChartModel.chartElements[propertyCounter-1].nr;
+
/*var filtered=myChartModel.chartElements.filter(obj => obj.nr !== propertyCounter-1);
myChartModel.chartElements=filtered;*/
- delete myChartModel.chartElements[propertyCounter-1];
+ //delete myChartModel.chartElements[propertyCounter-1];
+ myChartModel.chartElements.pop();
elemID--;
- document.getElementById("chartElementID").value=elemID;
-
+ if(document.getElementById("chartElementID"))
+ document.getElementById("chartElementID").value=elemID;
+ document.getElementById("vizElementCounter").value=myChartModel.chartElements.length;
renderChart('chartDiv',myChartModel);
}
}
diff --git a/superx/xml/viz_html_chart.xsl b/superx/xml/viz_html_chart.xsl
index eb334ea..6b286d1 100644
--- a/superx/xml/viz_html_chart.xsl
+++ b/superx/xml/viz_html_chart.xsl
@@ -298,7 +298,14 @@ var newVizTypeProperty = new vizTypeProperty("
","
",
-
+
+
+true
+
+
+false
+
+
,""
);
vizTypeProperties.push(newVizTypeProperty);
@@ -1850,7 +1857,9 @@ rs[].push(new dataRow_
@@ -1864,11 +1873,8 @@ rs[].push(new dataRow_
