diff --git a/src-modules/module/viz/conf/viz.xml b/src-modules/module/viz/conf/viz.xml
index 1c1dce8..41565d2 100644
--- a/src-modules/module/viz/conf/viz.xml
+++ b/src-modules/module/viz/conf/viz.xml
@@ -840,60 +840,12 @@ parent="Visualisierungen">Abfragen zur Administration von Visualisierungen $VIZ_PFAD/masken
-
-
-
- $VIZ_PFAD/masken
-
-
-
-
-
- $VIZ_PFAD/masken
-
-
-
-
-
- $VIZ_PFAD/masken
-
-
-
-
-
- $VIZ_PFAD/masken
-
-
-
-
-
- $VIZ_PFAD/masken
-
-
-
-
-
- $VIZ_PFAD/masken
-
-
-
-
-
- $VIZ_PFAD/masken
-
-
$VIZ_PFAD/masken
-
-
-
- $VIZ_PFAD/masken
-
-
Initialisierung für Makroberichte
diff --git a/src-modules/module/viz/masken/44220_felderinfo.unl b/src-modules/module/viz/masken/44220_felderinfo.unl
deleted file mode 100644
index 308e646..0000000
--- a/src-modules/module/viz/masken/44220_felderinfo.unl
+++ /dev/null
@@ -1,43 +0,0 @@
-44220^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>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')\
-and R.systeminfo_id=7)\
-and uniquename in ('sos_stud_geschl_dashboard')\
-order by sortnr, caption\
- ;^^<>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')\
-and R.systeminfo_id=7)\
-and uniquename in ('sos_stud_geschl_dashboard')\
-order by sortnr, caption limit 1\
- ;^
-44221^Semester^10^0^0^140^80^1^integer^30^0^1^<> --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;^ ^<> 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^<> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^
-44223^Abschluss^7^0^0^100^200^3^char^1500^0^12^<> 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^<> select uniquename, caption from viz_chart where maskeninfo_id=44220 order by 2;^^<> 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^999^<> select 1,'ja' from xdummy^Eintrag^ ^
-44227^Bis Semester^20^350^-1^140^80^1^integer^30^0^999^<> --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;^ ^<> 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^<> 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^<> 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^<> 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^ ^<> 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^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> 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^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^
-44233^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
-44234^Semestertyp^22^350^-1^140^80^1^integer^255^0^999^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^ ^<> select 2,'nur Wintersemester' from xdummy^
-44238^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^
-44242^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^
diff --git a/src-modules/module/viz/masken/44220_maske_system_bez.unl b/src-modules/module/viz/masken/44220_maske_system_bez.unl
deleted file mode 100644
index 9e7fdaa..0000000
--- a/src-modules/module/viz/masken/44220_maske_system_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-44220^320^
diff --git a/src-modules/module/viz/masken/44220_masken_felder_bez.unl b/src-modules/module/viz/masken/44220_masken_felder_bez.unl
deleted file mode 100644
index 9622a36..0000000
--- a/src-modules/module/viz/masken/44220_masken_felder_bez.unl
+++ /dev/null
@@ -1,17 +0,0 @@
-44220^44220^
-44220^44221^
-44220^44222^
-44220^44223^
-44220^44224^
-44220^44225^
-44220^44226^
-44220^44227^
-44220^44228^
-44220^44229^
-44220^44230^
-44220^44231^
-44220^44232^
-44220^44233^
-44220^44234^
-44220^44238^
-44220^44242^
diff --git a/src-modules/module/viz/masken/44220_maskeninfo.unl b/src-modules/module/viz/masken/44220_maskeninfo.unl
deleted file mode 100644
index f785d38..0000000
--- a/src-modules/module/viz/masken/44220_maskeninfo.unl
+++ /dev/null
@@ -1 +0,0 @@
-44220^Studierende nach Geschlecht^select select_stmt from maskeninfo where tid=48000^select xil_proplist from maskeninfo where tid=48000^Studienfach^Anzahl bzw. Anteil^Ausgabe der Studierenden nach Geschlecht in verschiedenen Visualisierungen (z.B. Tortendiagramm)^select cleanup_stmt from maskeninfo where tid=48000^^2^850^540^^1^<>SELECT description FROM rpta_column_layout where uniquename=<>;^
diff --git a/src-modules/module/viz/masken/44220_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44220_sachgeb_maske_bez.unl
deleted file mode 100644
index a4dc386..0000000
--- a/src-modules/module/viz/masken/44220_sachgeb_maske_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-16^44220^
diff --git a/src-modules/module/viz/masken/44250_felderinfo.unl b/src-modules/module/viz/masken/44250_felderinfo.unl
deleted file mode 100644
index a9156c8..0000000
--- a/src-modules/module/viz/masken/44250_felderinfo.unl
+++ /dev/null
@@ -1,43 +0,0 @@
-44250^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>\
-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','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;^^<>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','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\
-limit 1\
- ;^
-44251^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<> --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;^ ^<> 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^<> 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^<> 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^<> select uniquename, caption from viz_chart where maskeninfo_id=44250 order by 2;^^<> 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^<> --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;^ ^<> 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^<> 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^<> 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^<> 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^ ^<> 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^
-44261^Stichtag^23^330^-1^130^100^1^sql^30^1^1^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
-44262^Hörerstatus^200^330^-1^140^150^1^sql^30^0^1^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^
-44263^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
-44264^Semestertyp^22^350^-1^140^80^1^integer^255^0^1^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^ ^<> select 2,'nur Wintersemester' from xdummy^
-44268^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^
-44272^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^
diff --git a/src-modules/module/viz/masken/44250_maske_system_bez.unl b/src-modules/module/viz/masken/44250_maske_system_bez.unl
deleted file mode 100644
index 67ade73..0000000
--- a/src-modules/module/viz/masken/44250_maske_system_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-44250^320^
diff --git a/src-modules/module/viz/masken/44250_masken_felder_bez.unl b/src-modules/module/viz/masken/44250_masken_felder_bez.unl
deleted file mode 100644
index e88c46b..0000000
--- a/src-modules/module/viz/masken/44250_masken_felder_bez.unl
+++ /dev/null
@@ -1,16 +0,0 @@
-44250^44250^
-44250^44251^
-44250^44252^
-44250^44253^
-44250^44254^
-44250^44255^
-44250^44257^
-44250^44258^
-44250^44259^
-44250^44260^
-44250^44261^
-44250^44262^
-44250^44263^
-44250^44264^
-44250^44268^
-44250^44272^
diff --git a/src-modules/module/viz/masken/44250_maskeninfo.unl b/src-modules/module/viz/masken/44250_maskeninfo.unl
deleted file mode 100644
index f63f3c2..0000000
--- a/src-modules/module/viz/masken/44250_maskeninfo.unl
+++ /dev/null
@@ -1 +0,0 @@
-44250^Studierende nach Staaten^select select_stmt from maskeninfo where tid=48000^select xil_proplist from maskeninfo where tid=48000^Studienfach^Anzahl bzw. Anteil^Ausgabe der Studierenden nach Staat (Staatsangehörigkeit, Staat der Hochschulzugangsberechtigung) als Datenblatt oder Weltkarte^select cleanup_stmt from maskeninfo where tid=48000^^2^850^540^^1^<>SELECT description FROM rpta_column_layout where uniquename=<>;^
diff --git a/src-modules/module/viz/masken/44250_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44250_sachgeb_maske_bez.unl
deleted file mode 100644
index 593a659..0000000
--- a/src-modules/module/viz/masken/44250_sachgeb_maske_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-16^44250^
diff --git a/src-modules/module/viz/masken/44280_felderinfo.unl b/src-modules/module/viz/masken/44280_felderinfo.unl
deleted file mode 100644
index 536dcff..0000000
--- a/src-modules/module/viz/masken/44280_felderinfo.unl
+++ /dev/null
@@ -1,43 +0,0 @@
-44280^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>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')\
-and R.systeminfo_id=7)\
-and uniquename in ('sos_stud_fak_dashboard')\
-order by sortnr, caption\
- ;^^<>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')\
-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^<> --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;^ ^<> 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^<> 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^12^<> 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^<> select uniquename, caption from viz_chart where maskeninfo_id=44280 and chart_active=1 order by 2;^^<> 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^<> select 1,'ja' from xdummy^Eintrag^ ^
-44287^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<> --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;^ ^<> 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^<> 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^<> 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^<> 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^ ^<> 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^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> 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^<> select apnr, eintrag from hoererstatus order by 2^ ^<> select apnr, eintrag from hoererstatus where eintrag='alle';^
-44293^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
-44294^Semestertyp^22^350^-1^140^80^1^integer^255^0^1^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^ ^<> select 2,'nur Wintersemester' from xdummy^
-44298^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^
-44302^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^
diff --git a/src-modules/module/viz/masken/44280_maske_system_bez.unl b/src-modules/module/viz/masken/44280_maske_system_bez.unl
deleted file mode 100644
index 8862d36..0000000
--- a/src-modules/module/viz/masken/44280_maske_system_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-44280^320^
diff --git a/src-modules/module/viz/masken/44280_masken_felder_bez.unl b/src-modules/module/viz/masken/44280_masken_felder_bez.unl
deleted file mode 100644
index caff1aa..0000000
--- a/src-modules/module/viz/masken/44280_masken_felder_bez.unl
+++ /dev/null
@@ -1,17 +0,0 @@
-44280^44280^
-44280^44281^
-44280^44282^
-44280^44283^
-44280^44284^
-44280^44285^
-44280^44286^
-44280^44287^
-44280^44288^
-44280^44289^
-44280^44290^
-44280^44291^
-44280^44292^
-44280^44293^
-44280^44294^
-44280^44298^
-44280^44302^
diff --git a/src-modules/module/viz/masken/44280_maskeninfo.unl b/src-modules/module/viz/masken/44280_maskeninfo.unl
deleted file mode 100644
index b45edb8..0000000
--- a/src-modules/module/viz/masken/44280_maskeninfo.unl
+++ /dev/null
@@ -1 +0,0 @@
-44280^Studierende nach Fakultät^select select_stmt from maskeninfo where tid=48000^select xil_proplist from maskeninfo where tid=48000^Studienfach^Anzahl bzw. Anteil^Ausgabe der Studierenden nach Fakultät mit verschiedenen Visualisierungen (z.B. Tortendiagramm)^select cleanup_stmt from maskeninfo where tid=48000^^2^850^540^^1^<>SELECT description FROM rpta_column_layout where uniquename=<>;^
diff --git a/src-modules/module/viz/masken/44280_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44280_sachgeb_maske_bez.unl
deleted file mode 100644
index 604396c..0000000
--- a/src-modules/module/viz/masken/44280_sachgeb_maske_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-16^44280^
diff --git a/src-modules/module/viz/masken/44310_felderinfo.unl b/src-modules/module/viz/masken/44310_felderinfo.unl
deleted file mode 100644
index e174b26..0000000
--- a/src-modules/module/viz/masken/44310_felderinfo.unl
+++ /dev/null
@@ -1,43 +0,0 @@
-44310^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>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')\
-and R.systeminfo_id=7)\
-and uniquename not in ('sos_stud_geschl_dashboard','sos_stud_sem_dashboard','sos_stud_dashboard_jahr')\
-order by sortnr, caption\
- ;^ ^<>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')\
-and R.systeminfo_id=7)\
-and uniquename in ('sos_stud_abgrp_dashboard')\
-order by sortnr, caption limit 1\
- ;^
-44311^Semester^10^0^0^140^80^1^integer^30^0^1^<> --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;^ ^<> 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^<> 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^12^<> 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^<> select uniquename, caption from viz_chart where maskeninfo_id=44310 and chart_active=1 order by 2;^^<> 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^999^<> select 1,'ja' from xdummy^Eintrag^ ^
-44317^Bis Semester^20^350^-1^140^80^1^integer^30^0^999^<> --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;^ ^<> 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^<> 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^<> 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^<> 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^ ^<> 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^
-44321^Stichtag^23^330^-1^130^100^1^sql^30^1^1^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
-44322^Hörerstatus^200^330^-1^140^150^1^sql^30^0^1^<> select apnr, eintrag from hoererstatus order by 2^ ^<> select apnr, eintrag from hoererstatus where eintrag='alle';^
-44323^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
-44324^Semestertyp^22^350^-1^140^80^1^integer^255^0^999^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^ ^<> select 2,'nur Wintersemester' from xdummy^
-44328^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^
-44332^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^
diff --git a/src-modules/module/viz/masken/44310_maske_system_bez.unl b/src-modules/module/viz/masken/44310_maske_system_bez.unl
deleted file mode 100644
index d96653c..0000000
--- a/src-modules/module/viz/masken/44310_maske_system_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-44310^320^
diff --git a/src-modules/module/viz/masken/44310_masken_felder_bez.unl b/src-modules/module/viz/masken/44310_masken_felder_bez.unl
deleted file mode 100644
index 24b1cc5..0000000
--- a/src-modules/module/viz/masken/44310_masken_felder_bez.unl
+++ /dev/null
@@ -1,17 +0,0 @@
-44310^44310^
-44310^44311^
-44310^44312^
-44310^44313^
-44310^44314^
-44310^44315^
-44310^44316^
-44310^44317^
-44310^44318^
-44310^44319^
-44310^44320^
-44310^44321^
-44310^44322^
-44310^44323^
-44310^44324^
-44310^44328^
-44310^44332^
diff --git a/src-modules/module/viz/masken/44310_maskeninfo.unl b/src-modules/module/viz/masken/44310_maskeninfo.unl
deleted file mode 100644
index dab3d0a..0000000
--- a/src-modules/module/viz/masken/44310_maskeninfo.unl
+++ /dev/null
@@ -1 +0,0 @@
-44310^Studierende nach Abschluss^select select_stmt from maskeninfo where tid=48000^select xil_proplist from maskeninfo where tid=48000^Studienfach^Anzahl bzw. Anteil^Ausgabe der Studierenden nach Fakultät mit verschiedenen Visualisierungen (z.B. Tortendiagramm)^select cleanup_stmt from maskeninfo where tid=48000^^2^850^540^^1^<>SELECT description FROM rpta_column_layout where uniquename=<>;^
diff --git a/src-modules/module/viz/masken/44310_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44310_sachgeb_maske_bez.unl
deleted file mode 100644
index 3f10999..0000000
--- a/src-modules/module/viz/masken/44310_sachgeb_maske_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-16^44310^
diff --git a/src-modules/module/viz/masken/44340_felderinfo.unl b/src-modules/module/viz/masken/44340_felderinfo.unl
deleted file mode 100644
index 625a6f2..0000000
--- a/src-modules/module/viz/masken/44340_felderinfo.unl
+++ /dev/null
@@ -1,43 +0,0 @@
-44340^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>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')\
-and R.systeminfo_id=7)\
-and uniquename in ('sos_stud_bildungstyp_dashboard')\
-order by sortnr, caption\
- ;^^<>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')\
-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^<> --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;^ ^<> 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^<> 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^12^<> 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^<> select uniquename, caption from viz_chart where maskeninfo_id=44340 and chart_active=1 order by 2;^^<> 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^<> select 1,'ja' from xdummy^Eintrag^ ^
-44347^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<> --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;^ ^<> 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^<> 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^<> 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^<> 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^ ^<> 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^
-44351^Stichtag^23^330^-1^130^100^1^sql^30^1^1^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
-44352^Hörerstatus^200^330^-1^140^150^1^sql^30^0^1^<> select apnr, eintrag from hoererstatus order by 2^ ^<> select apnr, eintrag from hoererstatus where eintrag='alle';^
-44353^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
-44354^Semestertyp^22^350^-1^140^80^1^integer^255^0^1^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^ ^<> select 2,'nur Wintersemester' from xdummy^
-44358^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Köpfe';^
-44362^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^
diff --git a/src-modules/module/viz/masken/44340_maske_system_bez.unl b/src-modules/module/viz/masken/44340_maske_system_bez.unl
deleted file mode 100644
index ca93f35..0000000
--- a/src-modules/module/viz/masken/44340_maske_system_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-44340^320^
diff --git a/src-modules/module/viz/masken/44340_masken_felder_bez.unl b/src-modules/module/viz/masken/44340_masken_felder_bez.unl
deleted file mode 100644
index 176a6eb..0000000
--- a/src-modules/module/viz/masken/44340_masken_felder_bez.unl
+++ /dev/null
@@ -1,17 +0,0 @@
-44340^44340^
-44340^44341^
-44340^44342^
-44340^44343^
-44340^44344^
-44340^44345^
-44340^44346^
-44340^44347^
-44340^44348^
-44340^44349^
-44340^44350^
-44340^44351^
-44340^44352^
-44340^44353^
-44340^44354^
-44340^44358^
-44340^44362^
diff --git a/src-modules/module/viz/masken/44340_maskeninfo.unl b/src-modules/module/viz/masken/44340_maskeninfo.unl
deleted file mode 100644
index b75e879..0000000
--- a/src-modules/module/viz/masken/44340_maskeninfo.unl
+++ /dev/null
@@ -1 +0,0 @@
-44340^Studierende nach Bildungstyp^select select_stmt from maskeninfo where tid=48000^select xil_proplist from maskeninfo where tid=48000^Studienfach^Anzahl bzw. Anteil^Bildungsinländer / -ausländer^select cleanup_stmt from maskeninfo where tid=48000^^2^850^540^^1^<>SELECT description FROM rpta_column_layout where uniquename=<>;^
diff --git a/src-modules/module/viz/masken/44340_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44340_sachgeb_maske_bez.unl
deleted file mode 100644
index da44e6c..0000000
--- a/src-modules/module/viz/masken/44340_sachgeb_maske_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-16^44340^
diff --git a/src-modules/module/viz/masken/44510_felderinfo.unl b/src-modules/module/viz/masken/44510_felderinfo.unl
deleted file mode 100644
index 3d660b8..0000000
--- a/src-modules/module/viz/masken/44510_felderinfo.unl
+++ /dev/null
@@ -1,41 +0,0 @@
-44510^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>SELECT uniquename,\
- caption\
-FROM rpta_column_layout \
-where 1=1\
-and resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat',\
-'sos_stud_astat_dashboard')\
-and R.systeminfo_id=7)\
-and uniquename like '%jahr%'\
-order by sortnr, caption\
- ;^^<>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_jahr';^
-44511^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<> --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;^ ^<> 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^<> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^
-44513^Abschluss^8^0^0^100^200^3^char^1500^0^12^<> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,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^<> select uniquename, caption from viz_chart where maskeninfo_id=44510 order by 2;^^ ^
-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^<> --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;^ ^<> 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^<> 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^<> 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^<> 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^ ^<> 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^
-44521^Stichtag^23^330^-1^130^100^1^sql^30^1^1^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
-44522^Hörerstatus^200^330^-1^140^150^1^sql^30^0^1^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^
-44523^Grafiktitel^1010^0^0^100^100^1^char^255^0^0^ ^{InputCheck:disabled}^ ^
-44528^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^
-44532^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^
diff --git a/src-modules/module/viz/masken/44510_maske_system_bez.unl b/src-modules/module/viz/masken/44510_maske_system_bez.unl
deleted file mode 100644
index c3d69f8..0000000
--- a/src-modules/module/viz/masken/44510_maske_system_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-44510^320^
diff --git a/src-modules/module/viz/masken/44510_masken_felder_bez.unl b/src-modules/module/viz/masken/44510_masken_felder_bez.unl
deleted file mode 100644
index 024f33a..0000000
--- a/src-modules/module/viz/masken/44510_masken_felder_bez.unl
+++ /dev/null
@@ -1,16 +0,0 @@
-44510^44510^
-44510^44511^
-44510^44512^
-44510^44513^
-44510^44514^
-44510^44515^
-44510^44516^
-44510^44517^
-44510^44518^
-44510^44519^
-44510^44520^
-44510^44521^
-44510^44522^
-44510^44523^
-44510^44528^
-44510^44532^
diff --git a/src-modules/module/viz/masken/44510_maskeninfo.unl b/src-modules/module/viz/masken/44510_maskeninfo.unl
deleted file mode 100644
index 84c3171..0000000
--- a/src-modules/module/viz/masken/44510_maskeninfo.unl
+++ /dev/null
@@ -1 +0,0 @@
-44510^Studierende nach Jahr^select select_stmt from maskeninfo where tid=48000^select xil_proplist from maskeninfo where tid=48000^Studienfach^Anzahl bzw. Anteil^Ausgabe der Studierenden nach Geschlecht in verschiedenen Visualisierungen (z.B. Tortendiagramm)^select cleanup_stmt from maskeninfo where tid=48000^^2^850^540^^1^<>SELECT description FROM rpta_column_layout where uniquename=<>;^
diff --git a/src-modules/module/viz/masken/44510_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44510_sachgeb_maske_bez.unl
deleted file mode 100644
index b292144..0000000
--- a/src-modules/module/viz/masken/44510_sachgeb_maske_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-16^44510^
diff --git a/src-modules/module/viz/masken/44540_felderinfo.unl b/src-modules/module/viz/masken/44540_felderinfo.unl
deleted file mode 100644
index 3fe6d03..0000000
--- a/src-modules/module/viz/masken/44540_felderinfo.unl
+++ /dev/null
@@ -1,28 +0,0 @@
-44540^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^50^1^1^<> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Köpfe';^
-44541^Seit Semester^3^0^0^140^80^1^integer^30^1^1^<> --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^<> 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^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^^<> 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^<> 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^<> select apnr,eintrag from sos_status order by 2^^<> select apnr,eintrag from sos_status where eintrag='Alle ohne Beurl.';^
-44545^Hörerstatus^15^0^0^140^170^1^sql^30^1^1^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> 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^<> 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^<> --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^<> 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^<> 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^<> 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^^^^
-44553^Studiengang^6^0^0^140^150^50^char^30^0^12^<> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') and aktiv=1 order by 3,2;^^^
-44555^In der RSZ^14^330^-1^130^100^1^sql^30^0^1^<> select wert, name from aggregierung where kategorie='RSZ-Filter';^^^
-44556^##line##^13^0^0^100^100^1^char^5000^0^8^^^1^
-44557^##line##^115^0^0^100^100^1^char^5000^0^8^^^1^
diff --git a/src-modules/module/viz/masken/44540_maske_system_bez.unl b/src-modules/module/viz/masken/44540_maske_system_bez.unl
deleted file mode 100644
index 48b8695..0000000
--- a/src-modules/module/viz/masken/44540_maske_system_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-44540^320^
diff --git a/src-modules/module/viz/masken/44540_masken_felder_bez.unl b/src-modules/module/viz/masken/44540_masken_felder_bez.unl
deleted file mode 100644
index 33e6315..0000000
--- a/src-modules/module/viz/masken/44540_masken_felder_bez.unl
+++ /dev/null
@@ -1,16 +0,0 @@
-44540^44540^
-44540^44541^
-44540^44542^
-44540^44543^
-44540^44544^
-44540^44545^
-44540^44547^
-44540^44548^
-44540^44549^
-44540^44550^
-44540^44551^
-44540^44552^
-44540^44553^
-44540^44555^
-44540^44556^
-44540^44557^
diff --git a/src-modules/module/viz/masken/44540_maskeninfo.unl b/src-modules/module/viz/masken/44540_maskeninfo.unl
deleted file mode 100644
index b6a2495..0000000
--- a/src-modules/module/viz/masken/44540_maskeninfo.unl
+++ /dev/null
@@ -1,151 +0,0 @@
-44540^Studierende nach Semester und Studiengang^--Freemarker Template\
-<#include "SQL_lingua_franca"/>\
-<#include "SuperX_general"/>\
-\
-= <> */\
-/* and tid <= <> */\
-order by 1 desc;\
- ]]>\
-\
-\
-\
-<#assign feldtyp="integer" />\
-\
-<#assign maxEbene=20 />\
-<#if '<>' != ''>\
-<#assign maxEbene='<>'?number />\
-#if>\
-\
-<#assign lehr_stg_ab="lehr_stg_ab"/>\
-<#assign quelltabelle='sos_stg_aggr'/>\
-\
--- ##################################################\
--- ##### Zwischentabelle #############\
--- ##################################################\
--- 1. FS start Datentabelle\
-<@selectintotmp \
-select="S.tid_stg,S.sem_rueck_beur_ein,S.geschlecht,sum(summe) as summe"\
-source=quelltabelle+" S, "+lehr_stg_ab+" L"\
-target="tmp_zwischen"> \
- where \
-\
- <>\
- and <>\
-and S.sem_rueck_beur_ein between <> and <>\
-and 's_' || L.tid in <@printkeys Studiengang.allNeededKeysList/>\
-/* and L.stg in <@printkeys Fächer.allNeededKeysList/> --<> */ \
-/* AND S.fach_sem_zahl <= <> */\
-/* and S.stichtag = <> */\
-/* and L.abschluss in (<>) */ \
-and S.tid_stg = L.tid\
-/* and S.fach_sem_zahl <= <> */\
-/* and kz_rueck_beur_ein in(<>) */\
-/* and geschlecht=<> */\
-/* and ca12_staat <> */\
-/* and ${<>} */\
-and S.sem_rueck_beur_ein >= L.semester_von \
-and S.sem_rueck_beur_ein <= L.semester_bis \
-group by 1,2,3\
-@selectintotmp>\
- <@informixnolog/>;\
-\
-\
-\
--- Ausgabe-Tabelle\
-create temp table tmp_aggre\
-(ebene int,\
-struktur varchar(255),\
-text varchar(255),\
-sortnr int,\
-semester_nr integer,\
-semester_name varchar(255),\
-summe ${feldtyp},\
-summe_w ${feldtyp}\
-) <@informixnolog/>;\
-\
-\
-\
-\
-\
--- ##################################################\
--- ######## Inserts in die Tabelle ##################\
--- ##################################################\
---Start der Schleifenverarbeitung über Fächer im ausgewählten Baum, Reihenfolge genau wie im Baum\
-\
-<#if semesterliste?has_content>\
-<#assign sortnr=1>\
-<#foreach semester in semesterliste>\
-\
-\
-<#foreach einElement in Studiengang.elements>\
-<@addcomment "############ Schleife Nr. " + "${sortnr}" + " Element: " + "${einElement.name}" + " strukturStr: " + "${einElement.strukturStr} ###########################"/>\
-\
---select '${einElement.name} - ${einElement.strukturStr}' from xdummy; \
-\
-<#if einElement.level <= maxEbene >\
-<#assign sortnr=sortnr+1>\
-\
--- ########## Einfügen ####################\
-insert into tmp_aggre (ebene,\
-struktur,\
-text, \
-sortnr,\
-semester_nr,\
-semester_name,\
-summe,\
-summe_w\
-)\
-select ${einElement.level}::smallint,\
-'${einElement.strukturStr}'::char(50),\
-'${einElement.name}'::char(255),\
-${sortnr},\
-${semester.nr} as semester_nr,\
-'${semester.name}' as semester_name,\
-summe,\
-(case when geschlecht=2 then summe else 0 end) as summe_w\
-from tmp_zwischen S\
-where 's_' || tid_stg in ${einElement.subkeys}\
-and sem_rueck_beur_ein=${semester.nr}\
-; \
-\
-#if> \
-\
-#foreach>--Studiengang Baum\
-#foreach>--Semester\
-#if>\
--- ##################################################\
--- ######## Ende Inserts in die Tabelle #############\
--- ##################################################\
-\
-\
-drop table tmp_zwischen;\
-\
--- Endselect\
-select ebene,\
-(case when ebene=1 then semester_name else text end) as text,\
-sum(summe) as summe,\
-sum(summe_w) as summe_w\
- from tmp_aggre\
- group by 1,2,sortnr\
-order by sortnr,2\
- ;^XIL List\
- sizable_columns horizontal_scrolling\
- drop_and_delete movable_columns\
- white_space_color=COLOR_WHITE\
-fixed_columns=3\
- min_heading_height=35\
-Column CID=0 heading_text="Ebene" explanation="" center_heading\
- row_selectable heading_platform readonly\
- width=7 text_size=20 \
-Column CID=1 heading_text="Studiengang" explanation="@@@sos_studiengang@@@" center_heading\
- row_selectable heading_platform readonly\
- width=40 text_size=60\
-Column CID=2 heading_text="Summe" explanation="@@@sos_gesamt_stud@@@" center_heading\
- row_selectable col_selectable rightJust heading_platform readonly\
- width=8\
-Column CID=2 heading_text="Summe weiblich" explanation="@@@sos_durchschnittsalter@@@" center_heading\
- row_selectable col_selectable rightJust heading_platform readonly\
- width=12\
-@@@^Altersgruppe^Anzahl^je Fach/Studiengang^drop table tmp_aggre;^^3^700^360^0^1^^
diff --git a/src-modules/module/viz/masken/44540_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44540_sachgeb_maske_bez.unl
deleted file mode 100644
index 684e83e..0000000
--- a/src-modules/module/viz/masken/44540_sachgeb_maske_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-16^44540^
diff --git a/src-modules/module/viz/masken/44570_felderinfo.unl b/src-modules/module/viz/masken/44570_felderinfo.unl
index e95d85b..e5c53f9 100644
--- a/src-modules/module/viz/masken/44570_felderinfo.unl
+++ b/src-modules/module/viz/masken/44570_felderinfo.unl
@@ -52,3 +52,4 @@ limit 1\
44591^Abschluss^35^0^0^100^200^3^char^1500^0^12^<> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
44592^viz_label_Studiengang^29^350^-1^150^180^1^char^200^0^8^^{InputCheck:matrikelnummern}^^
44593^viz_label_koepfe_faelle^0^350^-1^150^180^1^char^200^0^8^^{InputCheck:matrikelnummern}^^
+44594^Nur Endsemester^21^0^0^140^80^1^integer^30^0^1^<> select 1,'ja' from xdummy^Eintrag^ ^
diff --git a/src-modules/module/viz/masken/44570_masken_felder_bez.unl b/src-modules/module/viz/masken/44570_masken_felder_bez.unl
index f3d2675..98474e2 100644
--- a/src-modules/module/viz/masken/44570_masken_felder_bez.unl
+++ b/src-modules/module/viz/masken/44570_masken_felder_bez.unl
@@ -20,3 +20,4 @@
44570^44591^
44570^44592^
44570^44593^
+44570^44594^
diff --git a/src-modules/module/viz/masken/44600_felderinfo.unl b/src-modules/module/viz/masken/44600_felderinfo.unl
deleted file mode 100644
index 964b0d4..0000000
--- a/src-modules/module/viz/masken/44600_felderinfo.unl
+++ /dev/null
@@ -1,43 +0,0 @@
-44600^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>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')\
-and R.systeminfo_id=7)\
-and (uniquename like 'sos_stud_%_bland_dashboard' or uniquename like 'sos_stud_%_lkreis')\
-order by sortnr, caption\
- ;^ ^<>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')\
-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^<> --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;^ ^<> 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^<> 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^12^<> 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^<> select uniquename, caption from viz_chart where maskeninfo_id=44600 and chart_active=1 order by 2;^ ^<> 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^<> select 1,'ja' from xdummy^Eintrag^ ^
-44607^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<> --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;^ ^<> 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^<> 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^<> 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^<> 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^ ^<> 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^
-44611^Stichtag^23^330^-1^130^100^1^sql^30^1^1^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
-44612^Hörerstatus^200^330^-1^140^150^1^sql^30^0^1^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^
-44613^Jahr^110^0^0^140^80^1^integer^30^0^0^ ^ ^ ^
-44614^Semestertyp^22^350^-1^140^80^1^integer^255^0^1^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^ ^<> select 2,'nur Wintersemester' from xdummy^
-44618^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^
-44622^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^
diff --git a/src-modules/module/viz/masken/44600_maske_system_bez.unl b/src-modules/module/viz/masken/44600_maske_system_bez.unl
deleted file mode 100644
index 1b012be..0000000
--- a/src-modules/module/viz/masken/44600_maske_system_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-44600^320^
diff --git a/src-modules/module/viz/masken/44600_masken_felder_bez.unl b/src-modules/module/viz/masken/44600_masken_felder_bez.unl
deleted file mode 100644
index b336add..0000000
--- a/src-modules/module/viz/masken/44600_masken_felder_bez.unl
+++ /dev/null
@@ -1,17 +0,0 @@
-44600^44600^
-44600^44601^
-44600^44602^
-44600^44603^
-44600^44604^
-44600^44605^
-44600^44606^
-44600^44607^
-44600^44608^
-44600^44609^
-44600^44610^
-44600^44611^
-44600^44612^
-44600^44613^
-44600^44614^
-44600^44618^
-44600^44622^
diff --git a/src-modules/module/viz/masken/44600_maskeninfo.unl b/src-modules/module/viz/masken/44600_maskeninfo.unl
deleted file mode 100644
index 95ef630..0000000
--- a/src-modules/module/viz/masken/44600_maskeninfo.unl
+++ /dev/null
@@ -1 +0,0 @@
-44600^Studierende nach Region^select select_stmt from maskeninfo where tid=48000^select xil_proplist from maskeninfo where tid=48000^Studienfach^Anzahl bzw. Anteil^Ausgabe der Studierenden nach Landkreis/Bundesland^select cleanup_stmt from maskeninfo where tid=48000^^2^850^540^^1^<>SELECT description FROM rpta_column_layout where uniquename=<>;^
diff --git a/src-modules/module/viz/masken/44600_sachgeb_maske_bez.unl b/src-modules/module/viz/masken/44600_sachgeb_maske_bez.unl
deleted file mode 100644
index 9f2d864..0000000
--- a/src-modules/module/viz/masken/44600_sachgeb_maske_bez.unl
+++ /dev/null
@@ -1 +0,0 @@
-16^44600^
diff --git a/src-modules/module/viz/masken/44720_felderinfo.unl b/src-modules/module/viz/masken/44720_felderinfo.unl
index 4713b4f..14ef498 100644
--- a/src-modules/module/viz/masken/44720_felderinfo.unl
+++ b/src-modules/module/viz/masken/44720_felderinfo.unl
@@ -24,31 +24,30 @@ order by tid DESC;^Eintrag^<> select tid,eintrag from semester where today(
44734^Jahr^110^0^0^140^80^1^integer^30^0^13^^ ^ ^
44735^tablestylesheet^150^0^0^100^100^1^char^255^1^1^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44720 order by ord^ ^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44720 order by ord limit 1^
44736^Grafiktitel^1010^0^0^100^100^1^char^255^0^0^^{InputCheck:disabled}^ ^
-44737^Grafik^1000^300^-1^170^150^1^char^30^0^1^<> select uniquename, caption from viz_chart where maskeninfo_id=44720 order by 2;^ ^<> select uniquename, caption from viz_chart where maskeninfo_id=44720 order by 2 limit 1;^
-44738^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>SELECT uniquename,\
- caption\
-FROM rpta_column_layout \
-where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rpta_sos_lab_aggr'\
+44737^Grafik^1000^300^-1^170^150^1^char^30^0^1^<> select uniquename, caption from viz_chart where maskeninfo_id=44720 order by 2;^{InputAction:setDependentFields}^<> select uniquename, caption from viz_chart where maskeninfo_id=44720 order by 2 limit 1;^
+44738^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>SELECT L.uniquename,\
+ L.caption\
+FROM rpta_column_layout L\
+where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('rpta_sos_lab_aggr')\
and R.systeminfo_id=7)\
-order by sortnr, caption\
- ;^hidden^ ^
-44739^Semestertyp^25^350^-1^140^80^1^integer^255^0^1^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^Eintrag^ ^
-44740^##line##^30^0^0^100^100^1^char^5000^0^8^^ ^1^
-44741^Abschluss^7^0^0^100^200^3^char^1500^0^12^<> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
-44742^viz_label_Zeitraum^20^350^-1^150^180^1^char^200^0^8^^{InputCheck:matrikelnummern}^ ^
-44743^##line##^40^0^0^100^100^1^char^5000^0^8^^ ^1^
-44744^_customVorbelegung^40^0^0^100^100^1^char^5000^0^1^<> select 'splitFields(''Grafikausgabe'')','Ausgabe';^{InputCheck:disabled}^<> select 'splitFields(''Grafikausgabe'')','Ausgabe';^
-44745^Grafikausgabe^1000^300^-1^170^150^1^char^30^0^1^<> select 'Grafik='||C.uniquename||'*Spaltenlayout='||L.uniquename, CL.caption\
+/* and L.uniquename in (select L.uniquename\
from viz_chart C, viz_chart2layout CL, rpta_column_layout L\
where C.tid=CL.chart_id\
and CL.layout_id=L.tid\
and C.maskeninfo_id=44720 \
- order by CL.sortnr,2\
-;^ ^<> select 'Grafik='||C.uniquename||'*Spaltenlayout='||L.uniquename, CL.caption\
+and C.uniquename=<>)*/\
+ order by L.sortnr, L.caption\
+ ;^ ^<>select L.uniquename, CL.caption\
from viz_chart C, viz_chart2layout CL, rpta_column_layout L\
where C.tid=CL.chart_id\
and CL.layout_id=L.tid\
and C.maskeninfo_id=44720 \
- order by CL.sortnr,2\
+/* and C.uniquename=<> */\
+ order by 2\
limit 1\
;^
+44739^Semestertyp^25^350^-1^140^80^1^integer^255^0^1^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^Eintrag^ ^
+44740^##line##^30^0^0^100^100^1^char^5000^0^8^^ ^1^
+44741^Abschluss^7^0^0^100^200^3^char^1500^0^12^<> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
+44742^viz_label_Zeitraum^20^350^-1^150^180^1^char^200^0^8^^{InputCheck:matrikelnummern}^ ^
+44743^##line##^40^0^0^100^100^1^char^5000^0^8^^ ^1^
diff --git a/src-modules/module/viz/masken/44720_masken_felder_bez.unl b/src-modules/module/viz/masken/44720_masken_felder_bez.unl
index 8c6e54b..a5298b1 100644
--- a/src-modules/module/viz/masken/44720_masken_felder_bez.unl
+++ b/src-modules/module/viz/masken/44720_masken_felder_bez.unl
@@ -19,5 +19,3 @@
44720^44741^
44720^44742^
44720^44743^
-44720^44744^
-44720^44745^
diff --git a/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql b/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql
index f1e38f1..2045f42 100644
--- a/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql
+++ b/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql
@@ -37,12 +37,12 @@ select tid from sos_stichtag where appl_key='4';
{"makro":"44190", "tid":"44630", "sortnr":"0"},
{"makro":"44190", "tid":"44570", "sortnr":"1"},
-{"makro":"44190", "tid":"44220", "sortnr":"10"},
-{"makro":"44190", "tid":"44280", "sortnr":"20"},
-{"makro":"44190", "tid":"44310", "sortnr":"30"},
-{"makro":"44190", "tid":"44310", "sortnr":"40"},
-{"makro":"44190", "tid":"44340", "sortnr":"50"},
-{"makro":"44190", "tid":"44600", "sortnr":"60"},
+{"makro":"44190", "tid":"44570", "sortnr":"10"},
+{"makro":"44190", "tid":"44570", "sortnr":"20"},
+{"makro":"44190", "tid":"44570", "sortnr":"30"},
+{"makro":"44190", "tid":"44570", "sortnr":"40"},
+{"makro":"44190", "tid":"44570", "sortnr":"50"},
+{"makro":"44190", "tid":"44570", "sortnr":"60"},
{"makro":"44660", "tid":"44630", "sortnr":"0"},
{"makro":"44660", "tid":"44750", "sortnr":"5"},