Browse Source

Breite und Höhe der Grafik bei Dashboards als Maskenfeld #7

master
Daniel Quathamer 3 days ago
parent
commit
f6dc7c4592
  1. 5
      src-modules/module/viz/conf/includes.txt
  2. 14
      src-modules/module/viz/conf/viz.xml
  3. 7
      src-modules/module/viz/conf/viz_upgrade_man.sql
  4. 3
      src-modules/module/viz/masken/44190_felderinfo.unl
  5. 1
      src-modules/module/viz/masken/44190_masken_felder_bez.unl
  6. 10
      src-modules/module/viz/masken/44660_felderinfo.unl
  7. 1
      src-modules/module/viz/masken/44660_masken_felder_bez.unl
  8. 13
      src-modules/module/viz/schluesseltabellen/customxmladd.sql
  9. 4
      src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql
  10. 569
      src-modules/module/viz/schluesseltabellen/viz_type_echarts_fuellen.sql
  11. 88
      superx/images/icons/into_excel_normal.svg
  12. 94
      superx/images/icons/into_pdf.svg
  13. 88
      superx/images/icons/into_word.svg
  14. 1774
      superx/xml/js/viz/viz_assistent.js
  15. 48
      superx/xml/js/viz/viz_viewer.js
  16. 133
      superx/xml/viz_components.xsl
  17. 27
      superx/xml/viz_html_chart.xsl
  18. 5
      superx/xml/viz_html_chart_viewer.xsl
  19. 82
      superx/xml/viz_html_chart_viewer_grid.xsl
  20. 4
      superx/xml/viz_html_chart_viewer_mask.xsl
  21. 4
      superx/xml/viz_html_chart_viewer_mask_and_table.xsl

5
src-modules/module/viz/conf/includes.txt

@ -1,4 +1,7 @@ @@ -1,4 +1,7 @@
doku/viz_modul/viz.html
images/icons/into_excel_normal.svg
images/icons/into_pdf.svg
images/icons/into_word.svg
images/icons/more.svg
images/icons/chart-bar.svg
images/information_grey_liberation.svg
@ -41,7 +44,7 @@ xml/js/viz/plot-0.6.1-license.txt @@ -41,7 +44,7 @@ xml/js/viz/plot-0.6.1-license.txt
xml/js/viz/d3-sankey.js
xml/js/viz/d3-sankey-license.txt
xml/js/viz/viz_viewer.js
xml/js/viz/viz_functions.js
xml/js/viz/viz_assistent.js
xml/js/viz/world.geojson.license.txt
xml/js/viz/world.geojson
xml/pageComponents_html_final_viz.xsl.sam

14
src-modules/module/viz/conf/viz.xml

@ -129,6 +129,10 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[VIZ]" /> @@ -129,6 +129,10 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[VIZ]" />
<column name="chart_position" type="CHAR" size="10" default="" notnull="" description="Position des Diagramms"><comment>CENTER,TOP,BOTTOM,LEFT,RIGHT,INLINE</comment></column>
<column name="chart_active" type="SMALLINT" size="2"
default="1" notnull="false" description="Grafik aktiv"></column>
<column name="chart_width" type="INTEGER" size="10" default="600" notnull="" description="Breite des Diagramms"><comment>in px</comment></column>
<column name="chart_height" type="INTEGER" size="10" default="400" notnull="" description="Höhe des Diagramms"><comment>in px</comment></column>
<column name="chart_miniature_width" type="INTEGER" size="10" default="200" notnull="" description="Breite der Diagramm-Miniatur"><comment>in px</comment></column>
<column name="chart_miniature_height" type="INTEGER" size="10" default="100" notnull="" description="Höhe der Diagramm-Miniatur"><comment>in px</comment></column>
</columns>
@ -666,6 +670,8 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen </the @@ -666,6 +670,8 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen </the
<loadtable refresh="true" delimiter="^" header="false" tabname="viz_staat_isocode"><file path="$VIZ_PFAD/schluesseltabellen/viz_staat_isocode.unl"/></loadtable>
<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sachgebiete_fuellen.sql" database=""/>
<nativeaction sql="" scriptfile="$VIZ_PFAD/upgrade/viz_upgrade_man.sql" database=""/>
</action>
<action error="stop">
<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sx_stylesheets_einfuegen.sql" database=""/>
@ -755,8 +761,12 @@ mode="full"> @@ -755,8 +761,12 @@ mode="full">
<customfield name="renderer_id" visibleSize="10" nullFieldValue="" />
<customfield name="chartmodel" visibleSize="10" nullFieldValue="" />
<customfield name="chartmodel_miniature" visibleSize="10" nullFieldValue="" />
<customfield name="preview_svg" visibleSize="80" nullFieldValue="" />
<customfield name="chart_position" visibleSize="10" nullFieldValue="" />
<!--<customfield name="preview_svg" visibleSize="80" nullFieldValue="" />
<customfield name="chart_position" visibleSize="10" nullFieldValue="" />-->
<customfield name="chart_width" visibleSize="10" nullFieldValue="" />
<customfield name="chart_height" visibleSize="10" nullFieldValue="" />
<customfield name="chart_miniature_width" visibleSize="10" nullFieldValue="" />
<customfield name="chart_miniature_height" visibleSize="10" nullFieldValue="" />
<customfield name="chart_active" nullFieldValue="" visibleSize="30" />
</form>

7
src-modules/module/viz/conf/viz_upgrade_man.sql

@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
update viz_chart set chart_width=600 where chart_width is null;
update viz_chart set chart_height=400 where chart_height is null;
update viz_chart set chart_miniature_width=600 where chart_miniature_width is null;
update viz_chart set chart_miniature_height=400 where chart_miniature_height is null;

3
src-modules/module/viz/masken/44190_felderinfo.unl

@ -17,10 +17,11 @@ order by 1;^^<<SQL>> SELECT 2,'2-spaltig' from xdummy^ @@ -17,10 +17,11 @@ order by 1;^^<<SQL>> SELECT 2,'2-spaltig' from xdummy^
44203^Studiengang^6^0^0^140^150^50^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^^^
44204^Schlüssel anzeigen^150^0^0^100^100^1^integer^30^1^1^<<SQL>> select 1,'Ja' from xdummy union select 0,'Nein' from xdummy^hidden^<<SQL>> select 1,'Ja' from xdummy^
44205^tablestylesheet^150^0^0^100^100^1^char^255^1^1^<<SQL>> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44190 order by ord^ ^<<SQL>> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44190 order by ord limit 1^
44206^Kachelbreite^305^0^0^100^15^1^integer^5000^0^0^^^800^
44207^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart order by 2;^hidden^ ^
44208^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
44209^Semestertyp^5^350^-1^140^80^1^integer^255^0^1^<<SQL>> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^Eintrag^<<SQL>> select 2,'nur Wintersemester' from xdummy^
44210^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^
44211^Abschluss^7^0^0^140^170^5^char^30^0^1^<<SQL>> select abint,dtxt from k_abint order by 2;^^^
44212^Matrikel-Nr.^20^350^-1^150^180^1^char^200^0^13^^{InputCheck:matrikelnummern}^^
44212^Kachelhöhe^310^0^0^100^15^1^integer^5000^0^0^^^600^
44213^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^

1
src-modules/module/viz/masken/44190_masken_felder_bez.unl

@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
44190^44203^
44190^44204^
44190^44205^
44190^44206^
44190^44207^
44190^44208^
44190^44209^

10
src-modules/module/viz/masken/44660_felderinfo.unl

