From 595a335a988810f12b80cb169131bab21fdc1e92 Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Thu, 31 Oct 2024 14:55:48 +0100
Subject: [PATCH] Bugfix negat. Fachsem./Hochschulsem. #1

---
 src-modules/module/xcube/conf/xcube.xml       | 48 +++++++++++++++++++
 .../schluesseltabellen/xcube_dims_install.sql |  6 +--
 .../xcube_install_restrictions.sql            |  2 +-
 3 files changed, 52 insertions(+), 4 deletions(-)

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 </thema>
 </action>
 </install-step>
 </install>
+<!-- Elemente nur für die neue KV von HIS:-->
+<install_upgrade_job>
+  <install-upgrade-step name="pre_upgrade" type="container" id="xcube_preupgrade_containernode">
+    <action error="stop"/>
+  </install-upgrade-step>
+  <install-upgrade-step name="upgrade_tables" type="" id="xcube_upgrade_tables_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$XCUBE_PFAD/upgrade/xcube_upgrade_tables_pg.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="upgrade_fields" type="" id="xcube_upgrade_fields_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$XCUBE_PFAD/upgrade/xcube_upgrade_fields_pg.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="upgrade_views" type="" id="xcube_upgrade_views_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$XCUBE_PFAD/upgrade/xcube_upgrade_views_pg.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="install_functions" type="container" id="xcube_install_functions_containernode">
+    <action error="stop"/>
+  </install-upgrade-step>
+  <install-upgrade-step name="upgrade_indices" type="" id="xcube_upgrade_indices_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$XCUBE_PFAD/upgrade/xcube_upgrade_indexes_pg.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="fill_tables" type="" id="xcube_fill_tables_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$XCUBE_PFAD/conf/sx_tables_fuellen.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="Update Module Metadata" type="container" id="xcube_update_module_metadata_container">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$XCUBE_PFAD/conf/module_metadata.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  
+  <install-upgrade-step name="update_topic_tree" type="" id="xcube_update_topictree_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$XCUBE_PFAD/upgrade/xcube_upgrade_themenbaum.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="install_masks" type="container" id="xcube_install_masks_containernode">
+    <action error="stop"/>
+  </install-upgrade-step>
+</install_upgrade_job>
 
 <upgrade>
 <upgrade-step>
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>
 
 <#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;
 </#if>
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='<<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>>