From c4355fa476c0aeb1ca38baf7d04618a0d4442f95 Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Tue, 30 May 2023 10:36:55 +0200 Subject: [PATCH] Viewer-XSL, Makroberichte #4 --- src-modules/module/viz/conf/viz.xml | 56 ++++-- .../module/viz/masken/44000_maskeninfo.unl | 90 ++++++++- .../sx_stylesheets_einfuegen.sql | 6 +- .../viz/schluesseltabellen/viz_renderer.unl | 1 + .../viz/schluesseltabellen/viz_type.unl | 1 + .../schluesseltabellen/viz_type_property.unl | 3 + superx/xml/js/viz/viz_functions.js | 14 +- superx/xml/viz_html_chart.xsl | 150 +++++++++++++- superx/xml/viz_html_chart_viewer.xsl | 184 ++++++++++++++++++ 9 files changed, 469 insertions(+), 36 deletions(-) create mode 100644 superx/xml/viz_html_chart_viewer.xsl diff --git a/src-modules/module/viz/conf/viz.xml b/src-modules/module/viz/conf/viz.xml index 9784bba..fb5470d 100644 --- a/src-modules/module/viz/conf/viz.xml +++ b/src-modules/module/viz/conf/viz.xml @@ -108,14 +108,21 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[VIZ]" /> + releaseUnload="demo"> Diagrammentwürfe - - - - - + + + + + + + + + + + + @@ -133,7 +140,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[VIZ]" />
-Eigenschaften für Diagrammentwürfe @@ -157,7 +164,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[VIZ]" /> -
+--> Schlüsseltabelle für Eigenschaften von Visualisieren @@ -339,11 +346,20 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen - - + - + + + + + + + + @@ -461,7 +477,7 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen Abfragen zur Administration von Visualisierungen In diesem Formular können Sie Diagramme verwalten. -tid +tid +created_by - + + + + + @@ -509,6 +530,7 @@ mode="full"> gotoHt="" helpfile="" maxRows="*" + javascriptFieldsArray="true" mode="full"> In diesem Formular können Sie Diagrammtypen verwalten. Im Details-Formular können Sie Eigenschaften zuordnen. @@ -528,7 +550,7 @@ mode="full"> orderBy="caption" gotoHt="" helpfile="" - +javascriptFieldsArray="true" maxRows="1" mode="full"> In diesem Formular können Sie Diagrammelemente verwalten. diff --git a/src-modules/module/viz/masken/44000_maskeninfo.unl b/src-modules/module/viz/masken/44000_maskeninfo.unl index 3d5badb..04c6773 100644 --- a/src-modules/module/viz/masken/44000_maskeninfo.unl +++ b/src-modules/module/viz/masken/44000_maskeninfo.unl @@ -1,12 +1,85 @@ 44000^Visualisierungen verwalten^--Autor: D. Quathamer\ --Datum: 2.8.2019\ --freemarker template\ +create temp table tmp_ergebnis (\ +ord smallint,\ +tid integer, \ +userinfo_id integer,\ +benutzer varchar(255),\ +caption varchar(255),\ +uniquename varchar(255),\ +maskeninfo_id integer,\ +maskeninfo_name varchar(255),\ +nextedit varchar(255)\ +);\ +insert into tmp_ergebnis (ord,\ +tid,\ +userinfo_id, \ +benutzer,\ +caption,\ +uniquename,\ +maskeninfo_id,\ +maskeninfo_name,\ + nextedit) \ +select 1 as ord,\ +C.tid,\ +C.userinfo_id,\ +nvl(U.name,U.benutzer),\ +C.caption,\ +C.uniquename,\ +C.maskeninfo_id,\ +M.name,\ + ('../edit/viz/viz_chart_edit.jsp|tid=' || C.tid)::varchar(255)\ +FROM maskeninfo M, viz_chart C left outer join userinfo U\ +on (U.tid=C.userinfo_id)\ +where M.tid=C.maskeninfo_id\ +/* and C.userinfo_id=<> */\ +/* and C.caption ilike '%<>%' */\ +/* and C.uniquename ilike '%<>%' */\ +/* and C.maskeninfo_id=<> */\ +\ +;\ +\ +\ +insert into tmp_ergebnis (ord,\ +--tid,userinfo_id, benutzer,\ +caption, --maskeninfo_id,\ +--maskeninfo_name,\ +-- is_active,\ +-- stylesheet_id,\ +-- contenttype,\ +-- output_filename,\ +-- letzter_lauf,\ + nextedit) \ +select 10, --ord\ +'Neuer Eintrag',\ +nvl(('../edit/viz/viz_chart_edit.jsp|tid=' || max(tid)+1)::varchar(255),'../edit/viz/viz_chart_edit.jsp'::varchar(255))\ +from viz_chart\ +--where 0=(select count(*) from qa_mask_execution)\ +;\ +\ +<@selectintotmp \ +select="caption,\ +uniquename,\ +maskeninfo_name,\ +benutzer,\ +nextedit,\ +ord"\ +source="tmp_ergebnis"\ +target="tmp_ergebnis2">\ +order by ord,caption ,uniquename,maskeninfo_name\ +\ + <@informixnolog/>;\ + \ +drop table tmp_ergebnis;\ \ select \ caption,\ -uniquename\ -from viz_chart\ -order by 1\ +uniquename,\ +maskeninfo_name,\ +benutzer,\ +nextedit \ +from tmp_ergebnis2\ ;^XIL List\ drop_and_delete movable_columns sizable_columns horizontal_scrolling\ white_space_color=COLOR_WHITE fixed_columns=2\ @@ -17,4 +90,13 @@ Column CID=0 heading_text="Name" center_heading\ Column CID=0 heading_text="Schlüssel" center_heading\ row_selectable col_selectable heading_platform readonly\ width=50 text_size=100\ -@@@^^^Diagrammtypen und Eigenschaften verwalten^ ^^1^440^360^0^1^^ +Column CID=1 heading_text="Maske" center_heading\ + row_selectable col_selectable heading_platform readonly\ + width=150 text_size=200\ +Column CID=1 heading_text="Benutzer/in " center_heading\ + row_selectable col_selectable heading_platform readonly\ + width=30 text_size=200\ +Column CID=1 heading_text="Bearbeiten" center_heading\ + row_selectable col_selectable heading_platform readonly\ + width=5 text_size=200\ +@@@^^^Diagrammtypen und Eigenschaften verwalten^drop table tmp_ergebnis2;^^1^440^360^0^1^^ diff --git a/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql b/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql index 0cb2248..a35267e 100755 --- a/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql +++ b/src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql @@ -3,8 +3,6 @@ --Bitte nur Freemarker Variablen füllen <#assign masken = [ -{"mask":"16000", "filename":"tabelle_html_datenblatt.xsl", "ord":"1"}, -{"mask":"16000", "filename":"viz_html_chart.xsl", "ord":"100"}, {"mask":"30220", "filename":"viz_html_chart_sankey.xsl", "ord":"120"}, {"mask":"30220", "filename":"30220_html_chart_sankey.xsl", "ord":"130"} ] /> @@ -18,8 +16,8 @@ "is_generic":"1" }, {"filename":"viz_html_chart_sankey.xsl", "caption":"Übergangsdiagramm (Sankey-Diagramm)", "description":"Kreuztabelle Studienanfänger MA und vorheriger BA", "relation":"table", "contenttype":"text/html","is_generic":"0"}, -{"filename":"30220_html_chart_sankey.xsl", "caption":"Übergangsdiagramm-Viewer(Sankey-Diagramm)", "description":"Kreuztabelle Studienanfänger MA und vorheriger BA", "relation":"table", "contenttype":"text/html","is_generic":"0"} - +{"filename":"30220_html_chart_sankey.xsl", "caption":"Übergangsdiagramm-Viewer(Sankey-Diagramm)", "description":"Kreuztabelle Studienanfänger MA und vorheriger BA", "relation":"table", "contenttype":"text/html","is_generic":"0"}, +{"filename":"viz_html_chart_viewer.xsl", "caption":"Visualisierung (Viewer)", "description":"Viewer-Stylesheet für VIZ Charts", "relation":"table", "contenttype":"text/html","is_generic":"1"} ] /> <#assign stylesheet_field = [ {"filename":"viz_html_chart_sankey.xsl", "tablename":"erfolg_ba_ma_uebergang", "fieldname":"abschluss_vorher_abschluss"}, diff --git a/src-modules/module/viz/schluesseltabellen/viz_renderer.unl b/src-modules/module/viz/schluesseltabellen/viz_renderer.unl index 42da31c..ce6a960 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_renderer.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_renderer.unl @@ -1,2 +1,3 @@ 1^d3js^D3JS (V7)^ 2^plot^Observable Plot^ +3^basic^Basic Shapes^ diff --git a/src-modules/module/viz/schluesseltabellen/viz_type.unl b/src-modules/module/viz/schluesseltabellen/viz_type.unl index 4422046..d867e6a 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_type.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_type.unl @@ -9,3 +9,4 @@ 10^text^Wertelabel^2^ ^ ^^ 11^bar_x_d3^Balken (horizontal)^1^^^H^ 12^sankey^Sankey^1^ ^^H^ +13^table_bar_x^Tabelle + Balken einfach (horiz.)^3^^^H^ diff --git a/src-modules/module/viz/schluesseltabellen/viz_type_property.unl b/src-modules/module/viz/schluesseltabellen/viz_type_property.unl index 20bda5c..aac9ad9 100644 --- a/src-modules/module/viz/schluesseltabellen/viz_type_property.unl +++ b/src-modules/module/viz/schluesseltabellen/viz_type_property.unl @@ -384,3 +384,6 @@ 404^12^6^10^0^ 405^12^7^0^0^ 406^12^5^20^0^ +407^13^73^1^10^ +408^13^95^1^1^ +409^13^96^0^5^ diff --git a/superx/xml/js/viz/viz_functions.js b/superx/xml/js/viz/viz_functions.js index ed233ec..a81740d 100644 --- a/superx/xml/js/viz/viz_functions.js +++ b/superx/xml/js/viz/viz_functions.js @@ -336,7 +336,8 @@ function renderChartSVGfromModelWithPlot (currentChartModel,targetDiv) myOptions["marks"].push(marksArray); var svgPlot=Plot.plot(myOptions); var srcPlot=JSON.stringify(myOptions); - document.getElementById("plotCodeTextArea").innerHTML=srcPlot; + if(document.getElementById("plotCodeTextArea")) + document.getElementById("plotCodeTextArea").innerHTML=srcPlot; document.getElementById(targetDiv).innerHTML=""; document.getElementById(targetDiv).appendChild(svgPlot); @@ -748,6 +749,17 @@ function showChartPropertiesFormDiv(formDiv,formElementsDiv,renderer) } +function showSaveChartFormDiv(formDiv,renderer) +{ + var myDiv=document.getElementById(formDiv); + + if(myDiv.style.display=="block") + myDiv.style.display="none"; + else + myDiv.style.display="block"; + +} + function prepareChartProperties(chartType) { /*OBSOLETE*/ diff --git a/superx/xml/viz_html_chart.xsl b/superx/xml/viz_html_chart.xsl index 1ac5189..c2e3f8d 100644 --- a/superx/xml/viz_html_chart.xsl +++ b/superx/xml/viz_html_chart.xsl @@ -224,7 +224,25 @@ commonChartProperties.push(newCommonChartProperty); --> +function vizRenderer(uniquename,caption) +{ +this.caption=caption; +this.uniquename=uniquename; +} +var vizRenderers=[]; + + + +var newVizRenderer = new vizRenderer(" + +"," + +"); +vizRenderers.push(newVizRenderer); + + + function vizType(uniquename,caption,rendererUniquename,orientation) { this.caption=caption; @@ -840,13 +858,9 @@ rs[].push(new dataRow_

@@ -1079,9 +1093,64 @@ rs[].push(new dataRow_
-

-

-
+

+ + + @@ -1168,4 +1237,65 @@ rs[].push(new dataRow_ + + +legende +

+toggleLegendeDisplay(''); +Legende ... +

+
+ +

+ + + + + + + + + + + + :  + + + + + ... + + + + - Stand: + + + + ; + + + +User:   +Stand:

+ + + + + + +
+ + + + + +

+
+Platzhalter +
+ + + + + diff --git a/superx/xml/viz_html_chart_viewer.xsl b/superx/xml/viz_html_chart_viewer.xsl new file mode 100644 index 0000000..020a9ee --- /dev/null +++ b/superx/xml/viz_html_chart_viewer.xsl @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

 Laden...

+ + + + + + +
+ +page-wrap + + + + + +
+ + wrapper + + + + customfooter +
+
+ + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + +  + + +
+
+ +]]> + + + + + + + + + + + + + + + + + + +
+]]> + + +]]> +
+
+ +