@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
44660^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<<SQL>> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<<SQL>> select apnr, eintrag from koepfe_oder_faelle where eintrag='Köpfe';^
44661^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^
44661^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today()-(3*365) between sem_beginn and sem_ende;^
44662^Stichtag^1^350^-1^140^100^1^sql^30^0^1^<<SQL>> select tid, name from sos_stichtag where stichtagsart='Studierende';^^<<SQL>> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
44663^Staatsangehörigkeit^36^0^0^130^150^10^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^hidden^^
44664^Status^14^350^-1^140^180^1^sql^30^0^1^<<SQL>> select apnr,eintrag from sos_status order by 2^^<<SQL>> select apnr,eintrag from sos_status where eintrag='Alle ohne Beurl.';^
44665^Hörerstatus^33^0^0^140^170^1^sql^30^0^1^<<SQL>> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<<SQL>> select apnr, eintrag from hoererstatus where eintrag='alle';^
44666^Spaltenanzahl^300^0^0^140^80^1^integer^30^0^1^<<SQL>> SELECT 1,'1-spaltig' from xdummy \
44666^Spaltenanzahl^300^0^0^140^80^1^integer^30^0^1^<<SQL>> SELECT 0,'Automatisch' from xdummy \
union SELECT 1,'1-spaltig' from xdummy \
union SELECT 2,'2-spaltig' from xdummy \
union SELECT 3,'3-spaltig' from xdummy \
union SELECT 4,'4-spaltig' from xdummy \
@ -17,11 +18,12 @@ order by 1;^^<<SQL>> SELECT 2,'2-spaltig' from xdummy^ @@ -17,11 +18,12 @@ order by 1;^^<<SQL>> SELECT 2,'2-spaltig' from xdummy^
44672^Tabnr.^1000^0^0^140^80^1^integer^30^0^13^ ^^1^
44673^Studiengang^6^0^0^140^150^50^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^^^
44674^Schlüssel anzeigen^150^0^0^100^100^1^integer^30^1^1^<<SQL>> select 1,'Ja' from xdummy union select 0,'Nein' from xdummy^hidden^<<SQL>> select 1,'Ja' from xdummy^
44675^tablestylesheet^150^0^0^100^100^1^char^255^1^1^<<SQL>> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44190 order by ord^ ^<<SQL>> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44190 order by ord limit 1^
44675^tablestylesheet^150^0^0^100^100^1^char^255^1^1^<<SQL>> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44660 order by ord^ ^<<SQL>> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44660 order by ord limit 1^
44676^Kachelbreite^305^0^0^100^15^1^integer^5000^0^0^^^800^
44677^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart order by 2;^hidden^ ^
44678^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
44679^Semestertyp^5^350^-1^140^80^1^integer^255^0^1^<<SQL>> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^Eintrag^<<SQL>> select 2,'nur Wintersemester' from xdummy^
44680^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^
44681^Abschluss^7^0^0^140^170^5^char^30^0^1^<<SQL>> select abint,dtxt from k_abint order by 2;^^^
44682^Matrikel-Nr.^20^350^-1^150^180^1^char^200^0^13^^{InputCheck:matrikelnummern}^^
44682^Kachelhöhe^310^0^0^100^15^1^integer^5000^0^0^^^600^
44683^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^

1
src-modules/module/viz/masken/44660_masken_felder_bez.unl

@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
44660^44673^
44660^44674^
44660^44675^
44660^44676^
44660^44677^
44660^44678^
44660^44679^

13
src-modules/module/viz/schluesseltabellen/customxmladd.sql

@ -39,7 +39,7 @@ SELECT @@ -39,7 +39,7 @@ SELECT
R.uniquename,
R.caption
FROM viz_renderer R
order by 2 desc
order by 2 asc
;
</sqlvar>
<sqlvar name="vizTypes" type="hash">
@ -97,9 +97,14 @@ V.description, @@ -97,9 +97,14 @@ V.description,
V.chart_position,
--replace(V.chartcode,'"','§') as chartcode_escaped,
--replace(V.datasource_def,'"','§') as datasource_def_escaped
R.uniquename as renderer_uniquename
R.uniquename as renderer_uniquename,
V.chart_width,
V.chart_height,
V.chart_miniature_width,
V.chart_miniature_height
FROM viz_chart V, viz_renderer R
where R.tid=V.renderer_id
and chart_active=1
order by 3
;
</sqlvar>
@ -196,6 +201,10 @@ order by 3 @@ -196,6 +201,10 @@ order by 3
chartmodel_miniature="${ch.chartmodel_miniature_escaped}"
chart_position="${ch.chart_position}"
renderer="${ch.renderer_uniquename}"
chart_width="${ch.chart_width}"
chart_height="${ch.chart_height}"
chart_miniature_width="${ch.chart_width}"
chart_miniature_height="${ch.chart_height}"
/>
</#foreach>
</#if>

4
src-modules/module/viz/schluesseltabellen/sx_stylesheets_einfuegen.sql

