Dashboard Semesterkonstente #7

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

@@ -669,6 +669,8 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen </the
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_type_fuellen.sql" database=""/>
 -->
 <!--<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sx_jobs_fuellen.sql" database=""/>-->
+
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/konstanten_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sx_stylesheets_einfuegen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/macro_masken_bez_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_type_plot_fuellen.sql" database=""/>
@@ -690,6 +692,7 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen </the
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_bildungstyp_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_abgrp_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_la_fuellen.sql" database=""/>
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_geschl_dashboard_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_zeitreihe_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_abgrp_zeitreihe_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_in_rsz_zeitreihe_fuellen.sql" database=""/>
@@ -761,6 +764,7 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen </the
 <loadtable refresh="true" delimiter="^" header="false" tabname="viz_type_property"><file path="$VIZ_PFAD/schluesseltabellen/viz_type_property.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="viz_staat_isocode"><file path="$VIZ_PFAD/schluesseltabellen/viz_staat_isocode.unl"/></loadtable>
 
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/konstanten_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/sachgebiete_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/upgrade/viz_upgrade_man.sql" database=""/>
 
@@ -784,6 +788,7 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen </the
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_bildungstyp_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_abgrp_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_la_fuellen.sql" database=""/>
+<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_geschl_dashboard_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_zeitreihe_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_abgrp_zeitreihe_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_in_rsz_zeitreihe_fuellen.sql" database=""/>

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

@@ -1,5 +1,11 @@
 44020^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';^
-44021^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;^
+44021^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44022^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';^
 44023^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;^^^
 44024^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.';^
@@ -7,7 +13,13 @@
 44026^Weitere Tabellen^123^0^0^140^140^10^char^30^0^1^<<SQL>> select name,string_not_null(caption) || ' - ' || name from sx_tables where  name in ('dim_studiengang','dim_staat')\
 order by 2^^^
 44027^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^0^^^^
-44029^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;^
+44029^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44030^Filter Studierende^119^0^0^140^150^1^sql^20^0^1^<<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;^^^
 44031^Geschlecht^37^0^0^140^80^1^integer^30^0^1^<<SQL>> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^^^
 44032^Felder^125^0^0^150^190^10^char^30^0^1^<<SQL>>\

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

@@ -1,5 +1,11 @@
 44070^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';^
-44071^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;^
+44071^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44072^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';^
 44073^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^^
 44074^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.';^
@@ -10,7 +16,13 @@ union SELECT 3,'3-spaltig' from xdummy \
 union SELECT 4,'4-spaltig' from xdummy \
 order by 1;^^<<SQL>> SELECT 3,'3-spaltig' from xdummy^
 44077^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^13^^^^
-44079^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;^
+44079^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44080^Filter Studierende^119^0^0^140^150^1^sql^20^0^13^<<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;^^^
 44081^Geschlecht^37^0^0^140^80^1^integer^30^0^13^<<SQL>> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^^^
 44083^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;^^^

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

@@ -1,11 +1,23 @@
 44100^Köpfe oder Fälle ?^-3^0^0^130^150^1^sql^30^1^1^<<SQL>> select apnr, eintrag from koepfe_oder_faelle;^hidden^<<SQL>> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Köpfe';^
-44101^Seit Semester^1^0^0^130^80^1^integer^30^1^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^^<<SQL>> select tid,eintrag from semester where today()-(3*365) between sem_beginn  and sem_ende;^
+44101^Seit Semester^1^0^0^130^80^1^integer^30^1^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^^<<SQL>> select tid,eintrag from semester where today()-(3*365) between sem_beginn  and sem_ende;^
 44102^Fächer^6^0^0^130^200^6^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^^^
 44103^bis Fachsemester^23^330^-1^130^100^1^integer^30^0^0^^hidden^^
 44104^Hörerstatus^18^0^0^130^150^1^sql^30^0^1^<<SQL>> select apnr, eintrag from hoererstatus order by 2^hidden^<<SQL>> select apnr, eintrag from hoererstatus  where eintrag='alle';^
 44105^Stichtag^-2^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';^
 44106^Status^11^330^-1^130^180^1^sql^30^0^1^<<SQL>> select apnr,eintrag from sos_status order by 2^hidden^<<SQL>> select apnr,eintrag from sos_status where eintrag='Alle ohne Beurl.';^
-44107^Bis Semester^3^330^-1^130^100^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;^
+44107^Bis Semester^3^330^-1^130^100^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44108^Abschluss^5^0^0^130^150^5^char^30^0^1^<<SQL>> select apnr,  trim(druck) || ' (' || trim(apnr) || ')'  from cifx where key = 35 order by 2;^^^
 44109^Fachkennz.^16^330^-1^130^150^1^char^30^0^1^<<SQL>> select apnr,druck from sos_k_kzfa order by 2^hidden^^
 44110^Vertiefung^7^330^-1^130^100^1^char^30^0^1^<<SQL>> select apnr,druck  from cifx where key=39  order by 2;^hidden^^

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

@@ -13,13 +13,25 @@ and R.systeminfo_id=7)\
 and uniquename in ('sos_stud_nach_alter')\
 order by sortnr, caption\
  ;^
-44131^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;^
+44131^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44132^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;^ ^ ^
 44133^Abschluss^40^0^0^100^200^3^char^1500^0^1^<<SQL>> select apnr, druck from cifx where key=35 order by 2;^ ^ ^
 44134^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^0^^ ^ ^
 44135^Semestertyp^22^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^
 44136^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^1^hs_zugangsber^apnr, eintrag^ ^
