diff --git a/src-modules/module/xcube/schluesseltabellen/xcube_install.sql b/src-modules/module/xcube/schluesseltabellen/xcube_install.sql index 9cea848..d7998f5 100644 --- a/src-modules/module/xcube/schluesseltabellen/xcube_install.sql +++ b/src-modules/module/xcube/schluesseltabellen/xcube_install.sql @@ -103,7 +103,6 @@ {"maskeninfo_id":21000, "name":"hzbart", "caption":"Hochschulzugangsberechtigung", - "is_coldefault":1, "foreignkey_tab":"hs_zugangsber", "foreignkey_col":"tid::varchar(255)", "foreignkey_cap":"eintrag", @@ -132,7 +131,6 @@ {"maskeninfo_id":21000, "name":"ch27_grund_beurl", "caption":"Beurlaubungsgrund", - "is_coldefault":1, "foreignkey_tab":"cifx", "foreignkey_col":"apnr::varchar(255)", "foreignkey_cap":"druck", @@ -141,7 +139,6 @@ {"maskeninfo_id":21000, "name":"hzbart_int", "caption":"HZB (intern)", - "is_coldefault":1, "is_coldim":0, "foreignkey_tab":"k_hzbart", "foreignkey_col":"hzbart::varchar(255)", @@ -208,6 +205,7 @@ "foreignkey_cond":"key=9001", "sortfield":"druck"}, + <#--Entwicklung Prüfungswürfel--> {"maskeninfo_id":21100, "name":"geschlecht", diff --git a/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql b/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql index 7aa8649..4bf3f84 100644 --- a/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql +++ b/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql @@ -9,6 +9,7 @@ update xcube set restriction='<> /* and ${<>} */ /* 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 tid_stg in (select tid from dim_studiengang where stg in <@printkeys Fächer.allNeededKeysList/>) --<> */ /* and '''' || ca12_staat in <@printkeys Staatsangehörigkeit.allNeededKeysList/> --<> */ /* and (('''' || semkfz in <@printkeys Wohnort.allNeededKeysList/> and semkfzkz=0) --<> */ /* or ('''' || semkfz in <@printkeys Wohnort.allNeededKeysList/> and semkfzkz=1)) --<> */ @@ -27,7 +28,8 @@ update xcube set restriction='<> /* and sem_der_pruefung <= <>*/ /* and stichtag = <> */ /* 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 ''s_'' || tid_stg::char(10) in <@printkeys Studiengang.allNeededKeysList /> --<> + /* and tid_stg in (select tid from dim_studiengang where stg in <@printkeys Fächer.allNeededKeysList/>) --<> */ /* and '''' || ca12_staat in <@printkeys Staatsangehörigkeit.allNeededKeysList/> --<> */ /* and geschlecht=<> */ <#if "<>"!=""> and ${Alter.selectedItems[0].strukturStr?replace("$1","alter")}