From 67ece9cd3c666f9c4c6d59cb3326a349a367cdec Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Thu, 15 Dec 2022 08:38:02 +0100 Subject: [PATCH] Eigenschafften Gruppen, mehrspaltiges Layout #5 --- build.xml | 17 ++++--- src-modules/module/viz/conf/viz.xml | 21 ++++++++- .../module/viz/masken/44000_felderinfo.unl | 2 +- superx/xml/js/viz/viz_functions.js | 46 +++++++++++++++++-- superx/xml/viz_html_chart.xsl | 12 ++++- 5 files changed, 83 insertions(+), 15 deletions(-) diff --git a/build.xml b/build.xml index 614ebae..0655e2a 100644 --- a/build.xml +++ b/build.xml @@ -1,12 +1,7 @@ - + @@ -26,6 +21,14 @@ ant -DMODULE_PATH=$VIZ_PFAD -DWEBAPP_DIR=$WEBAPP -DMODULE=viz dist + + + + + + + + @@ -69,5 +72,5 @@ ant -DMODULE_PATH=$VIZ_PFAD -DWEBAPP_DIR=$WEBAPP -DMODULE=viz dist - + diff --git a/src-modules/module/viz/conf/viz.xml b/src-modules/module/viz/conf/viz.xml index 304698a..f60a8c1 100644 --- a/src-modules/module/viz/conf/viz.xml +++ b/src-modules/module/viz/conf/viz.xml @@ -159,7 +159,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[VIZ]" /> - + 1=ja, 0=nein @@ -391,6 +391,7 @@ mode="full"> + @@ -423,6 +424,24 @@ mode="full"> + +
+In diesem Formular können Sie Gruppen von Diagrammeigenschaften verwalten. + + + + + + diff --git a/src-modules/module/viz/masken/44000_felderinfo.unl b/src-modules/module/viz/masken/44000_felderinfo.unl index ae36de4..2559f5d 100644 --- a/src-modules/module/viz/masken/44000_felderinfo.unl +++ b/src-modules/module/viz/masken/44000_felderinfo.unl @@ -3,6 +3,6 @@ 44002^Eigenschaften verwalten^100^0^0^150^300^1^char^30^0^18^^^<> select '../edit/viz/viz_property_list.jsp' from xdummy;^ 44003^Name^20^0^0^150^150^1^sql^50^0^0^^^^ 44004^Komponente^1^0^0^150^200^1^integer^200^0^13^<> select tid,name from systeminfo order by 2;^ ^^ -44005^Projekte verwalten^200^0^0^150^300^1^char^30^0^13^^^<> select '../edit/qa/qa_project_list.jsp' from xdummy;^ +44005^Eigenschaftsgruppen verwalten^200^0^0^150^300^1^char^30^0^18^^^<> select '../edit/viz/viz_property_group_list.jsp' from xdummy;^ 44006^Projekt^5^0^0^150^200^1^integer^200^0^13^<> select tid,name from qa_project where active=1 /* and systeminfo_id=<> */ order by 2;^^^ 44007^Status Test^200^0^0^150^200^1^integer^200^0^13^<> select 1,'nur aktive' from xdummy union select 0,'nur inaktive' from xdummy order by 2;^^ ^ diff --git a/superx/xml/js/viz/viz_functions.js b/superx/xml/js/viz/viz_functions.js index 6ae0132..4bb2a61 100644 --- a/superx/xml/js/viz/viz_functions.js +++ b/superx/xml/js/viz/viz_functions.js @@ -450,6 +450,9 @@ function renderFormDetails(formDiv,myCommonChartProperties) while (myForm.firstChild) { myForm.removeChild(myForm.firstChild); } + const columnsDiv = document.createElement("div"); + columnsDiv.classList.add("columns"); + /* const tabElem = document.createElement("table"); for(var k=0;k < myCommonChartProperties.length;k++) @@ -485,10 +488,45 @@ function renderFormDetails(formDiv,myCommonChartProperties) tabElem.appendChild( rowElem); } */ - for(var k=0;k < myCommonChartProperties.length;k++) + +//first Collect all groups: +var commonChartPropertyGroups=[]; +var previousGroup=""; +for(var k=0;k < myCommonChartProperties.length;k++) { - myForm.appendChild(renderChartPropertyField(myCommonChartProperties[k])); + var groupUniquename=myCommonChartProperties[k].groupUniquename; + if(groupUniquename != previousGroup) + { + var newcommonChartPropertyGroup = new commonChartPropertyGroup(myCommonChartProperties[k].groupCaption,groupUniquename); + commonChartPropertyGroups.push(newcommonChartPropertyGroup); + } + previousGroup=groupUniquename; + } + for(var i=0;i < commonChartPropertyGroups.length;i++) + { + const columnDiv = document.createElement("div"); + columnDiv.classList.add("column"); + columnDiv.classList.add("is-narrow"); + const columnDivBox = document.createElement("div"); + columnDivBox.classList.add("box"); + columnDivBox.style="width: 300px"; + + const colHeader = document.createTextNode(commonChartPropertyGroups[i].caption); + const colHeaderParagraph = document.createElement("p"); + colHeaderParagraph.classList.add("title"); + colHeaderParagraph.classList.add("is-6"); + colHeaderParagraph.appendChild(colHeader); + columnDivBox.appendChild(colHeaderParagraph); + + for(var k=0;k < myCommonChartProperties.length;k++) + { + if(myCommonChartProperties[k].groupUniquename==commonChartPropertyGroups[i].groupUniquename) + columnDivBox.appendChild(renderChartPropertyField(myCommonChartProperties[k])); + } + columnDiv.appendChild(columnDivBox); + columnsDiv.appendChild(columnDiv); } + myForm.appendChild(columnsDiv); } function renderChartPropertyField(commonChartProperty) @@ -521,7 +559,7 @@ function renderChartPropertyField(commonChartProperty) //Einfaches Texteingabefeld: const inpElem = document.createElement("input"); inpElem.type="TEXT"; - inpElem.size=15; + inpElem.size=5; inpElem.title=commonChartProperty.explanation; inpElem.name=commonChartProperty.name; inpElem.id=commonChartProperty.name; @@ -1085,7 +1123,7 @@ function getCommonChartProperty(name) var propertyValue=""; for (var i=0;i @@ -179,6 +185,8 @@ var newCommonChartProperty = new commonChartProperty(" "," "," + +"," "); commonChartProperties.push(newCommonChartProperty); @@ -186,7 +194,7 @@ commonChartProperties.push(newCommonChartProperty); var newCommonChartProperty = new commonChartProperty("chartCaption","Titel des Diagramms", false,"TEXT", ""," -","wird unter dem Diagramm angezeigt","TITLE"); +","wird unter dem Diagramm angezeigt","Diagrammkopf","TITLE"); commonChartProperties.push(newCommonChartProperty);