diff --git a/src-modules/module/xcube/conf/xcube.xml b/src-modules/module/xcube/conf/xcube.xml index bcc94e9..0af13e3 100644 --- a/src-modules/module/xcube/conf/xcube.xml +++ b/src-modules/module/xcube/conf/xcube.xml @@ -240,6 +240,54 @@ parent="Xcubes">Abfragen zur Administration von Xcubes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-modules/module/xcube/schluesseltabellen/xcube_dims_install.sql b/src-modules/module/xcube/schluesseltabellen/xcube_dims_install.sql index e7dad0d..ea96856 100644 --- a/src-modules/module/xcube/schluesseltabellen/xcube_dims_install.sql +++ b/src-modules/module/xcube/schluesseltabellen/xcube_dims_install.sql @@ -49,16 +49,16 @@ select 'semester',druck ,tid::varchar(50),tid from kenn_semester; delete from xcube_dims where id='fssemzahl'; INSERT INTO xcube_dims (id,apnr,name,sort1) select distinct 'fssemzahl',fach_sem_zahl::varchar(10),fach_sem_zahl||'.FS',fach_sem_zahl from sos_stg_aggr -where fach_sem_zahl <= 10; +where fach_sem_zahl between 0 and 10; INSERT INTO xcube_dims (id,apnr,name,sort1) select distinct 'fssemzahl', '99','FS>10',99 from sos_stg_aggr where fach_sem_zahl>10; <#if TableFieldExists('sos_stg_aggr','hssem')> -delete from xcube_dims where id='hssem'; +delete from xcube_dims where id='hssemzahl'; INSERT INTO xcube_dims (id,apnr,name,sort1) select distinct 'hssemzahl',hssem::varchar(10),hssem||'.HS',hssem from sos_stg_aggr -where hssem <= 10; +where hssem between 0 and 10; INSERT INTO xcube_dims (id,apnr,name,sort1) select distinct 'hssemzahl', '999','HS>10',99 from sos_stg_aggr where hssem>10; diff --git a/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql b/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql index b9e6b7b..33cb950 100644 --- a/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql +++ b/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql @@ -5,7 +5,7 @@ update xcube set restriction='<> /* AND fach_sem_zahl <= <> */ /* and stichtag = <> */ /* and kz_rueck_beur_ein in(<>) */ - /* and geschlecht=<> */ + /* and geschlecht in (<>) */ /* 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 /> --<>