einheitliche Benennung Xcubes

src-modules/module/xcube/masken/21000_felderinfo.unl

@@ -1,8 +1,8 @@
 21000^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<<SQL>> select apnr, eintrag from koepfe_oder_faelle where eintrag not like 'gewichtet nach%'  order by 2^apnr, eintrag^<<SQL>> select apnr, eintrag from koepfe_oder_faelle where eintrag='Köpfe';^
 21001^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;^
-21002^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';^
-21003^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;^ ^ ^
-21004^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.';^
+21002^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';^
+21003^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;^^^
+21004^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.';^
 21005^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';^
 21006^Weitere Tabellen^123^0^0^140^140^10^char^30^0^999^<<SQL>> \
 --freemarker template\
@@ -10,12 +10,11 @@ select name,string_not_null(caption) || ' - ' || name from sx_tables where  name
 <#if <<tablestylesheet>>!='tabelle_html_datenblatt.xsl'>\
  and  name in (select distinct tablename from stylesheet_field where stylesheet_id in (select tid from sx_stylesheets where filename=<<tablestylesheet>>)) \
 </#if>\
-order by 2^ ^ ^
-21007^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^0^^ ^ ^
-21008^Fächer^8^0^0^130^150^10^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^
+order by 2^^^
+21007^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^0^^^^
 21009^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;^
-21010^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;^ ^ ^
-21011^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;^ ^ ^
+21010^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;^^^
+21011^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;^^^
 21012^Felder^125^0^0^150^190^10^char^30^0^999^<<SQL>>\
 --freemarker template\
  select trim(F.table_name) || '.' || F.name,trim(T.caption) || ':' || trim(F.caption) || ' - ' || trim(F.name) from sx_fields F,\
@@ -31,23 +30,23 @@ and apnr=1)) \
 and trim(F.table_name) || '.' || F.name in (select trim(tablename)||'.'||trim(fieldname) from stylesheet_field where stylesheet_id in \
 (select tid from sx_stylesheets where filename=<<tablestylesheet>>))\
 </#if>\
-  order by 2;^ ^ ^
-21013^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;^ ^ ^
-21014^Schlüssel anzeigen^150^0^0^100^100^1^integer^30^1^999^<<SQL>> select 1,'Ja' from xdummy union select 0,'Nein' from xdummy^ ^<<SQL>>  select 1,'Ja' from xdummy^
-21015^Ansicht in Ergebniszeilen^121^0^0^100^200^1^char^200^1^1^<<SQL>> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_rowdim=1 order by 2^ ^<<SQL>> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_rowdefault=1^
-21016^Ansicht in Ergebnisspalten^2001^0^0^100^150^1^char^200^1^1^<<SQL>> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_coldim=1 order by 2^ ^<<SQL>> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_coldefault=1^
-21017^Zivilstatus^41^350^-1^140^180^1^sql^30^0^13^<<SQL>> select attributevalue from personattribute_value_list where personattributetype_id = (select personattributetype_id from personattributetype where attributevalue = 'Status');^ ^ ^
-21018^Jahrgang^42^350^-1^140^180^1^sql^30^0^13^<<SQL>> select attributevalue from personattribute_value_list where personattributetype_id = (select personattributetype_id from personattributetype where attributevalue = 'Jahrgang');^ ^ ^
+  order by 2;^^^
+21013^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;^^^
+21014^Schlüssel anzeigen^150^0^0^100^100^1^integer^30^1^999^<<SQL>> select 1,'Ja' from xdummy union select 0,'Nein' from xdummy^^<<SQL>>  select 1,'Ja' from xdummy^
+21015^Ansicht in Ergebniszeilen^121^0^0^100^200^1^char^200^1^1^<<SQL>> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_rowdim=1 order by 2^^<<SQL>> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_rowdefault=1^
+21016^Ansicht in Ergebnisspalten^2001^0^0^100^150^1^char^200^1^1^<<SQL>> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_coldim=1 order by 2^^<<SQL>> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_coldefault=1^
+21017^Zivilstatus^41^350^-1^140^180^1^sql^30^0^13^<<SQL>> select attributevalue from personattribute_value_list where personattributetype_id = (select personattributetype_id from personattributetype where attributevalue = 'Status');^^^
+21018^Jahrgang^42^350^-1^140^180^1^sql^30^0^13^<<SQL>> select attributevalue from personattribute_value_list where personattributetype_id = (select personattributetype_id from personattributetype where attributevalue = 'Jahrgang');^^^
 21019^Leere Zeilen ausblenden^130^350^-1^140^80^1^char^30^0^1^<<SQL>> select 'ja','ja' from xdummy union select 'nein','nein' from xdummy^ ^<<SQL>> select 'ja','ja' from xdummy^
