diff --git a/src-modules/module/xcube/masken/21000_felderinfo.unl b/src-modules/module/xcube/masken/21000_felderinfo.unl index f8ea12d..1ec666b 100644 --- a/src-modules/module/xcube/masken/21000_felderinfo.unl +++ b/src-modules/module/xcube/masken/21000_felderinfo.unl @@ -39,7 +39,7 @@ and trim(F.table_name) || '.' || F.name in (select trim(tablename)||'.'||trim(fi 21018^Jahrgang^42^350^-1^140^180^1^sql^30^0^13^<> 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^<> select 'ja','ja' from xdummy union select 'nein','nein' from xdummy^ ^<> select 'ja','ja' from xdummy^ 21020^Leere Spalten ausblenden^2020^0^0^100^100^1^char^30^0^1^<> select 'ja','ja' from xdummy union select 'nein','nein' from xdummy^^<> select 'ja','ja' from xdummy^ -21021^Abschluss^7^0^0^140^170^5^char^30^0^1^<> select abint,dtxt from k_abint order by 2;^^^ +21021^Abschluss^7^0^0^140^170^5^char^30^0^12^<> 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^<> select tid,name from xcube_kennzahl where maskeninfo_id=${Maskennummer} order by sortnr,name;^hidden^<> 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^<> 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^<> select tid,name,sortnr from sichten where art in ('XCUBE-Wohnort-Sicht') order by 3,2;^^^ diff --git a/src-modules/module/xcube/schluesseltabellen/xcube_install.sql b/src-modules/module/xcube/schluesseltabellen/xcube_install.sql index 8bdf967..c74dfee 100644 --- a/src-modules/module/xcube/schluesseltabellen/xcube_install.sql +++ b/src-modules/module/xcube/schluesseltabellen/xcube_install.sql @@ -77,10 +77,7 @@ "caption":"Abschluss", "is_virtual":1, "vcsql":"update tmp_rohdaten set abschluss=(select abschluss from dim_studiengang where tid=tid_stg)", - "foreignkey_tab":"k_abint", - "foreignkey_col":"abint", - "foreignkey_cap":"dtxt", - "sortfield":"dtxt"}, + "is_sicht":1}, {"maskeninfo_id":21000, "name":"sem_rueck_beur_ein", "caption":"Semester", diff --git a/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql b/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql index 9e77166..d67be36 100644 --- a/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql +++ b/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql @@ -7,7 +7,7 @@ update xcube set restriction='<> /* and kz_rueck_beur_ein in(<>) */ /* and geschlecht=<> */ /* and ${<>} */ - /* and L.abschluss in (<>) */ + /* and tid_stg in (select tid from dim_studiengang where abschluss in <@printkeys Abschluss.allNeededKeysList />) --<> */ /* and ''s_'' || tid_stg::char(10) in <@printkeys Studiengang.allNeededKeysList /> --<> */ /* and '''' || ca12_staat in <@printkeys Staatsangehörigkeit.allNeededKeysList/> --<> */ /* and (('''' || semkfz in <@printkeys Wohnort.allNeededKeysList/> and semkfzkz=0) --<> */