@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
{"mask":"44190", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"},
{"mask":"44190", "filename":"viz_html_chart_viewer_grid.xsl", "ord":"1"},
{"mask":"44190", "filename":"viz_html_chart_viewer.xsl", "ord":"40"},
{"mask":"44190", "filename":"viz_report_44190.jrxml", "ord":"50"},
{"mask":"44190", "filename":"viz_report_44190_xmlsource.jrxml", "ord":"50"},
{"mask":"44220", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"},
{"mask":"44220", "filename":"viz_html_chart_viewer.xsl", "ord":"1"},
{"mask":"44220", "filename":"viz_html_chart_viewer_mask.xsl", "ord":"30"},
@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
{"mask":"44660", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"},
{"mask":"44660", "filename":"viz_html_chart_viewer_grid.xsl", "ord":"1"},
{"mask":"44660", "filename":"viz_html_chart_viewer.xsl", "ord":"40"},
{"mask":"44660", "filename":"viz_report_44660.jrxml", "ord":"50"}
{"mask":"44660", "filename":"viz_report_44660_xmlsource.jrxml", "ord":"50"}
] />

569
src-modules/module/viz/schluesseltabellen/viz_type_echarts_fuellen.sql

@ -0,0 +1,569 @@ @@ -0,0 +1,569 @@
--Freemarker Template
<#include "SQL_lingua_franca"/>
<#include "SuperX_general"/>
<sqlvars>
<sqlvar name="renderer">
select tid from viz_renderer where uniquename='echarts';
</sqlvar>
</sqlvars>
<#assign viz_types = [
{"uniquename":"echarts_bar_y", "caption":"Säulendiagramm (vertikal)",
"orientation":"V",
"description":"Vertikales Balkendiagramm",
"explanation":""},
{"uniquename":"echarts_bar_x", "caption":"Balkendiagramm (horizontal)",
"orientation":"H",
"description":"Horizontales Balkendiagramm",
"explanation":""},
{"uniquename":"echarts_line_y", "caption":"Liniendiagramm (vertikal)",
"orientation":"V",
"description":"Vertikales Liniendiagramm",
"explanation":""},
{"uniquename":"echarts_line_x", "caption":"Liniendiagramm (horizontal)",
"orientation":"H",
"description":"Horizontales Liniendiagramm",
"explanation":""},
{"uniquename":"echarts_pie", "caption":"Tortendiagramm",
"orientation":"Z",
"description":"Tortendiagramm oder Donut",
"explanation":""}
]
/>
<#assign viz_properties = [
{ "caption":"X-Achse",
"prop_uniquename":"x",
"explanation":"X-Achse",
"prop_default":"",
"prop_unit":"",
"is_generic":"0",
"static_values":"",
"is_mandatory":"0",
"input_type_uniquename":"SELECT",
"property_group_uniquename":"CATEGORY",
"sortnr":"608",
"range_from":"",
"range_to":"",
"prop_value_type":"string"
},
{ "caption":"Y-Achse",
"prop_uniquename":"y",
"explanation":"Y-Achse",
"prop_default":"",
"prop_unit":"",
"is_generic":"0",
"static_values":"",
"is_mandatory":"0",
"input_type_uniquename":"SELECT",
"property_group_uniquename":"CATEGORY",
"sortnr":"610",
"range_from":"",
"range_to":"",
"prop_value_type":"string"
},
{ "caption":"Dimension 1",
"prop_uniquename":"dimension1",
"explanation":"Dimension 1",
"prop_default":"",
"prop_unit":"",
"is_generic":"0",
"static_values":"",
"is_mandatory":"0",
"input_type_uniquename":"SELECT",
"property_group_uniquename":"CATEGORY",
"sortnr":"610",
"range_from":"",
"range_to":"",
"prop_value_type":"string"
},
{ "caption":"Maß 1",
"prop_uniquename":"measure1",
"explanation":"Maß",
"prop_default":"",
"prop_unit":"",
"is_generic":"0",
"static_values":"",
"is_mandatory":"0",
"input_type_uniquename":"SELECT",
"property_group_uniquename":"CATEGORY",
"sortnr":"610",
"range_from":"",
"range_to":"",
"prop_value_type":"string"
}
]
/>
<#assign viz_type_properties = [
{ "viz_type_uniquename":"echarts_bar_y",
"viz_property_uniquename":"x",
"is_mandatory":"1",
"sortnr":"1"},
{ "viz_type_uniquename":"echarts_bar_y",
"viz_property_uniquename":"y",
"is_mandatory":"1",
"sortnr":"10"},
{ "viz_type_uniquename":"echarts_bar_x",
"viz_property_uniquename":"x",
"is_mandatory":"1",
"sortnr":"1"},
{ "viz_type_uniquename":"echarts_bar_x",
"viz_property_uniquename":"y",
"is_mandatory":"1",
"sortnr":"10"},
{ "viz_type_uniquename":"echarts_line_x",
"viz_property_uniquename":"x",
"is_mandatory":"1",
"sortnr":"1"},
{ "viz_type_uniquename":"echarts_line_x",
"viz_property_uniquename":"y",
"is_mandatory":"1",
"sortnr":"10"},
{ "viz_type_uniquename":"echarts_line_y",
"viz_property_uniquename":"x",
"is_mandatory":"1",
"sortnr":"1"},
{ "viz_type_uniquename":"echarts_line_y",
"viz_property_uniquename":"y",
"is_mandatory":"1",
"sortnr":"10"},
{ "viz_type_uniquename":"echarts_pie",
"viz_property_uniquename":"dimension1",
"is_mandatory":"1",
"sortnr":"10"},
{ "viz_type_uniquename":"echarts_pie",
"viz_property_uniquename":"measure1",
"is_mandatory":"1",
"sortnr":"10"}
]
/>
<#assign viz_type_properties_general = [
]
/>
<@create_temp_tables />
<@fill_viz_properties />
<#foreach viz_type in viz_types>
<@fill_viz_type_properties_general viz_type_p=viz_type />
<@fill_viz_type_properties viz_type_p=viz_type />
</#foreach>
<@drop_temp_tables />
<#macro fill_viz_type_properties_general viz_type_p>
select 'Befülle Grafikelement ${viz_type_p.caption}' from xdummy;
delete from tmp_viz_type;
insert into tmp_viz_type(tid,
uniquename,
caption,
renderer_id,
-- srcpath,
-- method,
orientation,
explanation)
select T.tid,
'${viz_type_p.uniquename}',
'${viz_type_p.caption}',
${renderer},
'${viz_type_p.orientation}',
'${viz_type_p.explanation}'
from xdummy left outer join viz_type T on (
T.uniquename='${viz_type_p.uniquename}'
and T.renderer_id=${renderer}
)
;
insert into viz_type(
uniquename,
caption,
renderer_id,
-- srcpath,
-- method,
orientation)
select uniquename,
caption,
renderer_id,
-- srcpath,
-- method,
orientation
from tmp_viz_type T
where T.tid is null;
update viz_type set
uniquename=T.uniquename,
caption=T.caption,
renderer_id=T.renderer_id,
-- srcpath,
-- method,
orientation=T.orientation,
explanation=T.explanation
from tmp_viz_type T
where T.tid=viz_type.tid
and viz_type.tid in (select distinct T.tid from tmp_viz_type);
delete from viz_type_property
where (viz_type_id,
viz_property_id)
in (select Y.tid as viz_type_id,
P.tid as viz_property_id
from tmp_viz_property T,viz_type Y, viz_property P
where Y.uniquename='${viz_type_p.uniquename}'
and Y.renderer_id=${renderer}
and P.prop_uniquename=T.prop_uniquename
and T.is_general=1)
;
insert into viz_type_property(
viz_type_id,
viz_property_id,
is_mandatory,
sortnr)
select Y.tid as viz_type_id,
P.tid as viz_property_id,
P.is_mandatory,
T.sortnr
from tmp_viz_property T,viz_type Y, viz_property P
where Y.uniquename='${viz_type_p.uniquename}'
and Y.renderer_id=${renderer}
and P.prop_uniquename=T.prop_uniquename
and T.is_general=1;
</#macro>
<#macro fill_viz_type_properties viz_type_p>
<#foreach viz_prop in viz_type_properties>
<#if viz_prop.viz_type_uniquename==viz_type_p.uniquename >
delete from viz_type_property
where (viz_type_id,
viz_property_id)
in (select Y.tid as viz_type_id,
P.tid as viz_property_id
from viz_type Y, viz_property P
where Y.uniquename='${viz_type_p.uniquename}'
and Y.renderer_id=${renderer}
and P.prop_uniquename='${viz_prop.viz_property_uniquename}') ;
insert into viz_type_property(
viz_type_id,
viz_property_id,
is_mandatory,
sortnr)
select Y.tid as viz_type_id,
P.tid as viz_property_id,
${viz_prop.is_mandatory},
${viz_prop.sortnr}
from viz_type Y, viz_property P
where Y.uniquename='${viz_type_p.uniquename}'
and Y.renderer_id=${renderer}
and P.prop_uniquename='${viz_prop.viz_property_uniquename}'
;
</#if>
</#foreach>
</#macro>
<#macro create_temp_tables>
CREATE temp TABLE tmp_viz_type
(
tid INTEGER ,
uniquename varchar(255) NOT NULL,
caption varchar(255),
renderer_id integer,
srcpath varchar(255),
method varchar(255),
orientation char(1),
description text,
explanation text
);
CREATE temp TABLE tmp_viz_type_property
(
tid serial NOT NULL,
viz_type_id integer,
viz_property_id integer,
is_mandatory smallint DEFAULT 0,
sortnr smallint DEFAULT 0
);
CREATE temp TABLE tmp_viz_property_renderer
(
tid serial NOT NULL,
renderer_id integer NOT NULL,
property_id integer NOT NULL,
variable_name varchar(255)
);
create temp table tmp_viz_property_group
(
tid serial NOT NULL,
uniquename varchar(255) NOT NULL,
caption varchar(255),
sortnr integer
);
CREATE temp TABLE tmp_viz_property_group_renderer
(
tid serial NOT NULL,
renderer_id integer NOT NULL,
property_group_id integer NOT NULL,
variable_name varchar(255)
);
CREATE temp TABLE tmp_viz_property
(
tid integer,
caption varchar(255),
prop_uniquename varchar(255),
prop_default varchar(255),
prop_unit varchar(255),
is_generic smallint DEFAULT 1,
static_values text,
is_mandatory smallint DEFAULT 0,
input_type_id integer DEFAULT 1,
input_type_uniquename varchar(255),
property_group_id integer,
property_group_uniquename varchar(255),
explanation text,
sortnr integer,
range_from integer,
range_to integer,
prop_value_type varchar(255) DEFAULT 'string'::character varying,
variable_name varchar(255),
is_general smallint
);
</#macro>
<#macro drop_temp_tables>
drop table tmp_viz_type;
drop table tmp_viz_property_group;
drop table tmp_viz_property;
drop table tmp_viz_type_property;
drop table tmp_viz_property_renderer;
drop table tmp_viz_property_group_renderer;
</#macro>
<#macro fill_viz_properties>
<#assign sortnr=0 />
<#foreach viz_prop in viz_properties>
<#assign sortnr=sortnr+100 />
insert into tmp_viz_property(tid,
caption,
prop_uniquename,
prop_default,
prop_unit,
is_generic,
static_values,
is_mandatory,
input_type_uniquename,
property_group_uniquename,
explanation,
sortnr,
range_from,
range_to,
prop_value_type,
variable_name,
is_general)
select P.tid,
'${viz_prop.caption}',
'${viz_prop.prop_uniquename}',
'${viz_prop.prop_default}',
'${viz_prop.prop_unit}',
${viz_prop.is_generic},
'${viz_prop.static_values}',
${viz_prop.is_mandatory},
'${viz_prop.input_type_uniquename}',
'${viz_prop.property_group_uniquename}',
'${viz_prop.explanation}',
${sortnr},
val('${viz_prop.range_from}'),
val('${viz_prop.range_to}'),
'${viz_prop.prop_value_type}',
<#if viz_prop.variable_name?exists>
'${viz_prop.variable_name}',
<#else>
'',
</#if>
0 as is_general
from xdummy left outer join viz_property P
on (P.prop_uniquename='${viz_prop.prop_uniquename}')
;
</#foreach>
<#assign sortnr=1000 />
<#foreach viz_prop in viz_type_properties_general>
<#assign sortnr=sortnr+100 />
insert into tmp_viz_property(tid,
caption,
prop_uniquename,
prop_default,
prop_unit,
is_generic,
static_values,
is_mandatory,
input_type_uniquename,
property_group_uniquename,
explanation,
sortnr,
range_from,
range_to,
prop_value_type,
variable_name,
is_general)
select P.tid,
'${viz_prop.caption}',
'${viz_prop.prop_uniquename}',
'${viz_prop.prop_default}',
'${viz_prop.prop_unit}',
${viz_prop.is_generic},
'${viz_prop.static_values}',
${viz_prop.is_mandatory},
'${viz_prop.input_type_uniquename}',
'${viz_prop.property_group_uniquename}',
'${viz_prop.explanation}',
${sortnr},
val('${viz_prop.range_from}'),
val('${viz_prop.range_to}'),
'${viz_prop.prop_value_type}',
<#if viz_prop.variable_name?exists>
'${viz_prop.variable_name}',
<#else>
'',
</#if>
1 as is_general
from xdummy left outer join viz_property P
on (P.prop_uniquename='${viz_prop.prop_uniquename}')
;
</#foreach>
update tmp_viz_property set input_type_id=T.tid
from viz_property_input_type T
where T.uniquename=tmp_viz_property.input_type_uniquename;
select 'Warnung: Property ohne input_type: ' || prop_uniquename
from tmp_viz_property
where input_type_id is null;
update tmp_viz_property set property_group_id=T.tid
from viz_property_group T
where T.uniquename=tmp_viz_property.property_group_uniquename;
select 'Warnung: Property ohne property_group: ' || prop_uniquename
from tmp_viz_property
where property_group_id is null;
--neue Datensätze:
insert into viz_property(
caption,
prop_uniquename,
prop_default,
prop_unit,
is_generic,
static_values,
is_mandatory,
input_type_id,
property_group_id,
explanation,
sortnr,
range_from,
range_to,
prop_value_type)
select
caption,
prop_uniquename,
prop_default,
prop_unit,
is_generic,
static_values,
is_mandatory,
input_type_id,
property_group_id,
explanation,
sortnr,
range_from,
range_to,
prop_value_type
from tmp_viz_property P
where P.tid is null;
update viz_property
set caption=T.caption,
--prop_uniquename,
prop_default=T.prop_default,
prop_unit=T.prop_unit,
is_generic=T.is_generic,
static_values=T.static_values,
is_mandatory=T.is_mandatory,
input_type_id=T.input_type_id,
property_group_id=T.property_group_id,
explanation=T.explanation,
sortnr=T.sortnr,
range_from=T.range_from,
range_to=T.range_to,
prop_value_type=T.prop_value_type
from tmp_viz_property T
where T.tid=viz_property.tid
and viz_property.tid in (select T.tid from tmp_viz_property T);
--renderer:
delete from viz_property_renderer
where (renderer_id, property_id)
in (select ${renderer},P.tid
from tmp_viz_property P);
delete from viz_property_renderer
where (renderer_id, property_id)
in (select ${renderer},P.tid
from tmp_viz_property P);
insert into viz_property_renderer(
renderer_id,
property_id,
variable_name)
select ${renderer},
P.tid,
case when P.variable_name !='' then P.variable_name else P.prop_uniquename end
from tmp_viz_property P;
</#macro>

