From 7440ee0d7579663fa4f2cbb47132db0548942b7f Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Tue, 30 Jul 2024 08:32:03 +0200
Subject: [PATCH] Neues Feld costage_st_studien_aggr.st_studium_nr_msg #16

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

diff --git a/src-modules/module/costage/conf/costage.xml b/src-modules/module/costage/conf/costage.xml
index 3565d1c..3dd1938 100644
--- a/src-modules/module/costage/conf/costage.xml
+++ b/src-modules/module/costage/conf/costage.xml
@@ -600,6 +600,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
   </column>-->
   <column name="praxissemester" type ="INTEGER" size ="4" default ="" notnull ="false" description="Praxissemester" />
 <column name="klinsem" type ="INTEGER" size ="4" default ="" notnull ="false" description="Klinische Semester" />
+<column name="st_studium_nr_msg" type ="INTEGER" size ="8" default ="" notnull ="false" description="Studium des MSG (ID)" />
 </columns>
 <indexes>
 
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 1957ec9..e72252a 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
@@ -597,6 +597,7 @@ studiengangs_identifikator,
 studiengangs_bezeichnung,
 st_sem_nr,
 st_studium_nr,
+st_studium_nr_msg,
 st_studstamm_nr,
 studienstatustyp,
 st_studienstatus_nr,
@@ -806,6 +807,7 @@ studiengangs_identifikator,
 studiengangs_bezeichnung,
 st_sem_nr,
 T.st_studium_nr,
+T.st_studium_nr_msg,
 st_studstamm_nr,
 studienstatustyp,
 st_studienstatus_nr,
@@ -853,7 +855,7 @@ into temp tmp_studien3
 from tmp_studien2 T left outer join costage_st_studien_spoversionen SPO
 on (SPO.st_studium_nr=T.st_studium_nr
 and SPO.gueltig_ab < T.semester_ende)
-group by 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45 ,46, 47,48 --,49,50,51,52
+group by 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45 ,46, 47,48,49 --,50,51,52
 ;
 
 select 160,timestamp_str(now()) from xdummy;
@@ -884,6 +886,7 @@ create index ix_tmp_studien2 on tmp_studien3(kz_rueck_beur_ein)
 ;
 insert into costage_st_studien_aggr(
 st_studium_nr,
+st_studium_nr_msg,
        st_studstamm_nr,
        matrikelnummer,
        st_studiengang_nr,
@@ -924,6 +927,7 @@ st_studium_nr,
        )
        
 select st_studium_nr,
+st_studium_nr_msg,
        st_studstamm_nr,
        matrikelnummer,
        st_studiengang_nr,
@@ -984,6 +988,7 @@ select st_studium_nr,
 -- from above to accomodate ranking in  studiengangNummer field
 insert into costage_st_studien_aggr(
 st_studium_nr,
+st_studium_nr_msg,
        st_studstamm_nr,
        matrikelnummer,
        st_studiengang_nr,
@@ -1024,6 +1029,7 @@ st_studium_nr,
        )
        
 select st_studium_nr,
+st_studium_nr_msg,
        st_studstamm_nr,
        matrikelnummer,
        st_studiengang_nr,
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 337da12..2926b87 100644
--- a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml
+++ b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml
@@ -236,7 +236,7 @@ null::char(1) as field_of_study,
 primaerflag as primaerfach,
 unikey ,
 po_regelstudienzeit ,-- individual_number_of_semesters
-F.st_studium_nr as degree_program_id ,
+coalesce(F.st_studium_nr_msg,F.st_studium_nr) as degree_program_id ,
 null::char(10) as hssem_valid,
 null::Char(10) as k_field_of_study_subj_id,
 F.kz_rueck_beur_ein_tsg,
@@ -1041,8 +1041,18 @@ select * from k_stg where 1=0;
 </unload-job>
 <unload-job id="sos_labzuord" extraction-table="" extraction-script="" transfer-unload-file="unl/sos_labzuord.unl" >
 <extraction-sql sourcesystem="co"  database="" version="">
-<![CDATA[
-select * from k_stg where 1=0;
+<![CDATA[ select 
+matrikelnummer as mtknr,
+       leistung_nr as labnr,
+       null::char(1) as artzuordnung,
+       null::char(1) as pordnrzu,
+       leistung_nr_msg as labnrzu,
+       null::char(1) as bonus,
+       null::char(1) as malus
+       from costage_st_pruef_aggr
+       where leistung_nr_msg != leistung_nr
+       --AND semester >= $start_pruef_sem
+;
 ]]>
 </extraction-sql>
 </unload-job>