-44137^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;^
+44137^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44138^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;^ ^ ^
 44139^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;^ ^ ^
 44140^Grafik^4000^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;^

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

@@ -1,8 +1,20 @@
 44160^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^13^<<SQL>> select apnr, eintrag from koepfe_oder_faelle order by 2^hidden^<<SQL>> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^
-44161^Seit Semester^3^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()-(3*365) between sem_beginn  and sem_ende;^
+44161^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today()-(3*365) between sem_beginn  and sem_ende;^
 44162^Fächer^9^0^0^100^200^6^char^30^0^12^<<SQL>> select tid from sichten where art='Fächer-Sicht' order by sortnr^ ^ ^
 44163^Staatsangehörigkeit^35^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;^ ^ ^
-44164^Bis Semester^4^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;^
+44164^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44165^Abschluss^12^0^0^100^100^6^char^30^0^1^<<SQL>> select apnr, druck from cifx where key=35 order by druck;^hidden^ ^
 44166^Weitere Tabellen^123^0^0^140^140^3^char^30^0^1^<<SQL>> \
 --freemarker template\

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

@@ -1,5 +1,11 @@
 44190^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';^
-44191^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;^
+44191^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44192^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';^
 44193^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^^
 44194^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.';^
@@ -11,7 +17,13 @@ union SELECT 3,'3-spaltig' from xdummy \
 union SELECT 4,'4-spaltig' from xdummy \
 order by 1;^^<<SQL>> SELECT 2,'2-spaltig' from xdummy^
 44197^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^0^ ^^^
-44199^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;^
+44199^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44200^Filter Studierende^100^0^0^140^150^1^sql^20^0^1^<<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;^^^
 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;^^^
 44202^Tabnr.^1000^0^0^140^80^1^integer^30^0^13^ ^^^
@@ -23,6 +35,6 @@ order by 1;^^<<SQL>> SELECT 2,'2-spaltig' from xdummy^
 44208^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
 44209^Semestertyp^5^350^-1^140^80^1^integer^255^0^1^<<SQL>> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^Eintrag^<<SQL>>  select 2,'nur Wintersemester' from xdummy^
 44210^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^
-44211^Abschluss^7^0^0^140^170^5^char^30^0^1^<<SQL>> select abint,dtxt from k_abint order by 2;^^^
+44211^Abschluss^7^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
 44212^Kachelhöhe^310^0^0^100^15^1^integer^5000^0^0^^^600^
 44213^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^

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

@@ -13,13 +13,25 @@ and R.systeminfo_id=7)\
 and uniquename in ('sos_stud_geschl_dashboard')\
 order by sortnr, caption limit 1\
  ;^
-44221^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;^
+44221^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 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;^ ^ ^
+44223^Abschluss^7^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
 44224^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^ ^
 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^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<<SQL>> select 1,'ja' from xdummy^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;^
+44227^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+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=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^

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

@@ -2,24 +2,36 @@
 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_dashboard')\
+where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat_dashboard','sos_stud_astat')\
 and R.systeminfo_id=7)\
 and uniquename like  'sos_stud_ca12_staat%' or uniquename like 'sos_stud_hzb_staat%'\
 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 in ('sos_stud_astat_dashboard')\
+where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat_dashboard','sos_stud_astat')\
 and R.systeminfo_id=7)\
-and uniquename like 'sos_stud_hzb_staat%'\
+and uniquename like  'sos_stud_ca12_staat%' or uniquename like 'sos_stud_hzb_staat%'\
 order by sortnr, caption\
 limit 1\
  ;^
-44251^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;^
+44251^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 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^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;^
-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;^
+44257^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+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;^ ^ ^
 44259^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;^ ^ ^
 44260^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=44250 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/44280_felderinfo.unl

@@ -13,13 +13,25 @@ and R.systeminfo_id=7)\
 and uniquename in ('sos_stud_fak_dashboard')\
 order by sortnr, caption limit 1\
  ;^
-44281^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;^
+44281^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 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;^ ^ ^
+44283^Abschluss^40^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
 44284^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^ ^
 44285^Grafik^4000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44280 and chart_active=1 order by 2;^^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44280  and chart_active=1 order by 2 limit 1;^
 44286^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<<SQL>> select 1,'ja' from xdummy^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;^
+44287^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+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=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^

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

@@ -13,13 +13,25 @@ and R.systeminfo_id=7)\
 and uniquename in ('sos_stud_abgrp_dashboard')\
 order by sortnr, caption limit 1\
  ;^
-44311^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;^
+44311^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44312^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;^ ^ ^
-44313^Abschluss^40^0^0^100^200^3^char^1500^0^1^<<SQL>> select apnr, druck from cifx where key=35 order by 2;^ ^ ^
+44313^Abschluss^40^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
 44314^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^ ^
 44315^Grafik^4000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44310 and chart_active=1 order by 2;^^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44310  and chart_active=1 order by 2 limit 1;^
 44316^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<<SQL>> select 1,'ja' from xdummy^Eintrag^ ^
-44317^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;^
+44317^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44318^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;^ ^ ^
 44319^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;^ ^ ^
 44320^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=44310 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=44310 order by ord limit 1^

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

@@ -13,13 +13,25 @@ and R.systeminfo_id=7)\
 and uniquename in ('sos_stud_bildungstyp_dashboard')\
 order by sortnr, caption limit 1\
  ;^
