Stylesheets für Dashboards auf Makroerbene #7

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

@@ -20,6 +20,7 @@ xml/viz_html_chart.xsl
 xml/viz_html_chart_sankey.xsl
 xml/viz_html_chart_viewer.xsl
 xml/viz_html_chart_viewer_mask.xsl
+xml/viz_html_chart_viewer_mask_and_table.xsl
 xml/viz_html_chart_viewer_grid.xsl
 xml/viz_components.xsl
 xml/viz_tableComponents.xsl

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

@@ -142,6 +142,9 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[VIZ]" />
 </rs>
 </primaryKeys>
 <indexes>
+<index name="ix_viz_chart" type="unique">
+<index-column name="uniquename"/>
+</index>
 
 </indexes>
 </table>
@@ -429,6 +432,12 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen </the
 					<path>$VIZ_PFAD/masken</path>
 				</src>
 			</maske>				
+<maske tid="44570" name="Studierende nach Semester" thema="Visualisierungen">
+				<description> </description>
+				<src>
+					<path>$VIZ_PFAD/masken</path>
+				</src>
+			</maske>				
 			</masken>	
 
   

src-modules/module/viz/masken/44020_felderinfo.unl

@@ -24,7 +24,7 @@ and apnr=1)) \
 44034^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^^<<SQL>>  select 1,'Ja' from xdummy^
 44035^tablestylesheet^121^0^0^100^200^1^char^200^1^1^<<SQL>> select distinct filename,X.caption,ord from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=44070 order by ord^^<<SQL>> select distinct filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=44070 and S.ord=1^
 44036^Ausgabeformat^2001^0^0^100^150^1^char^200^1^1^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and nature::smallint<100 order by nature::smallint^^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and description='HTML'^
-44037^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart order by 2;^^ ^
+44037^Grafik^1000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart order by 2;^^ ^
 44038^Semester^42^350^-1^140^180^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^^^
 44039^Semestertyp^15^350^-1^140^80^1^integer^255^0^1^<<SQL>> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^ ^ ^
 44040^Spaltenanzahl^300^0^0^140^80^1^integer^30^0^1^<<SQL>> SELECT 1,'1-spaltig' from xdummy \

src-modules/module/viz/masken/44100_felderinfo.unl

@@ -18,5 +18,5 @@ select 'Abschluss' from xdummy^hidden^^
 44114^Studiengang^4^0^0^130^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;^^^
 44115^##line##^13^0^0^100^100^1^char^5000^0^8^^^1^
 44116^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^
-44117^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44100 order by 2;^ ^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44100 order by 2 limit 1;^
+44117^Grafik^1000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44100 order by 2;^ ^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44100 order by 2 limit 1;^
 44118^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=44100 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=44100 order by ord limit 1^

src-modules/module/viz/masken/44130_felderinfo.unl

@@ -24,7 +24,7 @@ and apnr=1)) \
 44144^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^
 44145^tablestylesheet^121^0^0^100^200^1^char^200^1^1^<<SQL>> select filename,X.caption,ord from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=44130 order by ord^^<<SQL>> select filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=44130 and ord=20 order by ord limit 1^
 44146^Ausgabeformat^2001^0^0^100^150^1^char^200^1^1^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and nature::smallint<100 order by nature::smallint^hidden^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and description='HTML'^
-44147^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44130 order by 2;^^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44130 order by 2 limit 1^
+44147^Grafik^1000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44130 order by 2;^^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44130 order by 2 limit 1^
 44148^Jahrgang^42^350^-1^140^180^1^sql^30^0^13^<<SQL>> select attributevalue from personattribute_value_list where personattributetype_id = (select personattributetype_id from personattributetype where attributevalue = 'Jahrgang');^hidden^^
 44149^Name der Hochschule^15^350^-1^140^80^1^char^255^0^13^<<SQL>> select name from hochschulinfo;^Eintrag^<<SQL>>  select name from hochschulinfo;^
 44150^Spaltenanzahl^300^0^0^140^80^1^integer^30^0^1^<<SQL>> SELECT 1,'1-spaltig' from xdummy \

src-modules/module/viz/masken/44160_felderinfo.unl

@@ -34,6 +34,6 @@ order by 1^hidden^<<SQL>> select 'stg','Fach (intern)' from xdummy^
 44174^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^
 44175^tablestylesheet^121^0^0^100^200^1^char^200^1^1^<<SQL>> select distinct filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=44160^ ^<<SQL>> select filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=44160 order by ord limit 1^
 44176^Ausgabeformat^2001^0^0^100^150^1^char^200^1^1^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and nature::smallint<100 order by nature::smallint^hidden^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and description='HTML'^
-44177^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44160 order by 2;^^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44160 order by 2 limit 1^
+44177^Grafik^1000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44160 order by 2;^^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44160 order by 2 limit 1^
 44178^##line##^30^0^0^100^100^1^char^5000^0^8^^ ^1^
 44179^##line##^40^0^0^100^100^1^char^5000^0^8^^ ^1^

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

@@ -15,7 +15,7 @@ order by 1;^^<<SQL>> SELECT 3,'3-spaltig' from xdummy^
 44201^Geschlecht^37^0^0^140^80^1^integer^30^0^999^<<SQL>> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^^^
 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=44070 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=44070 and ord =1^
+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=44070 and ord =1^
 44207^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart order by 2;^hidden^ ^
 44208^Jahrgang^42^350^-1^140^180^1^sql^30^0^999^<<SQL>> select attributevalue from personattribute_value_list where personattributetype_id = (select personattributetype_id from personattributetype where attributevalue = 'Jahrgang');^^^
 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^

src-modules/module/viz/masken/44220_felderinfo.unl

@@ -1,11 +1,11 @@
-44220^Spaltenlayout^3000^350^-1^140^180^1^integer^30^1^1^<<SQL>>SELECT tid,\
+44220^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<<SQL>>SELECT uniquename,\
        caption\
 FROM rpta_column_layout \
 where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat')\
 and R.systeminfo_id=7)\
 and uniquename in ('sos_stud_geschl')\
 order by sortnr, caption\
- ;^^<<SQL>>SELECT tid,\
+ ;^^<<SQL>>SELECT uniquename,\
        caption\
 FROM rpta_column_layout \
 where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat')\
@@ -17,12 +17,12 @@ order by sortnr, caption limit 1\
 44222^Fächer^30^0^0^130^200^6^char^1000^0^12^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^
 44223^Abschluss^40^0^0^100^200^3^char^1500^0^1^<<SQL>> select apnr, druck from cifx where key=35 order by 2;^ ^ ^
 44224^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^ ^
-44225^Grafik^4000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44220 order by 2;^^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44220 order by 2 limit 1;^
+44225^Grafik^4000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44220 order by 2;^^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44220 order by 2 limit 1;^
 44226^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^1^hs_zugangsber^apnr, eintrag^ ^
 44227^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44228^Staatsangehörigkeit^150^0^0^140^150^10^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^
 44229^Studiengang^25^0^0^140^150^50^char^1000^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^ ^ ^
-44230^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=44100 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=44100 order by ord limit 1^
+44230^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=44220 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=44220 order by ord limit 1^
 44231^Stichtag^23^330^-1^130^100^1^sql^30^1^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';^
 44232^Hörerstatus^200^330^-1^140^150^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';^
 44238^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 = 'Fälle';^

src-modules/module/viz/masken/44250_felderinfo.unl

@@ -1,11 +1,11 @@
-44250^Spaltenlayout^3000^350^-1^140^180^1^integer^30^1^1^<<SQL>>SELECT tid,\
+44250^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<<SQL>>SELECT uniquename,\
        caption\
 FROM rpta_column_layout \
 where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat')\
 and R.systeminfo_id=7)\
 and uniquename in ('sos_stud_ca12_staat','sos_stud_hzb_staat')\
 order by sortnr, caption\
- ;^^<<SQL>>SELECT tid,\
+ ;^^<<SQL>>SELECT uniquename,\
        caption\
 FROM rpta_column_layout \
 where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat')\
@@ -18,7 +18,7 @@ limit 1\
 44252^Fächer^30^0^0^130^200^6^char^1000^0^12^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^
 44253^Abschluss^40^0^0^100^200^3^char^1500^0^1^<<SQL>> select apnr, druck from cifx where key=35 order by 2;^ ^ ^
 44254^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^ ^
-44255^Grafik^4000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44250 order by 2;^^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44250 order by 2 limit 1;^
+44255^Grafik^4000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44250 order by 2;^^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44250 order by 2 limit 1;^
 44256^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^1^hs_zugangsber^apnr, eintrag^ ^
 44257^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44258^Staatsangehörigkeit^150^0^0^140^150^10^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^

src-modules/module/viz/masken/44280_felderinfo.unl

@@ -1,11 +1,11 @@
-44280^Spaltenlayout^3000^350^-1^140^180^1^integer^30^1^1^<<SQL>>SELECT tid,\
+44280^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<<SQL>>SELECT uniquename,\
        caption\
 FROM rpta_column_layout \
 where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat')\
 and R.systeminfo_id=7)\
 and uniquename in ('sos_stud_fak')\
 order by sortnr, caption\
- ;^^<<SQL>>SELECT tid,\
+ ;^^<<SQL>>SELECT uniquename,\
        caption\
 FROM rpta_column_layout \
 where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat')\
@@ -17,12 +17,12 @@ order by sortnr, caption limit 1\
 44282^Fächer^30^0^0^130^200^6^char^1000^0^12^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^
 44283^Abschluss^40^0^0^100^200^3^char^1500^0^1^<<SQL>> select apnr, druck from cifx where key=35 order by 2;^ ^ ^
 44284^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^ ^
-44285^Grafik^4000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44280 order by 2;^^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44280 order by 2 limit 1;^
+44285^Grafik^4000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44280 order by 2;^^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44280 order by 2 limit 1;^
 44286^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^1^hs_zugangsber^apnr, eintrag^ ^
 44287^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44288^Staatsangehörigkeit^150^0^0^140^150^10^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^
 44289^Studiengang^25^0^0^140^150^50^char^1000^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^ ^ ^
-44290^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=44100 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=44100 order by ord limit 1^
+44290^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=44280 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=44280 order by ord limit 1^
 44291^Stichtag^23^330^-1^130^100^1^sql^30^1^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';^
 44292^Hörerstatus^200^330^-1^140^150^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';^
 44298^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 = 'Fälle';^

src-modules/module/viz/masken/44510_felderinfo.unl

@@ -1,23 +1,19 @@
-44510^Spaltenlayout^3000^350^-1^140^180^1^integer^30^1^1^<<SQL>>SELECT tid,\
+44510^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<<SQL>>SELECT uniquename,\
        caption\
 FROM rpta_column_layout \
-where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat')\
+where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sos_stud_astat'\
 and R.systeminfo_id=7)\
-and uniquename in ('sos_stud_sem_jahr')\
 order by sortnr, caption\
- ;^^<<SQL>>SELECT tid,\
+ ;^^<<SQL>>SELECT uniquename,\
        caption\
 FROM rpta_column_layout \
-where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat')\
+where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sos_stud_astat'\
-and R.systeminfo_id=7)\
+and R.systeminfo_id=7) and uniquename='sos_stud_sem_jahr';^
-and uniquename in ('sos_stud_sem_jahr')\
-order by sortnr, caption limit 1\
- ;^
 44511^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44512^Fächer^30^0^0^130^200^6^char^1000^0^12^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^
 44513^Abschluss^40^0^0^100^200^3^char^1500^0^1^<<SQL>> select apnr, druck from cifx where key=35 order by 2;^ ^ ^
 44514^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^1^
-44515^Grafik^4000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44510 order by 2;^^<<SQL>> select tid, caption from viz_chart where maskeninfo_id=44510 order by 2 limit 1;^
+44515^Grafik^4000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44510 order by 2;^^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44510 order by 2 limit 1;^
 44516^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^1^hs_zugangsber^apnr, eintrag^ ^
 44517^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44518^Staatsangehörigkeit^150^0^0^140^150^10^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^

