From 88f8d1bda206d0239252889365319ab5e2092ef0 Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Fri, 7 Feb 2025 08:55:47 +0100
Subject: [PATCH] Bugfix Filter Fach/Abschluss #25

---
 src-modules/module/costage/conf/costage.xml               | 2 +-
 src-modules/module/costage/masken/43040_maskeninfo.unl    | 4 ++--
 src-modules/module/costage/masken/43080_maskeninfo.unl    | 4 ++--
 .../module/costage/rohdaten_sos/sos_costage_unload.xml    | 8 ++++----
 .../costage_dim_studiengang_fuellen.sql                   | 1 +
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src-modules/module/costage/conf/costage.xml b/src-modules/module/costage/conf/costage.xml
index 614a195..ffdd9e8 100644
--- a/src-modules/module/costage/conf/costage.xml
+++ b/src-modules/module/costage/conf/costage.xml
@@ -304,7 +304,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 
 <table name="costage_dim_studiengang" thema="Studierende und Gebühren" caption="Studiengänge (CO)" typ="Schlüsseltabelle" releaseUnload="empty">
 <columns>
-<column name="tid" type ="INTEGER" size ="8" default ="" notnull ="true" description="Laufnummer"/>
+<column name="tid" type ="SERIAL" size ="8" default ="" notnull ="true" description="Laufnummer"/>
 <column name="st_studiengang_nr" type ="INTEGER" size ="10" default ="" notnull ="false" description="Studiengang Laufnr."/>
 <column name="studiengangs_identifikator" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Studiengang ID"/>
 <column name="studiengangs_bezeichnung" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Studiengang Name"/>
diff --git a/src-modules/module/costage/masken/43040_maskeninfo.unl b/src-modules/module/costage/masken/43040_maskeninfo.unl
index cf22663..8218784 100644
--- a/src-modules/module/costage/masken/43040_maskeninfo.unl
+++ b/src-modules/module/costage/masken/43040_maskeninfo.unl
@@ -69,8 +69,8 @@ SELECT name,\
 /* and semester <= <<Bis Semester>> */\
 /* AND fachsemester <= <<bis Fachsemester>> */\
 /* and statustyp in(<<Status>>) */\
-/* and costage_st_studien_aggr.studiengang_tid in (select G.tid from costage_st_studiengaenge G where G.abschluss in (<<Abschluss>>)) */\
-/* and costage_st_studien_aggr.studiengang_tid in (select G.tid from costage_st_studiengaenge G where G.skz_key in (<<Fach>>)) */\
+/* and costage_st_studien_aggr.studiengang_tid in (select G.tid from costage_dim_studiengang G where G.abschluss_code in (<<Abschluss>>)) */\
+/* and costage_st_studien_aggr.studiengang_tid in (select G.tid from costage_dim_studiengang G where G.skz_key in (<<Fach>>)) */\
 /* and studiengang_nr =<<Studiengang-Nr.>> */\
 /* and fach_nr =<<Fach-Nr.>> */\
 /* and costage_st_studien_aggr.st_studstamm_nr in (select S.st_studstamm_nr from costage_st_studierendenstammdaten S where S.st_land1_nr in (<<Staatsangehörigkeit>>) ) */\
diff --git a/src-modules/module/costage/masken/43080_maskeninfo.unl b/src-modules/module/costage/masken/43080_maskeninfo.unl
index 3d5dd19..a1c7842 100644
--- a/src-modules/module/costage/masken/43080_maskeninfo.unl
+++ b/src-modules/module/costage/masken/43080_maskeninfo.unl
@@ -67,7 +67,7 @@ SELECT name,\
 /* and hrst in (<<Hörerstatus>>) */\
 /* AND leistungsdetailtyp_kb in (<<Leistungsdetailtyp>>) */\
 /* and leistungsstatus_map_kb in(<<Prüfungsstatus>>) */\
-/* and costage_st_pruef_aggr.studiengang_tid in (select G.tid from costage_st_studiengaenge G where G.abschluss in (<<Abschluss>>)) */\
+/* and costage_st_pruef_aggr.studiengang_tid in (select G.tid from costage_dim_studiengang G where G.abschluss_code in (<<Abschluss>>)) */\
 /* and studiengang_nr =<<Studiengang-Nr.>> */\
 /* and fach_nr =<<Fach-Nr.>> */\
 /* and costage_st_pruef_aggr.st_studstamm_nr in (select S.st_studstamm_nr from costage_st_studierendenstammdaten S where S.st_land1_nr in (<<Staatsangehörigkeit>>) ) */\
@@ -93,7 +93,7 @@ SELECT name,\
 \
 <#assign fach_filter="1=1" />\
 --Default: \
-/* <#assign fach_filter="costage_st_pruef_aggr.studiengang_tid in (select G.tid from costage_st_studiengaenge G where G.skz_key in (<<Fach>>))  "/> \
+/* <#assign fach_filter="costage_st_pruef_aggr.studiengang_tid in (select G.tid from costage_dim_studiengang G where G.skz_key in (<<Fach>>))  "/> \
 */\
 \
 \
diff --git a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml
index 15b3270..6964c32 100644
--- a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml
+++ b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml
@@ -197,7 +197,7 @@ and S.st_studstamm_nr=H.st_person_nr
 <![CDATA[
 SELECT
 F.matrikelnummer,
-G.abschluss,
+G.abschluss_code as abschluss,
 G.skz_key as stg,
 '' ,--vert,
 '' ,--schwp,
@@ -234,7 +234,7 @@ null::char(1),--  -- country.astat nur h1
 null::char(1) , --Art der Promotion
 null::char(1) as field_of_study,
 primaerflag as primaerfach,
-unikey ,
+F.unikey ,
 po_regelstudienzeit ,-- individual_number_of_semesters
 F.st_studium_nr as degree_program_id ,
 null::char(10) as hssem_valid,
@@ -245,8 +245,8 @@ abm_art_s as abmeldegrund,
 abm_art_s_tsg as abmeldegrund_tsg,
 G.studiengangs_identifikator as  degree_program_uniquename
 
-FROM costage_st_studiengaenge G, costage_st_studien_aggr F
-WHERE G.st_studiengang_nr=F.st_studiengang_nr
+FROM costage_dim_studiengang G, costage_st_studien_aggr F
+WHERE G.tid=F.studiengang_tid
 and F.statustyp is not null
 and F.fachsemester is not null
 and F.kz_rueck_beur_ein is not null
diff --git a/src-modules/module/costage/schluesseltabellen/costage_dim_studiengang_fuellen.sql b/src-modules/module/costage/schluesseltabellen/costage_dim_studiengang_fuellen.sql
index 2414063..5ea4918 100644
--- a/src-modules/module/costage/schluesseltabellen/costage_dim_studiengang_fuellen.sql
+++ b/src-modules/module/costage/schluesseltabellen/costage_dim_studiengang_fuellen.sql
@@ -106,6 +106,7 @@ create temp table tmp_hilf(
 maxtid integer);
 
 insert into tmp_hilf select max(tid) from costage_dim_studiengang;
+update tmp_hilf set maxtid=0 where maxtid is null;
 
 update tmp_costage_dim_studiengang set tid_orig=tid+(select maxtid from tmp_hilf)
 where ist_neu=1;