-44341^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;^
+44341^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44342^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;^ ^ ^
-44343^Abschluss^40^0^0^100^200^3^char^1500^0^1^<<SQL>> select apnr, druck from cifx where key=35 order by 2;^ ^ ^
+44343^Abschluss^40^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
 44344^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^13^^ ^ ^
 44345^Grafik^4000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44340 and chart_active=1 order by 2;^^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44340  and chart_active=1 order by 2 limit 1;^
 44346^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<<SQL>> select 1,'ja' from xdummy^Eintrag^ ^
-44347^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;^
+44347^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44348^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;^ ^ ^
 44349^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;^ ^ ^
 44350^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=44340 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=44340 order by ord limit 1^

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

@@ -9,13 +9,25 @@ order by sortnr, 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_jahr';^
-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;^
+44511^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+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^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;^
+44517^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+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;^ ^ ^
 44519^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;^ ^ ^
 44520^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=44510 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=44510 order by ord limit 1^

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

@@ -1,12 +1,24 @@
 44540^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^50^1^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';^
-44541^Seit Semester^3^0^0^140^80^1^integer^30^1^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;^
+44541^Seit Semester^3^0^0^140^80^1^integer^30^1^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44542^Stichtag^1^350^-1^140^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';^
 44543^Fächer^8^0^0^140^200^6^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^^^
 44544^Status^10^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.';^
 44545^Hörerstatus^15^0^0^140^170^1^sql^30^1^1^<<SQL>> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<<SQL>> select apnr, eintrag from hoererstatus  where eintrag='alle';^
 44547^bis Fachsemester^16^350^-1^140^100^1^integer^30^0^0^^^^
 44548^Abschluss^7^350^-1^140^190^4^char^30^0^12^<<SQL>> select tid from sichten where art='SOS-Abschluss-Sicht' order by 1;^^^
-44549^Bis Semester^4^350^-1^140^80^1^integer^30^1^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;^
+44549^Bis Semester^4^350^-1^140^80^1^integer^30^1^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44550^Filter Studierende^120^350^-1^140^150^1^sql^20^0^1^<<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;^^^
 44551^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<<SQL>> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^^^
 44552^Filter bis Ebene^125^0^0^140^20^1^integer^30^0^0^^^^

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

@@ -1,11 +1,23 @@
 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;^
+44571^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+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;^
+44579^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+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^1^<<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;^^^
@@ -27,6 +39,6 @@ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='so
 and R.systeminfo_id=7) and uniquename='sos_stud_sem_dashboard';^
 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;^^^
+44591^Abschluss^7^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,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/44600_felderinfo.unl

@@ -13,13 +13,25 @@ and R.systeminfo_id=7)\
 and uniquename in ('sos_stud_hzb_bland_dashboard')\
 order by sortnr, caption limit 1\
  ;^
-44601^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;^
+44601^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44602^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;^ ^ ^
-44603^Abschluss^40^0^0^100^200^3^char^1500^0^1^<<SQL>> select apnr, druck from cifx where key=35 order by 2;^ ^ ^
+44603^Abschluss^40^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
 44604^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^0^^ ^ ^
 44605^Grafik^4000^300^-1^170^150^1^char^30^0^1^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44600 and chart_active=1 order by 2;^ ^<<SQL>> select uniquename, caption from viz_chart where maskeninfo_id=44600 and chart_active=1order by 2 limit 1;^
 44606^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<<SQL>> select 1,'ja' from xdummy^Eintrag^ ^
-44607^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;^
+44607^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44608^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;^ ^ ^
 44609^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;^ ^ ^
 44610^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=44600 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=44600 order by ord limit 1^

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

@@ -2,7 +2,13 @@
 44631^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;^^^
 44632^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
 44633^Tabnr.^1000^0^0^140^80^1^integer^30^0^13^ ^^^
-44634^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;^
+44634^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44635^Filter Studierende^100^0^0^140^150^1^sql^20^0^1^<<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;^hidden^^
 44636^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^0^^ ^ ^
 44645^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 in (44190,44660) order by ord^hidden^<<SQL>> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44190 order by ord limit 1^

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

@@ -1,5 +1,11 @@
 44660^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<<SQL>> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<<SQL>> select apnr, eintrag from koepfe_oder_faelle where eintrag='Köpfe';^
-44661^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today()-(3*365) between sem_beginn  and sem_ende;^
+44661^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today()-(3*365) between sem_beginn  and sem_ende;^
 44662^Stichtag^1^350^-1^140^100^1^sql^30^0^1^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende';^^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
 44663^Staatsangehörigkeit^36^0^0^130^150^10^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^hidden^^
 44664^Status^14^350^-1^140^180^1^sql^30^0^1^<<SQL>> select apnr,eintrag from sos_status order by 2^^<<SQL>> select apnr,eintrag from sos_status where eintrag='Alle ohne Beurl.';^
@@ -12,7 +18,13 @@ union SELECT 4,'4-spaltig' from xdummy \
 order by 1;^^<<SQL>> SELECT 3,'3-spaltig' from xdummy^
 44667^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^0^ ^^^
 44668^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<<SQL>> select 1,'ja' from xdummy^Eintrag^ ^
-44669^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;^
+44669^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44670^Filter Studierende^100^0^0^140^150^1^sql^20^0^1^<<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;^^^
 44671^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;^^^
 44672^Tabnr.^1000^0^0^140^80^1^integer^30^0^13^ ^^1^