src-modules/module/viz/masken/44570_felderinfo.unl

@@ -0,0 +1,30 @@
+44570^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';^
+44571^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;^
+44572^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';^
+44573^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^^
+44574^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.';^
+44575^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';^
+44577^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^13^^^^
+44579^Bis Semester^4^350^-1^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;^
+44580^Filter Studierende^119^0^0^140^150^1^sql^20^0^999^<<SQL>> SELECT id,caption from sx_repository where aktiv =1 and today() between gueltig_seit and gueltig_bis and art='SOS_STUD_FILTER' order by 2;^^^
+44581^Geschlecht^37^0^0^140^80^1^integer^30^0^999^<<SQL>> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^^^
+44583^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;^^^
+44584^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^
+44585^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=44570 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=44570 order by ord limit 1^
+44587^Grafik^1000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44570 order by 2;^ ^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44570 order by 2 limit 1;^
+44588^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<<SQL>>SELECT uniquename,\
+       caption\
+FROM rpta_column_layout \
+where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sos_stud_astat'\
+and R.systeminfo_id=7)\
+order by sortnr, caption\
+ ;^^<<SQL>>SELECT uniquename,\
+       caption\
+FROM rpta_column_layout \
+where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sos_stud_astat'\
+and R.systeminfo_id=7) and uniquename='sos_stud_sem';^
+44589^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^
+44590^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^
+44591^Abschluss^7^0^0^140^170^5^char^30^0^1^<<SQL>> select abint,dtxt from k_abint order by 2;^^^
+44592^Matrikel-Nr.^20^350^-1^150^180^1^char^200^0^13^^{InputCheck:matrikelnummern}^^
+44593^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^

src-modules/module/viz/masken/44570_maske_system_bez.unl

@@ -0,0 +1 @@
+44570^7^

src-modules/module/viz/masken/44570_masken_felder_bez.unl

@@ -0,0 +1,20 @@
+44570^44570^
+44570^44571^
+44570^44572^
+44570^44573^
+44570^44574^
+44570^44575^
+44570^44577^
+44570^44579^
+44570^44580^
+44570^44581^
+44570^44583^
+44570^44584^
+44570^44585^
+44570^44587^
+44570^44588^
+44570^44589^
+44570^44590^
+44570^44591^
+44570^44592^
+44570^44593^

src-modules/module/viz/masken/44570_maskeninfo.unl

@@ -0,0 +1 @@
+44570^Studierende nach Semester^<sximport>select select_stmt from maskeninfo where tid=45000</sximport>^<sximport>select xil_proplist from maskeninfo where tid=45000</sximport>^Altersgruppe^Anzahl^Studienanfänger_innen als Zeitreihe, nach Gesschlecht und Fakultät in verschiedenen Visualisierungen^<sximport>select cleanup_stmt from maskeninfo where tid=45000</sximport>^^3^700^360^0^1^^

src-modules/module/viz/masken/44570_sachgeb_maske_bez.unl

@@ -0,0 +1 @@
+16^44570^

src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql

@@ -19,97 +19,99 @@
 {"makro":"44070", "tid":"44020", "sortnr":"70"},
 {"makro":"44070", "tid":"44020", "sortnr":"80"},
 
