From 6717b6d4d82ac3162db4d48e10cea76ed6c320e4 Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Thu, 14 Sep 2023 07:24:43 +0200
Subject: [PATCH] =?UTF-8?q?Status=20von=20TSG=20nach=20SOS=20=C3=BCbergebe?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-modules/module/costage/conf/costage.xml     |  9 +++++++++
 .../costage_st_studien_aggr_fuellen.sql         | 11 ++++++++++-
 .../module/costage/rohdaten/csv_unloads2unl.sql |  4 ++--
 .../costage/rohdaten_sos/sos_costage_unload.xml | 17 ++++++++++++++---
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src-modules/module/costage/conf/costage.xml b/src-modules/module/costage/conf/costage.xml
index becb933..75d3ed1 100644
--- a/src-modules/module/costage/conf/costage.xml
+++ b/src-modules/module/costage/conf/costage.xml
@@ -565,6 +565,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
   </column>
 
 <column name="summe" type ="INTEGER" size ="2" default ="" notnull ="false" description="Summe" />
+<column name="kz_rueck_beur_ein_tsg" type ="SMALLINT" size ="2" default ="" notnull ="false" description="Rückmeldestatus (amtlich) TSG" />
 
 </columns>
 <indexes>
@@ -1686,6 +1687,14 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
 	displayType="select" visibleFields="matrikelnummer" format="%s">
 	<relation-column from="st_studstamm_nr" to="st_studstamm_nr" />
 </relation>
+<relation from="cif" to="costage_st_studien_aggr" delete="FALSE" displayType="select" visibleFields="druck"  uniquenameField="" format="%s">
+<relation-column from="apnr" to="kz_rueck_beur_ein" />
+<relation-column from="key" to="9001" />
+</relation>
+<relation from="cif" to="costage_st_studien_aggr" delete="FALSE" displayType="select" visibleFields="druck"  uniquenameField="" format="%s">
+<relation-column from="apnr" to="kz_rueck_beur_ein_tsg" />
+<relation-column from="key" to="9001" />
+</relation>
 
 <!--costage_st_pruef_aggr-->
 <relation from="costage_st_semester" to="costage_st_pruef_aggr" delete="FALSE"
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 de64d88..879e7fb 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
@@ -50,6 +50,7 @@ null::date as anfdat,
 null::date as ruebeudat,
 null::date as endedat,
 null::smallint as kz_rueck_beur_ein,
+null::smallint as kz_rueck_beur_ein_tsg,
 null::char(10) as hzb_art,
 rank () over (partition by SM.st_sem_nr, S.st_studstamm_nr, SG.studiengangs_identifikator  order by SA.gueltig_ab desc) as status_historie
 into temp tmp_studien
@@ -433,7 +434,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
+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
 ;
 
 update tmp_studien3 set po_stp_stp_version_kb= SPO.po_stp_stp_version_kb
@@ -441,6 +442,10 @@ from costage_st_studien_spoversionen SPO
 where SPO.st_studium_nr=tmp_studien3.st_studium_nr
 and tmp_studien3.spo_max_gueltig_ab =SPO.gueltig_ab;
 
+update tmp_studien3 set kz_rueck_beur_ein_tsg=(select val(astat)
+from cifx where key=400 
+and apnr=tmp_studien3.statustyp_tsg
+);
 
 drop table tmp_studien2;
 
@@ -475,6 +480,7 @@ st_studium_nr,
        endedat,
        stufrm,
        kz_rueck_beur_ein,
+       kz_rueck_beur_ein_tsg,
        hzb_art,
        po_stp_stp_version_kb,
        summe
@@ -514,6 +520,7 @@ select st_studium_nr,
        else null::date end) as endedat,
        studienform_statistik_code as stufrm,
        kz_rueck_beur_ein,
+       kz_rueck_beur_ein_tsg,
        hzb_art,
        po_stp_stp_version_kb,
        1 as summe
@@ -546,6 +553,7 @@ st_studium_nr,
        endedat,
        stufrm,
        kz_rueck_beur_ein,
+       kz_rueck_beur_ein_tsg,
        hzb_art,
        po_stp_stp_version_kb,
        summe
@@ -586,6 +594,7 @@ cast (NULL as int)   as studiengang_nr2,
        else null::date end) as endedat,
        studienform_statistik_code as stufrm,
        kz_rueck_beur_ein,