@@ -24,6 +36,6 @@ order by 1;^^<<SQL>> SELECT 3,'3-spaltig' from xdummy^
 44678^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
 44679^Semestertyp^5^350^-1^140^80^1^integer^255^0^1^<<SQL>> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^Eintrag^<<SQL>>  select 2,'nur Wintersemester' from xdummy^
 44680^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^
-44681^Abschluss^7^0^0^140^170^5^char^30^0^1^<<SQL>> select abint,dtxt from k_abint order by 2;^^^
+44681^Abschluss^7^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
 44682^Kachelhöhe^310^0^0^100^15^1^integer^5000^0^0^^^400^
 44683^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^

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

@@ -1,5 +1,11 @@
 44690^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';^
-44691^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today()-(3*365) between sem_beginn  and sem_ende;^
+44691^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today()-(3*365) between sem_beginn  and sem_ende;^
 44692^Stichtag2^1^350^-1^140^100^1^sql^30^0^13^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende';^^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
 44693^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^^
 44694^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.';^
@@ -12,7 +18,13 @@ union SELECT 4,'4-spaltig' from xdummy \
 order by 1;^^<<SQL>> SELECT 3,'3-spaltig' from xdummy^
 44697^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^0^ ^^^
 44698^Nur Endsemester^1000^0^0^140^80^1^integer^30^0^1^<<SQL>> select 1,'ja' from xdummy^Eintrag^ ^
-44699^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;^
+44699^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template\
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44700^Filter Studierende^100^0^0^140^150^1^sql^20^0^1^<<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;^^^
 44701^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;^^^
 44702^Tabnr.^1000^0^0^140^80^1^integer^30^0^13^ ^^1^
@@ -24,6 +36,6 @@ order by 1;^^<<SQL>> SELECT 3,'3-spaltig' from xdummy^
 44708^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
 44709^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^
 44710^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^
-44711^Abschluss^7^0^0^140^170^5^char^30^0^1^<<SQL>> select abint,dtxt from k_abint order by 2;^^^
+44711^Abschluss^8^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
 44712^Kachelhöhe^310^0^0^100^15^1^integer^5000^0^0^^^300^
 44713^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^

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

@@ -1,11 +1,23 @@
 44720^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^ ^<<SQL>> select apnr, eintrag from koepfe_oder_faelle where eintrag='Fälle';^
-44721^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()-(4*365) between sem_beginn  and sem_ende;^
+44721^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today()-(4*365) between sem_beginn  and sem_ende;^
 44722^Stichtag^1^350^-1^140^100^1^sql^30^0^13^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Prüfungen';^^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Prüfungen' and appl_key='2';^
 44723^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^^
 44724^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.';^
 44725^Hörerstatus^33^0^0^140^170^1^sql^255^0^13^<<SQL>> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<<SQL>> select apnr, eintrag from hoererstatus  where eintrag='alle';^
 44727^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^13^^^^
-44729^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;^
+44729^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
+select tid, eintrag from semester \
+<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
+where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\
+</#if>\
+and  sem_beginn <=today()\
+order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 44730^Filter Studierende^119^0^0^140^150^1^sql^20^0^1^<<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;^hidden^^
 44731^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;^^^
 44733^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;^^^
@@ -26,6 +38,6 @@ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rp
 and R.systeminfo_id=7) and uniquename='rpta_sos_lab_aggr_sem';^
 44739^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^
 44740^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^
-44741^Abschluss^7^0^0^140^170^5^char^30^0^1^<<SQL>> select abint,dtxt from k_abint order by 2;^^^
+44741^Abschluss^7^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
 44742^Matrikel-Nr.^20^350^-1^150^180^1^char^200^0^13^^{InputCheck:matrikelnummern}^^
 44743^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^

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

@@ -107,7 +107,6 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
 <#assign filter="<<Köpfe oder Fälle ?>>\
 /* and sem_der_pruefung = <<Semester>> */\
 /* and stichtag = <<Stichtag>> */\
-/* and abschluss in (<<Abschluss>>) */\
 /* and geschlecht = <<Geschlecht>> */\
 /* and fach_sem_zahl <= <<bis Fachsemester>> */\
 /* and substring('' || sem_der_pruefung from 5 for 1)='<<Semestertyp>>' */\
@@ -121,6 +120,7 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
 <#assign filter = filter + " and 's_' || tid_stg in "+Studiengang.allNeededKeysList /> \
 /* <#assign filter = filter + " and '' || ca12_staat in "+Staatsangehörigkeit.allNeededKeysList /> --<<Staatsangehörigkeit>> */\
 /* <#assign filter = filter + " and stg in "+Fächer.allNeededKeysList /> --<<Fächer>> */\
+/* <#assign filter = filter + " and tid_stg in (select L2.tid from lehr_stg_ab L2 where L2.abschluss in "+Abschluss.allNeededKeysList +")" /> --<<Abschluss>> */\
 \
 <#if columns?has_content>\
 \

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

