From 1dadb01b8fe3983885573cb8161062f7f5a2917e Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Thu, 20 Jun 2024 08:19:41 +0200 Subject: [PATCH] Bugfix Dashboard Makro Felder in Tabelle #7 --- src-modules/module/viz/conf/viz.xml | 2 +- .../viz/schluesseltabellen/viz_property.unl | 1 + .../viz_property_renderer.unl | 1 + superx/xml/js/viz/viz_functions.js | 113 +------- superx/xml/tabelle_html_viz.xsl | 251 +++++++++++++++++- superx/xml/viz_tableComponents.xsl | 19 +- 6 files changed, 272 insertions(+), 115 deletions(-) diff --git a/src-modules/module/viz/conf/viz.xml b/src-modules/module/viz/conf/viz.xml index 7879a8c..37e7863 100644 --- a/src-modules/module/viz/conf/viz.xml +++ b/src-modules/module/viz/conf/viz.xml @@ -1,6 +1,6 @@ - diff --git a/src-modules/module/viz/schluesseltabellen/viz_property.unl b/src-modules/module/viz/schluesseltabellen/viz_property.unl index 503b8e2..b3ed54c 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_property.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_property.unl @@ -53,3 +53,4 @@ 96^Dimension 2^dimension2^^ ^0^ ^0^1^5^ ^608^^^string^ 97^Leerzeilen-Maskierung^null_value_mask^ ^ ^0^ ^0^1^10^Text, der ersetzt wird, wenn eine Dimension leer ist, z.B. *Andere Hochschule* bei BA-MA-Übergang^700^^^string^ 98^Y-Wertebereich^domain^ ^ ^1^ ^0^1^21^Bittte Wertebereich mit [] eingeben, z.B. [0,100] für 0-100^1000^^^js^ +99^X: Skala^scale_x^band^ ^1^linear|identity|point|band|time^0^2^18^ ^1000^^^string^ diff --git a/src-modules/module/viz/schluesseltabellen/viz_property_renderer.unl b/src-modules/module/viz/schluesseltabellen/viz_property_renderer.unl index 451e623..b826ca0 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_property_renderer.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_property_renderer.unl @@ -27,3 +27,4 @@ 29^2^94^line^ 30^1^97^null_value_mask^ 31^2^98^domain^ +32^2^99^type^ diff --git a/superx/xml/js/viz/viz_functions.js b/superx/xml/js/viz/viz_functions.js index b8868c4..cf6d667 100644 --- a/superx/xml/js/viz/viz_functions.js +++ b/superx/xml/js/viz/viz_functions.js @@ -2395,6 +2395,8 @@ for (let i = 1; i < 4; i++) { } } + + function makeSankeyD3(myCommonChartProperties,mySvg,data,metaData,chartElem) { // load the data @@ -2407,6 +2409,7 @@ renderSankey(myCommonChartProperties,mySvg,sNodes,sLinks); //var myChartSVG = SankeyChart(sNodes,sLinks); } + function getSankeyNodes(data,captionEmptyTarget) { var myNodes=[]; @@ -2674,115 +2677,5 @@ function closeModalCardDetail(ergebniselementOrdnr) myModalCard.classList.remove('is-active'); } -function tabelleComboLaden(maskentid,fname, caption,fnameEscaped) { - Feldname = fname; - var callurl = '/superx/servlet/SuperXmlMaske'; - callurl += "?tid=" + maskentid + "&getJSON_" + getEncoded(Feldname) + - '=xxxxxx-xxxxxx@'; - var params = ""; - var e=document.forms["Weiterverarbeitung"].elements[fname]; - if (e) { - var t = e.type; - var name = fname; - //todo bei startsWith select_ label_ auch überspringen - - if (e.value != '') //leere Felder müssen auch übergeben werden MB!! - params += "&" + getEncoded(fname) + "=" + getEncoded(e.value); - else - params += "&" + getEncoded(fname) + "=--leer--"; - } - - - - //alert(params); - //return false; - if (!caption || caption == '') caption = Feldname; - document.getElementById("comboElementName").innerHTML = 'Auswahl ' + caption; - document.getElementById("comboload").style.display = ""; - document.getElementById("comboselect").style.display = "none"; - - var currentFieldValue=document.forms['Weiterverarbeitung'].elements[Feldname].value; - var splitchar=","; - if(currentFieldValue.indexOf("|")>-1) - splitchar="\|"; - var currentFieldValueArray = currentFieldValue.split(splitchar); - var currentFieldValueCount=currentFieldValueArray.length; - var combodlg = dojo.widget.byId("combodlg"); - combodlg._onKey = null; - //alert(callurl + params); - combodlg.show(); - //return false; - dojo.io.bind({ - url: callurl + params, - encoding: "UTF-8", - method: "get", - handler: function(type, data, evt) { - - var da = purgeval(data); - - if (type == 'error' || da.error) { - // - if (da.error) msg = da.error; - else msg = data.message; - document.getElementById('progressbar').style.display = "none"; - alert('Fehler beim Lesen der Daten!\n' + msg); - combodlg.hide(); - } else { - nodes = da.nodes; - - document.forms['comboform'].comboselect.options.length = 0; - if (nodes.length == 0) { - document.forms['comboform'].comboselect.options[0] = new Option( - "keine Auswahl möglich", ""); - } else { - if (da.zeilenanzahl > 1 && nodes.length > 1) { - document.forms['comboform'].comboselect.size = 10; - - document.forms['comboform'].comboselect.multiple = true; - document.getElementById("multiselecthint").style.display = ""; - document.getElementById("suchselect").multiple = true; - - } else { - document.forms['comboform'].comboselect.size = 1; - document.forms['comboform'].comboselect.multiple = false; - document.getElementById("multiselecthint").style.display = "none"; - document.getElementById("suchselect").multiple = false; - } - for (i = 0; i < nodes.length; i++) - - { - - sel = false; - if (nodes[i].isSelected && nodes[i].objectId !="") sel = true; - if(currentFieldValue - && nodes[i].objectId !="" - && currentFieldValueArray.includes(nodes[i].objectId) - ) - sel=true; - //-------------------HIER IST DER ANGEPASSTE CODE------------------------------------------------------------------------ - title = nodes[i].title; - var o = new Option(title, nodes[i].objectId, sel, sel); - document.forms['comboform'].comboselect.options[i] = o; - - if (nodes[i].nodeattrib && nodes[i].nodeattrib == 3) o.innerHTML = - "  " + title; - //---------------------------------------- BIS HIER ------------------------------------------------------------- - } - - document.getElementById("comboload").style.display = "none"; - document.getElementById("comboselect").style.display = ""; - } - document.getElementById('progressbar').style.display = "none"; - } - } - }); - -} -function tabelleComboHide() -{ -var combodlg = dojo.widget.byId("combodlg"); - combodlg.hide(); -} - diff --git a/superx/xml/tabelle_html_viz.xsl b/superx/xml/tabelle_html_viz.xsl index 9ee4556..048888d 100644 --- a/superx/xml/tabelle_html_viz.xsl +++ b/superx/xml/tabelle_html_viz.xsl @@ -80,7 +80,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sx="http://memtext.de"> ]]> - + @@ -238,6 +238,10 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sx="http://memtext.de"> +
+
+ +

@@ -250,6 +254,16 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sx="http://memtext.de">
+ +
+
+ + + +
+ +
+ + + + + + + + + + + + + + + +tabelleComboLaden( + + ,' + + ',' + + ',' + + '); + +
+
+

+ + + + +

+
+   +   + +
+

+ + + + + + + + + + +

+   +   +   +   + + +
+
+ + + + + +tabelleSichtLaden( + + ,' + + ',' + + ',' + + ',' + + '); + +
+
+

+ + + + +

+
+   +   + +
+

+ + + + + + + + + + +

+   +   +   +   + + +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + + + + + diff --git a/superx/xml/viz_tableComponents.xsl b/superx/xml/viz_tableComponents.xsl index 3ae9e55..702f2cf 100644 --- a/superx/xml/viz_tableComponents.xsl +++ b/superx/xml/viz_tableComponents.xsl @@ -55,12 +55,25 @@ function jsDisableInput(datei) {