+       kz_rueck_beur_ein_tsg,
        hzb_art,
        po_stp_stp_version_kb,
        1 as summe
diff --git a/src-modules/module/costage/rohdaten/csv_unloads2unl.sql b/src-modules/module/costage/rohdaten/csv_unloads2unl.sql
index 1958413..30c7c8d 100644
--- a/src-modules/module/costage/rohdaten/csv_unloads2unl.sql
+++ b/src-modules/module/costage/rohdaten/csv_unloads2unl.sql
@@ -35,8 +35,8 @@
   {"srcfile":"px_st_abmeldungsarten_v.csv", "targettable":"costage_st_abmeldungsarten", "targetfile":"costage_st_abmeldungsarten.unl"},
   {"srcfile":"px_st_personen_abmeldungen_v.csv", "targettable":"costage_st_personen_abmeldungen", "targetfile":"costage_st_personen_abmeldungen.unl"},
   {"srcfile":"px_st_ersthochschulen_v.csv", "targettable":"costage_st_ersthochschulen", "targetfile":"costage_st_ersthochschulen.unl"},
-  {"srcfile":"px_st_hochschulsemester_v.csv", "targettable":"costage_st_hochschulsemester", "targetfile":"costage_st_hochschulsemester.unl"},
-  {"srcfile":"px_leistungen_v.csv", "targettable":"costage_leistungen", "targetfile":"costage_leistungen.unl"},
+  {"srcfile":"sx_st_hochschulsemester_v.csv", "targettable":"costage_st_hochschulsemester", "targetfile":"costage_st_hochschulsemester.unl"},
+  {"srcfile":"sx_leistungen_v.csv", "targettable":"costage_leistungen", "targetfile":"costage_leistungen.unl"},
   {"srcfile":"px_leistungen_detail_typen_v.csv", "targettable":"costage_leistungen_detail_typen", "targetfile":"costage_leistungen_detail_typen.unl"},
   {"srcfile":"px_leistungen_typen_v.csv", "targettable":"costage_leistungen_typen", "targetfile":"costage_leistungen_typen.unl"},
   {"srcfile":"px_antritte_v.csv", "targettable":"costage_antritte", "targetfile":"costage_antritte.unl"},
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 ffaca67..2b0e14e 100644
--- a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml
+++ b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml
@@ -211,7 +211,8 @@ null::char(1) as field_of_study,
 primaerflag as primaerfach,
 unikey ,
 null::numeric(9,6) ,-- individual_number_of_semesters
-F.st_studium_nr as degree_program_id 
+F.st_studium_nr as degree_program_id ,
+F.kz_rueck_beur_ein_tsg
 FROM costage_st_studiengaenge G, costage_st_studien_aggr F
 WHERE G.st_studiengang_nr=F.st_studiengang_nr
 and F.statustyp is not null
@@ -266,7 +267,7 @@ P.abschnitt as pnr,
 val(G.pversion),
 P.leistungsstatus_map_kb as pstatus,
 P.fachsemester ,
-null::char(7) as part,
+P.leistungsdetailtyp_kb as part,
 P.leistung_nr,
 null::integer as pversuch,
 null::char(7)as ppruef1,
@@ -297,7 +298,9 @@ null::char(1) as  ut_top_unit_id,
 null::char(1) as ut_top_k_elementtype_id,
 null::char(1) as child_ut_top_unit_id,
 null::char(1) as child_ut_top_unit_stat,
-null::char(1) as k_unit_purpose_id
+null::char(1) as k_unit_purpose_id,
+null::char(1) as sem_der_pruefung_exa,
+null::char(1) as d_abg_pruefung_exa
 FROM costage_st_pruef_aggr P, costage_st_studiengaenge G
 where G.st_studiengang_nr=P.st_studiengang_nr
 AND P.semester >= $start_pruef_sem
@@ -1033,6 +1036,14 @@ select * from k_stg where 1=0;
 ]]>
 </extraction-sql>
 </unload-job>
+<unload-job id="sos_event_del_person" extraction-table="" extraction-script="" transfer-unload-file="unl/sos_event_del_person.unl" >
+<comment></comment>
+<extraction-sql sourcesystem="co"  database="" version="">
+<![CDATA[
+select * from k_stg where 1=0;
+]]>
+</extraction-sql>
+</unload-job>
 <unload-job id="finalize" extraction-table="" extraction-script="">
 <comment></comment>
 <extraction-sql sourcesystem="co"  database="" version="">