88
superx/images/icons/into_excel_normal.svg

@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="510.6619"
version="1.1"
id="svg1013"
sodipodi:docname="excel_normal.svg"
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
height="614.86377">
<metadata
id="metadata1019">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs1017" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1021"
id="namedview1015"
showgrid="true"
inkscape:zoom="0.53"
inkscape:cx="-425.80229"
inkscape:cy="301.43183"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg1013">
<inkscape:grid
type="xygrid"
id="grid1592"
originx="962.40715"
originy="409.17909" />
</sodipodi:namedview>
<g
id="g4962"
transform="translate(2.3841858e-6)">
<path
style="fill:#666666;stroke:#666666;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path842"
d="m 486.18338,133.23112 q 8.20148,9.67781 13.84002,25.40429 5.63848,15.72644 5.63848,30.24317 v 388.32263 q 0,13.91184 -7.68888,22.98478 -7.68889,9.07295 -19.4785,9.67776 H 94.05021 q -11.78961,0 -19.4785,-9.67776 -7.68889,-9.67797 -8.20148,-22.98478 V 37.66265 q 0,-13.91188 8.20148,-22.98483 Q 82.77319,5.60487 94.05021,5 H 350.3464 q 11.27705,0 25.11703,6.65351 13.83999,6.65349 21.52888,16.33131 z M 359.06049,50.96965 v 127.0214 h 107.64438 q -2.56295,-9.67785 -6.15112,-13.9119 L 370.85011,58.22803 q -3.07558,-4.23405 -11.78962,-7.25838 z M 469.26784,566.91844 V 220.93639 H 350.3464 q -11.78961,0 -19.4785,-9.07299 -7.68888,-9.07293 -8.20148,-22.98482 V 47.94534 H 102.76427 v 518.9731 z"
inkscape:connector-curvature="0" />
<rect
style="opacity:1;fill:#008000;fill-opacity:1;stroke:#ffffff;stroke-width:8.8143158;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect844"
width="404"
height="258.93933"
x="4.4071555"
y="237.23116"
rx="0.20325401"
ry="0.20325398" />
<text
transform="scale(0.99799663,1.0020074)"
id="text848"
y="465.85318"
x="223.70889"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:273.8069458px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10.267766"
xml:space="preserve"
inkscape:transform-center-x="329.56936"
inkscape:transform-center-y="-0.00052566018"><tspan
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;stroke-width:10.267766"
y="465.85318"
x="223.70889"
id="tspan846"
sodipodi:role="line">X</tspan></text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.8 KiB

94
superx/images/icons/into_pdf.svg

