From 4fd0c79d424a9cfa1d06caa85bf9b2da4b4758b4 Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Tue, 21 Feb 2023 15:56:02 +0100
Subject: [PATCH] =?UTF-8?q?=C3=9Cbergabe=20COSTAGE=20an=20SOS=20korrigiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-modules/module/costage/conf/costage.xml   |  4 +++
 .../costage_st_studien_aggr_fuellen.sql       |  1 +
 .../rohdaten_sos/sos_costage_unload.xml       | 28 +++++++++++++------
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src-modules/module/costage/conf/costage.xml b/src-modules/module/costage/conf/costage.xml
index f371888..27939e5 100644
--- a/src-modules/module/costage/conf/costage.xml
+++ b/src-modules/module/costage/conf/costage.xml
@@ -1315,6 +1315,10 @@ parent="CO Basisdaten">Abfragen zu Prüfungen und Leistungen</thema>
 <relation-column from="apnr" to="geschlecht" />
 <relation-column from="key" to="9003" />
 </relation>
+<relation from="cif" to="costage_st_studierendenstammdaten" delete="FALSE" displayType="select" visibleFields="druck"  uniquenameField="" format="%s">
+<relation-column from="apnr" to="ca12_staat" />
+<relation-column from="key" to="12" />
+</relation>
 <relation from="costage_st_laender" to="costage_st_studierendenstammdaten" delete="FALSE"
 	displayType="select" visibleFields="name" format="%s">
 	<relation-column from="st_land_nr" to="st_land1_nr" />
diff --git a/src-modules/module/costage/hilfstabellen/costage_st_studien_aggr_fuellen.sql b/src-modules/module/costage/hilfstabellen/costage_st_studien_aggr_fuellen.sql
index 472958c..4f10f1b 100644
--- a/src-modules/module/costage/hilfstabellen/costage_st_studien_aggr_fuellen.sql
+++ b/src-modules/module/costage/hilfstabellen/costage_st_studien_aggr_fuellen.sql
@@ -62,6 +62,7 @@ and SG.studiengangs_typ_kb in ('ESG','TSG','MSG')
 and SA.st_studium_nr=ST.st_studium_nr
 and SA.st_sem_nr=SM.st_sem_nr
 and SA.gueltig_ab <=SM.semester_ende --nur letzter Status im jew. Semester interessiert, nicht danach
+and SA.gueltig_ab <= today() --Studis werden in der Semestermitte exmatr. zum Endedatum Semesterende, wenn dieses Datum in der Zukunft liegt soll der Studi mit dem vorherigen Status erscheinen
 and SA.studienstatustyp not in ('a','o')
 and ${COSTAGE_STUDENT_FILTER}
 --group by 1,2,3,4,5,6,7,8,9,10,11,12,13
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 7574fbe..853687b 100644
--- a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml
+++ b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml
@@ -2511,16 +2511,16 @@ P.matrikelnummer,
 P.studiengang_nr,
 P.fach_nr,
 G.abschluss,
-P.semester_veranst,
+P.semester,
 P.leistungsdatum,
-G.stg,
+G.skz_key as stg,
 null::integer as vert,
 null::integer as schwp,
-G.fachkennzeichen,
+string_not_null(G.fachkennzeichen),
 round(P.note::decimal(15,4),2) as note,
 null::integer as vken1,
 null::char(7), --pruefungsamt_nr
-P.pnr,
+P.abschnitt as pnr,
 val(G.pversion),
 P.leistungsstatus_map_kb as pstatus,
 P.fachsemester ,
@@ -3809,7 +3809,19 @@ SELECT distinct
    from cif
    where key=9003
    and apnr != -999990
-  
+  union
+   select 9010,
+   -1,
+   2 as apnr,
+   'Haupt',
+   'Hauptprüfung' as druck,
+   'Hauptprüfung' as lang,
+    null , --astat
+   null,
+   '' ,--sortc1
+   null,
+   '' --sprache
+   from xdummy
    
 ]]>
 </extraction-sql>
@@ -5923,7 +5935,7 @@ SELECT  substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
        null::integer,--vglgrp,
        K.struktur_c as fb,
        null::integer,--stutyp,
-       G.fachkennzeichen as kzfa,
+       string_not_null(G.fachkennzeichen) as kzfa,
        null::integer,--immsemkz,
        null::integer,--kzfaarray,
        null::integer,--stort,
@@ -5934,7 +5946,7 @@ SELECT  substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
        null::integer,--prax1fsem,
        null::integer,--prax2fsem,
        abschluss,
-       stg,
+       G.skz_key as stg,
        null::integer,--vert,
        null::integer,--schwp,
        null::integer,--stuart,
@@ -5949,7 +5961,7 @@ SELECT  substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
        null::integer -- ects
        FROM costage_st_studiengaenge G, cifx K
        where K.key=30
-       and K.apnr=G.stg
+       and K.apnr=G.skz_key
        ;
 ]]>
 </extraction-sql>