@@ -0,0 +1,128 @@
+--freemarker template
+<#if SQLdialect='Postgres'>
+<#assign texttype="text" />
+<#else>
+EXECUTE PROCEDURE IFX_ALLOW_NEWLINE('T');
+<#assign texttype="lvarchar" />
+</#if>
+<#assign newline="'
+'" />
+
+
+create table tmp_konstanten
+  (
+    tid serial,
+    apnr integer,
+    beschreibung char(255),
+	defaultvalue integer,
+	description   ${texttype},
+	systeminfo_id integer,
+	doku_link varchar(255),
+	read_only integer,
+	wertebereich varchar(250),
+	ab_version varchar(10),
+	gruppe varchar(255),
+	sachgebiete_id integer
+  );
+insert into tmp_konstanten(apnr,
+beschreibung,
+ defaultvalue,
+ description,
+ systeminfo_id,
+ doku_link,
+ read_only,
+ wertebereich,
+ ab_version,
+ gruppe,
+ sachgebiete_id)
+ values (20,
+'VIZ_ZEITR_SEM_ANZ',
+ 20,
+'Anzahl Semester rückwirkend in Zeitreihen',
+320,
+ 'https://www.superx-projekt.de/doku/viz_modul/admin/f_Konstanten.htm',--doku link
+0,
+'',
+ '>0.3',
+ 'Datenquelle, Entladestartzeitpunkt, -umfang',
+ 320);
+
+--vorhandene Schlüssel Metadaten updaten:
+
+<#if SQLdialect='Postgres'>
+--Postgres Dialekt:
+update konstanten set defaultvalue=T.defaultvalue,
+description=T.description,
+systeminfo_id=T.systeminfo_id ,
+doku_link=T.doku_link,
+read_only=T.read_only ,
+wertebereich=T.wertebereich,
+ab_version=T.ab_version,
+gruppe=T.gruppe ,
+sachgebiete_id=T.sachgebiete_id
+from tmp_konstanten T
+where T.beschreibung=konstanten.beschreibung;
+
+<#else>
+
+--Informix Dialekt:
+update konstanten set (defaultvalue,
+ description,
+ systeminfo_id,
+ doku_link,
+ read_only,
+ wertebereich,
+  ab_version,
+ gruppe,
+ sachgebiete_id)
+       = ((select
+       defaultvalue,
+ description,
+ systeminfo_id,
+ doku_link,
+ read_only,
+ wertebereich,
+  ab_version,
+ gruppe,
+ sachgebiete_id
+from tmp_konstanten T
+where T.beschreibung=konstanten.beschreibung));
+
+
+</#if>
+
+delete from tmp_konstanten where beschreibung in (select beschreibung from konstanten);
+
+create temp table tmp_hilf (tid integer);
+insert into tmp_hilf select max(tid) from konstanten;
+update tmp_hilf set tid=0 where tid is null;
+
+
+insert into konstanten(tid , 
+apnr ,beschreibung,
+ defaultvalue,
+ description,
+ systeminfo_id,
+ doku_link,
+ read_only,
+ wertebereich,
+ ab_version,
+ gruppe,
+ sachgebiete_id )
+select H.tid+K.tid ,
+K.apnr ,
+K.beschreibung,
+ K.defaultvalue,
+ K.description,
+ K.systeminfo_id,
+ K.doku_link,
+ K.read_only,
+ K.wertebereich,
+ K.ab_version,
+ K.gruppe,
+ K.sachgebiete_id
+from tmp_konstanten  K, tmp_hilf H;
+
+drop table tmp_hilf;
+drop table tmp_konstanten;
+

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