@ -0,0 +1,94 @@ @@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="514.66187"
version="1.1"
id="svg1013"
sodipodi:docname="pdf.svg"
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
height="614.86377">
<metadata
id="metadata1019">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs1017" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1021"
id="namedview1015"
showgrid="true"
inkscape:zoom="0.53"
inkscape:cx="649.2184"
inkscape:cy="307.43187"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg1013">
<inkscape:grid
type="xygrid"
id="grid1592"
originx="84.407158"
originy="415.17913" />
</sodipodi:namedview>
<path
inkscape:connector-curvature="0"
d="m 490.18339,127.57075 q 8.20148,9.67781 13.84002,25.40429 5.63848,15.72644 5.63848,30.24317 v 388.32263 q 0,13.91184 -7.68888,22.98478 -7.68889,9.07295 -19.4785,9.67776 H 98.05022 q -11.78961,0 -19.4785,-9.67776 -7.68889,-9.67797 -8.20148,-22.98478 V 32.002274 q 0,-13.91188 8.20148,-22.9848305 8.20148,-9.07295095 19.4785,-9.67782095 h 256.29619 q 11.27705,0 25.11703,6.65350995 13.83999,6.6534915 21.52888,16.3313115 z M 363.0605,45.309274 V 172.33068 h 107.64438 q -2.56295,-9.67785 -6.15112,-13.9119 L 374.85012,52.567654 q -3.07558,-4.23405 -11.78962,-7.25838 z M 473.26785,561.25807 V 215.27602 H 354.34641 q -11.78961,0 -19.4785,-9.07299 -7.68888,-9.07293 -8.20148,-22.98482 V 42.284964 H 106.76428 V 561.25807 Z"
id="path842"
style="fill:#666666;stroke:#666666;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<rect
ry="0.20325398"
rx="0.20325401"
y="229.45757"
x="4.4071598"
height="258.93933"
width="404"
id="rect844"
style="opacity:1;fill:#d40000;fill-opacity:1;stroke:#ffffff;stroke-width:8.8143158;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<text
inkscape:transform-center-y="-1.2818605e-05"
inkscape:transform-center-x="257.18955"
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:215.52926636px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:8.08234978"
x="199.6281"
y="414.03802"
id="text848"
transform="scale(0.98940378,1.0107097)"><tspan
sodipodi:role="line"
id="tspan846"
x="199.6281"
y="414.03802"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;stroke-width:8.08234978">pdf</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:29.33333397px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
x="124.40716"
y="359.68463"
id="text4417"><tspan
sodipodi:role="line"
id="tspan4415"
x="124.40716"
y="385.63776" /></text>
</svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

88
superx/images/icons/into_word.svg

@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="506.66187"
version="1.1"
id="svg1013"
sodipodi:docname="word.svg"
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
height="614.86377">
<metadata
id="metadata1019">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs1017" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1021"
id="namedview1015"
showgrid="true"
inkscape:zoom="0.53"
inkscape:cx="892.07705"
inkscape:cy="273.12992"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg1013">
<inkscape:grid
type="xygrid"
id="grid1592"
originx="78.407141"
originy="409.17907" />
</sodipodi:namedview>
<g
id="g5528"
transform="translate(0,6)">
<path
style="fill:#666666;stroke:#666666;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path3195"
d="m 482.18337,127.23112 q 8.20148,9.67781 13.84002,25.40429 5.63848,15.72644 5.63848,30.24317 v 388.32263 q 0,13.91184 -7.68888,22.98478 -7.68889,9.07295 -19.4785,9.67776 H 90.050205 q -11.78961,0 -19.4785,-9.67776 -7.68889,-9.67797 -8.20148,-22.98478 V 31.66265 q 0,-13.91188 8.20148,-22.98483 Q 78.773185,-0.39513 90.050205,-1 H 346.34639 q 11.27705,0 25.11703,6.65351 13.83999,6.65349 21.52888,16.33131 z M 355.06048,44.96965 v 127.0214 h 107.64438 q -2.56295,-9.67785 -6.15112,-13.9119 L 366.8501,52.22803 q -3.07558,-4.23405 -11.78962,-7.25838 z M 465.26783,560.91844 V 214.93639 H 346.34639 q -11.78961,0 -19.4785,-9.07299 -7.68888,-9.07293 -8.20148,-22.98482 V 41.94534 H 98.76426 v 518.9731 z"
inkscape:connector-curvature="0" />
<rect
style="opacity:1;fill:#003380;fill-opacity:1;stroke:#ffffff;stroke-width:8.8143158;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect3197"
width="404"
height="258.93933"
x="4.4071579"
y="230.89154"
rx="0.20325401"
ry="0.20325398" />
<text
transform="scale(0.83643596,1.1955488)"
id="text3201"
y="384.68228"
x="251.1759"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:229.55397034px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:8.60827637"
xml:space="preserve"
inkscape:transform-center-x="231.57467"
inkscape:transform-center-y="1.401285e-05"><tspan
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff;stroke-width:8.60827637"
y="384.68228"
x="251.1759"
id="tspan3199"
sodipodi:role="line">W</tspan></text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.7 KiB

1774
superx/xml/js/viz/viz_assistent.js

File diff suppressed because it is too large Load Diff

48
superx/xml/js/viz/viz_viewer.js