-21020^Leere Spalten ausblenden^2020^0^0^100^100^1^char^30^0^1^<<SQL>> select 'ja','ja' from xdummy union select 'nein','nein' from xdummy^ ^<<SQL>> select 'ja','ja' from xdummy^
-21021^Abschluss^7^0^0^140^170^5^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('SOS-Abschluss-Sicht') order by 3,2;^ ^ ^
+21020^Leere Spalten ausblenden^2020^0^0^100^100^1^char^30^0^1^<<SQL>> select 'ja','ja' from xdummy union select 'nein','nein' from xdummy^^<<SQL>> select 'ja','ja' from xdummy^
+21021^Abschluss^7^0^0^140^170^5^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('SOS-Abschluss-Sicht') order by 3,2;^^^
 21022^Kennzahl^3000^350^-1^150^180^1^integer^200^1^1^<<SQL>> select tid,name from xcube_kennzahl where maskeninfo_id=${Maskennummer} order by sortnr,name;^hidden^<<SQL>> select tid,name from xcube_kennzahl where maskeninfo_id=${Maskennummer} and is_default=1^
 21023^2.Ansicht in Zeilen^125^0^0^100^100^1^char^50^0^999^<<SQL>> select name,caption from xcube_dimconfig where maskeninfo_id=${Maskennummer} and is_secondrowdim=1  order by 1^hidden^1^
-21024^Wohnort^38^0^0^140^80^1^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('XCUBE-Wohnort-Sicht') order by 3,2;^ ^ ^
-21025^Alter^39^0^0^140^80^1^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('XCUBE-Alter-Sicht') order by 3,2;^ ^ ^
-21026^HZB-Note^40^0^0^140^80^1^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('XCUBE-HZB-Note-Sicht') order by 3,2;^ ^ ^
-21027^Hörerstatus (intern)^43^0^0^140^80^1^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('XCUBE-Hörerstatus-Sicht') order by 3,2;^ ^ ^
+21024^Wohnort^38^0^0^140^80^1^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('XCUBE-Wohnort-Sicht') order by 3,2;^^^
+21025^Alter^39^0^0^140^80^1^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('XCUBE-Alter-Sicht') order by 3,2;^^^
+21026^HZB-Note^40^0^0^140^80^1^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('XCUBE-HZB-Note-Sicht') order by 3,2;^^^
+21027^Hörerstatus (intern)^43^0^0^140^80^1^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('XCUBE-Hörerstatus-Sicht') order by 3,2;^^^
 21028^Spaltenvisualisierung^10000^0^0^140^80^1^char^30^0^1^<<SQL>> select '_graph','Balken (horiz. linksb.)' from xdummy\
 union select '_graphbarright','Balken (horiz. rechtsb.)' from xdummy\
-union select '_graphbaralternating','Balken (horiz. rechtsb./linksb.)' from xdummy^ ^ ^
-21029^Zeilenfilter bis Ebene^140^0^0^140^10^1^integer^30^0^0^^ ^ ^
+union select '_graphbaralternating','Balken (horiz. rechtsb./linksb.)' from xdummy^^^
+21029^Zeilenfilter bis Ebene^140^0^0^140^80^1^integer^30^0^0^ ^^^

src-modules/module/xcube/masken/21000_maskeninfo.unl

@@ -1,4 +1,4 @@
-21000^Studierende XCUBE^--freemarker template\
+21000^Studierende Xcube^--freemarker template\
 -- Maskenfelder -Leere Zeilen ausblenden, leere SPalten ausblenden?\
 <sqlvars>\
 <sqlvar name="table_name">select table_name from xcube where maskeninfo_id=${Maskennummer}</sqlvar>\
@@ -432,5 +432,5 @@ Column CID=1 heading_text="${spalte.name}" center_heading\
    row_selectable heading_platform readonly explanation="Ausprägung ${spalte.name}"\
    width=12\
 </#foreach>\
-@@@^Altersgruppe^Anzahl^Dynamische Darstellung von Studierendenzahlen^drop table tmp_erg;\
-drop table tmp_cellmax;^^3^700^360^^1^^
+@@@^Altersgruppe^Anzahl^Kreuztabellen zu Studierendenzahlen^drop table tmp_erg;\
+drop table tmp_cellmax;^ ^3^700^360^0^1^ ^

src-modules/module/xcube/masken/21030_maskeninfo.unl

@@ -1,4 +1,4 @@
-21030^Datenwürfel verwalten^--freemarker template\
+21030^Kreuztabellen (Xcubes) verwalten^--freemarker template\
  \
 SELECT --X.tid,\
 X.name,\
@@ -41,4 +41,4 @@ Column CID=0 heading_text="Maske Nummer" center_heading\
 Column CID=0 heading_text="Bearbeiten" center_heading\
    row_selectable col_selectable heading_platform readonly\
    width=5 text_size=100\