@@ -17,7 +17,7 @@ select count(*) from systeminfo where tid=330;
 
 <#assign rpta_columns = [
 {"uniquename":"sem_der_pruefung",
-"caption":"Semester",
+"caption":"Semester (Schlüssel)",
 "srcfieldname":"sem_der_pruefung",
 "targetfieldname":"sem_der_pruefung",
 "column_type":"physicalColumn",
@@ -29,7 +29,7 @@ select count(*) from systeminfo where tid=330;
 "description":""
 },
 {"uniquename":"semester_str",
-"caption":"Semester Name",
+"caption":"Semester",
 "srcfieldname":"sem_der_pruefung",
 "targetfieldname":"semester_str",
 "column_type":"logicalColumn",

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

@@ -17,7 +17,7 @@ select count(*) from systeminfo where tid=330;
 
 <#assign rpta_columns = [
 {"uniquename":"sem_der_pruefung",
-"caption":"Semester",
+"caption":"Semester (Schlüssel)",
 "srcfieldname":"sem_der_pruefung",
 "targetfieldname":"sem_der_pruefung",
 "column_type":"physicalColumn",
@@ -29,7 +29,7 @@ select count(*) from systeminfo where tid=330;
 "description":""
 },
 {"uniquename":"semester_str",
-"caption":"Semester Name",
+"caption":"Semester",
 "srcfieldname":"sem_der_pruefung",
 "targetfieldname":"semester_str",
 "column_type":"logicalColumn",

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

@@ -17,7 +17,7 @@ select count(*) from systeminfo where tid=330;
 
 <#assign rpta_columns = [
 {"uniquename":"sem_der_pruefung",
-"caption":"Semester",
+"caption":"Semester (Schlüssel)",
 "srcfieldname":"sem_der_pruefung",
 "targetfieldname":"sem_der_pruefung",
 "column_type":"physicalColumn",

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

@@ -16,7 +16,8 @@ select count(*) from systeminfo where tid=330;
 
 <#assign rpta_columns = [
 {"uniquename":"staat_iso3",
-"caption":"Staatsangehörigkeit",
+"caption_der_spalte":"Staatsangehörigkeit (ISO Code)",
+"caption_in_ergebnistabelle":"Staatsangehörigkeit",
 "srcfieldname":"ca12_staat",
 "targetfieldname":"staat_iso3",
 "column_type":"lookupColumn",
@@ -27,6 +28,32 @@ select count(*) from systeminfo where tid=330;
 "is_aggregate":"0",
 "description":"Staat (ISO Code)"
 },
+{"uniquename":"ca12staat",
+"caption_der_spalte":"Staatsangehörigkeit (Schlüssel)",
+"caption_in_ergebnistabelle":"Staatsangehörigkeit (Schlüssel)",
+"srcfieldname":"ca12_staat",
+"targetfieldname":"ca12_staat",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"0",
+"format_code":"",
+"visible_size":"5",
+"is_aggregate":"0",
+"description":"Staat (ASTAT Code)"
+},
+{"uniquename":"ca12staat_str",
+"caption_der_spalte":"Staatsangehörigkeit (Name des Staates)",
+"caption_in_ergebnistabelle":"Staatsangehörigkeit (Name des Staates)",
+"srcfieldname":"ca12_staat",
+"targetfieldname":"ca12staat_str",
+"column_type":"lookupColumn",
+"col_function":"select C2.druck from cif C2 where C2.key=12 and C2.apnr=ca12_staat",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"15",
+"is_aggregate":"0",
+"description":"Staat (Name)"
+},
 {"uniquename":"summe",
 "caption":"Anzahl der Studierenden",
 "srcfieldname":"summe",

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

@@ -29,7 +29,7 @@ select count(*) from systeminfo where tid=330;
 "description":""
 },
 {"uniquename":"semester_str",
-"caption":"Semester Name",
+"caption":"Semester",
 "srcfieldname":"semester_str",
 "targetfieldname":"semester_str",
 "column_type":"physicalColumn",

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

@@ -17,7 +17,7 @@ select count(*) from systeminfo where tid=330;
 
 <#assign rpta_columns = [
 {"uniquename":"sem_rueck_beur_ein",
-"caption":"Semester",
+"caption":"Semester (Schlüssel)",
 "srcfieldname":"sem_rueck_beur_ein",
 "targetfieldname":"sem_rueck_beur_ein",
 "column_type":"physicalColumn",
@@ -29,7 +29,7 @@ select count(*) from systeminfo where tid=330;
 "description":""
 },
 {"uniquename":"semester_str",
-"caption":"Semester Name",
+"caption":"Semester",
 "srcfieldname":"sem_rueck_beur_ein",
 "targetfieldname":"semester_str",
 "column_type":"logicalColumn",

superx/xml/js/viz/viz_viewer.js

@@ -1559,10 +1559,15 @@ if(orientation=="x")
       width: 7
     	},
       label: {
-      show: true
+      show: true,
+      /*distance:10,*/
+      /* offset:[30, 40]*/
+      /*labelLayout:{}*/
+      distance:20,
+      position:"bottom"
     },
     labelLayout(params) {
-    return getLabelLayout(params,orientation)
+    return getLabelLayout(chartTypes[1],params,orientation)
 	}
 
     }
@@ -1577,9 +1582,10 @@ return option;
 - horizontal: rechts neben Balken
 - vertikal: zentriert im Balken
 */ 
-function getLabelLayout(params,orientation)
+function getLabelLayout(seriesType,params,orientation)
 {
-	if(orientation=="x")
+	if(seriesType=="bar")
+	{if(orientation=="x")
 	{
 		return {
         x: params.rect.x +params.rect.width+ 30,
@@ -1590,6 +1596,12 @@ function getLabelLayout(params,orientation)
 	}
 	else
 	return {verticalAlign: 'middle'};
+	}
+	else
+	{//line:
+	return {verticalAlign: 'bottom'};
+	}
+	
 	
 }
 

superx/xml/viz_components.xsl

@@ -1045,7 +1045,7 @@ Stand: <xsl:value-of select="../stand" /></p>
 <xsl:param name="openModalCardDetail" select="'true'" />
 <div class="card is-shady">
 
-<div class="card-image">
+<div class="card-image" id="{concat('cardImage',$ergebniselement_ordnr)}">
 <!--zum Debuggen: <a onClick="initPage()">Anzeigen</a><br />-->
 <xsl:choose>
 <xsl:when test="$openModalCardDetail='true'">
@@ -1164,6 +1164,7 @@ Platzhalter
 <!-- Start Schleife alle Maskenfelder-->
 <xsl:for-each select="/ergebnisse/ergebnis[@ordnr=$ergebniselementOrdnr]/completefields/feld">
 	<xsl:variable name="feldname"><xsl:value-of select="@varname" /></xsl:variable>
+	<xsl:variable name="feldcaption"><xsl:value-of select="caption_short" /></xsl:variable>
 	<xsl:variable name="feldnameEscaped"><xsl:call-template name="create_varname"><xsl:with-param name="string"><xsl:value-of select="@varname"/></xsl:with-param></xsl:call-template></xsl:variable> 
 	<xsl:variable name="feldart">
 	<xsl:call-template name="getFeldArt">
@@ -1176,10 +1177,19 @@ Platzhalter
 </xsl:call-template>
 </xsl:variable>
 <xsl:variable name="feldZeilenanzahl">
+<xsl:variable name="t1">
 	<xsl:call-template name="getFeldZeilenanzahl">
 <xsl:with-param name="feldname" select="$feldname"/>
 </xsl:call-template>
 </xsl:variable>
+<xsl:choose>
+<xsl:when test="$t1=''">
+<xsl:text>1</xsl:text>
+</xsl:when>
+<xsl:otherwise><xsl:value-of select="$t1"/>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:variable>
 
 
 <xsl:choose>
@@ -1198,6 +1208,7 @@ Platzhalter
 <xsl:call-template name="tabellenFeldComboOderSicht">
 <xsl:with-param name="maskeninfo_id" select="$maskentid"/>
 <xsl:with-param name="Feldname" select="$feldname"/>
+<xsl:with-param name="Feldcaption" select="$feldcaption"/>
 <xsl:with-param name="FeldnameEscaped" select="$feldnameEscaped"/>
 <xsl:with-param name="feldZeilenanzahl" select="$feldZeilenanzahl"/>
 <xsl:with-param name="feldart" select="$feldart"/>
@@ -1207,7 +1218,6 @@ Platzhalter
 <br />
 </xsl:otherwise>
 </xsl:choose>
-
 	</xsl:for-each>
 	
 	<div class="field">
@@ -1308,16 +1318,26 @@ Platzhalter
 <xsl:template name="tabellenFeldComboOderSicht">
 <xsl:param name="maskeninfo_id" />
 <xsl:param name="Feldname" />
+<xsl:param name="Feldcaption" />
 <xsl:param name="FeldnameEscaped" />
 <xsl:param name="feldZeilenanzahl" select="1"/>
 <xsl:param name="feldart" select="1"/>
-
+<xsl:variable name="capNotNull">
+<xsl:choose>
+<xsl:when test="$Feldcaption !='' and $Feldcaption !='null' ">
+<xsl:value-of select="$Feldcaption"/>
+</xsl:when>
+<xsl:otherwise>
+<xsl:value-of select="$Feldname"/>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:variable>
 <xsl:variable name="jsCall"><xsl:text>vizTabelleComboOderSichtLaden(</xsl:text>
 			   <xsl:value-of select="$maskeninfo_id" />
 			   <xsl:text>,'</xsl:text>
 			   <xsl:value-of select="$Feldname"/>
 			   <xsl:text>','</xsl:text>
-			   <xsl:value-of select="$Feldname"/>
+			   <xsl:value-of select="$capNotNull"/>
 			   <xsl:text>','</xsl:text>
 			   <xsl:value-of select="$FeldnameEscaped"/>
 			   <xsl:text>',</xsl:text>
@@ -1337,7 +1357,7 @@ Platzhalter
 			   	<xsl:value-of select="$jsCall"/>
 			   </xsl:attribute>
 			   
-			   <xsl:value-of select="$Feldname"/></span>
+			   <xsl:value-of select="$capNotNull"/></span>
 		   </label>
 		  </div>
 		  
@@ -1373,6 +1393,7 @@ Platzhalter
             <xsl:value-of select="concat($Feldname,'-Stand')"/>
           </xsl:attribute>
 	 </input>
+	 <xsl:if test="../../felder/feld[@varname=$Feldname]/sicht/@name_intern !=''">
 	<input type="hidden">
        <xsl:attribute name="name">
             <xsl:value-of select="concat($Feldname,'-Sicht')"/>
@@ -1382,6 +1403,7 @@ Platzhalter
           </xsl:attribute>
 	  </input>
 	  </xsl:if>
+	  </xsl:if>
 	  </div>
 	  <div class="control">
 	  <button class="button is-small is-rounded is-link has-tooltip-bottom"  onclick="return false;" tabindex="1353" data-tooltip="Muss noch ergänzt werden.">
@@ -1656,6 +1678,10 @@ Platzhalter
 <p class="teiltabelle_titel" style="font-size:3em;">
 <xsl:text>Datentabelle </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="20px" style="height:20px" border="0" /></a></p>
 <style>
+table.ergtabelle
+{
+padding-left:100px;
+}
 table.ergtabelle th {
   background-color: #b8c3ef;
   color: black;
@@ -1802,7 +1828,7 @@ td.integer {
   position: fixed;
   top: 50%;
   z-index: 700;
-  left: calc(100vw - 345px - 30px);/* Viewport-Breite minus Sidebar-Breite minus Abstand */
+  left: calc(100vw - 445px - 40px);/* Viewport-Breite minus Sidebar-Breite minus Abstand */
   transform: none;		 /* keine vertikale Zentrierung */
   }
 
@@ -1814,7 +1840,7 @@ td.integer {
   padding-right: 0.7em;
   right: 0em;
   bottom: 0;
-  width: 345px; 		/*Breite nach Bedarf */
+  width: 445px; 		/*Breite nach Bedarf */
   background: white;
   box-shadow: -2px 0 5px rgba(0,0,0,0.1);
   overflow-y: auto;
@@ -1830,7 +1856,7 @@ td.integer {
 .vizLabel-container { 
    display: flex;
    background: inherit;	
-   min-width: 7.5rem; 
+   min-width: 10.5rem; 
    }
 
 .label.is-small { width: 100%; } /*einheitliche Labelbreite*/ 
@@ -1853,7 +1879,7 @@ td.integer {
 <div class="inside-buttons">
 
   		<a href="javascript:toggleSideBarDiv('mySidebarMaske');" title="Filter">
-		<img src="../images/viz_sidebarbuttonMaske.svg" alt="Filter" width="30px" border="0" /></a>
+		<img src="../images/viz_sidebarbuttonMaske.svg" alt="Filter" width="40px" border="0" /></a>
 </div>
 <xsl:call-template name="renderTableDialogs" >
   <xsl:with-param name="stylesheet" select="$stylesheet" />
@@ -1863,7 +1889,7 @@ td.integer {
 <div id="mySidebarInfo" class="sidebar" style="display:none;">
 <div class="inside-buttons">
 		<a href="javascript:toggleSideBarDiv('mySidebarInfo');" title="Info">
-		<img src="../images/viz_sidebarbuttonInfo.svg" alt="Infos" width="30px" border="0" /></a>
+		<img src="../images/viz_sidebarbuttonInfo.svg" alt="Infos" width="40px" border="0" /></a>
 </div>
 
   <xsl:call-template name="erlaeuterung">
@@ -2193,9 +2219,9 @@ vertical-align:center;
 <xsl:template name="vizSideBarButtons" >
 <div class="buttons fixed-right-buttons">
 <a href="javascript:toggleSideBarDiv('mySidebarInfo');" title="Info">
-<img src="../images/viz_sidebarbuttonInfo.svg" alt="Infos" width="25px" border="0" /></a>
+<img src="../images/viz_sidebarbuttonInfo.svg" alt="Infos" width="40px" border="0" /></a>
 <a href="javascript:toggleSideBarDiv('mySidebarMaske');" title="Maske">
-<img src="../images/viz_sidebarbuttonMaske.svg" alt="Maske" width="25px" border="0" /></a>
+<img src="../images/viz_sidebarbuttonMaske.svg" alt="Maske" width="40px" border="0" /></a>
 </div>
 </xsl:template>
 <xsl:template name="showFieldValueInLegend">
@@ -2232,4 +2258,7 @@ vertical-align:center;
 </xsl:for-each>
 </p>
 </xsl:template>
+<xsl:template name="getChartCollapsibleHeading">
+<xsl:text>Diagramm</xsl:text>
+</xsl:template>
 </xsl:stylesheet>

superx/xml/viz_components_final.xsl

@@ -0,0 +1,15 @@
+<?xml version="1.0"  encoding="UTF-8" ?>
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:ext1="de.memtext.util.DateUtils"
+xmlns:ext2="java.util.Date"
+xmlns:string="java.lang.String"
+xmlns:HtmlUtils="de.superx.util.HtmlUtils">
+<!--In diesem Stylesheet können Sie individuelle templates unterbringen,
+  die in ihrer Präzedenz das normale Stylesheet 
+  pageComponents_html.xsl überragt. -->
+<!--<xsl:template name="showJavascriptMenue" >
+<xsl:text>true</xsl:text>
+</xsl:template>-->
+
+</xsl:stylesheet>

superx/xml/viz_html_chart_viewer_mask_and_table.xsl

@@ -71,22 +71,27 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
 <!--Beginn Seitentitel, Krümelpfad, Knopfleiste, Legende, Erläuterung-->
 <section class="hero-body">
 <div class="container"> 
-<div class="columns is-mobile is-left">
+<!--<div class="columns is-mobile is-left">
-<div class="column is-full">
+<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:variable name="chartCollapsibleHeading">
+<xsl:call-template name="getChartCollapsibleHeading" />
+</xsl:variable>
+<xsl:call-template name="viz_viewer_columnwise">
+<xsl:with-param name="chartCollapsibleHeading" select="$chartCollapsibleHeading" />
+</xsl:call-template>
 
 <xsl:call-template name="bottombar" />
  <xsl:comment>customfooter</xsl:comment>
  </div> <!--Ende content -->
 </div> <!--Ende card-content-->
-</div> <!--Ende card-background -->
+<!--</div>--> <!--Ende card-background -->
-</div> <!--Ende column-->
+<!--</div>--> <!--Ende column-->
-</div> <!--Ende hero-columns-->
+</div> <!--Ende container-->
 
 </section> <!--Ende hero = Berichts-Card-->
 </div> <!--Ende site-columns-->
@@ -103,6 +108,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
 
 
 <xsl:template name="viz_viewer_columnwise">
+<xsl:param name="chartCollapsibleHeading" select="''" /> 
 <xsl:if test="/ergebnisse/@isMakro='true'">
 <p class="cockpit_title"><xsl:value-of select="/ergebnisse/makro/name" /></p>
 </xsl:if>
@@ -124,8 +130,11 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:HtmlUtils="de.superx.util
 <xsl:variable name="ergebniselement_counter" select="position()" />
 <xsl:variable name="chart_uniquename"><xsl:value-of select="../felder/feld[@varname='Grafik']/value" /></xsl:variable>
 <xsl:variable name="ergebniselement_ordnr"><xsl:value-of select="@ordnr" /></xsl:variable>
-
+<xsl:if test="$chartCollapsibleHeading !=''"> 
-
+<p class="teiltabelle_titel" style="font-size:3em;">
+<xsl:value-of select="concat($chartCollapsibleHeading,' ')"/><a onclick="{concat('toggleTableVisibility(',$colon,'toggleBtnChart',@ordnr+1, $colon,',',$colon, 'cardImage',@ordnr,$colon,');')}"> <img  id="{concat('toggleBtnChart',@ordnr+1)}" src="../images/minus-circled.svg" height="20px" style="height:20px" border="0" /></a>
+</p>
+</xsl:if>
 <!--<p><xsl:value-of select="concat('Zähler: ',$ergebniselement_counter)"/></p>-->
 <xsl:call-template name="viewer_kachel">
 <xsl:with-param name="caption" select="viz_charts/viz_chart[@uniquename=$chart_uniquename]/@caption"/>