@ -166,15 +166,15 @@ function fillEchartsDataSet(myRs,myRsMetaData,currentChartModel) @@ -166,15 +166,15 @@ function fillEchartsDataSet(myRs,myRsMetaData,currentChartModel)
//Identify dimensions and measures:
switch (chartType) {
case "echarts_pie":
var measure1Fldname=getChartElementPropertyValue(currentChartModel,"1","measure1");
var dimension1Fldname=getChartElementPropertyValue(currentChartModel,"1","dimension1");
var measure1Fldname=getChartElementPropertyValueFromModel(currentChartModel,"1","measure1");
var dimension1Fldname=getChartElementPropertyValueFromModel(currentChartModel,"1","dimension1");
dataset=fillEchartsDataSetNameValue(myRs,myRsMetaData,dimension1Fldname,measure1Fldname);
break;
case "echarts_bar_y_stack":
//TODO klappt nich tnicht)
var measure1Fldname=getChartElementPropertyValue(currentChartModel,"1","measure1");
var dimension1Fldname=getChartElementPropertyValue(currentChartModel,"1","dimension1");
var dimension2Fldname=getChartElementPropertyValue(currentChartModel,"1","dimension2");
var measure1Fldname=getChartElementPropertyValueFromModel(currentChartModel,"1","measure1");
var dimension1Fldname=getChartElementPropertyValueFromModel(currentChartModel,"1","dimension1");
var dimension2Fldname=getChartElementPropertyValueFromModel(currentChartModel,"1","dimension2");
dataset=fillEchartsDataSetCrosstab(myRs,myRsMetaData,dimension1Fldname,dimension2Fldname,measure1Fldname);
break;
default:
@ -339,7 +339,7 @@ function renderPlotD3Chart(chartDiv,currentChartModel,ergebniselementOrdnr) @@ -339,7 +339,7 @@ function renderPlotD3Chart(chartDiv,currentChartModel,ergebniselementOrdnr)
}
/* Render Model:*/
function renderChartSVGFromModel(currentChartModel,targetDiv,ergebniselementOrdnr) {
function renderChartSVGFromModel(currentChartModel,targetDiv,ergebniselementOrdnr,title) {
//first update data if function is defined:
if(currentChartModel.dataTransformation.length>0)
{
@ -360,6 +360,9 @@ function renderChartSVGFromModel(currentChartModel,targetDiv,ergebniselementOrdn @@ -360,6 +360,9 @@ function renderChartSVGFromModel(currentChartModel,targetDiv,ergebniselementOrdn
case "d3js":
renderChartSVGWithD3(currentChartModel,targetDiv,ergebniselementOrdnr);
break;
case "echarts":
renderEChart2(currentChartModel,targetDiv,ergebniselementOrdnr,title);
break;
default:
alert("No renderer");
break;
@ -459,17 +462,6 @@ var data=filld3data(rs[rsIndexNr],rsColumnMetaData[rsIndexNr],chartElem); @@ -459,17 +462,6 @@ var data=filld3data(rs[rsIndexNr],rsColumnMetaData[rsIndexNr],chartElem);
console.log("Mark-option for "+chartType);
switch (chartType)
{
case "bar_x_d3":
var mySvg = d3.select("#"+targetDiv).append("svg")
.attr("width", width + margin.left + margin.right)
.attr("height", height + margin.top + margin.bottom)
.attr("viewBox", [0,0, width+ margin.left + margin.right, height+ margin.top + margin.bottom])
.append("g")
.attr("transform",
"translate(" + margin.left + "," + margin.top + ")")
;
mySvg=makeBarX_d3(currentChartModel.chartPropertiesUsed,mySvg,data,chartElem);
break;
case "sankey":
var mySvg = d3.select("#"+targetDiv).append("svg")
.attr("width", width + margin.left + margin.right)
@ -1180,8 +1172,14 @@ function getPlotOptionsObj(chartPropertiesUsed,currentChartModel) @@ -1180,8 +1172,14 @@ function getPlotOptionsObj(chartPropertiesUsed,currentChartModel)
/*echarts:*/
function renderEChart2(currentChartModel,chartDiv,ergebniselementOrdnr,chartTitle)
{
//first empty the element, if necessary:
var chartDivElem=document.getElementById(chartDiv);
while (chartDivElem.firstChild) {
chartDivElem.removeChild(chartDivElem.firstChild);
}
// Initialize the echarts instance based on the prepared dom
var myChart = echarts.init(document.getElementById(chartDiv),null, { renderer: 'svg' });
var myChart = echarts.init(chartDivElem,null, { renderer: 'svg' });
var chartType=currentChartModel.chartElements[0].vizTypeUniquename;
var titleText=chartTitle;
if(chartTitle=="")
@ -1290,8 +1288,11 @@ if(orientation=="x") @@ -1290,8 +1288,11 @@ if(orientation=="x")
xAxisType="value";
}
var measure1Fldname=getChartPropertyValue(currentChartModel.chartPropertiesUsed,measure1Axis);
var dimension1Fldname=getChartPropertyValue(currentChartModel.chartPropertiesUsed,dimension1Axis);
//var measure1Fldname=getChartPropertyValue(currentChartModel.chartPropertiesUsed,measure1Axis);
var measure1Fldname=getChartElementPropertyValueFromModel(currentChartModel,1,measure1Axis);
var dimension1Fldname=getChartElementPropertyValueFromModel(currentChartModel,1,dimension1Axis);
//var dimension1Fldname=getChartPropertyValue(currentChartModel.chartPropertiesUsed,dimension1Axis);
var subtitleText=getChartPropertyValue(currentChartModel.chartPropertiesUsed,"subtitle");
var scheme = getChartPropertyValue(currentChartModel.chartPropertiesUsed,"scheme");
var myPalette=getSchemeArray(scheme);
@ -1390,8 +1391,8 @@ function getEchartOptionsNative(currentChartModel,myDataset) @@ -1390,8 +1391,8 @@ function getEchartOptionsNative(currentChartModel,myDataset)
}
function getEchartOptionsPie(currentChartModel,myDataset)
{
var measure1Fldname=getChartElementPropertyValue(currentChartModel,"1","measure1");
var dimension1Fldname=getChartElementPropertyValue(currentChartModel,"1","dimension1");
var measure1Fldname=getChartElementPropertyValueFromModel(currentChartModel,"1","measure1");
var dimension1Fldname=getChartElementPropertyValueFromModel(currentChartModel,"1","dimension1");
var titleText=getChartPropertyValue(currentChartModel.chartPropertiesUsed,"caption");
var scheme = getChartPropertyValue(currentChartModel.chartPropertiesUsed,"scheme");
var myPalette=getSchemeArray(scheme);
@ -1463,7 +1464,7 @@ function getChartPropertyValue(propArray,propName) @@ -1463,7 +1464,7 @@ function getChartPropertyValue(propArray,propName)
return propertyValue;
}
function getChartElementPropertyValue(myChartModel,elemID,propUniquename)
function getChartElementPropertyValueFromModel(myChartModel,elemID,propUniquename)
{
var elemID="1";
var retVal=null;
@ -1924,6 +1925,7 @@ function openKachelDetails(ergebniselementOrdnr,formName,maskeninfoTID,grafikUni @@ -1924,6 +1925,7 @@ function openKachelDetails(ergebniselementOrdnr,formName,maskeninfoTID,grafikUni
{
document.forms[formName].elements["reuseresult"].value="false";
}
document.forms[formName].target="_blank";
document.forms[formName].submit();
}

133
superx/xml/viz_components.xsl

@ -974,6 +974,110 @@ Stand: <xsl:value-of select="../stand" /></p> @@ -974,6 +974,110 @@ Stand: <xsl:value-of select="../stand" /></p>
</xsl:for-each>
</xsl:template>
<xsl:template name="viz_viewer_grid">
<!-- Variableninitialisierung fürs Dashboard:
-->
<xsl:variable name="spalten_anz">
<!--<xsl:value-of select="2"/>-->
<xsl:value-of select="/ergebnisse/ergebnis/felder/feld[@varname='Spaltenanzahl']/value"/>
</xsl:variable>
<xsl:variable name="kachelbreite">
<xsl:value-of select="/ergebnisse/ergebnis/felder/feld[@varname='Kachelbreite']/value"/>
</xsl:variable>
<xsl:variable name="kachelhoehe">
<xsl:value-of select="/ergebnisse/ergebnis/felder/feld[@varname='Kachelhöhe']/value"/>
</xsl:variable>
<xsl:variable name="ergebniselemente_anz">
<xsl:value-of select="count(/ergebnisse/ergebnis[felder/feld[@varname='Grafik']])"/>
</xsl:variable>
<xsl:variable name="kachelbreite_bulma">
<xsl:value-of select="round($kachelbreite div 24)"/><!-- 1 em=16px, für bulma dann *1,5 -->
</xsl:variable>
<xsl:variable name="kachelbreite_em">
<xsl:value-of select="round($kachelbreite div 24 * 1.5)"/><!-- 1 em=16px, für bulma dann *1,5 -->
</xsl:variable>
<!--<p>plan: <xsl:value-of select="/ergebnisse/ergebnis/felder/feld[@varname='Spaltenanzahl']/value"/>
</p>-->
<!--<span class="separator">&#160;</span>-->
<!--Beginn Selektions-Card-->
<!--Beginn Berichtstitel, Pfad, Knopfleiste-->
<!--<section class="hero-body">
<section class="container">--> <!--Beginn Kartenreihe -->
<!--<div class="columns features is-mobile is-left">-->
<div>
<xsl:choose>
<xsl:when test="$spalten_anz='0'">
<xsl:attribute name="class"><xsl:value-of select="concat('grid is-col-min-',$kachelbreite_bulma)" /></xsl:attribute>
<!--wegen eines Bugs in Bulma muss man style noch zusätzlich anfügen, wird in zukünftigen Bulma Versionen nicht mehr nötig sein:-->
<xsl:attribute name="style"><xsl:value-of select="concat('--bulma-grid-column-min:',$kachelbreite_em,'em')" /></xsl:attribute>
<!--<xsl:attribute name="class"><xsl:value-of select="'grid'" /></xsl:attribute>-->
<xsl:call-template name="viz_viewer_grid_cells" >
<xsl:with-param name="kachelbreite" select="$kachelbreite"/>
<xsl:with-param name="kachelhoehe" select="$kachelhoehe"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise><!--nicht dynamisch-->
<xsl:attribute name="class"><xsl:value-of select="concat('fixed-grid has-',$spalten_anz,'-cols')" />
</xsl:attribute>
<div class="grid">
<xsl:call-template name="viz_viewer_grid_cells" >
<xsl:with-param name="kachelbreite" select="$kachelbreite"/>
<xsl:with-param name="kachelhoehe" select="$kachelhoehe"/>
</xsl:call-template>
</div>
</xsl:otherwise>
</xsl:choose>
<!--Beginn columns Kartenreihe -->
</div><!-- des grid -->
<!--
</section>
</section>--><!-- des Portals -->
</xsl:template>
<xsl:template name="viz_viewer_grid_cells">
<xsl:param name="kachelbreite" select="800"/>
<xsl:param name="kachelhoehe" select="600"/>
<xsl:for-each select="ergebnisse/ergebnis[felder/feld[@varname='Grafik']/value!='']/ergebniselement">
<xsl:variable name="ergebniselement_counter" select="position()" />
<xsl:variable name="chart_uniquename"><xsl:value-of select="../felder/feld[@varname='Grafik']/value" /></xsl:variable>
<xsl:variable name="ergebniselement_ordnr"><xsl:value-of select="@ordnr" /></xsl:variable>
<xsl:variable name="maskennummer"><xsl:value-of select="@id" /></xsl:variable>
<!--<p><xsl:value-of select="concat('Zähler: ',$ergebniselement_counter)"/></p>-->
<!--
<div>
<xsl:attribute name="class"><xsl:text>column is-</xsl:text><xsl:value-of select="$colwidth"/></xsl:attribute>-->
<div class="cell">
<xsl:call-template name="weiterverarbeitungHiddenInputs" >
<xsl:with-param name="formName" select="concat('frmTab',$ergebniselement_ordnr)" />
<xsl:with-param name="ergebniselement_ordnr" select="$ergebniselement_ordnr" />
</xsl:call-template>
<xsl:call-template name="viewer_kachel">
<xsl:with-param name="caption" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@caption"/>
<xsl:with-param name="ergebniselement_ordnr" select="$ergebniselement_ordnr" />
<xsl:with-param name="kachelbreite" select="$kachelbreite - 5 "/><!-- wegen abgerundeter Ecken etwas kleiner-->
<xsl:with-param name="kachelhoehe" select="$kachelhoehe - 15"/>
<xsl:with-param name="chart_tid" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@tid"/>
<xsl:with-param name="showEdit" select="/ergebnisse/user/@admin" />
<xsl:with-param name="link_maskennummer" select="$maskennummer"/>
<xsl:with-param name="link_chart_uniquename" select="$chart_uniquename" />
<xsl:with-param name="link_tablestylesheet" select="'viz_html_chart_viewer_mask_and_table.xsl'"/>
</xsl:call-template>
<!--<p><xsl:value-of select="concat($spalten_anz,'-',$ergebniselement_counter,':',$ergebniselement_counter mod $spalten_anz)"/></p>-->
</div>
</xsl:for-each>
</xsl:template>
<xsl:template name="viewer_kachel">
<xsl:param name="caption" />
<xsl:param name="ergebniselement_ordnr" />
@ -981,13 +1085,15 @@ Stand: <xsl:value-of select="../stand" /></p> @@ -981,13 +1085,15 @@ Stand: <xsl:value-of select="../stand" /></p>
<xsl:param name="kachelhoehe" select="600"/>
<xsl:param name="link_maskennummer" />
<xsl:param name="link_chart_uniquename" />
<xsl:param name="chart_tid" />
<xsl:param name="link_tablestylesheet" select="'viz_html_chart_viewer_mask_and_table.xsl'"/>
<xsl:param name="showEdit" select="'false'" />
<div class="card is-shady">
<div class="card-image">
<!--zum Debuggen: <a onClick="initPage()">Anzeigen</a><br />-->
<a onClick="{concat('javascript:openModalCardDetail(',$ergebniselement_ordnr,');')}">
<div id="{concat('chartDiv',$ergebniselement_ordnr)}" style="width: 800px;height:600px;"></div>
<div id="{concat('chartDiv',$ergebniselement_ordnr)}" style="{concat('width: ',$kachelbreite,'px;height:',$kachelhoehe,'px;')}"></div>
</a>
<xsl:if test="$link_maskennummer!=''">
<br />
@ -1008,16 +1114,21 @@ Stand: <xsl:value-of select="../stand" /></p> @@ -1008,16 +1114,21 @@ Stand: <xsl:value-of select="../stand" /></p>
Details...
</a>
</xsl:if>
</div>
<p>
<!--<a onClick="{concat('javascript:openModalImage(',$ergebniselement_ordnr,');')}">
<span class="button is-success is-small modal-button">Vergrößern ...</span></a>
-->
<xsl:if test="$showEdit='true' and $chart_tid!=''">
<span class="separator">&#160;|&#160; </span>
<a aria-haspopup="true">
<xsl:attribute name="onClick"><xsl:text>javascript:neu=window.open('/superx/edit/viz/viz_chart_edit.jsp?tid=</xsl:text>
<xsl:value-of select="$chart_tid"/><xsl:text>','_blank','directories=no,location=no,menubar=no,scrollbars=yes,resizable=yes,toolbar=no,width=800,height=600'); return false;</xsl:text>
</xsl:attribute>
Bearbeiten...
</a>
</p>
</xsl:if>
</div>
</div>
</div>
</xsl:template>
<xsl:template name="viewer_kachel_alt">
@ -1095,8 +1206,8 @@ Platzhalter @@ -1095,8 +1206,8 @@ Platzhalter
<xsl:when test="$feldname='##line##'">
<!-- do nothing-->
</xsl:when>
<xsl:when test="$feldHidden='true' or $feldname='tablestylesheet'">
<!--verstecktesFeld-->
<xsl:when test="$feldHidden='true' or $feldname='tablestylesheet' or $feldart='0'">
<!--verstecktesFeld oder Eingabefeld-->
<xsl:text disable-output-escaping="yes"><![CDATA[<input type="hidden" name="]]></xsl:text><xsl:value-of disable-output-escaping="no" select="@varname"/><xsl:text>" value="</xsl:text>
<xsl:value-of disable-output-escaping="no" select="value"/><xsl:text>"</xsl:text>
<xsl:text disable-output-escaping="yes"><![CDATA[</input>

27
superx/xml/viz_html_chart.xsl

@ -47,14 +47,14 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util @@ -47,14 +47,14 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
<xsl:call-template name="nd_tableJavascript" />
<xsl:call-template name="nd_tableCSS" />
<xsl:call-template name="importVizViewer"></xsl:call-template>
<script language="Javascript" type="text/javascript" src="../xml/js/viz/viz_functions.js" />
<script language="Javascript" type="text/javascript" src="../xml/js/viz/viz_assistent.js" />
<body class="has-navbar-fixed-top" onload="document.getElementById('progressbar').style.display='none';tableonload();initThemenbaumJs();">
<body class="has-navbar-fixed-top" onload="document.getElementById('progressbar').style.display='none';tableonload();"> <!--initThemenbaumJs();-->
<!--#Template Beginn Top-Navigation-->
<xsl:call-template name="nd_navi_top" />
<!--#Template Ende Top-Navigation-->
<div class="columns">
<!--<div class="columns">-->
<!--#Template Beginn Navigations-Panel Auswertungen-->
<xsl:if test="/ergebnisse/@showNavigation='true' and 1=0"><!-- erstmal kein Panel,weil der Asssistent schon recht breit ist -->
@ -65,10 +65,10 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util @@ -65,10 +65,10 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
<!--#Template Ende Navigations-Panel Auswertungen-->
<!--Beginn Seitentitel, Krümelpfad, Knopfleiste, Legende, Erläuterung-->
<section class="hero-body">
<!--<section class="hero-body">
<div class="container">
<div class="columns is-mobile is-left">
<div class="column is-full">
<div class="column is-full">-->
<div class="card ">
<div class="card-content">
@ -79,12 +79,13 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util @@ -79,12 +79,13 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
<xsl:comment>customfooter</xsl:comment>
</div> <!--Ende content -->
</div> <!--Ende card-content-->
</div> <!--Ende card-background -->
</div> <!--Ende column-->
</div> <!--Ende hero-columns-->
<!--
</div>
</div>
</div>
</section> <!--Ende hero = Berichts-Card-->
</div> <!--Ende site-columns-->
</section>
</div>-->
</body>
<!-- end body -->
</html>
@ -317,7 +318,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util @@ -317,7 +318,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
<div id="chartProperties"> <!--class="section">-->
<form name="chartPropertiesForm">
<div class="columns">
<div class="column is-four-fifth">
<div class="column is-two-fifths">
<!--<p><span class="button is-link is-outlined is-small" onClick="updateChartModel();renderChart('chartDiv',myChartModel);">Erzeugen</span></p>-->
@ -365,7 +366,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util @@ -365,7 +366,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
</div>
<!-- Beginn Grafikelemente+ Vorschau-->
<div class="columns">
<div class="column is-four-fifth">
<div class="column is-two-fifths">
@ -481,7 +482,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util @@ -481,7 +482,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
<span class="separator">&#160;</span>
<div id="chartCanvas">
<div id="chartDiv">
<div id="chartDiv" style="width:800px;height:600px;">
<svg>
<rect x="0" y="0" width="650" height="450" fill="#cccccc"></rect>
</svg></div>

5
superx/xml/viz_html_chart_viewer.xsl

@ -114,6 +114,11 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util @@ -114,6 +114,11 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
<xsl:call-template name="viewer_kachel">
<xsl:with-param name="caption" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@caption"/>
<xsl:with-param name="ergebniselement_ordnr" select="$ergebniselement_ordnr" />
<xsl:with-param name="kachelbreite" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chart_width"/>
<xsl:with-param name="kachelhoehe" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chart_height"/>
<xsl:with-param name="chart_tid" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@tid"/>
<xsl:with-param name="showEdit" select="/ergebnisse/user/@admin" />
</xsl:call-template>
<!--<p><xsl:value-of select="concat($spalten_anz,'-',$ergebniselement_counter,':',$ergebniselement_counter mod $spalten_anz)"/></p>-->
</div>

82
superx/xml/viz_html_chart_viewer_grid.xsl

@ -108,89 +108,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util @@ -108,89 +108,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
<xsl:template name="viz_viewer_grid">
<!-- Variableninitialisierung fürs Dashboard:
-->
<xsl:variable name="spalten_anz">
<!--<xsl:value-of select="2"/>-->
<xsl:value-of select="/ergebnisse/ergebnis/felder/feld[@varname='Spaltenanzahl']/value"/>
</xsl:variable>
<xsl:variable name="kachelbreite">
<xsl:value-of select="/ergebnisse/ergebnis/felder/feld[@varname='Kachelbreite']/value"/>
</xsl:variable>
<xsl:variable name="kachelhoehe">
<xsl:value-of select="/ergebnisse/ergebnis/felder/feld[@varname='Kachelhöhe']/value"/>
</xsl:variable>
<xsl:variable name="ergebniselemente_anz">
<xsl:value-of select="count(/ergebnisse/ergebnis[felder/feld[@varname='Grafik']])"/>
</xsl:variable>
<xsl:variable name="kachelbreite_rem">
<xsl:value-of select="round($kachelbreite div 24)"/><!-- 1 em=16px, für bulma dann *1,5 -->
</xsl:variable>
<!--<p>plan: <xsl:value-of select="/ergebnisse/ergebnis/felder/feld[@varname='Spaltenanzahl']/value"/>
</p>-->
<!--<span class="separator">&#160;</span>-->
<!--Beginn Selektions-Card-->
<!--Beginn Berichtstitel, Pfad, Knopfleiste-->
<!--<section class="hero-body">
<section class="container">--> <!--Beginn Kartenreihe -->
<!--<div class="columns features is-mobile is-left">-->
<div>
<xsl:if test="$spalten_anz!='0'"><!--nicht dynamisch-->
<xsl:attribute name="class"><xsl:value-of select="concat('fixed-grid has-',$spalten_anz,'-cols')" />
</xsl:attribute>
</xsl:if>
<div><!--Beginn columns Kartenreihe -->
<xsl:choose>
<xsl:when test="$spalten_anz='0'"><!--dynamisch-->
<!--klappt noch nicht, Bug in Bulma?-->
<xsl:attribute name="class"><xsl:value-of select="concat('grid is-col-min-',$kachelbreite_rem)" />
</xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:attribute name="class"><xsl:text>grid</xsl:text></xsl:attribute>
</xsl:otherwise>
</xsl:choose>
<xsl:for-each select="ergebnisse/ergebnis[felder/feld[@varname='Grafik']/value!='']/ergebniselement">
<xsl:variable name="ergebniselement_counter" select="position()" />
<xsl:variable name="chart_uniquename"><xsl:value-of select="../felder/feld[@varname='Grafik']/value" /></xsl:variable>
<xsl:variable name="ergebniselement_ordnr"><xsl:value-of select="@ordnr" /></xsl:variable>
<xsl:variable name="maskennummer"><xsl:value-of select="@id" /></xsl:variable>
<!--<p><xsl:value-of select="concat('Zähler: ',$ergebniselement_counter)"/></p>-->
<!--
<div>
<xsl:attribute name="class"><xsl:text>column is-</xsl:text><xsl:value-of select="$colwidth"/></xsl:attribute>-->
<div class="cell is-col-min-25">
<xsl:call-template name="weiterverarbeitungHiddenInputs" >
<xsl:with-param name="formName" select="concat('frmTab',$ergebniselement_ordnr)" />
<xsl:with-param name="ergebniselement_ordnr" select="$ergebniselement_ordnr" />
</xsl:call-template>
<xsl:call-template name="viewer_kachel">
<xsl:with-param name="caption" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@caption"/>
<xsl:with-param name="ergebniselement_ordnr" select="$ergebniselement_ordnr" />
<xsl:with-param name="kachelbreite" select="$kachelbreite"/>
<xsl:with-param name="kachelhoehe" select="$kachelhoehe"/>
<xsl:with-param name="link_maskennummer" select="$maskennummer"/>
<xsl:with-param name="link_chart_uniquename" select="$chart_uniquename" />
<xsl:with-param name="link_tablestylesheet" select="'viz_html_chart_viewer_mask_and_table.xsl'"/>
</xsl:call-template>
<!--<p><xsl:value-of select="concat($spalten_anz,'-',$ergebniselement_counter,':',$ergebniselement_counter mod $spalten_anz)"/></p>-->
</div>
</xsl:for-each>
</div><!-- des grid -->
</div><!--fixed-grid-->
<!--
</section>
</section>--><!-- des Portals -->
</xsl:template>
<xsl:template name="ude_header_dashboard_alt">
<header>

4
superx/xml/viz_html_chart_viewer_mask.xsl

@ -129,6 +129,10 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util @@ -129,6 +129,10 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
<xsl:call-template name="viewer_kachel">
<xsl:with-param name="caption" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@caption"/>
<xsl:with-param name="ergebniselement_ordnr" select="$ergebniselement_ordnr" />
<xsl:with-param name="kachelbreite" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chart_width"/>
<xsl:with-param name="kachelhoehe" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chart_height"/>
<xsl:with-param name="chart_tid" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@tid"/>
<xsl:with-param name="showEdit" select="/ergebnisse/user/@admin" />
</xsl:call-template>
<!--<p><xsl:value-of select="concat($spalten_anz,'-',$ergebniselement_counter,':',$ergebniselement_counter mod $spalten_anz)"/></p>-->

4
superx/xml/viz_html_chart_viewer_mask_and_table.xsl

@ -130,6 +130,10 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util @@ -130,6 +130,10 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
<xsl:call-template name="viewer_kachel">
<xsl:with-param name="caption" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@caption"/>
<xsl:with-param name="ergebniselement_ordnr" select="$ergebniselement_ordnr" />
<xsl:with-param name="kachelbreite" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chart_width"/>
<xsl:with-param name="kachelhoehe" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chart_height"/>
<xsl:with-param name="chart_tid" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@tid"/>
<xsl:with-param name="showEdit" select="/ergebnisse/user/@admin" />
</xsl:call-template>
<!--<p><xsl:value-of select="concat($spalten_anz,'-',$ergebniselement_counter,':',$ergebniselement_counter mod $spalten_anz)"/></p>-->

Loading…
Cancel
Save