-{"makro":"44190", "tid":"44020", "sortnr":"1"},
+{"makro":"44190", "tid":"44570", "sortnr":"1"},
-{"makro":"44190", "tid":"44020", "sortnr":"10"},
+{"makro":"44190", "tid":"44220", "sortnr":"10"},
-{"makro":"44190", "tid":"44020", "sortnr":"20"}
+{"makro":"44190", "tid":"44280", "sortnr":"20"},
+{"makro":"44190", "tid":"44280", "sortnr":"30"}
 
 ] />
 
 <#assign felder = [
 {"makro":"44070", "sortnr":"1", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
 {"makro":"44070", "sortnr":"1", "feldname":"Felder", "value":"sos_stg_aggr.geschlecht|sos_stg_aggr.sem_rueck_beur_ein|sos_stg_aggr.summe"},
-{"makro":"44070", "sortnr":"1", "feldname":"Grafik", "value":"1"},
+{"makro":"44070", "sortnr":"1", "feldname":"Grafik", "value":"STUD_ENTW_SEM_GESCHL_LINE"},
 {"makro":"44070", "sortnr":"1", "feldname":"Weitere Tabellen", "value":"dim_studiengang"},
 {"makro":"44070", "sortnr":"1", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
 
 {"makro":"44070", "sortnr":"10", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
 {"makro":"44070", "sortnr":"10", "feldname":"Felder", "value":"dim_staat.inl_ausl_lang|sos_stg_aggr.sem_rueck_beur_ein|sos_stg_aggr.summe"},
-{"makro":"44070", "sortnr":"10", "feldname":"Grafik", "value":"2"},
+{"makro":"44070", "sortnr":"10", "feldname":"Grafik", "value":"STUD_ENTW_SEM_STAAT_LINE"},
 {"makro":"44070", "sortnr":"10", "feldname":"Weitere Tabellen", "value":"dim_staat"},
 {"makro":"44070", "sortnr":"10", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
 
 {"makro":"44070", "sortnr":"20", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
 {"makro":"44070", "sortnr":"20", "feldname":"Felder", "value":"dim_studiengang.abschlussart_str|sos_stg_aggr.sem_rueck_beur_ein|sos_stg_aggr.summe"},
-{"makro":"44070", "sortnr":"20", "feldname":"Grafik", "value":"3"},
+{"makro":"44070", "sortnr":"20", "feldname":"Grafik", "value":"STUD_ENTW_SEM_ABSCHLUSS_LINE"},
 {"makro":"44070", "sortnr":"20", "feldname":"Weitere Tabellen", "value":"dim_studiengang"},
 {"makro":"44070", "sortnr":"20", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
 
 {"makro":"44070", "sortnr":"30", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
 {"makro":"44070", "sortnr":"30", "feldname":"Felder", "value":"sos_stg_aggr.geschlecht|sos_stg_aggr.sem_rueck_beur_ein|sos_stg_aggr.summe"},
-{"makro":"44070", "sortnr":"30", "feldname":"Grafik", "value":"4"},
+{"makro":"44070", "sortnr":"30", "feldname":"Grafik", "value":"STUD_ENTW_SEM_GESCHL_LINE_1"},
 {"makro":"44070", "sortnr":"30", "feldname":"Weitere Tabellen", "value":"dim_studiengang"},
 {"makro":"44070", "sortnr":"30", "feldname":"bis Fachsemester", "value":"1"},
 {"makro":"44070", "sortnr":"30", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
 
 {"makro":"44070", "sortnr":"40", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
 {"makro":"44070", "sortnr":"40", "feldname":"Felder", "value":"dim_staat.inl_ausl_lang|sos_stg_aggr.sem_rueck_beur_ein|sos_stg_aggr.summe"},
-{"makro":"44070", "sortnr":"40", "feldname":"Grafik", "value":"5"},
+{"makro":"44070", "sortnr":"40", "feldname":"Grafik", "value":"STUD_ENTW_SEM_STAAT_LINE_1"},
 {"makro":"44070", "sortnr":"40", "feldname":"Weitere Tabellen", "value":"dim_staat"},
 {"makro":"44070", "sortnr":"40", "feldname":"bis Fachsemester", "value":"1"},
 {"makro":"44070", "sortnr":"40", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
 
 {"makro":"44070", "sortnr":"50", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
 {"makro":"44070", "sortnr":"50", "feldname":"Felder", "value":"dim_studiengang.abschlussart_str|sos_stg_aggr.sem_rueck_beur_ein|sos_stg_aggr.summe"},
-{"makro":"44070", "sortnr":"50", "feldname":"Grafik", "value":"6"},
+{"makro":"44070", "sortnr":"50", "feldname":"Grafik", "value":"STUD_ENTW_SEM_ABSCHLUSS_LINE_1"},
 {"makro":"44070", "sortnr":"50", "feldname":"Weitere Tabellen", "value":"dim_studiengang"},
 {"makro":"44070", "sortnr":"50", "feldname":"bis Fachsemester", "value":"1"},
 {"makro":"44070", "sortnr":"50", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
 
 {"makro":"44070", "sortnr":"60", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
 {"makro":"44070", "sortnr":"60", "feldname":"Felder", "value":"sos_stg_aggr.geschlecht|sos_stg_aggr.sem_rueck_beur_ein|sos_stg_aggr.summe"},
-{"makro":"44070", "sortnr":"60", "feldname":"Grafik", "value":"7"},
+{"makro":"44070", "sortnr":"60", "feldname":"Grafik", "value":"STUD_ENTW_SEM_GESCHL_LINE_1HS"},
 {"makro":"44070", "sortnr":"60", "feldname":"Weitere Tabellen", "value":"dim_studiengang"},
 {"makro":"44070", "sortnr":"60", "feldname":"Filter Studierende", "value":"SOS_HSSEM_1"},
 {"makro":"44070", "sortnr":"60", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
 
 {"makro":"44070", "sortnr":"70", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
 {"makro":"44070", "sortnr":"70", "feldname":"Felder", "value":"dim_staat.inl_ausl_lang|sos_stg_aggr.sem_rueck_beur_ein|sos_stg_aggr.summe"},
-{"makro":"44070", "sortnr":"70", "feldname":"Grafik", "value":"8"},
+{"makro":"44070", "sortnr":"70", "feldname":"Grafik", "value":"STUD_ENTW_SEM_STAAT_LINE_1HS"},
 {"makro":"44070", "sortnr":"70", "feldname":"Weitere Tabellen", "value":"dim_staat"},
 {"makro":"44070", "sortnr":"70", "feldname":"Filter Studierende", "value":"SOS_HSSEM_1"},
 {"makro":"44070", "sortnr":"70", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
 
 {"makro":"44070", "sortnr":"80", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
 {"makro":"44070", "sortnr":"80", "feldname":"Felder", "value":"dim_studiengang.abschlussart_str|sos_stg_aggr.sem_rueck_beur_ein|sos_stg_aggr.summe"},
-{"makro":"44070", "sortnr":"80", "feldname":"Grafik", "value":"9"},
+{"makro":"44070", "sortnr":"80", "feldname":"Grafik", "value":"STUD_ENTW_SEM_ABSCHLUSS_LINE_1HS"},
 {"makro":"44070", "sortnr":"80", "feldname":"Weitere Tabellen", "value":"dim_studiengang"},
 {"makro":"44070", "sortnr":"80", "feldname":"Filter Studierende", "value":"SOS_HSSEM_1"},
 {"makro":"44070", "sortnr":"80", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
 
 
 {"makro":"44190", "sortnr":"1", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
-{"makro":"44190", "sortnr":"1", "feldname":"Felder", "value":"sos_stg_aggr.sem_rueck_beur_ein|sos_stg_aggr.summe"},
+{"makro":"44190", "sortnr":"1", "feldname":"Spaltenlayout", "value":"sos_stud_sem"},
-{"makro":"44190", "sortnr":"1", "feldname":"Grafik", "value":"16"},
+{"makro":"44190", "sortnr":"1", "feldname":"Grafik", "value":"STUDANF_SEM_LINE"},
-{"makro":"44190", "sortnr":"1", "feldname":"Weitere Tabellen", "value":"dim_studiengang"},
 {"makro":"44190", "sortnr":"1", "feldname":"bis Fachsemester", "value":"1"},
 {"makro":"44190", "sortnr":"1", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
 
 {"makro":"44190", "sortnr":"10", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
-{"makro":"44190", "sortnr":"10", "feldname":"Felder", "value":"sos_stg_aggr.geschlecht|sos_stg_aggr.summe"},
+{"makro":"44190", "sortnr":"10", "feldname":"Spaltenlayout", "value":"sos_stud_geschl"},
-{"makro":"44190", "sortnr":"10", "feldname":"Grafik", "value":"17"},
+{"makro":"44190", "sortnr":"10", "feldname":"Grafik", "value":"STUD_GESCHL_W_DONUT"},
-{"makro":"44190", "sortnr":"10", "feldname":"Weitere Tabellen", "value":"dim_studiengang"},
 {"makro":"44190", "sortnr":"10", "feldname":"bis Fachsemester", "value":"1"},
-{"makro":"44190", "sortnr":"10", "feldname":"Semester", "value":"20232"},
 {"makro":"44190", "sortnr":"10", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
 
-
 {"makro":"44190", "sortnr":"20", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
-{"makro":"44190", "sortnr":"20", "feldname":"Felder", "value":"dim_studiengang.fb|dim_studiengang.fb_str|sos_stg_aggr.summe"},
+{"makro":"44190", "sortnr":"20", "feldname":"Spaltenlayout", "value":"sos_stud_fak"},
-{"makro":"44190", "sortnr":"20", "feldname":"Grafik", "value":"18"},
+{"makro":"44190", "sortnr":"20", "feldname":"Grafik", "value":"STUDANF_FAK_BAR"},
-{"makro":"44190", "sortnr":"20", "feldname":"Weitere Tabellen", "value":"dim_studiengang"},
 {"makro":"44190", "sortnr":"20", "feldname":"bis Fachsemester", "value":"1"},
-{"makro":"44190", "sortnr":"20", "feldname":"Semester", "value":"20232"},
+{"makro":"44190", "sortnr":"20", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"},
-{"makro":"44190", "sortnr":"20", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}
+
+{"makro":"44190", "sortnr":"30", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"},
+{"makro":"44190", "sortnr":"30", "feldname":"Spaltenlayout", "value":"sos_stud_fak"},
+{"makro":"44190", "sortnr":"30", "feldname":"Grafik", "value":"STUDANF_FAK_PIE"},
+{"makro":"44190", "sortnr":"30", "feldname":"bis Fachsemester", "value":"1"},
+{"makro":"44190", "sortnr":"30", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}
+
 
 ] />
 

src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_fak_fuellen.sql

@@ -42,12 +42,24 @@ select count(*) from systeminfo where tid=330;
 "visible_size":"5",
 "is_aggregate":"1",
 "description":"Summe der Studierenden"
+},
+{"uniquename":"anteil",
+"caption":"Anteil der Studierenden (in %)",
+"srcfieldname":"",
+"targetfieldname":"anteil",
+"column_type":"computedColumn",
+"col_function":"select (summe::float/(select G.summe from tmp_gesamt G)*100)::integer",
+"is_visible":"1",
+"visible_size":"5",
+"is_aggregate":"0",
+"description":"Anteil in % der Studierenden"
 }
 ]
    />
  
 <#if rpta_installed==1>
     ---ab hier nicht mehr ändern:
+drop TABLE if exists tmp_rpta_column2layout;
 
 CREATE temp TABLE tmp_rpta_column
 (
@@ -249,5 +261,5 @@ and L.resultset_id=T.resultset_id
  ;
 drop table tmp_rpta_column;
 drop TABLE tmp_rpta_column_layout;
-
+drop TABLE tmp_rpta_column2layout;
 </#if>

src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_fak_geschl_fuellen.sql

@@ -251,5 +251,5 @@ and L.resultset_id=T.resultset_id
  ;
 drop table tmp_rpta_column;
 drop TABLE tmp_rpta_column_layout;
-
+drop TABLE tmp_rpta_column2layout;
 </#if>

src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_fak_sem_fuellen.sql

@@ -0,0 +1,255 @@
+--freemarker template
+<sqlvars>
+<sqlvar name="rpta_installed">
+select count(*) from systeminfo where tid=330;
+</sqlvar>
+</sqlvars>
+<#assign rpta_column_layout = {"uniquename":"sos_stud_fak_sem",
+"caption":"Studierende nach Fak. und Semester",
+"rpta_resultset":"sos_stud_astat",
+"whereclause":"",
+"description":"Studierende nach Fak. und Semester"
+}
+   />
+
+<#assign rpta_columns = [
+{"uniquename":"dim_studiengang_fak",
+"caption":"Fakultät",
+"srcfieldname":"dim_studiengang_fb_str",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"visible_size":"10",
+"is_aggregate":"0",
+"description":"Fakultät"
+},
+{"uniquename":"sem_rueck_beur_ein",
+"caption":"Semester",
+"srcfieldname":"sem_rueck_beur_ein",
+"targetfieldname":"",
+"column_type":"logicalColumn",
+"col_function":"substring(sem_rueck_beur_ein::varchar(255) from 1 for 4)",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"is_aggregate":"0",
+"description":"Semester"
+},
+{"uniquename":"summe",
+"caption":"Anzahl der Studierenden",
+"srcfieldname":"summe",
+"column_type":"physicalColumn",
+"col_function":"sum",
+"is_visible":"1",
+"visible_size":"5",
+"is_aggregate":"1",
+"description":"Summe der Studierenden"
+}
+]
+   />
+ 
+<#if rpta_installed==1>
+    ---ab hier nicht mehr ändern:
+   
+CREATE temp TABLE tmp_rpta_column
+(
+   uniquename       varchar(255)   NOT NULL,
+   caption          varchar(255),
+   srcfieldname     varchar(255),
+   targetfieldname  varchar(255),
+   column_type      integer,
+   col_function     text,
+   is_visible       smallint,
+   visible_size     smallint,
+   is_aggregate     smallint,
+   resultset_id     integer,
+   sortnr integer,
+   description TEXT
+);
+
+CREATE temp TABLE tmp_rpta_column_layout
+(
+    uniquename    varchar(255)   NOT NULL,
+   caption       varchar(255),
+   resultset_id  integer,
+   whereclause text,
+   description text
+);
+
+insert into tmp_rpta_column_layout(
+resultset_id,
+uniquename,
+caption,
+whereclause,
+  description
+)
+select tid,
+'${rpta_column_layout.uniquename}',
+'${rpta_column_layout.caption}',
+'${rpta_column_layout.whereclause}',
+'${rpta_column_layout.description}'
+FROM rpta_resultset
+where uniquename='${rpta_column_layout.rpta_resultset}';
+
+<#assign sortnr=0 />
+<#foreach column in rpta_columns>
+<#assign sortnr=sortnr +1 />
+
+INSERT INTO tmp_rpta_column
+(resultset_id,
+  uniquename,
+  caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_visible,
+  visible_size,
+  is_aggregate,
+  sortnr,
+  description
+  )
+select R.tid,
+'${column.uniquename}',
+'${column.caption}',
+'${column.srcfieldname}',
+<#if !column.targetfieldname?exists || column.targetfieldname=="">null::varchar <#else>'${column.targetfieldname}' </#if>,
+T.tid as column_type,
+'${column.col_function}',
+${column.is_visible},
+${column.visible_size},
+${column.is_aggregate},
+${sortnr*10},
+'${column.description}'
+FROM rpta_resultset R, rpta_column_type T
+where R.uniquename='${rpta_column_layout.rpta_resultset}'
+and T.uniquename='${column.column_type}';
+
+</#foreach>
+
+
+select * into temp tmp_rpta_column2layout
+from rpta_column2layout
+where layout_id in (select L.tid
+from rpta_column_layout L,rpta_resultset R
+where R.tid=L.resultset_id 
+and R.uniquename='${rpta_column_layout.rpta_resultset}'
+and L.uniquename='${rpta_column_layout.uniquename}'
+)
+; 
+  
+select * into temp tmp_rpta_column_layout_target
+from rpta_column_layout
+where resultset_id in (select tid
+FROM rpta_resultset
+where uniquename='${rpta_column_layout.rpta_resultset}')
+and uniquename in (select uniquename from tmp_rpta_column_layout)
+;
+
+insert into rpta_column_layout
+(uniquename,
+       caption,
+       resultset_id,
+       whereclause,
+  description)
+ select uniquename,
+       caption,
+       resultset_id,
+       whereclause,
+  description
+FROM tmp_rpta_column_layout T
+where 0=(select count(*) from tmp_rpta_column_layout_target T2
+where T.uniquename=T2.uniquename);
+
+drop table tmp_rpta_column_layout_target;
+
+delete from rpta_column2layout
+where layout_id in (select L.tid
+from rpta_column_layout L,rpta_resultset R
+where R.tid=L.resultset_id 
+and R.uniquename='${rpta_column_layout.rpta_resultset}'
+and L.uniquename='${rpta_column_layout.uniquename}'
+)
+; 
+
+select * into temp tmp_rpta_column2 
+from tmp_rpta_column T 
+where (resultset_id,uniquename) not in
+(select resultset_id,uniquename from rpta_column);
+
+INSERT INTO rpta_column
+(resultset_id,
+  uniquename,
+  caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_aggregate,
+  description,
+  custom
+  )
+  select 
+resultset_id,
+  uniquename,
+  caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_aggregate,
+  description,
+  0 as custom
+from tmp_rpta_column2; 
+
+--evtl. neuen Satz einfügen, dann alle updaten
+
+update rpta_column set (  caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_aggregate,
+  description)
+  = (select   caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_aggregate,
+  description
+  from tmp_rpta_column T
+  where T.resultset_id=rpta_column.resultset_id
+  and T.uniquename=rpta_column.uniquename)
+  where custom=0
+  and  (resultset_id,uniquename) in
+(select T.resultset_id,T.uniquename
+from tmp_rpta_column T)
+;
+
+drop table tmp_rpta_column2;
+
+insert into rpta_column2layout(column_id,
+       layout_id,
+       sortnr,
+       is_visible,
+       visible_size,
+       caption,
+  description)
+select C.tid as column_id,
+       L.tid as layout_id,
+       T.sortnr,
+       T.is_visible,
+       T.visible_size,
+       T.caption,
+  T.description
+FROM rpta_column C,  rpta_column_layout L, tmp_rpta_column T
+where C.uniquename=T.uniquename
+and C.resultset_id=T.resultset_id
+and L.uniquename='${rpta_column_layout.uniquename}'
+and L.resultset_id=T.resultset_id
+ ;
+drop table tmp_rpta_column;
+drop TABLE tmp_rpta_column_layout;
+drop TABLE tmp_rpta_column2layout;
+</#if>

src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_geschl_fuellen.sql

@@ -14,27 +14,50 @@ select count(*) from systeminfo where tid=330;
    />
 
 <#assign rpta_columns = [
-{"uniquename":"geschlecht_w",
+{"uniquename":"geschlecht",
-"caption":"Geschlecht (weiblich)",
+"caption":"Geschlecht (Schlüssel)",
 "srcfieldname":"geschlecht",
-"targetfieldname":"",
+"targetfieldname":"geschlecht",
-"column_type":"logicalColumn",
+"column_type":"physicalColumn",
-"col_function":"case when geschlecht=2 then ''Weiblich''::varchar(255) else ''Nicht weiblich''::varchar(255) end",
+"col_function":"",
+"is_visible":"0",
+"format_code":"",
+"visible_size":"5",
+"is_aggregate":"0",
+"description":"Geschlecht"
+},{"uniquename":"geschlecht_str",
+"caption":"Geschlecht",
+"srcfieldname":"",
+"targetfieldname":"geschlecht_str",
+"column_type":"lookupColumn",
+"col_function":"select druck from sos_k_geschl GE where GE.apnr=geschlecht",
 "is_visible":"1",
 "format_code":"",
 "visible_size":"5",
 "is_aggregate":"0",
-"description":"Geschlecht weiblich"
+"description":"Geschlecht"
 },
 {"uniquename":"summe",
 "caption":"Anzahl der Studierenden",
 "srcfieldname":"summe",
+"targetfieldname":"summe",
 "column_type":"physicalColumn",
 "col_function":"sum",
 "is_visible":"1",
 "visible_size":"5",
 "is_aggregate":"1",
 "description":"Summe der Studierenden"
+},
+{"uniquename":"anteil",
+"caption":"Anteil der Studierenden (in %)",
+"srcfieldname":"",
+"targetfieldname":"anteil",
+"column_type":"computedColumn",
+"col_function":"select (summe::float/(select G.summe from tmp_gesamt G)*100)::integer",
+"is_visible":"1",
+"visible_size":"5",
+"is_aggregate":"0",
+"description":"Anteil in % der Studierenden"
 }
 ]
    />
@@ -242,5 +265,5 @@ and L.resultset_id=T.resultset_id
  ;
 drop table tmp_rpta_column;
 drop TABLE tmp_rpta_column_layout;
-
+drop TABLE tmp_rpta_column2layout;
 </#if>

src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_geschl_zeitreihe_fuellen.sql

@@ -242,5 +242,5 @@ and L.resultset_id=T.resultset_id
  ;
 drop table tmp_rpta_column;
 drop TABLE tmp_rpta_column_layout;
-
+drop TABLE tmp_rpta_column2layout;
 </#if>

src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_hzbstaat_fuellen.sql

@@ -242,5 +242,5 @@ and L.resultset_id=T.resultset_id
  ;
 drop table tmp_rpta_column;
 drop TABLE tmp_rpta_column_layout;
-
+drop TABLE tmp_rpta_column2layout;
 </#if>

src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_staat_fuellen.sql

@@ -242,5 +242,5 @@ and L.resultset_id=T.resultset_id
  ;
 drop table tmp_rpta_column;
 drop TABLE tmp_rpta_column_layout;
-
+drop TABLE tmp_rpta_column2layout;
 </#if>

src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_zeitreihe_fuellen.sql

@@ -5,38 +5,38 @@ select count(*) from systeminfo where tid=330;
 </sqlvar>
 </sqlvars>
 <#assign rpta_column_layout = 
-{"uniquename":"sos_stud_sem_jahr",
+{"uniquename":"sos_stud_sem",
-"caption":"Studierende nach Studienjahr",
+"caption":"Studierende nach Semester",
 "rpta_resultset":"sos_stud_astat",
 "whereclause":"",
-"description":"Studierende nach Studienjahr"
+"description":"Studierende nach Semester"
 }
    />
 
 <#assign rpta_columns = [
-{"uniquename":"jahr",
+{"uniquename":"sem_rueck_beur_ein",
-"caption":"Jahr",
+"caption":"Semester",
 "srcfieldname":"sem_rueck_beur_ein",
-"targetfieldname":"jahr",
+"targetfieldname":"sem_rueck_beur_ein",
-"column_type":"logicalColumn",
+"column_type":"physicalColumn",
-"col_function":"get_akad_jahr(sem_rueck_beur_ein,''A'')",
+"col_function":"",
-"is_visible":"1",
+"is_visible":"0",
-"format_code":"",
+"format_code":"TEXT",
 "visible_size":"5",
 "is_aggregate":"0",
-"description":"(WS + darauffolgendes SS)"
+"description":""
 },
-{"uniquename":"semestertyp",
+{"uniquename":"semester_str",
-"caption":"Semestertyp",
+"caption":"Semester Name",
 "srcfieldname":"sem_rueck_beur_ein",
-"targetfieldname":"semestertyp",
+"targetfieldname":"semester_str",
-"column_type":"logicalColumn",
+"column_type":"lookupColumn",
-"col_function":"(case when substring('''' || sem_rueck_beur_ein from 5 for 1)=''2'' then ''WiSe'' else ''SoSe'' end)::varchar(255) ",
+"col_function":"select replace(replace(eintrag,''SoSe'',''''),''WiSe '','''') from semester SEM where SEM.tid=sem_rueck_beur_ein",
 "is_visible":"1",
 "format_code":"",
 "visible_size":"5",
 "is_aggregate":"0",
-"description":"Winter oder Sommersemester"
+"description":""
 },
 {"uniquename":"summe",
 "caption":"Anzahl der Studierenden",
@@ -254,5 +254,5 @@ and L.resultset_id=T.resultset_id
  ;
 drop table tmp_rpta_column;
 drop TABLE tmp_rpta_column_layout;
-
+drop TABLE tmp_rpta_column2layout;
 </#if>

src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_zeitreihe_jahr_fuellen.sql

@@ -0,0 +1,258 @@
+--freemarker template
+<sqlvars>
+<sqlvar name="rpta_installed">
+select count(*) from systeminfo where tid=330;
+</sqlvar>
+</sqlvars>
+<#assign rpta_column_layout = 
+{"uniquename":"sos_stud_sem_jahr",
+"caption":"Studierende nach Studienjahr",
+"rpta_resultset":"sos_stud_astat",
+"whereclause":"",
+"description":"Studierende nach Studienjahr"
+}
+   />
+
+<#assign rpta_columns = [
+{"uniquename":"jahr",
+"caption":"Jahr",
+"srcfieldname":"sem_rueck_beur_ein",
+"targetfieldname":"jahr",
+"column_type":"logicalColumn",
+"col_function":"get_akad_jahr(sem_rueck_beur_ein,''A'')",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"is_aggregate":"0",
+"description":"(WS + darauffolgendes SS)"
+},
+{"uniquename":"semestertyp",
+"caption":"Semestertyp",
+"srcfieldname":"sem_rueck_beur_ein",
+"targetfieldname":"semestertyp",
+"column_type":"logicalColumn",
+"col_function":"(case when substring('''' || sem_rueck_beur_ein from 5 for 1)=''2'' then ''WiSe'' else ''SoSe'' end)::varchar(255) ",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"is_aggregate":"0",
+"description":"Winter oder Sommersemester"
+},
+{"uniquename":"summe",
+"caption":"Anzahl der Studierenden",
+"srcfieldname":"summe",
+"column_type":"physicalColumn",
+"col_function":"sum",
+"is_visible":"1",
+"visible_size":"5",
+"is_aggregate":"1",
+"description":"Summe der Studierenden"
+}
+]
+   />
+ 
+<#if rpta_installed==1>
+    ---ab hier nicht mehr ändern:
+   
+CREATE temp TABLE tmp_rpta_column
+(
+   uniquename       varchar(255)   NOT NULL,
+   caption          varchar(255),
+   srcfieldname     varchar(255),
+   targetfieldname  varchar(255),
+   column_type      integer,
+   col_function     text,
+   is_visible       smallint,
+   visible_size     smallint,
+   is_aggregate     smallint,
+   resultset_id     integer,
+   sortnr integer,
+   description TEXT
+);
+
+CREATE temp TABLE tmp_rpta_column_layout
+(
+    uniquename    varchar(255)   NOT NULL,
+   caption       varchar(255),
+   resultset_id  integer,
+   whereclause text,
+   description text
+);
+
+insert into tmp_rpta_column_layout(
+resultset_id,
+uniquename,
+caption,
+whereclause,
+  description
+)
+select tid,
+'${rpta_column_layout.uniquename}',
+'${rpta_column_layout.caption}',
+'${rpta_column_layout.whereclause}',
+'${rpta_column_layout.description}'
+FROM rpta_resultset
+where uniquename='${rpta_column_layout.rpta_resultset}';
+
+<#assign sortnr=0 />
+<#foreach column in rpta_columns>
+<#assign sortnr=sortnr +1 />
+
+INSERT INTO tmp_rpta_column
+(resultset_id,
+  uniquename,
+  caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_visible,
+  visible_size,
+  is_aggregate,
+  sortnr,
+  description
+  )
+select R.tid,
+'${column.uniquename}',
+'${column.caption}',
+'${column.srcfieldname}',
+<#if !column.targetfieldname?exists || column.targetfieldname=="">null::varchar <#else>'${column.targetfieldname}' </#if>,
+T.tid as column_type,
+'${column.col_function}',
+${column.is_visible},
+${column.visible_size},
+${column.is_aggregate},
+${sortnr*10},
+'${column.description}'
+FROM rpta_resultset R, rpta_column_type T
+where R.uniquename='${rpta_column_layout.rpta_resultset}'
+and T.uniquename='${column.column_type}';
+
+</#foreach>
+
+
+select * into temp tmp_rpta_column2layout
+from rpta_column2layout
+where layout_id in (select L.tid
+from rpta_column_layout L,rpta_resultset R
+where R.tid=L.resultset_id 
+and R.uniquename='${rpta_column_layout.rpta_resultset}'
+and L.uniquename='${rpta_column_layout.uniquename}'
+)
+; 
+  
+select * into temp tmp_rpta_column_layout_target
+from rpta_column_layout
+where resultset_id in (select tid
+FROM rpta_resultset
+where uniquename='${rpta_column_layout.rpta_resultset}')
+and uniquename in (select uniquename from tmp_rpta_column_layout)
+;
+
+insert into rpta_column_layout
+(uniquename,
+       caption,
+       resultset_id,
+       whereclause,
+  description)
+ select uniquename,
+       caption,
+       resultset_id,
+       whereclause,
+  description
+FROM tmp_rpta_column_layout T
+where 0=(select count(*) from tmp_rpta_column_layout_target T2
+where T.uniquename=T2.uniquename);
+
+drop table tmp_rpta_column_layout_target;
+
+delete from rpta_column2layout
+where layout_id in (select L.tid
+from rpta_column_layout L,rpta_resultset R
+where R.tid=L.resultset_id 
+and R.uniquename='${rpta_column_layout.rpta_resultset}'
+and L.uniquename='${rpta_column_layout.uniquename}'
+)
+; 
+
+select * into temp tmp_rpta_column2 
+from tmp_rpta_column T 
+where (resultset_id,uniquename) not in
+(select resultset_id,uniquename from rpta_column);
+
+INSERT INTO rpta_column
+(resultset_id,
+  uniquename,
+  caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_aggregate,
+  description,
+  custom
+  )
+  select 
+resultset_id,
+  uniquename,
+  caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_aggregate,
+  description,
+  0 as custom
+from tmp_rpta_column2; 
+
+--evtl. neuen Satz einfügen, dann alle updaten
+
+update rpta_column set (  caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_aggregate,
+  description)
+  = (select   caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_aggregate,
+  description
+  from tmp_rpta_column T
+  where T.resultset_id=rpta_column.resultset_id
+  and T.uniquename=rpta_column.uniquename)
+  where custom=0
+  and  (resultset_id,uniquename) in
+(select T.resultset_id,T.uniquename
+from tmp_rpta_column T)
+;
+
+drop table tmp_rpta_column2;
+
+insert into rpta_column2layout(column_id,
+       layout_id,
+       sortnr,
+       is_visible,
+       visible_size,
+       caption,
+  description)
+select C.tid as column_id,
+       L.tid as layout_id,
+       T.sortnr,
+       T.is_visible,
+       T.visible_size,
+       T.caption,
+  T.description
+FROM rpta_column C,  rpta_column_layout L, tmp_rpta_column T
+where C.uniquename=T.uniquename
+and C.resultset_id=T.resultset_id
+and L.uniquename='${rpta_column_layout.uniquename}'
+and L.resultset_id=T.resultset_id
+ ;
+drop table tmp_rpta_column;
+drop TABLE tmp_rpta_column_layout;
+drop TABLE tmp_rpta_column2layout;
+</#if>

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

@@ -19,13 +19,20 @@
 {"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"},
+{"mask":"44220", "filename":"viz_html_chart_viewer_mask_and_table.xsl", "ord":"40"},
+{"mask":"44280", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"},
+{"mask":"44280", "filename":"viz_html_chart_viewer.xsl", "ord":"1"},
+{"mask":"44280", "filename":"viz_html_chart_viewer_mask.xsl", "ord":"30"},
+{"mask":"44280", "filename":"viz_html_chart_viewer_mask_and_table.xsl", "ord":"40"},
 {"mask":"44510", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"},
 {"mask":"44510", "filename":"viz_html_chart_viewer.xsl", "ord":"1"},
 {"mask":"44510", "filename":"viz_html_chart_viewer_mask.xsl", "ord":"30"},
 {"mask":"44250", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"},
 {"mask":"44250", "filename":"viz_html_chart_viewer.xsl", "ord":"1"},
-{"mask":"44250", "filename":"viz_html_chart_viewer_mask.xsl", "ord":"30"}
+{"mask":"44250", "filename":"viz_html_chart_viewer_mask.xsl", "ord":"30"},
-
+{"mask":"44570", "filename":"tabelle_html_datenblatt.xsl", "ord":"20"},
+{"mask":"44570", "filename":"viz_html_chart_viewer.xsl", "ord":"1"},
+{"mask":"44570", "filename":"viz_html_chart_viewer_mask.xsl", "ord":"30"}
 ] />
 
 <#assign stylesheet = [
@@ -39,7 +46,9 @@
 {"filename":"viz_html_chart_viewer_grid.xsl", "caption":"Dashboard", "description":"Viewer-Stylesheet für VIZ Charts in einer Kachelansicht ", "relation":"table", "contenttype":"text/html","is_generic":"0"},
 {"filename":"viz_html_chart_viewer_mask.xsl", "caption":"Diagramm + Maskenfelder", "description":"Viewer-Stylesheet für VIZ Charts mit Maskenfeldern", "relation":"table", "contenttype":"text/html","is_generic":"0"},
 {"filename":"tabelle_html_viz.xsl", "caption":"Tabelle + Visualisierung", "description":"Viewer-Stylesheet für Tabellen und VIZ Charts", "relation":"table", "contenttype":"text/html","is_generic":"0"},
-{"filename":"viz_html_chart_viewer.xsl", "caption":"Diagramm-Viewer (einfach)", "description":"Viewer-Stylesheet für VIZ Charts in einer Einzelansicht ", "relation":"table", "contenttype":"text/html","is_generic":"0"}
+{"filename":"viz_html_chart_viewer.xsl", "caption":"Diagramm-Viewer (einfach)", "description":"Viewer-Stylesheet für VIZ Charts in einer Einzelansicht ", "relation":"table", "contenttype":"text/html","is_generic":"0"},
+{"filename":"viz_html_chart_viewer_mask_and_table.xsl", "caption":"Diagramm, Tabelle + Maskenfelder", "description":"Viewer-Stylesheet für VIZ Charts mit Tabelle und Maskenfeldern", "relation":"table", "contenttype":"text/html","is_generic":"0"}
+
 
 ] />
 <#assign stylesheet_field = [

src-modules/module/viz/schluesseltabellen/viz_property.unl

@@ -65,3 +65,6 @@
 108^Strichfarbe^stroke_static^ ^ ^0^ ^0^3^11^Strichfarbe (einfach)^1200^^^string^
 109^Zusätzl. Sortierung^sortchannel^ ^ ^0^ ^0^1^5^Standardmäßig wird nach den Achsendimensionen alphabetisch aufsteigend sortiert. Wenn Sie nach einem anderen Merkmal sortieren wollen, geben Sie dies hier an (z.B. die Zeilennummer, um die Sortierung der Datentabelle zu nutzen). Nützlich z.B. um Semesternamen zu sortieren.^500^^^string^
 110^Innerer Radius^innerRadius^0^ ^0^ ^0^1^10^Innerer Radius bei Tortendiagrammen (Faktor in %). Bei 0 wird kein innerer Radius genutzt, ein Wert größer 0 macht das Tortendiagramm zum Donut.^400^0^100^string^
+111^Beschriftung Radius^labelRadiusFactor^80^ ^0^ ^0^1^10^Beschrftungs-Radius Faktor bei Tortendiagrammen (Faktor in %). Bei 0 wird kein innerer Radius genutzt, ein Wert größer 0 macht das Tortendiagramm zum Donut.^500^0^100^string^
+112^Kanten-Radius^cornerRadius^10^px^0^ ^0^1^10^Ecken-Radius bei Tortendiagrammen (in Pixel). Bei 0 wird keine gerundete Kante genutzt, ein Wert größer 0 macht das Tortendiagramm zum Donut.^600^0^50^string^
+113^Label-Deckungsgrad^labelOpacity^70^ ^0^ ^0^1^10^Deckungsgrad Faktor bei Beschriftungen (Faktor in %). Bei 100 ist maximale Deckung erreicht^700^0^100^string^

src-modules/module/viz/schluesseltabellen/viz_property_renderer.unl

@@ -44,7 +44,10 @@
 282^2^106^opacity^
 283^2^100^strokeDasharray^
 284^2^45^strokeWidth^
-314^1^95^dimension1^
+323^1^95^dimension1^
-315^1^96^dimension2^
+324^1^96^dimension2^
-316^1^73^measure1^
+325^1^73^measure1^
-317^1^110^innerRadius^
+326^1^110^innerRadius^
+327^1^111^labelRadiusFactor^
+328^1^112^cornerRadius^
+329^1^113^labelOpacity^

src-modules/module/viz/schluesseltabellen/viz_type_d3js_fuellen.sql

@@ -86,7 +86,54 @@
 "range_from":"0",
 "range_to":"100",
 "prop_value_type":"string"
+},
+{ "caption":"Beschriftung Radius",
+"prop_uniquename":"labelRadiusFactor",
+"explanation":"Beschrftungs-Radius Faktor bei Tortendiagrammen (Faktor in %). Bei 0 wird kein innerer Radius genutzt, ein Wert größer 0 macht das Tortendiagramm zum Donut.",
+"prop_default":"80",
+"prop_unit":"",
+"is_generic":"0",
+"static_values":"",
+"is_mandatory":"0",
+"input_type_uniquename":"TEXT",
+"property_group_uniquename":"LAYOUT",
+"sortnr":"",
+"range_from":"0",
+"range_to":"100",
+"prop_value_type":"string"
+},
+{ "caption":"Kanten-Radius",
+"prop_uniquename":"cornerRadius",
+"explanation":"Ecken-Radius bei Tortendiagrammen (in Pixel). Bei 0 wird keine gerundete Kante genutzt, ein Wert größer 0 macht das Tortendiagramm zum Donut.",
+"prop_default":"10",
+"prop_unit":"px",
+"is_generic":"0",
+"static_values":"",
+"is_mandatory":"0",
+"input_type_uniquename":"TEXT",
+"property_group_uniquename":"LAYOUT",
+"sortnr":"",
+"range_from":"0",
+"range_to":"50",
+"prop_value_type":"string"
+},
+{ "caption":"Label-Deckungsgrad",
+"prop_uniquename":"labelOpacity",
+"explanation":"Deckungsgrad Faktor bei Beschriftungen (Faktor in %). Bei 100 ist maximale Deckung erreicht",
+"prop_default":"70",
+"prop_unit":"",
+"is_generic":"0",
+"static_values":"",
+"is_mandatory":"0",
+"input_type_uniquename":"TEXT",
+"property_group_uniquename":"LAYOUT",
+"sortnr":"",
+"range_from":"0",
+"range_to":"100",
+"prop_value_type":"string"
 }
+
+
 ]
 />
 
@@ -147,6 +194,19 @@
 "viz_property_uniquename":"scheme",
 "is_mandatory":"1",
 "sortnr":"47"},
+{ "viz_type_uniquename":"pie",
+"viz_property_uniquename":"cornerRadius",
+"is_mandatory":"1",
+"sortnr":"57"},
+{ "viz_type_uniquename":"pie",
+"viz_property_uniquename":"labelRadiusFactor",
+"is_mandatory":"1",
+"sortnr":"67"},
+{ "viz_type_uniquename":"pie",
+"viz_property_uniquename":"labelOpacity",
+"is_mandatory":"0",
+"sortnr":"77"},
+
 { "viz_type_uniquename":"sunburst",
 "viz_property_uniquename":"dimension1",
 "is_mandatory":"1",
@@ -159,8 +219,6 @@
 "viz_property_uniquename":"measure1",
 "is_mandatory":"1",
 "sortnr":"20"}
-
-
 ]
 />
 

src-modules/module/viz/schluesseltabellen/viz_type_property.unl

@@ -145,18 +145,22 @@
 1835^10^79^0^30^
 1836^3^109^0^800^
 1837^10^109^0^800^
-1928^12^95^1^1^
+1964^12^95^1^1^
-1929^12^96^1^10^
+1965^12^96^1^10^
-1930^12^73^1^20^
+1966^12^73^1^20^
-1932^12^6^0^100^
+1968^12^6^0^100^
-1933^12^7^0^110^
+1969^12^7^0^110^
-1934^12^5^0^120^
+1970^12^5^0^120^
-1935^14^95^1^1^
+1971^14^95^1^1^
-1936^14^73^1^20^
+1972^14^73^1^20^
-1937^14^2^1^30^
+1973^14^2^1^30^
-1938^14^1^1^40^
+1974^14^1^1^40^
-1939^14^110^1^50^
+1975^14^110^1^50^
-1940^14^4^1^45^
+1976^14^4^1^45^
-1941^15^95^1^1^
+1977^14^24^1^47^
-1942^15^96^1^10^
+1978^14^112^1^57^
-1943^15^73^1^20^
+1979^14^111^1^67^
+1980^14^113^0^77^
+1981^15^95^1^1^
+1982^15^96^1^10^
+1983^15^73^1^20^

superx/xml/js/viz/viz_functions.js

@@ -1839,8 +1839,14 @@ var plotMark=new Object;
 if(chartElem)
 {
 var chartType=chartElem.vizTypeUniquename;
-var myDatasourceRs=rs[chartElem.datasource];
+var rsIndexNr=chartElem.datasource;
-
+if(rs.length==1)
+{
+	//if only 1 datasource is given, the indexNr is ignored
+	//this way a chartModel can be used in a macro *and* a single view
+	rsIndexNr=0;
+}
+var myDatasourceRs=rs[rsIndexNr];
 var optionString=prepareChartPropertiesForPlotMark(chartType,chartElem);
 	
 console.log("Mark-option for "+chartType+":"+ optionString);
@@ -1993,8 +1999,15 @@ chartElem=currentChartModel.chartElements[chartElemNr];
 if(chartElem)
 {
 var chartType=chartElem.vizTypeUniquename;
-var myDatasourceRs=rs[chartElem.datasource];
+var rsIndexNr=chartElem.datasource;
-var data=filld3data(rs[chartElem.datasource],rsColumnMetaData[chartElem.datasource],chartElem);
+if(rs.length==1)
+{
+	//if only 1 datasource is given, the indexNr is ignored
+	//this way a chartModel can be used in a macro *and* a single view
+	rsIndexNr=0;
+}
+var myDatasourceRs=rs[rsIndexNr];
+var data=filld3data(rs[rsIndexNr],rsColumnMetaData[rsIndexNr],chartElem);
 console.log("Mark-option for "+chartType);
 switch (chartType)
 {
@@ -2195,6 +2208,11 @@ function makePie_d3(myCommonChartProperties,svg,data,chartElem,width,height)
   var innerRadiusPercent = parseFloat(getChartPropertyFromModel(myCommonChartProperties,"innerRadius"),false);
   var innnerRadiusComputed= radius * innerRadiusPercent / 100;
   var myPalette=getChartPropertyFromModel(myCommonChartProperties,"scheme",false);
+  var textColor=getChartPropertyFromModel(myCommonChartProperties,"stroke",false);
+  var cornerRadius=getChartPropertyFromModel(myCommonChartProperties,"cornerRadius",false);
+  var labelRadiusFactor=parseFloat(getChartPropertyFromModel(myCommonChartProperties,"labelRadiusFactor",false))/100;
+  if(textColor=="")
+	  textColor="black";
   /*const color = d3.scaleOrdinal()
       .domain(data.map(d => d.dimension1))
       .range(d3.quantize(t => d3.interpolateSpectral(t * 0.8 + 0.1), data.length).reverse())
@@ -2218,14 +2236,14 @@ const color = d3.scaleOrdinal(getD3ColorScheme(myPalette));
   const arc = d3.arc()
       .innerRadius(innnerRadiusComputed ) 
       .outerRadius(radius - 1)
-      .cornerRadius(10);
+      .cornerRadius(cornerRadius);
 
-  const labelRadius = arc.outerRadius()() * 0.8;
+  const labelRadius = arc.outerRadius()() * labelRadiusFactor;
 
   // A separate arc generator for labels.
   const arcLabel = d3.arc()
       .innerRadius(labelRadius)
-      .outerRadius(labelRadius);
+      .outerRadius(labelRadius+200);
 
   const arcs = pie(data);
   //svg.width=width;
@@ -2248,7 +2266,7 @@ const color = d3.scaleOrdinal(getD3ColorScheme(myPalette));
       .attr("fill", d => color(d.data.dimension1))
       .attr("d", arc)
     .append("title")
-      .text(d => `${d.data.dimension1}: ${d.data.measure1.toLocaleString("en-US")}`);
+      .text(d => `${d.data.dimension1}: ${d.data.measure1.toLocaleString("de-DE")}`);
 
   // Create a new arc generator to place a label close to the edge.
   // The label shows the value if there is enough room.
@@ -2260,13 +2278,15 @@ const color = d3.scaleOrdinal(getD3ColorScheme(myPalette));
       .attr("transform", d => `translate(${arcLabel.centroid(d)})`)
       .call(text => text.append("tspan")
           .attr("y", "-0.4em")
-          .attr("font-weight", "bold")
+          //.attr("font-weight", "bold")
+	  .attr("stroke", textColor)
+	  .attr("fill", textColor)
           .text(d => d.data.dimension1))
       .call(text => text.filter(d => (d.endAngle - d.startAngle) > 0.25).append("tspan")
           .attr("x", 0)
           .attr("y", "0.7em")
           .attr("fill-opacity", 0.7)
-          .text(d => d.data.measure1.toLocaleString("en-US")));
+          .text(d => d.data.measure1.toLocaleString("de-DE")));
 
   //return svg.node();
   return svg.node();

superx/xml/viz_components.xsl

@@ -540,9 +540,9 @@ and (@renderer_uniquename='plot' or @renderer_uniquename='d3js') ]">
 <xsl:template name="modalCards" >
 <xsl:for-each select="/ergebnisse">
 <xsl:for-each select="ergebnis/ergebniselement">
-<xsl:variable name="chart_id"><xsl:value-of select="../felder/feld[@varname='Grafik']/value" /></xsl:variable>
+<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:if test="$chart_id != ''">
+<xsl:if test="$chart_uniquename != ''">
 <div  class="modal modal-fx-3dSlit" id="{concat('modalCard',$ergebniselement_ordnr)}">
   <div class="modal-background"></div>
       <div class="modal-content is-huge is-image">
@@ -568,7 +568,7 @@ and (@renderer_uniquename='plot' or @renderer_uniquename='d3js') ]">
   <div class="modal-background"></div>
      <div class="modal-content is-tiny">
      <div class="box" style="text-align:right">
-     <h4><xsl:value-of select="viz_charts/viz_chart[@tid=$chart_id]/@caption"/></h4>
+     <h4><xsl:value-of select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@caption"/></h4>
      <a href="{concat('javascript:closeModalCardDetail(',$ergebniselement_ordnr,');')}">
      <span class="button is-black is-outlined"> X </span>
      </a>
@@ -584,7 +584,7 @@ and (@renderer_uniquename='plot' or @renderer_uniquename='d3js') ]">
        <div class="card-content">
             <div class="media">
               <div class="media-content">
-	      <p><xsl:value-of select="viz_charts/viz_chart[@tid=$chart_id]/@description"/></p>
+	      <p><xsl:value-of select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@description"/></p>
             <p class="legende">
 <xsl:for-each select="../felder/feld">
 	<xsl:if test="(value !='' or sicht/@isFirstInGroup='false' or @isstandtoday='false')  and @varname != 'sort' and @varname != 'maxoffset' and value_caption != ''">
@@ -640,9 +640,9 @@ Stand: <xsl:value-of select="../stand" /></p>
 <xsl:template name="modalCards_neu" >
 <xsl:for-each select="/ergebnisse">
 <xsl:for-each select="ergebnis/ergebniselement">
-<xsl:variable name="chart_id"><xsl:value-of select="../felder/feld[@varname='Grafik']/value" /></xsl:variable>
+<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:if test="$chart_id != ''">
+<xsl:if test="$chart_uniquename != ''">
 <div  class="modal" id="{concat('modalCard',$ergebniselement_ordnr)}">
   <div class="modal-background"></div>
       <div class="modal-card">
@@ -669,7 +669,7 @@ Stand: <xsl:value-of select="../stand" /></p>
     <header class="modal-card-head">
 
      <div class="box" style="text-align:right">
-     <h4><xsl:value-of select="viz_charts/viz_chart[@tid=$chart_id]/@caption"/></h4>
+     <h4><xsl:value-of select="viz_charts/viz_chart[@chart_uniquename=$chart_uniquename]/@caption"/></h4>
      <a href="{concat('javascript:closeModalCardDetail(',$ergebniselement_ordnr,');')}">
      <span class="button is-black is-outlined"> X </span>
      </a>
@@ -682,7 +682,7 @@ Stand: <xsl:value-of select="../stand" /></p>
       </div>
        </section>
     <footer class="modal-card-foot">
-	      <p><xsl:value-of select="viz_charts/viz_chart[@tid=$chart_id]/@description"/></p>
+	      <p><xsl:value-of select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@description"/></p>
             <p class="legende">
 <xsl:for-each select="../felder/feld">
 	<xsl:if test="(value !='' or sicht/@isFirstInGroup='false' or @isstandtoday='false')  and @varname != 'sort' and @varname != 'maxoffset' and value_caption != ''">
@@ -1051,15 +1051,15 @@ Platzhalter
 </script>
 </xsl:template>
 <xsl:template name="getChartModel">
-<xsl:param name="chart_id" />
+<xsl:param name="chart_uniquename" />
 <xsl:param name="useMiniatureIfAvailable" select="'true'"/> 
 <xsl:variable name="chartModel">
 <xsl:choose>
-<xsl:when test="$useMiniatureIfAvailable='true' and viz_charts/viz_chart[@tid=$chart_id]/@chartmodel_miniature !=''">
+<xsl:when test="$useMiniatureIfAvailable='true' and viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chartmodel_miniature !=''">
-<xsl:value-of select="viz_charts/viz_chart[@tid=$chart_id]/@chartmodel_miniature"/>
+<xsl:value-of select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chartmodel_miniature"/>
 </xsl:when>
 <xsl:otherwise>
-<xsl:value-of select="viz_charts/viz_chart[@tid=$chart_id]/@chartmodel"/>
+<xsl:value-of select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chartmodel"/>
 </xsl:otherwise>
 </xsl:choose>
 </xsl:variable>

superx/xml/viz_html_chart.xsl

@@ -107,7 +107,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
 
 <!--Beginn Selektions-Card-->
 <!--Beginn Berichtstitel, Pfad, Knopfleiste-->
-<section class="hero-body">
+<section class="hero-body has-background-light">
 <!--<div class="columns is-mobile is-left">
 <div class="card has-background-light">
 <div class="card-content">-->
@@ -387,9 +387,9 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
    <div id="ChartElementsDiv" style="display:none" class="box">
    
    <div class="field is-grouped">
-	<div class="label-container" lang="de"><span class="labelNormal">
+	<div class="label-container" lang="de"><span class="labelNormal has-tooltip-bottom" data-tooltip="Nur für Grafiktool Plot: Übersicht Grafikelemente, wählen Sie ein Element zum Bearbeiten, oder erzeugen einen neuen Grafikelementtyp. Sie können auch mehrere erzeugen bzw. entfernen mit dem + bzw - Button">
 	Grafikelement</span></div>
-	<div class="control has-tooltip-right" data-tooltip="Nur für Grafiktool Plot: Übersicht Grafikelemente, wählen Sie ein Element zum Bearbeiten, oder erzeugen einen neuen Grafikelementtyp. Sie können auch mehrere erzeugen bzw. entfernen mit dem + bzw - Button">
+	<div class="control">
 	<div class="field"><div class="control is-expanded">
 	<div class="select  is-small is-fullwidth is-focused">
 	<select  id="chartElementID" name="chartElementID" 

superx/xml/viz_html_chart_viewer.xsl

@@ -129,7 +129,7 @@ Formel: ANZ / 2 kaufm. gerundet
 
 <xsl:for-each select="ergebnisse/ergebnis[felder/feld[@varname='Grafik']/value!='']/ergebniselement">
 <xsl:variable name="ergebniselement_counter" select="position()" />
-<xsl:variable name="chart_id"><xsl:value-of select="../felder/feld[@varname='Grafik']/value" /></xsl:variable>
+<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>
 
 
@@ -137,7 +137,7 @@ Formel: ANZ / 2 kaufm. gerundet
 <div>
 <xsl:attribute name="class"><xsl:text>column is-</xsl:text><xsl:value-of select="$colwidth"/></xsl:attribute>
 <xsl:call-template name="viewer_kachel">
-<xsl:with-param name="caption" select="viz_charts/viz_chart[@tid=$chart_id]/@caption"/>
+<xsl:with-param name="caption" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@caption"/>
 <xsl:with-param name="ergebniselement_ordnr" select="$ergebniselement_ordnr" />
 </xsl:call-template>
 <!--<p><xsl:value-of select="concat($spalten_anz,'-',$ergebniselement_counter,':',$ergebniselement_counter mod $spalten_anz)"/></p>-->
@@ -185,12 +185,12 @@ var myDiv="";
 ]]></xsl:text>
 <xsl:for-each select="ergebnisse">
 <xsl:for-each select="ergebnis/ergebniselement">
-<xsl:variable name="chart_id"><xsl:value-of select="../felder/feld[@varname='Grafik']/value" /></xsl:variable>
+<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:if test="$chart_id != ''">
+<xsl:if test="$chart_uniquename != ''">
 <xsl:text><![CDATA[
 myChartModelStr=']]></xsl:text>
-<xsl:value-of select="translate(viz_charts/viz_chart[@tid=$chart_id]/@chartmodel,'§',$quote)" />
+<xsl:value-of select="translate(viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chartmodel,'§',$quote)" />
 <xsl:text><![CDATA[';
 myDiv="]]></xsl:text>
 <xsl:value-of select="concat('chartDiv',$ergebniselement_ordnr)" />

superx/xml/viz_html_chart_viewer_grid.xsl

@@ -135,7 +135,7 @@ Formel: ANZ / 2 kaufm. gerundet
 
 <xsl:for-each select="ergebnisse/ergebnis[felder/feld[@varname='Grafik']/value!='']/ergebniselement">
 <xsl:variable name="ergebniselement_counter" select="position()" />
-<xsl:variable name="chart_id"><xsl:value-of select="../felder/feld[@varname='Grafik']/value" /></xsl:variable>
+<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>
 
 
@@ -143,7 +143,7 @@ Formel: ANZ / 2 kaufm. gerundet
 <div>
 <xsl:attribute name="class"><xsl:text>column is-</xsl:text><xsl:value-of select="$colwidth"/></xsl:attribute>
 <xsl:call-template name="viewer_kachel">
-<xsl:with-param name="caption" select="viz_charts/viz_chart[@tid=$chart_id]/@caption"/>
+<xsl:with-param name="caption" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@caption"/>
 <xsl:with-param name="ergebniselement_ordnr" select="$ergebniselement_ordnr" />
 </xsl:call-template>
 <!--<p><xsl:value-of select="concat($spalten_anz,'-',$ergebniselement_counter,':',$ergebniselement_counter mod $spalten_anz)"/></p>-->
@@ -198,13 +198,13 @@ var myDiv="";
 ]]></xsl:text>
 <xsl:for-each select="ergebnisse">
 <xsl:for-each select="ergebnis/ergebniselement">
-<xsl:variable name="chart_id"><xsl:value-of select="../felder/feld[@varname='Grafik']/value" /></xsl:variable>
+<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:if test="$chart_id != ''">
+<xsl:if test="$chart_uniquename != ''">
 <xsl:text>
 myChartModelStr='</xsl:text>
 <xsl:call-template name="getChartModel">
-<xsl:with-param name="chart_id" select="$chart_id"/>
+<xsl:with-param name="chart_uniquename" select="$chart_uniquename"/>
 <xsl:with-param name="useMiniatureIfAvailable" select="'true'"/> 
 </xsl:call-template>
 <xsl:text>';
@@ -217,7 +217,7 @@ myDiv="]]></xsl:text>
 <xsl:text>";
 myChartModelStr='</xsl:text>
 <xsl:call-template name="getChartModel">
-<xsl:with-param name="chart_id" select="$chart_id"/>
+<xsl:with-param name="chart_uniquename" select="$chart_uniquename"/>
 <xsl:with-param name="useMiniatureIfAvailable" select="'false'"/> 
 </xsl:call-template>
 <xsl:text>';
@@ -228,7 +228,7 @@ myDiv="</xsl:text>
 <xsl:text>";
 myChartModelStr='</xsl:text>
 <xsl:call-template name="getChartModel">
-<xsl:with-param name="chart_id" select="$chart_id"/>
+<xsl:with-param name="chart_uniquename" select="$chart_uniquename"/>
 <xsl:with-param name="useMiniatureIfAvailable" select="'false'"/> 
 </xsl:call-template>
 <xsl:text>';

superx/xml/viz_html_chart_viewer_grid_hms.xsl

@@ -0,0 +1,266 @@
+<?xml version="1.0"  encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util.HtmlUtils">
+<xsl:import href="resultset_html.xsl" />
+<xsl:import href="interLinks_html.xsl" />
+<xsl:import href="nd_templates.xsl" />
+<xsl:import href="pageComponents_html.xsl" />
+<xsl:import href="viz_components.xsl" />
+<!--In diesem Stylesheet können Sie individuelle templates unterbringen,
+  die in ihrer Präzedenz das normale Stylesheet 
+  pageComponents_html.xsl überragt. --> 
+<xsl:import href="pageComponents_html_final.xsl" />
+
+<xsl:decimal-format name="German" grouping-separator="." NaN="" zero-digit ="0" decimal-separator="," />
+
+                                                      <!-- wichtig für DOJO!-->
+<xsl:output method="xml"    media-type="text/html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+   doctype-system="DTD/xhtml1-strict.dtd"    cdata-section-elements="script style"    indent="yes" encoding="UTF-8"/>
+
+<xsl:variable name="colon"><xsl:text>'</xsl:text></xsl:variable>
+<xsl:variable name="quote"><xsl:text>"</xsl:text></xsl:variable>
+
+<xsl:variable name="defaultRenderer" select="'plot'" />
+<xsl:variable name="availableRendererPlot" select="'true'" />
+<xsl:variable name="availableRendererD3" select="'true'" />
+
+<xsl:template match="/">
+<xsl:variable name="maskenname">
+<xsl:choose>
+<xsl:when test="/ergebnisse/@isMakro='true'">
+<xsl:value-of select="/ergebnisse/makro/name" />
+</xsl:when>
+<xsl:otherwise>
+<xsl:value-of select="/ergebnisse/ergebnis/maskenname" />
+</xsl:otherwise>
+</xsl:choose>
+</xsl:variable>
+<html>
+<head>
+    <xsl:call-template name="nd_htmlhead">
+    <xsl:with-param name="title" select="concat('Tabelle ',$maskenname)" />
+    </xsl:call-template> 
+
+    <link rel="stylesheet" href="../style/sx_tabelle.css" />
+    <!--<link rel="stylesheet" href="../style/superx.css" />-->
+    
+</head>
+<xsl:call-template name="nd_htmlscript" />
+<xsl:call-template name="nd_tableJavascript" />
+<xsl:call-template name="nd_tableCSS" />
+<xsl:call-template name="importVizJavascriptLibsViewer"></xsl:call-template> 
+
+<body  class="has-navbar-fixed-top" onload="document.getElementById('progressbar').style.display='none';initPage();"> 
+<!--#Template Beginn Top-Navigation-->
+<!--<xsl:call-template name="nd_navi_top" />--> 
+<!--#Template Ende Top-Navigation-->
+
+<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 -->
+<xsl:for-each select="/ergebnisse">
+<xsl:call-template name="nd_navi_panel" />
+</xsl:for-each>
+</xsl:if>
+<!--#Template Ende Navigations-Panel Auswertungen-->
+
+<!--Beginn Seitentitel, Krümelpfad, Knopfleiste, Legende, Erläuterung-->
+<section class="hero-body">
+<div class="container"> 
+<div class="columns is-mobile is-left">
+<div class="column is-full">
+<div class="card "> 
+<div class="card-content">
+
+<xsl:call-template name="nd_progressbar" /> 
+
+<xsl:call-template name="viz_viewer_columnwise"/>
+<xsl:call-template name="bottombar" />
+ <xsl:comment>customfooter</xsl:comment>
+ </div> <!--Ende content -->
+</div> <!--Ende card-content-->
+</div> <!--Ende card-background -->
+</div> <!--Ende column-->
+</div> <!--Ende hero-columns-->
+
+</section> <!--Ende hero = Berichts-Card-->
+</div> <!--Ende site-columns-->
+<xsl:call-template name="modalCards" />
+</body>
+<!-- end body -->
+</html>
+</xsl:template>
+<!-- end main -->
+
+
+
+
+
+
+<xsl:template name="viz_viewer_columnwise">
+<xsl:if test="/ergebnisse/@isMakro='true'">
+<h1><xsl:value-of select="/ergebnisse/makro/name" /></h1>
+</xsl:if>
+<p></p>
+<xsl:call-template name="buildVizMetadata" />
+
+<!-- end Kopf-->
+<!-- start Grafiken-->
+<!-- Berechne den Umbruch der Spalten für die Kacheln
+z.B. 6 Grafiken ergibt einen Umbruch nach der 3. Teiltabelle
+Formel: ANZ / 2 kaufm. gerundet 
+-->
+<xsl:variable name="spalten_anz">
+<xsl:value-of select="max(number(/ergebnisse/ergebnis/felder/feld[@varname='Spaltenanzahl']/value))"/>
+</xsl:variable>
+<xsl:variable name="colwidth">
+<xsl:value-of select="12 div $spalten_anz"/>
+</xsl:variable>
+
+<xsl:variable name="ergebniselemente_anz">
+<xsl:value-of select="count(/ergebnisse/ergebnis[felder/feld[@varname='Grafik']])"/>
+</xsl:variable>
+<xsl:variable name="ergebniselemente_umbruch">
+<xsl:value-of select="round($ergebniselemente_anz div max(number(/ergebnisse/ergebnis/felder/feld[@varname='Spaltenanzahl']/value)))"/>
+</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 has-background-light">
+<section class="container"> <!--Beginn Kartenreihe -->
+<div class="columns features is-mobile is-left"> <!--Beginn columns Kartenreihe -->
+
+<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>
+
+
+<!--<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>
+<h2><xsl:value-of select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@caption"/></h2>
+
+<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:call-template>
+<!--<p><xsl:value-of select="concat($spalten_anz,'-',$ergebniselement_counter,':',$ergebniselement_counter mod $spalten_anz)"/></p>-->
+</div>
+<!-- neue Zeile wenn counter mod Spaltenanz. =0 -->
+
+<!--<xsl:if test="$ergebniselement_counter &gt;= $spalten_anz and ($ergebniselement_counter mod $spalten_anz) =0">-->
+<xsl:text disable-output-escaping="yes"><![CDATA[
+</div>
+</section>
+<hr />
+<section class="container">
+<div class="columns features is-mobile is-left">
+]]></xsl:text>
+<!--</xsl:if>-->
+</xsl:for-each>
+</div><!-- der columns -->
+</section><!-- der letzten Kartenreihe -->
+</section><!-- des Portals -->
+</xsl:template>	
+<!--<xsl:template name="viewer_kachel">
+<xsl:param name="caption" />
+<xsl:param name="ergebniselement_ordnr" />
+<div class="card is-shady">
+<div class="card-image">
+<div id="{concat('chartDiv',$ergebniselement_ordnr)}">
+Platzhalter
+</div>
+</div>
+<p>
+<a onClick="{concat('javascript:openModalImage(',$ergebniselement_ordnr,');')}">
+<span class="button is-success is-small modal-button">Vergrößern ...</span></a>
+ 
+<a onClick="{concat('javascript:openModalCardDetail(',$ergebniselement_ordnr,');')}">
+<span class="button is-link is-small modal-button">Mehr Infos ...</span></a>
+
+</p>
+
+              </div>
+
+</xsl:template>-->
+<xsl:template name="importVizJavascriptLibsViewer">
+<script language="Javascript" type="text/javascript" src="../xml/js/jquery-2.1.1.min.js" />
+<script language="JavaScript" type="text/javascript" src="../xml/js/memtext/sx_functions.js"></script>
+<xsl:call-template name="tableJavascript_viz" />
+<script language="Javascript" type="text/javascript">
+<xsl:text><![CDATA[
+
+function initPage()
+{
+var myChartModelStr="";
+var myDiv="";
+]]></xsl:text>
+<xsl:for-each select="ergebnisse">
+<xsl:for-each select="ergebnis/ergebniselement">
+<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:if test="$chart_uniquename != ''">
+<xsl:text>
+myChartModelStr='</xsl:text>
+<xsl:call-template name="getChartModel">
+<xsl:with-param name="chart_uniquename" select="$chart_uniquename"/>
+<xsl:with-param name="useMiniatureIfAvailable" select="'true'"/> 
+</xsl:call-template>
+<xsl:text>';
+myDiv="</xsl:text>
+<xsl:value-of select="concat('chartDiv',$ergebniselement_ordnr)" />
+<xsl:text><![CDATA[";
+createViewer(myChartModelStr,myDiv);
+myDiv="]]></xsl:text>
+<xsl:value-of select="concat('modalCardImage',$ergebniselement_ordnr)" />
+<xsl:text>";
+myChartModelStr='</xsl:text>
+<xsl:call-template name="getChartModel">
+<xsl:with-param name="chart_uniquename" select="$chart_uniquename"/>
+<xsl:with-param name="useMiniatureIfAvailable" select="'false'"/> 
+</xsl:call-template>
+<xsl:text>';
+
+createViewer(myChartModelStr,myDiv);
+myDiv="</xsl:text>
+<xsl:value-of select="concat('modalCardDetailImage',$ergebniselement_ordnr)" />
+<xsl:text>";
+myChartModelStr='</xsl:text>
+<xsl:call-template name="getChartModel">
+<xsl:with-param name="chart_uniquename" select="$chart_uniquename"/>
+<xsl:with-param name="useMiniatureIfAvailable" select="'false'"/> 
+</xsl:call-template>
+<xsl:text>';
+createViewer(myChartModelStr,myDiv);
+</xsl:text>
+</xsl:if>
+</xsl:for-each>
+</xsl:for-each>
+<xsl:text><![CDATA[
+}
+
+function createViewer(myChartModelStr,chartDiv)
+{
+myChartModel=JSON.parse(myChartModelStr);
+renderChart(chartDiv,myChartModel);
+}
+
+function toggleLegendeDisplay(legendeDiv)
+{
+var myDiv=document.getElementById(legendeDiv);
+if(myDiv.style.display=="block")
+		myDiv.style.display="none";
+	else
+		myDiv.style.display="block";
+
+}
+
+]]></xsl:text>
+</script>
+
+</xsl:template>
+</xsl:stylesheet>

superx/xml/viz_html_chart_viewer_mask.xsl

@@ -129,7 +129,7 @@ Formel: ANZ / 2 kaufm. gerundet
 
 <xsl:for-each select="/ergebnisse/ergebnis[felder/feld[@varname='Grafik']/value!='']/ergebniselement">
 <xsl:variable name="ergebniselement_counter" select="position()" />
-<xsl:variable name="chart_id"><xsl:value-of select="../felder/feld[@varname='Grafik']/value" /></xsl:variable>
+<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>
 
 
@@ -137,7 +137,7 @@ Formel: ANZ / 2 kaufm. gerundet
 <div>
 <xsl:attribute name="class"><xsl:text>column is-</xsl:text><xsl:value-of select="$colwidth"/></xsl:attribute>
 <xsl:call-template name="viewer_kachel">
-<xsl:with-param name="caption" select="viz_charts/viz_chart[@tid=$chart_id]/@caption"/>
+<xsl:with-param name="caption" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@caption"/>
 <xsl:with-param name="ergebniselement_ordnr" select="$ergebniselement_ordnr" />
 </xsl:call-template>
 <!--<p><xsl:value-of select="concat($spalten_anz,'-',$ergebniselement_counter,':',$ergebniselement_counter mod $spalten_anz)"/></p>-->
@@ -185,12 +185,12 @@ var myDiv="";
 ]]></xsl:text>
 <xsl:for-each select="ergebnisse">
 <xsl:for-each select="ergebnis/ergebniselement">
-<xsl:variable name="chart_id"><xsl:value-of select="../felder/feld[@varname='Grafik']/value" /></xsl:variable>
+<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:if test="$chart_id != ''">
+<xsl:if test="$chart_uniquename != ''">
 <xsl:text><![CDATA[
 myChartModelStr=']]></xsl:text>
-<xsl:value-of select="translate(viz_charts/viz_chart[@tid=$chart_id]/@chartmodel,'§',$quote)" />
+<xsl:value-of select="translate(viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chartmodel,'§',$quote)" />
 <xsl:text><![CDATA[';
 myDiv="]]></xsl:text>
 <xsl:value-of select="concat('chartDiv',$ergebniselement_ordnr)" />

superx/xml/viz_html_chart_viewer_mask_and_table.xsl

@@ -0,0 +1,261 @@
+<?xml version="1.0"  encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util.HtmlUtils">
+<xsl:import href="resultset_html.xsl" />
+<xsl:import href="interLinks_html.xsl" />
+<xsl:import href="nd_templates.xsl" />
+<xsl:import href="pageComponents_html.xsl" />
+<xsl:import href="viz_components.xsl" />
+<!--In diesem Stylesheet können Sie individuelle templates unterbringen,
+  die in ihrer Präzedenz das normale Stylesheet 
+  pageComponents_html.xsl überragt. --> 
+<xsl:import href="pageComponents_html_final.xsl" />
+
+<xsl:decimal-format name="German" grouping-separator="." NaN="" zero-digit ="0" decimal-separator="," />
+
+                                                      <!-- wichtig für DOJO!-->
+<xsl:output method="xml"    media-type="text/html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+   doctype-system="DTD/xhtml1-strict.dtd"    cdata-section-elements="script style"    indent="yes" encoding="UTF-8"/>
+
+<xsl:variable name="colon"><xsl:text>'</xsl:text></xsl:variable>
+<xsl:variable name="quote"><xsl:text>"</xsl:text></xsl:variable>
+<xsl:variable name="colwidth"><xsl:text>is-full</xsl:text></xsl:variable>
+
+<xsl:variable name="defaultRenderer" select="'plot'" />
+<xsl:variable name="availableRendererPlot" select="'true'" />
+<xsl:variable name="availableRendererD3" select="'true'" />
+
+<xsl:template match="/">
+<xsl:variable name="maskenname">
+<xsl:choose>
+<xsl:when test="/ergebnisse/@isMakro='true'">
+<xsl:value-of select="/ergebnisse/makro/name" />
+</xsl:when>
+<xsl:otherwise>
+<xsl:value-of select="/ergebnisse/ergebnis/maskenname" />
+</xsl:otherwise>
+</xsl:choose>
+</xsl:variable>
+<html>
+<head>
+    <xsl:call-template name="nd_htmlhead">
+    <xsl:with-param name="title" select="concat('Tabelle ',$maskenname)" />
+    </xsl:call-template> 
+
+    <link rel="stylesheet" href="../style/sx_tabelle.css" />
+    <!--<link rel="stylesheet" href="../style/superx.css" />-->
+    
+</head>
+<xsl:call-template name="nd_htmlscript" />
+<xsl:call-template name="nd_tableJavascript" />
+<xsl:call-template name="nd_tableCSS" />
+<xsl:call-template name="importVizJavascriptLibsViewer"></xsl:call-template> 
+<xsl:call-template name="tableMaskenfelderJS" />
+
+<body  class="has-navbar-fixed-top" onload="document.getElementById('progressbar').style.display='none';initPage();"> 
+<!--#Template Beginn Top-Navigation-->
+<xsl:call-template name="nd_navi_top" /> 
+<!--#Template Ende Top-Navigation-->
+
+<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 -->
+<xsl:for-each select="/ergebnisse">
+<!--kein Navi Panel bei Maskenfeldern <xsl:call-template name="nd_navi_panel" />-->
+</xsl:for-each>
+</xsl:if>
+<!--#Template Ende Navigations-Panel Auswertungen-->
+
+<!--Beginn Seitentitel, Krümelpfad, Knopfleiste, Legende, Erläuterung-->
+<section class="hero-body">
+<div class="container"> 
+<div class="columns is-mobile is-left">
+<div class="column is-two-thirds">
+<div class="card "> 
+<div class="card-content">
+
+<xsl:call-template name="nd_progressbar" /> 
+
+<xsl:call-template name="viz_viewer"/>
+<!-- jetzt Tabelle-->
+<div style="margin-left:50px">
+<xsl:for-each select="/ergebnisse/ergebnis/ergebniselement">
+<p class="teiltabelle_titel">
+<xsl:text>Tabelle </xsl:text><a onclick="{concat('toggleTableVisibility(',$colon,'toggleBtnTable',@ordnr+1, $colon,',',$colon, 'table',@ordnr+1,$colon,');')}"> <img  id="{concat('toggleBtnTable',@ordnr+1)}" src="../images/minus-circled.svg" height="10px" border="0" /></a></p>
+
+<xsl:call-template name="nd_singleTable">
+<xsl:with-param name="ergebniselement_ordnr" select="@ordnr" />
+<xsl:with-param name="showPager" select="'none'" />
+</xsl:call-template>
+</xsl:for-each>
+</div>
+<xsl:call-template name="bottombar" />
+ <xsl:comment>customfooter</xsl:comment>
+ </div> <!--Ende content -->
+</div> <!--Ende card-content-->
+</div> <!--Ende card-background -->
+
+<div class="column">
+<xsl:if test="count(/ergebnisse/ergebnis[@ordnr='0']/completefields/feld[@art='1']) &gt; 0">
+<xsl:call-template name="renderTableDialogs" />
+</xsl:if>
+</div>
+</div> <!--Ende column-->
+</div> <!--Ende hero-columns-->
+
+</section> <!--Ende hero = Berichts-Card-->
+</div> <!--Ende site-columns-->
+<xsl:call-template name="modalCards" />
+</body>
+<!-- end body -->
+</html>
+</xsl:template>
+<!-- end main -->
+
+
+
+
+
+
+<xsl:template name="viz_viewer">
+<xsl:param name="show_maskenfelder" select="'true'" />
+<xsl:variable name="pageTitle">
+<xsl:choose>
+<xsl:when test="/ergebnisse/@isMakro='true'">
+<xsl:value-of select="/ergebnisse/makro/name" />
+</xsl:when>
+<xsl:otherwise>
+<xsl:value-of select="/ergebnisse/ergebnis[@ordnr='0']/maskenname" />
+</xsl:otherwise>
+</xsl:choose>
+</xsl:variable>
+
+<xsl:call-template name="buildVizMetadata" />
+
+<!-- end Kopf-->
+<!-- start Grafiken-->
+<!-- Berechne den Umbruch der Spalten für die Kacheln
+z.B. 6 Grafiken ergibt einen Umbruch nach der 3. Teiltabelle
+Formel: ANZ / 2 kaufm. gerundet 
+-->
+<span class="separator">&#160;</span>
+<!--Beginn Selektions-Card-->
+<!--Beginn Berichtstitel, Pfad, Knopfleiste-->
+<section class="hero-body has-background-light">
+<xsl:call-template name="nd_pagetitle">
+<xsl:with-param name="title" select="$pageTitle" />
+<xsl:with-param name="subtitle" />
+<xsl:with-param name="icon_classname" />
+</xsl:call-template>
+
+<section class="container"> <!--Beginn Kartenreihe -->
+<div class="columns features is-mobile is-left"> <!--Beginn columns Kartenreihe -->
+
+<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>
+
+
+<!--<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>
+<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:call-template>
+<!--<p><xsl:value-of select="concat($spalten_anz,'-',$ergebniselement_counter,':',$ergebniselement_counter mod $spalten_anz)"/></p>-->
+</div>
+<!-- neue Zeile wenn counter mod Spaltenanz. =0 -->
+
+
+</xsl:for-each>
+</div><!-- der columns -->
+</section><!-- der letzten Kartenreihe -->
+</section><!-- des Portals -->
+</xsl:template>	
+<!--<xsl:template name="viewer_kachel">
+<xsl:param name="caption" />
+<xsl:param name="ergebniselement_ordnr" />
+<div class="card is-shady">
+<div class="card-image">
+<div id="{concat('chartDiv',$ergebniselement_ordnr)}">
+Platzhalter
+</div>
+</div>
+<p>
+<a onClick="{concat('javascript:openModalImage(',$ergebniselement_ordnr,');')}">
+<span class="button is-success is-small modal-button">Vergrößern ...</span></a>
+ 
+<a onClick="{concat('javascript:openModalCardDetail(',$ergebniselement_ordnr,');')}">
+<span class="button is-link is-small modal-button">Mehr Infos ...</span></a>
+
+</p>
+
+              </div>
+
+</xsl:template>-->
+<xsl:template name="importVizJavascriptLibsViewer">
+<script language="Javascript" type="text/javascript" src="../xml/js/jquery-2.1.1.min.js" />
+<script language="JavaScript" type="text/javascript" src="../xml/js/memtext/sx_functions.js"></script>
+<xsl:call-template name="tableJavascript_viz" />
+<script language="Javascript" type="text/javascript">
+<xsl:text><![CDATA[
+
+function initPage()
+{
+var myChartModelStr="";
+var myDiv="";
+]]></xsl:text>
+<xsl:for-each select="ergebnisse">
+<xsl:for-each select="ergebnis/ergebniselement">
+<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:if test="$chart_uniquename != ''">
+<xsl:text><![CDATA[
+myChartModelStr=']]></xsl:text>
+<xsl:value-of select="translate(viz_charts/viz_chart[@uniquename=$chart_uniquename]/@chartmodel,'§',$quote)" />
+<xsl:text><![CDATA[';
+myDiv="]]></xsl:text>
+<xsl:value-of select="concat('chartDiv',$ergebniselement_ordnr)" />
+<xsl:text><![CDATA[";
+createViewer(myChartModelStr,myDiv);
+myDiv="]]></xsl:text>
+<xsl:value-of select="concat('modalCardImage',$ergebniselement_ordnr)" />
+<xsl:text><![CDATA[";
+createViewer(myChartModelStr,myDiv);
+myDiv="]]></xsl:text>
+<xsl:value-of select="concat('modalCardDetailImage',$ergebniselement_ordnr)" />
+<xsl:text><![CDATA[";
+createViewer(myChartModelStr,myDiv);
+
+]]></xsl:text>
+</xsl:if>
+</xsl:for-each>
+</xsl:for-each>
+<xsl:text><![CDATA[
+}
+
+function createViewer(myChartModelStr,chartDiv)
+{
+myChartModel=JSON.parse(myChartModelStr);
+renderChart(chartDiv,myChartModel);
+}
+
+function toggleLegendeDisplay(legendeDiv)
+{
+var myDiv=document.getElementById(legendeDiv);
+if(myDiv.style.display=="block")
+		myDiv.style.display="none";
+	else
+		myDiv.style.display="block";
+
+}
+
+]]></xsl:text>
+</script>
+
+</xsl:template>
+</xsl:stylesheet>