From 4eff60971472699bc095267785a10a9aff00a3d9 Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Wed, 9 Oct 2024 15:20:46 +0200
Subject: [PATCH] negative Fachsem verhindern #1

---
 .../module/xcube/schluesseltabellen/xcube_dims_install.sql    | 4 ++--
 .../xcube/schluesseltabellen/xcube_install_restrictions.sql   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src-modules/module/xcube/schluesseltabellen/xcube_dims_install.sql b/src-modules/module/xcube/schluesseltabellen/xcube_dims_install.sql
index 32c28cf..be90a18 100644
--- a/src-modules/module/xcube/schluesseltabellen/xcube_dims_install.sql
+++ b/src-modules/module/xcube/schluesseltabellen/xcube_dims_install.sql
@@ -49,7 +49,7 @@ 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>
@@ -58,7 +58,7 @@ select distinct 'fssemzahl', '99','FS>10',99 from sos_stg_aggr where fach_sem_za
 delete from xcube_dims where id='hssem';
 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;
 </#if>
diff --git a/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql b/src-modules/module/xcube/schluesseltabellen/xcube_install_restrictions.sql
index fe4b0af..e0ba6bb 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='<<Köpfe oder Fälle ?>>
   /* AND fach_sem_zahl <= <<bis Fachsemester>> */
   /* and stichtag = <<Stichtag>> */
   /* and kz_rueck_beur_ein in(<<Status>>) */
-  /* and geschlecht=<<Geschlecht>> */
+  /* and geschlecht in (<<Geschlecht>>) */
   /* and ${<<Filter Studierende>>} */
   /* and tid_stg in (select tid from dim_studiengang where abschluss in <@printkeys Abschluss.allNeededKeysList />)  --<<Abschluss>> */
    and ''s_'' || tid_stg::char(10) in <@printkeys Studiengang.allNeededKeysList />  --<<Studiengang>>