diff --git a/src-modules/module/viz/conf/viz.xml b/src-modules/module/viz/conf/viz.xml index 7fdf963..cb9cdc2 100644 --- a/src-modules/module/viz/conf/viz.xml +++ b/src-modules/module/viz/conf/viz.xml @@ -1,11 +1,11 @@ - - @@ -146,7 +146,7 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen + @@ -220,6 +221,8 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen + + @@ -241,7 +244,48 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen - +
+In diesem Formular können Sie Diagramme verwalten. Im Details-Formular können Sie Eigenschaften zuordnen. + + + + + + + + +
+In diesem Formular können Sie Diagramme verwalten. + +tid + + + + + + + + +
diff --git a/superx/images/information_grey_liberation.svg b/superx/images/information_grey_liberation.svg new file mode 100644 index 0000000..321c309 --- /dev/null +++ b/superx/images/information_grey_liberation.svg @@ -0,0 +1,97 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + i + + + diff --git a/superx/images/more.svg b/superx/images/more.svg new file mode 100644 index 0000000..f2cb4fb --- /dev/null +++ b/superx/images/more.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + ... + + diff --git a/superx/style/sx_viz_muster.css b/superx/style/sx_viz_muster.css new file mode 100644 index 0000000..391e73f --- /dev/null +++ b/superx/style/sx_viz_muster.css @@ -0,0 +1,57 @@ +/*dateispezifische Basics*/ +.hero-body { margin-left: 1.5em; } /*Abstand zum Burger-Button*/ + +.title, .subtitle { /*für Seitentitel*/ + margin-left: 0.4em; + margin-top: 0%; } + +.card { /*für Cardposition, -style*/ + display: flex; + flex-flow: column; + margin-left: 0em; /*1.5em bei farbigem Hintergrund*/ + margin-top: 0em; /*-1.2em bei farbigem Hintergrund*/ + box-shadow: none; } + +/*Buttonleiste, Legende*/ +.legende { /*für Berichtslegende*/ + margin-left: 0.15em; + padding: 0.4rem 0.4rem 0.4rem 0.4rem; } /*für Padding: ob re un li*/ + +.feldname { + color: hsl(0, 0%, 29%); } + +/*Tabs, Selektionsfelder-Formular*/ +.label-container { /*für Responsibility der Eingabefelder*/ + display: flex; + justify-content: left; + background: inherit; + min-width: 10.0em; } + +.label { /*für Selektionsfeld-Bezeichner*/ + font-family: sans-serif; + font-weight: normal; + font-size: 2rem; + margin-left: 1.0em; + margin-top: 0.4em; } + +.control-new { /*für einheitliche Controlbreite*/ + width: 17.0em; + } + +.tabs { + font-family: sans-serif; + font-weight: normal; } + +.tabs { /*für Tab-Namen*/ + font-size: 2rem; } + +.input::-moz-placeholder, .textarea::-moz-placeholder, .select select::-moz-placeholder { + /*font-family: sans-serif;*/ + font-size: 0.8rem; + color: black /*rgba(54, 54, 54, 0.3)*/; } + +.input:-ms-input-placeholder, .textarea:-ms-input-placeholder, .select select:-ms-input-placeholder { + /*font-family: sans-serif;*/ + font-size: 0.8rem; + color: black /*(54, 54, 54, 0.3);*/; } + diff --git a/superx/xml/js/viz/viz_functions.js b/superx/xml/js/viz/viz_functions.js index b7f4e62..30cf277 100644 --- a/superx/xml/js/viz/viz_functions.js +++ b/superx/xml/js/viz/viz_functions.js @@ -130,7 +130,12 @@ return selectionProperties; function showChartPropertiesForm() { - document.getElementById("chartPropertiesFormDiv").style.visibility="visible"; + var myDiv=document.getElementById("chartPropertiesFormDetails"); + if(myDiv.style.display=="block") + myDiv.style.display="none"; + else + myDiv.style.display="block"; + } function prepareChartProperties(chartType) @@ -211,6 +216,9 @@ function prepareLineForm_alt() return chartProperties; } function fillDataSelectionForm(formDiv) +{ +formDivElem=document.getElementById(formDiv); +if(formDivElem.style.display=="none") { var selectionProperties=[]; var dimFunctions=[]; @@ -227,10 +235,17 @@ function fillDataSelectionForm(formDiv) fillSelectOptions(fnSelElem,dimFunctions,false); } } + formDivElem.style.display="block"; +} +else + formDivElem.style.display="none"; } function selectionResultPreview(myDiv) +{ + myDivElem=document.getElementById(myDiv); +if(myDivElem.style.display=="none") { var selectionRs=[]; var selectionRsMetaData=[]; @@ -242,7 +257,10 @@ function selectionResultPreview(myDiv) selectionRs=fillSelectionResult(selectionRsMetaData); showSelectionTable("selectionResultPreviewTable",selectionRs,selectionRsMetaData,10); - + myDivElem.style.display="block"; +} +else + myDivElem.style.display="none"; } function fillSelectionResultMetaData() { @@ -480,7 +498,8 @@ function showDataTable(myTableDiv,data,metadata,maxRows) { tableDiv=document.getElementById(myTableDiv); -tableDiv.innerHTML=""; //reset table +if(tableDiv.innerHTML=="") +{ var rowcount=data.length; if(rowcount > maxRows) rowcount=maxRows; @@ -520,6 +539,9 @@ for(row=1;row - + @@ -108,9 +108,9 @@ padding:3px; div.section { -margin-bottom:30px; +margin-bottom:5px; padding-bottom:10px; -border-bottom:thick solid gray; +/*border-bottom:thick solid gray;*/ } @@ -1103,18 +1103,94 @@ var platform='superx'; - -

- - + + +
+
+
+
+

Konfigurationsassistent Datenvisualisierung:

- + + +
+
+ +
+ + + +
-
- -
-
-
- +
+
+ +
+ + + +
-
-
-
+
+ + + +
-
- -
-
+ +
+
+ +
+ + +
+
+ +
-
- -
- +
@@ -1321,28 +1617,26 @@ rs.push(new dataRow(
+ +
-
- -
+
+
+ +
+ + + + + + +
+ +
- - - - - - - - - - - - - -