-@@@^^^Dimensionen und Datenwürfel (xCubes) verwalten^ ^^1^440^360^0^1^^
+@@@^^^Dimensionen und Kreuztabellen (Xcubes) verwalten^ ^^1^440^360^0^1^^

src-modules/module/xcube/masken/21100_felderinfo.unl

@@ -50,4 +50,4 @@ and trim(F.table_name) || '.' || F.name in (select trim(tablename)||'.'||trim(fi
 21128^Spaltenvisualisierung^10000^0^0^140^80^1^char^30^0^1^<<SQL>> select '_graph','Balken (horiz. linksb.)' from xdummy\
 union select '_graphbarright','Balken (horiz. rechtsb.)' from xdummy\
 union select '_graphbaralternating','Balken (horiz. rechtsb./linksb.)' from xdummy^^^
-21129^Zeilenfilter bis Ebene^140^0^0^140^10^1^integer^30^0^0^ ^^^
+21129^Zeilenfilter bis Ebene^140^0^0^140^80^1^integer^30^0^0^ ^^^

src-modules/module/xcube/masken/21100_maskeninfo.unl

@@ -1,4 +1,4 @@
-21100^Abschlussprüfungen XCUBE^--freemarker template\
+21100^Abschlussprüfungen Xcube^--freemarker template\
 -- Maskenfelder -Leere Zeilen ausblenden, leere SPalten ausblenden?\
 <sqlvars>\
 <sqlvar name="table_name">select table_name from xcube where maskeninfo_id=${Maskennummer}</sqlvar>\
@@ -426,5 +426,5 @@ Column CID=1 heading_text="${spalte.name}" center_heading\
    row_selectable heading_platform readonly explanation="Ausprägung ${spalte.name}"\
    width=12\
 </#foreach>\
-@@@^Altersgruppe^Anzahl^Dynamische Darstellung von Studierendenzahlen^drop table tmp_erg;\
+@@@^Altersgruppe^Anzahl^Kreuztabellen zu Zahlen für Abschlussprüfungen^drop table tmp_erg;\
 drop table tmp_cellmax;^ ^3^700^360^0^1^ ^

src-modules/module/xcube/masken/21200_felderinfo.unl

@@ -4,7 +4,7 @@
 21203^Dienstart^4^0^0^100^150^3^char^30^0^12^<<SQL>>select tid,type,name from sichten where art ='SVA Dienstart' and aktiv=1 order by type,name;^^^
 21204^BVL-Gruppe^5^300^-1^100^150^3^char^30^0^12^<<SQL>>select tid,type,name from sichten where art ='SVA BVL-Gruppen' and aktiv=1 order by type,name;^^^
 21205^Amtsbezeichnung^6^0^0^100^150^3^char^30^0^12^<<SQL>>select tid,type,name from sichten where art ='SVA Amtsdienstbez.' and aktiv=1 order by type,name;^^^
-21206^Personalzählung^121^0^0^110^150^1^sql^20^1^5^<<SQL>> SELECT 'v','Vollzeit-Äquiv.' from xdummy ;^^<<SQL>> select 'v','Vollzeit-Äquiv.' from xdummy;^
+21206^Personalzählung^121^0^0^110^150^1^sql^20^1^1^<<SQL>> SELECT 'v','Vollzeit-Äquiv.' from xdummy ;^^<<SQL>> select 'v','Vollzeit-Äquiv.' from xdummy;^
 21207^Alter (bis)^11^130^-1^100^70^1^integer^5^0^0^^^^
 21208^Befristet bis^12^300^-1^100^80^1^date^10^0^0^^^^
 21209^Beurlaubung^3^300^-1^100^150^3^char^30^0^12^<<SQL>>select tid,type,name from sichten where art ='SVA-Beurlaubung-Sicht' and aktiv=1 order by type,name;^^^

src-modules/module/xcube/masken/21200_maskeninfo.unl

@@ -1,4 +1,4 @@
-21200^Personal XCUBE^--freemarker template\
+21200^Personal Xcube^--freemarker template\
 -- Maskenfelder -Leere Zeilen ausblenden, leere SPalten ausblenden?\
 <sqlvars>\
 <sqlvar name="table_name">select table_name from xcube where maskeninfo_id=${Maskennummer}</sqlvar>\
@@ -426,5 +426,5 @@ Column CID=1 heading_text="${spalte.name}" center_heading\
    row_selectable heading_platform readonly explanation="Ausprägung ${spalte.name}"\
    width=12\
 </#foreach>\
-@@@^Altersgruppe^Anzahl^Dynamische Darstellung von Personalzahlen^drop table tmp_erg;\
+@@@^Altersgruppe^Anzahl^Kreuztabellen zu Personalzahlen^drop table tmp_erg;\
 drop table tmp_cellmax;^ ^3^700^360^0^1^ ^