Bugfix Übernahme SPO-Version von COSTAGE zu SOS #18

px_leistungen_v statt sx_leistungen_v laden #22
Merge branch 'bew_mzb' #24
22 changed files with 1422 additions and 505 deletions
--- a/README.md
+++ b/README.md
@ -10,6 +10,8 @@ Nach dem Auschecken des Repository z.B. in /home/superx/git können Sie es wie f
				@@ -10,6 +10,8 @@ Nach dem Auschecken des Repository z.B. in /home/superx/git können Sie es wie f
 	export ANT_HOME
 	PATH=$PATH:$ANT_HOME/bin
 	export PATH
+	COSTAGE_PFAD=$SUPERX_MODULE/costage; export COSTAGE_PFAD
+

 #Dann gehen Sie ins Verzeichnis

--- a/src-modules/module/costage/conf/costage.xml
+++ b/src-modules/module/costage/conf/costage.xml
@ -1,5 +1,5 @@
				@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module name="costage" version="0.4b" sachgebiet_id="310"
+<module name="costage" version="0.6b" sachgebiet_id="310"
 sachgebiet="CO Basisdaten" systeminfo_id="310"
 system="CO Basisdaten" thema="CO Basisdaten" thema_parent="Studierende, Prüfungen">
 <database name="superx" system="superx">
@ -315,9 +315,9 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -315,9 +315,9 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 <column name="studientyp_kb" type ="VARCHAR" size ="10" default ="" notnull ="false" description="Studientyp KB"/>
 <column name="stp_stp_nr" type ="INTEGER" size ="10" default ="" notnull ="false" description="" currentlyUsed="false"/>
 <column name="stuart" type ="CHAR" size ="10" default ="" notnull ="false" description="" currentlyUsed="false"/>
-<column name="stufrm" type ="CHAR" size ="10" default ="" notnull ="false" description="" currentlyUsed="false"/>
-<column name="pversion" type ="VARCHAR" size ="255" default ="" notnull ="false" description="P-Version"/>
-<column name="rsz" type ="INTEGER" size ="10" default ="" notnull ="false" description="Regelstudienzeit"/>
+<column name="stufrm" type ="CHAR" size ="10" default ="" notnull ="false" description="Studienform" />
+<column name="pversion" type ="VARCHAR" size ="255" default ="" notnull ="false" description="P-Version" currentlyUsed="false"/>
+<column name="rsz" type ="INTEGER" size ="10" default ="" notnull ="false" description="Regelstudienzeit" currentlyUsed="false"/>
 <column name="skz_key" type ="CHAR" size ="10" default ="" notnull ="false"  description="Studienfach (CO) Schlüssel" />
 <column name="skz_name" type ="VARCHAR" size ="255" default ="" notnull ="false"  description="Studienfach (CO) Name"/>
 <column name="unikey" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Hochschule"/>
@ -326,6 +326,8 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -326,6 +326,8 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 <column name="abschluss_name" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Abschluss Name"/>
 <column name="fakultaet_kurztext" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Fakultät KB"/>
 <column name="fakultaet_drucktext" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Fakultät Name"/>
+<column name="stort_nr" type ="VARCHAR" size ="4" default ="" notnull ="false" description="Standort Nr." />
+<column name="stort_name" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Standort Name" />
 </columns>
 <indexes></indexes>
 <primaryKeys><rs>
@ -422,13 +424,14 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -422,13 +424,14 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 </table>


-<table name="costage_st_studien" thema="Studierende und Gebühren" caption="Studienverläufe (CO)" typ="Datentabelle" releaseUnload="empty">
+<table name="costage_st_studien" thema="Studierende und Gebühren" caption="Persönliche Studien (CO)" typ="Datentabelle" releaseUnload="empty">
 <description>Studienverläufe (CO)</description>
 <columns><column name="st_studium_nr" type ="INTEGER" size ="8" default ="" notnull ="true" />
 <column name="st_studstamm_nr" type ="INTEGER" size ="8" default ="" notnull ="true" />
 <column name="st_studiengang_nr" type ="INTEGER" size ="8" default ="" notnull ="true" />
 <column name="studienform_name" type ="VARCHAR" size ="100" default ="" notnull ="false" />
 <column name="studienform_statistik_code" type ="VARCHAR" size ="2" default ="" notnull ="false" />
+<column name="hauptstudium_flag" type ="CHAR" size ="10" default ="" notnull ="false" description="Primärhaken" />
 </columns>
 <indexes></indexes>
 <primaryKeys><rs>
@ -480,6 +483,10 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -480,6 +483,10 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 <column name="second_nationality" type ="INTEGER" size ="4" default ="" notnull ="false" description="Amtl. Schluessel fuer zweite Staatsangehoerigkeit"  currentlyUsed="false"/>
 <column name="d_exmatr" type ="DATE" size ="4" default ="" notnull ="false" description="Datum der Exmatr. (obsolet)"/>
 <column name="semester_max" type ="INTEGER" size ="4" default ="" notnull ="false" description="Letztes eingeschriebenes Semester"  currentlyUsed=""/>
+<column name="abm_art_p" type ="CHAR" size ="10" default ="" notnull ="false" description="Art Abmeldung (personbezogen)" >
+ <sourcefield table="costage_st_personen_abmeldungen" name="st_abm_art_kurzbezeichnung" sourcesystem="co" />
+  <comment>Lookup via: st_sem_nr - costage_st_personen_abmeldungen.st_studstamm_nr/st_sem_nr - costage_st_semester.semester_tid / costage_st_personen_abmeldungen.person_flag='J'</comment>
+  </column>
  </columns>
 <indexes></indexes>
 <primaryKeys><rs>
@ -488,6 +495,29 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -488,6 +495,29 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 </rs></foreignKeys>
 </table>

+<table name="costage_st_hzb" thema="Studierende und Gebühren" caption="Schulische Vorbildung (CO)" typ="Datentabelle" releaseUnload="empty">
+<columns><column name="nr" type ="INTEGER" size ="4" default ="" isKey="true" notnull ="true" description="Nr" />
+<column name="hzb_land_nr" type ="INTEGER" size ="4" default ="" notnull ="false" description="HZB-Staat"/>
+<column name="hzb_land_sub_r_nr" type ="INTEGER" size ="4" default ="" notnull ="false" description="HZB-Ort"/>
+<column name="hzb_art_nr" type ="INTEGER" size ="4" default ="" notnull ="true" description="HZB-Art"/>
+<column name="hzb_jahr" type ="INTEGER" size ="4" default ="" notnull ="false" description="HZB-Jahr"/>
+<column name="hzb_datum" type ="DATE" size ="7" default ="" notnull ="true" description="HZB Datum "/>
+<column name="hzb_note" type ="VARCHAR" size ="40" default ="" notnull ="false" description="HZB-Note"/>
+<column name="st_person_nr" type ="INTEGER" size ="4" default ="" notnull ="true" description="Studierenden-Laufnr."/>
+<column name="hzb_note_original" type ="VARCHAR" size ="255" default ="" notnull ="false" description="HZB-Note (alphanumerisch)"/>
+</columns>
+<indexes></indexes>
+<primaryKeys><rs>
+</rs></primaryKeys>
+<foreignKeys><rs>
+</rs></foreignKeys>
+<importedKeys><rs>
+</rs></importedKeys>
+<privileges><rs>
+<row>
+</row>
+</rs></privileges>
+</table>


 <table name="costage_st_studien_aggr" thema="Studierende und Gebühren" caption="Studienverläufe (CO)" typ="Hilfstabelle" releaseUnload="empty">
@ -513,26 +543,6 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -513,26 +543,6 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 <column name="endedat" type ="DATE" size ="4" default ="" notnull ="false" description="Datum der Exmatr."/>
 <column name="stufrm" type ="CHAR" size ="10" default ="" notnull ="false" description="Studienform"/>
 <column name="kz_rueck_beur_ein" type ="SMALLINT" size ="2" default ="" notnull ="false" description="Rückmeldestatus (amtlich)" />
-<column name="hzb_art" type ="CHAR" size ="10" default ="" notnull ="false" description="Art der HZB (amtlich)" >
- <sourcefield table="costage_bw_bewerb_hzb" name="hzb_art_stla_code" sourcesystem="co" />
-  <comment>Lookup via: st_studstamm_nr - costage_bw_bewerbungen.st_studstamm_nr - costage_bw_bewerbungen.nr - costage_bw_bewerb_hzb.bw_bewrbng_nr </comment>
-  </column>
-<column name="hzb_datum" type ="DATE" size ="10" default ="" notnull ="false" description="Datum der HZB (Zeugnisdatum)" >
- <sourcefield table="costage_bw_bewerb_hzb" name="zeugnisdatum" sourcesystem="co" />
-  <comment>Lookup via: st_studstamm_nr - costage_bw_bewerbungen.st_studstamm_nr - costage_bw_bewerbungen.nr - costage_bw_bewerb_hzb.bw_bewrbng_nr - costage_bw_bewerb_hzb.zeugnisdatum</comment>
-  </column>
-<column name="hzb_note" type ="FLOAT" size ="10" default ="" notnull ="false" description="Note der HZB" >
- <sourcefield table="costage_bw_bewerb_hzb" name="hzb_note" sourcesystem="co" />
-  <comment>Lookup via: st_studstamm_nr - costage_bw_bewerbungen.st_studstamm_nr - costage_bw_bewerbungen.nr - costage_bw_bewerb_hzb.bw_bewrbng_nr - costage_bw_bewerb_hzb.hzb_note</comment>
-  </column>
-<column name="hzb_ort" type ="INTEGER" size ="10" default ="" notnull ="false" description="Landkreis der HZB" >
- <sourcefield table="costage_bw_bewerb_hzb" name="land_sub_r_nr" sourcesystem="co" />
-   <comment>Lookup via: st_studstamm_nr - costage_bw_bewerbungen.st_studstamm_nr - costage_bw_bewerbungen.nr - costage_bw_bewerb_hzb.bw_bewrbng_nr - costage_bw_bewerb_hzb.land_sub_r_nr - costage_land_subregionen.nr</comment>
-  </column>
-<column name="hzb_staat" type ="INTEGER" size ="10" default ="" notnull ="false" description="Staat der HZB (amtlich)" >
- <sourcefield table="costage_st_laender" name="statistik_code" sourcesystem="co" />
-   <comment>Lookup via: st_studstamm_nr - costage_bw_bewerbungen.st_studstamm_nr - costage_bw_bewerbungen.nr - costage_bw_bewerb_hzb.bw_bewrbng_nr - costage_bw_bewerb_hzb.st_land_nr - costage_st_laender.land_nr</comment>
-  </column>
 <column name="abm_art_p" type ="CHAR" size ="10" default ="" notnull ="false" description="Art Abmeldung (personbezogen)" >
 <sourcefield table="costage_st_personen_abmeldungen" name="st_abm_art_kurzbezeichnung" sourcesystem="co" />
  <comment>Lookup via: st_studium_nr/st_sem_nr - costage_st_personen_abmeldungen.st_studium_nr/st_sem_nr - costage_st_semester.semester_tid / costage_st_abmeldungsarten.bezug='P'</comment>
@ -563,11 +573,34 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -563,11 +573,34 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
  </column>
 <column name="po_stp_stp_version_kb" type ="CHAR" size ="10" default ="" notnull ="false" description="SPO-Version" >
 <sourcefield table="costage_st_studien_spoversionen" name="po_stp_stp_version_kb" sourcesystem="co" />
-  <comment>Lookup via: st_studium_nr - costage_st_adressen.st_studium_nr, hierbei die jeweils letzte  (max(gueltig_ab)  </comment>
+  <comment>Lookup via: st_studium_nr - costage_st_studien_spoversionen.st_studium_nr, hierbei die jeweils letzte  (max(gueltig_ab)  </comment>
  </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" />
+<column name="hzb_land_nr" type ="INTEGER" size ="4" default ="" notnull ="false" description="HZB-Staat"/>
+<column name="hzb_land_sub_r_nr" type ="INTEGER" size ="4" default ="" notnull ="false" description="HZB-Ort"/>
+<column name="hzb_art_nr" type ="INTEGER" size ="4" default ="" notnull ="false" description="HZB-Art"/>
+<column name="hzb_jahr" type ="INTEGER" size ="4" default ="" notnull ="false" description="HZB-Jahr"/>
+<column name="hzb_datum" type ="DATE" size ="7" default ="" notnull ="false" description="HZB Datum "/>
+<column name="hzb_note" type ="DECIMAL" size ="(14,7)" default ="" notnull ="false" description="HZB-Note"/>
+<column name="po_regelstudienzeit" type ="INTEGER" size ="10" default ="" notnull ="false" description="Regelstudienzeit SPO-Version" >
+ <sourcefield table="costage_st_studien_spoversionen" name="po_regelstudienzeit" sourcesystem="co" />
+  <comment>Lookup via: st_studium_nr - costage_st_studien_spoversionen.st_studium_nr, hierbei die jeweils letzte  (max(gueltig_ab)  </comment>
+  </column>
+<column name="endedat_tsg" type ="DATE" size ="4" default ="" notnull ="false" description="Datum der Abmeldung (TSG)"/>
+<column name="studiengangs_identifikator_msg" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Studiengang-Identifikator (MSG)"  />
+<column name="abm_art_s_msg" type ="CHAR" size ="10" default ="" notnull ="false" description="Art Abmeldung (studienbezogen) MSG" >
+ <sourcefield table="costage_st_personen_abmeldungen" name="st_abm_art_kurzbezeichnung" sourcesystem="co" />
+  <comment>Lookup via: st_studium_nr/st_sem_nr - costage_st_personen_abmeldungen.st_studium_nr/st_sem_nr - costage_st_semester.semester_tid / costage_st_abmeldungsarten.bezug='S'</comment>
+  </column>
+<!--<column name="abm_datum_p" type ="DATE" size ="10" default ="" notnull ="false" description="Datum der Abmeldung (personbezogen)" >
+ <sourcefield table="costage_st_personen_abmeldungen" name="st_abm_art_kurzbezeichnung" sourcesystem="co" />
+  <comment>Lookup via: st_studium_nr/st_sem_nr - costage_st_personen_abmeldungen.st_studium_nr/st_sem_nr - costage_st_semester.semester_tid / costage_st_personen_abmeldungen.person_flag='J'</comment>
+  </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>

@ -607,6 +640,10 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -607,6 +640,10 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 <column name="leistungsdatum_msg" type ="DATE" size ="7" default ="" notnull ="false" description="Prüfungsdatum MSG"/>
 <column name="semester_msg" type ="INTEGER" size ="8" default ="" notnull ="false" description="Semester MSG" />
 <column name="summe" type ="INTEGER" size ="2" default ="" notnull ="false" description="Summe" />
+<column name="po_stp_stp_version_kb" type ="CHAR" size ="10" default ="" notnull ="false" description="SPO-Version" >
+ <sourcefield table="costage_st_studien_spoversionen" name="po_stp_stp_version_kb" sourcesystem="co" />
+  <comment>Lookup via: st_studium_nr - costage_st_studien_spoversionen.st_studium_nr, hierbei die jeweils letzte  (max(gueltig_ab)  </comment>
+  </column>
 </columns>
 <indexes>
 <index name="ix_costage_st_pruef_aggr1" unique="false">
@ -689,27 +726,27 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -689,27 +726,27 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />

 <table name="costage_bw_antr_aggr" thema="Bewerbungen" caption="Bewerbungen (CO)" typ="Hilfstabelle" releaseUnload="empty">
 <columns>
-<column name="nr" type ="INTEGER" size ="4" default ="" notnull ="true" description="Bewerbungsnr."/>
-<column name="st_studstamm_nr" type ="INTEGER" size ="8" default ="" notnull ="true" description="Person-Nr." />
+<column name="nr" type ="INTEGER" size ="4" default ="" notnull ="true" description="Antragsnummer"/>
+<column name="st_studstamm_nr" type ="INTEGER" size ="8" default ="" notnull ="true" description="Bewerbernummer" />
 <column name="matrikelnummer" type ="INTEGER" size ="8" default ="" notnull ="false" description="Matrikelnummer" />
 <column name="semester" type ="INTEGER" size ="8" default ="" notnull ="false" description="Semester" ><comment></comment></column>
 <column name="st_studiengang_nr" type ="INTEGER" size ="8" default ="" notnull ="false" description="Studiengang (ID)" />
-<column name="st_studiengang_nr_msg" type ="INTEGER" size ="8" default ="" notnull ="false" description="Studiengang (ID) des MSG" ><comment>nur bei TSG</comment></column>
+<column name="st_studiengang_nr_msg" type ="INTEGER" size ="8" default ="" notnull ="false" description="Studiengang (ID) des MSG"  currentlyUsed="false"><comment>nur bei TSG</comment></column>
 <column name="unikey" type ="CHAR" size ="10" default ="" notnull ="false" description="Hochschulnummer" />
 <!--<column name="studienidentifikator" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Studienidentifikator"/>-->
 <column name="studiengang_nr" type ="INTEGER" size ="8" default ="" notnull ="false" description="Studiengang (Nr.)" currentlyUsed="false" />
 <column name="fach_nr" type ="INTEGER" size ="8" default ="" notnull ="false" description="Fach (Nr.)" />
 <column name="fachsemester" type ="INTEGER" size ="4" default ="" notnull ="false" description="Fachsemester" />
 <column name="stufrm" type ="CHAR" size ="10" default ="" notnull ="false" description="Studienform"/>
-<column name="bw_bewerbng_nr_msg" type ="INTEGER" size ="8" default ="" notnull ="false" description="Bewerbung MSG" />
-<column name="bw_sb_svor_nr" type ="INTEGER" size ="4" default ="" notnull ="true" />
-<column name="bw_zul_art_nr" type ="INTEGER" size ="4" default ="" notnull ="false" />
-<column name="bw_typ_kb" type ="VARCHAR" size ="10" default ="" notnull ="true" />
+<column name="bw_bewerbng_nr_msg" type ="INTEGER" size ="8" default ="" notnull ="false" description="Bewerbung MSG" currentlyUsed="false"/>
+<column name="bw_sb_svor_nr" type ="INTEGER" size ="4" default ="" notnull ="true" description="Status-Zuordnung"/>
+<column name="bw_zul_art_nr" type ="INTEGER" size ="4" default ="" notnull ="false" description="Zulassungsart"/>
+<column name="bw_typ_kb" type ="VARCHAR" size ="10" default ="" notnull ="true"  description="Bewerbungstyp"/>
 <column name="status_vss" type ="VARCHAR" size ="10" default ="" notnull ="false" description="Status formale Zulassungsvoraussetzungen" />
 <column name="status_dok" type ="VARCHAR" size ="10" default ="" notnull ="false" description="Status Bewerbungsunterlagen" />
 <column name="status_zul" type ="VARCHAR" size ="10" default ="" notnull ="false" description="Status Zulassung" />
 <column name="status_stpl" type ="VARCHAR" size ="10" default ="" notnull ="false" description="Status Studienplatzangebot" />
-<column name="status_qvss" type ="VARCHAR" size ="10" default ="" notnull ="false" description="Status Fachliche Zulassungsvoraussetzungen" />
+<column name="status_qvss" type ="VARCHAR" size ="10" default ="" notnull ="false" description="Status fachliche Zulassungsvoraussetzungen" />
 <column name="status_abgabe" type ="VARCHAR" size ="10" default ="" notnull ="false" description="Status Bewerbungsabgabe" />
 <column name="status_evs" type ="VARCHAR" size ="10" default ="" notnull ="false" description="Status Einschreibungsvoraussetzungen" />
 <column name="bew_kz" type ="VARCHAR" size ="10" default ="" notnull ="false" description="Kennzeichen gültige Bewerbung" />
@ -1106,6 +1143,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -1106,6 +1143,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 <column name="zusatzleistung_flag" type ="CHAR" size ="10" default ="" notnull ="false" description="Zusatzleistung (J/N)"/>
 <column name="leistungsstatus_nr" type ="INTEGER" size ="4" default ="" notnull ="true" />
 <column name="leistungsstatus_map_kb" type ="CHAR" size ="10" default ="" notnull ="false" />
+<column name="abs_fach_st_studium_nr" type ="INTEGER" size ="4" default ="" notnull ="false" description="Studium-Nr. der Abschlussarbeit" currentlyUsed="false"><comment>Teilstudiengangsnummer zu der eine Abschlussarbeit zugeordnet ist</comment></column>
 </columns>
 <indexes></indexes>
 <primaryKeys><rs>
@ -1348,6 +1386,23 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -1348,6 +1386,23 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 </rs></privileges>
 </table>

+<table name="costage_st_hochschulsemester_neu" thema="Studierende und Gebühren" caption="Studierende Hochschulsemester (CO)" typ="Ladetabelle" releaseUnload="empty">
+<columns><column name="st_studstamm_nr" type ="INTEGER" size ="4" default ="" notnull ="true" />
+<column name="st_sem_nr" type ="INTEGER" size ="4" default ="" notnull ="true" />
+<column name="anzahl_hochschulsemester" type ="INTEGER" size ="4" default ="" notnull ="false" />
+</columns>
+<indexes></indexes>
+<primaryKeys><rs>
+</rs></primaryKeys>
+<foreignKeys><rs>
+</rs></foreignKeys>
+<importedKeys><rs>
+</rs></importedKeys>
+<privileges><rs>
+
+</rs></privileges>
+</table>
+
 <table name="costage_leistungen_status_typen" thema="Prüfungen und Leistungen" caption="Leistungsstati Typen (CO)" typ="Schlüsseltabelle" releaseUnload="empty">
 <columns>
 <column name="leistungsstatus_nr" type ="INTEGER" size ="4" default ="" notnull ="true" />
@ -1366,11 +1421,12 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
				@@ -1366,11 +1421,12 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />

 </rs></privileges>
 </table>
-<table name="costage_k_hzbart" thema="Studierende und Gebühren" caption="HZB-Arten (CO)" typ="Schlüsseltabelle" releaseUnload="empty">
-<columns><column name="apnr" type ="char" size ="10" default ="" notnull ="true" />
-<column name="kurztext" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="drucktext" type ="VARCHAR" size ="255" default ="" notnull ="false" />
-<column name="langtext" type ="VARCHAR" size ="255" default ="" notnull ="false" />
+<table name="costage_bw_hzb_arten" thema="Studierende und Gebühren" caption="HZB-Arten (CO)" typ="Schlüsseltabelle" releaseUnload="empty">
+<columns><column name="hzb_nr" type ="INTEGER" size ="4" default ="" notnull ="true" />
+<column name="name" type ="VARCHAR" size ="255" default ="" notnull ="false" />
+<column name="name_kurz" type ="VARCHAR" size ="255" default ="" notnull ="false" />
+<column name="hzb_art_stla_code" type ="CHAR" size ="10" default ="" notnull ="true" />
+<column name="kurzbezeichnung" type ="VARCHAR" size ="255" default ="" notnull ="false" />
 </columns>
 <indexes></indexes>
 <primaryKeys><rs>
@ -1652,15 +1708,15 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
				@@ -1652,15 +1708,15 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>

 <relation from="costage_land_subregionen" to="costage_st_studien_aggr" delete="FALSE"
 	displayType="select" visibleFields="name" format="%s">
-	<relation-column from="land_sub_reg_nr" to="hzb_ort" />
+	<relation-column from="land_sub_reg_nr" to="hzb_land_sub_r_nr" />
 </relation>
 <relation from="costage_st_laender" to="costage_st_studien_aggr" delete="FALSE"
 	displayType="select" visibleFields="name" format="%s">
-	<relation-column from="st_land_nr" to="hzb_staat" />
+	<relation-column from="st_land_nr" to="hzb_land_nr" />
 </relation>
-<relation from="costage_k_hzbart" to="costage_st_studien_aggr" delete="FALSE"
-	displayType="select" visibleFields="drucktext" format="%s">
-	<relation-column from="apnr" to="hzb_art" />
+<relation from="costage_bw_hzb_arten" to="costage_st_studien_aggr" delete="FALSE"
+	displayType="select" visibleFields="name_kurz" format="%s">
+	<relation-column from="hzb_nr" to="hzb_art_nr" />
 </relation>
 <relation from="costage_st_abmeldungsarten" to="costage_st_studien_aggr" delete="FALSE"
 	displayType="select" visibleFields="name" format="%s">
@ -1688,6 +1744,17 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
				@@ -1688,6 +1744,17 @@ 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>
+<relation from="costage_st_studienformen" to="costage_st_studien_aggr" delete="FALSE" displayType="select" visibleFields="name"  uniquenameField="" format="%s">
+<relation-column from="statistik_code" to="studienform_statistik_code" />
+</relation>

 <!--costage_st_pruef_aggr-->
 <relation from="costage_st_semester" to="costage_st_pruef_aggr" delete="FALSE"
@ -1781,10 +1848,6 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
				@@ -1781,10 +1848,6 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
 	displayType="select" visibleFields="name" format="%s">
 	<relation-column from="nr" to="bw_zul_art_nr" />
 </relation>
-<relation from="costage_st_studierendenstammdaten" to="costage_bw_antr_aggr" delete="FALSE"
-	displayType="select" visibleFields="matrikelnummer" format="%s">
-	<relation-column from="st_studstamm_nr" to="st_studstamm_nr" />
-</relation>
 <!--costage_st_lv_aggr-->
 <relation from="costage_st_semester" to="costage_st_lv_aggr" delete="FALSE"
 	displayType="select" visibleFields="semester_bezeichnung" format="%s">
@ -1829,6 +1892,7 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
				@@ -1829,6 +1892,7 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_studien_spoversionen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_studien_spoversionen.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_studien"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_studien.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_studierendenstammdaten_neu"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_studierendenstammdaten.unl"/></loadtable>
+<loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_hzb"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_hzb.unl"/></loadtable>
 <!--neu ab 0.3-->
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_bw_bewerbungen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_bw_bewerbungen.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_bw_bewerbung_kombination"><file path="$COSTAGE_LOAD_PFAD/unl/costage_bw_bewerbung_kombination.unl"/></loadtable>
@ -1839,7 +1903,7 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
				@@ -1839,7 +1903,7 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_bw_sb_stat_vorl_zuordnung"><file path="$COSTAGE_LOAD_PFAD/unl/costage_bw_sb_stat_vorl_zuordnung.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_bw_zulassungsarten"><file path="$COSTAGE_LOAD_PFAD/unl/costage_bw_zulassungsarten.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_land_subregionen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_land_subregionen.unl"/></loadtable>
-<loadtable refresh="true" delimiter="^" header="false" tabname="costage_k_hzbart"><file path="$COSTAGE_LOAD_PFAD/unl/costage_k_hzbart.unl"/></loadtable>
+<loadtable refresh="true" delimiter="^" header="false" tabname="costage_bw_hzb_arten"><file path="$COSTAGE_LOAD_PFAD/unl/costage_bw_hzb_arten.unl"/></loadtable>
 <!--<loadtable refresh="true" delimiter="^" header="false" tabname="costage_abgeltungen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_abgeltungen.unl"/></loadtable>
 -->

@ -1850,7 +1914,7 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
				@@ -1850,7 +1914,7 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_abmeldungsarten"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_abmeldungsarten.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_personen_abmeldungen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_personen_abmeldungen.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_ersthochschulen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_ersthochschulen.unl"/></loadtable>
-<loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_hochschulsemester"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_hochschulsemester.unl"/></loadtable>
+<loadtable refresh="true" delimiter="^" header="false" tabname="costage_st_hochschulsemester_neu"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_hochschulsemester.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_leistungen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_leistungen.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_leistungen_detail_typen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_leistungen_detail_typen.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="costage_leistungen_typen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_leistungen_typen.unl"/></loadtable>
@ -1875,6 +1939,8 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
				@@ -1875,6 +1939,8 @@ parent="CO Basisdaten">Abfragen zu Studienplänen und Ordnungen</thema>
 <nativeaction sql="" scriptfile="$COSTAGE_PFAD/schluesseltabellen/costage_dim_studiengang_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$COSTAGE_PFAD/datentabellen/trans_costage_lehrveranstaltungen.sql" database=""/>
 <nativeaction sql="" scriptfile="$COSTAGE_PFAD/datentabellen/trans_costage_lv_teilnehmende.sql" database=""/>
+<nativeaction sql="" scriptfile="$COSTAGE_PFAD/datentabellen/trans_costage_st_hochschulsemester.sql" database=""/>
+<nativeaction sql="" scriptfile="$COSTAGE_PFAD/datentabellen/trans_costage_leistungen.sql" database=""/>

 </action>
 </etl-step>
--- a/src-modules/module/costage/datentabellen/trans_costage_leistungen.sql
+++ b/src-modules/module/costage/datentabellen/trans_costage_leistungen.sql
@ -0,0 +1,12 @@
				@@ -0,0 +1,12 @@
+--freemarker template
+--(c) 2025 D.Quathamer
+
+<#if COSTAGE_LEISTUNGSSTATUS_MAP?exists>
+
+update costage_leistungen set leistungsstatus_map_kb=${COSTAGE_LEISTUNGSSTATUS_MAP}
+;
+
+</#if>
+
+
+
--- a/src-modules/module/costage/datentabellen/trans_costage_st_hochschulsemester.sql
+++ b/src-modules/module/costage/datentabellen/trans_costage_st_hochschulsemester.sql
@ -0,0 +1,14 @@
				@@ -0,0 +1,14 @@
+
+
+delete from costage_st_hochschulsemester
+where st_sem_nr in (select distinct st_sem_nr
+from costage_st_hochschulsemester_neu);
+
+insert into costage_st_hochschulsemester(st_studstamm_nr,
+       st_sem_nr,
+       anzahl_hochschulsemester)
+select st_studstamm_nr,
+       st_sem_nr,
+       anzahl_hochschulsemester
+from costage_st_hochschulsemester_neu;
+
--- a/src-modules/module/costage/datentabellen/trans_costage_st_studierendenstammdaten.sql
+++ b/src-modules/module/costage/datentabellen/trans_costage_st_studierendenstammdaten.sql
@ -18,6 +18,7 @@ d_geburt DATE ,
				@@ -18,6 +18,7 @@ d_geburt DATE ,
 ca12_staat INTEGER , 
 second_nationality INTEGER , 
 d_exmatr DATE , 
+abm_art_p char(10),
 semester_max INTEGER 
 ) 
 ;
@ -57,7 +58,7 @@ insert into tmp_st_studierendenstammdaten(
				@@ -57,7 +58,7 @@ insert into tmp_st_studierendenstammdaten(
 --      ca12_staat,
 --      second_nationality,
       d_geburt,
-       d_exmatr,
+--       d_exmatr,
       semester_max)
 select 
 S.st_studstamm_nr,
@ -77,7 +78,6 @@ when S.geschlecht='W' then 2
				@@ -77,7 +78,6 @@ when S.geschlecht='W' then 2
 when S.geschlecht='X' then 3
 else 4 end)::smallint as geschlecht,
 date(S.geburtsdatum) as d_geburt,
-date(S.abmeldungsdatum) as d_exmatr,
 M.semester_max
 FROM costage_st_laender L, costage_st_studierendenstammdaten_neu S left outer join tmp_max M
 on (M.st_studstamm_nr=S.st_studstamm_nr)
@ -85,6 +85,16 @@ where L.st_land_nr=S.st_land1_nr
				@@ -85,6 +85,16 @@ where L.st_land_nr=S.st_land1_nr
 and S.matrikelnummer is not null
 ;

+ --TODO: statt semesterende das tatsächliche Abmeldungsdatum
+update tmp_st_studierendenstammdaten set d_exmatr=date(S.semester_ende),
+abm_art_p=A.st_abm_art_kurzbezeichnung
+from costage_st_personen_abmeldungen A,costage_st_semester S
+where A.st_sem_nr=S.st_sem_nr
+and A.st_studstamm_nr=tmp_st_studierendenstammdaten.st_studstamm_nr
+and S.semester_tid=tmp_st_studierendenstammdaten.semester_max
+and A.person_flag='J';
+
+ 
 update tmp_st_studierendenstammdaten set ca12_staat=val(L.statistik_code) 
 from costage_st_laender L
 where L.st_land_nr=tmp_st_studierendenstammdaten.st_land1_nr;
@ -115,6 +125,7 @@ insert into costage_st_studierendenstammdaten(
				@@ -115,6 +125,7 @@ insert into costage_st_studierendenstammdaten(
       second_nationality,
       d_geburt,
       d_exmatr,
+       abm_art_p,
       semester_max)
 select 
 st_studstamm_nr,
@ -134,6 +145,7 @@ st_studstamm_nr,
				@@ -134,6 +145,7 @@ st_studstamm_nr,
       second_nationality,
       d_geburt,
       d_exmatr,
+       abm_art_p,
       semester_max
 FROM tmp_st_studierendenstammdaten
 ;
--- a/src-modules/module/costage/hilfstabellen/costage_bw_antr_aggr_fuellen.sql
+++ b/src-modules/module/costage/hilfstabellen/costage_bw_antr_aggr_fuellen.sql
@ -8,6 +8,11 @@ SELECT nr,
				@@ -8,6 +8,11 @@ SELECT nr,
 FROM costage_bw_sb_status_werte 
 ;
 </sqlvar>
+<sqlvar name="beginn_semester"><![CDATA[
+select param_val from unload_params
+where param_id='COSTAGE_start_bw_sem';
+]]>
+</sqlvar>
 </sqlvars>


@ -68,6 +73,7 @@ on (B.st_studstamm_nr=S.st_studstamm_nr)
				@@ -68,6 +73,7 @@ on (B.st_studstamm_nr=S.st_studstamm_nr)
 where E.st_sem_nr=B.st_sem_nr
 --and B.bw_typ_kb not in ('MBW') --keine Mehrfachbewerbung
 --and B.st_studstamm_nr=1186303
+and E.semester_tid  >= ${beginn_semester}
 ;
 --klappt nicht weil nicht eindeutig:
 -- update tmp_bew set bw_bewerbng_nr_msg=K.bw_bewrbng_nr
@ -173,7 +179,9 @@ from costage_st_laender L
				@@ -173,7 +179,9 @@ from costage_st_laender L
 where L.st_land_nr=tmp_bew.hzb_st_land_nr
 ;

-truncate table costage_bw_antr_aggr;
+delete from costage_bw_antr_aggr
+where semester >= ${beginn_semester}
+;
 insert into costage_bw_antr_aggr( nr,
       st_studstamm_nr,
       matrikelnummer,
--- a/src-modules/module/costage/hilfstabellen/costage_st_lv_aggr_fuellen.sql
+++ b/src-modules/module/costage/hilfstabellen/costage_st_lv_aggr_fuellen.sql
@ -1,3 +1,11 @@
				@@ -1,3 +1,11 @@
+--freemarker template
+<sqlvars>
+<sqlvar name="beginn_semester"><![CDATA[
+select param_val from unload_params
+where param_id='COSTAGE_start_lv_sem';
+]]>
+</sqlvar>
+</sqlvars>



@ -27,13 +35,16 @@ costage_lv_teilnehmende T, costage_st_studien U
				@@ -27,13 +35,16 @@ costage_lv_teilnehmende T, costage_st_studien U
 where T.stp_sp_nr=L.stp_sp_nr
 and U.st_studium_nr=T.st_studium_nr
 and U.st_studstamm_nr=S.st_studstamm_nr
+and L.semester  >= ${beginn_semester}
 ;

 update tmp_lv set studienidentifikator=S.studiengangs_identifikator
 from costage_st_studiengaenge S
 where S.st_studiengang_nr=tmp_lv.st_studiengang_nr
 ;
-truncate table costage_st_lv_aggr;
+delete from costage_st_lv_aggr
+where semester >= ${beginn_semester};
+
 insert into costage_st_lv_aggr(st_studium_nr,
       st_studstamm_nr,
       matrikelnummer,
--- a/src-modules/module/costage/hilfstabellen/costage_st_pruef_aggr_fuellen.sql
+++ b/src-modules/module/costage/hilfstabellen/costage_st_pruef_aggr_fuellen.sql
@ -1,3 +1,11 @@
				@@ -1,3 +1,11 @@
+--freemarker template
+<sqlvars>
+<sqlvar name="beginn_semester"><![CDATA[
+select param_val from unload_params
+where param_id='COSTAGE_start_leistungen_sem';
+]]>
+</sqlvar>
+</sqlvars>


 --Leistungen mit Veranstaltung -> Semester:
@ -49,7 +57,8 @@ null::integer as pnr,
				@@ -49,7 +57,8 @@ null::integer as pnr,
 null::integer as leistung_nr_msg,
 null::integer as st_studiengang_nr_msg,
 null::date as leistungsdatum_msg,
-null::integer as semester_msg
+null::integer as semester_msg,
+null::char(10) as po_stp_stp_version_kb 
 into temp tmp_pruef
 FROM costage_st_semester E, costage_leistungen_typen T, costage_leistungen L, costage_st_studierendenstammdaten S
 where E.semester_id=L.veranstaltung_semester
@ -64,6 +73,7 @@ and L.leistungsstatus_nr in (4,2) --Letztgültig/Final/gültige Leistung
				@@ -64,6 +73,7 @@ and L.leistungsstatus_nr in (4,2) --Letztgültig/Final/gültige Leistung
 --2^V^gültige Leistung^valid^
 --3^I^ungültige Leistung^invalid^
 --5^D^gelöscht^deleted^
+and E.semester_tid  >= ${beginn_semester}
 ;

 --Leistungen ohne Veranstaltungssemester gehen über Prüfungsdatum:
@ -125,6 +135,7 @@ and S.matrikelnummer::varchar(255)=L.matrikelnummer
				@@ -125,6 +135,7 @@ and S.matrikelnummer::varchar(255)=L.matrikelnummer
 -- TSAB/AB:
 and T.kurzbezeichnung in ('AP','AAP') --Abschlussprüfung/Anerkannte Abschlussprüfung
 and L.leistungsstatus_nr in (4,2) --Letztgültig/Final/gültige Leistung
+and E.semester_tid  >= ${beginn_semester}
 ;
 
 update tmp_pruef set semester=E.semester_tid
@ -139,6 +150,15 @@ from costage_st_studien S
				@@ -139,6 +150,15 @@ from costage_st_studien S
 where S.st_studium_nr=tmp_pruef.st_studium_nr
 and S.st_studstamm_nr=tmp_pruef.st_studstamm_nr
 ;
+--Fachsemester bei TSAB aus Sem. des Prüfungsdatums holen:
+update tmp_pruef set 
+fachsemester = S.fachsemester
+from  costage_st_studien_aggr S
+where S.semester=tmp_pruef.semester
+and S.st_studium_nr=tmp_pruef.st_studium_nr
+and S.matrikelnummer=tmp_pruef.matrikelnummer
+and tmp_pruef.leistungsdetailtyp_kb='TSAB'
+;

 --Prüfung kann nach letztem eingeschr. Semester sein, daher zuerst letztes Sem. ermitteln:
 select S.st_studium_nr,
@ -158,11 +178,12 @@ group by 1,2
				@@ -158,11 +178,12 @@ group by 1,2
 --Dann Studium vom letzten Semester in den Prüfungs-Datensatz schreiben:
 update tmp_pruef set 
 st_studienstatus_nr=S.st_studienstatus_nr,
-fachsemester = S.fachsemester,
+--fachsemester = S.fachsemester, --wird oben ermittelt, ab 0.6 nicht mehr aus letztem Studiums-Semester
 studiengang_nr=S.studiengang_nr,
 fach_nr=S.fach_nr,
 unikey=S.unikey,
-st_studiengang_nr_msg=S.st_studiengang_nr_msg
+st_studiengang_nr_msg=S.st_studiengang_nr_msg,
+po_stp_stp_version_kb=S.po_stp_stp_version_kb
 from  tmp_max_sem M, costage_st_studien_aggr S
 where S.matrikelnummer=M.matrikelnummer
 and S.st_studium_nr=M.st_studium_nr
@ -203,6 +224,24 @@ leistungsdatum_msg=leistungsdatum,
				@@ -203,6 +224,24 @@ leistungsdatum_msg=leistungsdatum,
 semester_msg=semester
 where tmp_pruef.leistungsdetailtyp_kb !='TSAB'
 ;
+--Fachsemester bei MSG gibt es in CO nicht. Daher die Regel:
+--die Fachsemesterzahl sollte die höchste FS-Zahl aus allen TSG enthalten: 
+select matrikelnummer,st_studiengang_nr_msg,max(semester) as semester_max,max(fachsemester) as fachsem_max
+into temp tmp_fachsem_msg
+from tmp_pruef
+where leistungsdetailtyp_kb='TSAB'
+and st_studiengang_nr_msg is not null
+group by 1,2;
+
+update tmp_pruef set fachsemester=T.fachsem_max
+from tmp_fachsem_msg T
+where T.matrikelnummer=tmp_pruef.matrikelnummer
+and T.st_studiengang_nr_msg=tmp_pruef.st_studiengang_nr
+and T.semester_max <=tmp_pruef.semester
+and tmp_pruef.leistungsdetailtyp_kb='BAKN'
+;
+
+drop table tmp_fachsem_msg;

 --unikey setzen, wenn noch nicht vorhanden (z.B. bei MSG):
 update tmp_pruef set unikey=K.unikey
@ -212,7 +251,11 @@ and K.st_skz_nr=G.st_skz_nr
				@@ -212,7 +251,11 @@ and K.st_skz_nr=G.st_skz_nr
 and tmp_pruef.unikey is null
 ;

-truncate table costage_st_pruef_aggr;
+
+
+delete from costage_st_pruef_aggr
+where semester >= ${beginn_semester};
+
 insert into costage_st_pruef_aggr(st_studium_nr,
       st_studstamm_nr,
       matrikelnummer,
@ -231,6 +274,7 @@ insert into costage_st_pruef_aggr(st_studium_nr,
				@@ -231,6 +274,7 @@ insert into costage_st_pruef_aggr(st_studium_nr,
       pnr,
       abschnitt,
       stp_sp_nr,
+       po_stp_stp_version_kb,
       note,
       credits,
       leistungsdatum,
@ -260,6 +304,7 @@ select
				@@ -260,6 +304,7 @@ select
       pnr,
       abschnitt,
       stp_sp_nr,
+       po_stp_stp_version_kb,
       case when pv_notenskala_typ_kb in ('DE1','DE2','DE3','DE4','DE5','DE6','DE7') or pv_notenskala_typ_kb is null  then note_zahl else null::float end as note,
       credits,
       leistungsdatum,
@ -271,7 +316,7 @@ select
				@@ -271,7 +316,7 @@ select
       semester_msg,
       count(*)
       from tmp_pruef
-       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,24,25,26,27;
+       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,24,25,26,27,28;

 drop table tmp_pruef;
 drop table tmp_pruef2;
--- a/src-modules/module/costage/hilfstabellen/costage_st_studien_aggr_fuellen.sql
+++ b/src-modules/module/costage/hilfstabellen/costage_st_studien_aggr_fuellen.sql
--- a/src-modules/module/costage/masken/43110_felderinfo.unl
+++ b/src-modules/module/costage/masken/43110_felderinfo.unl
@ -1,15 +1,10 @@
				@@ -1,15 +1,10 @@
-43110^Studiengang-Nr.^110^0^0^140^150^1^integer^70^0^13^<<SQL>> --Freemarker template\
-<#list 1..6 as i>\
- select ${i},'${i}. Studiengang' from xdummy\
-  <#if i_has_next> union </#if>\
-</#list>\
-order by 1^ ^^
+43110^Antragsnummer^32^0^0^140^180^1^char^30^0^0^ ^ ^ ^
 43111^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> select semester_tid, semester_bezeichnung from costage_st_semester order by 1 DESC;^ ^<<SQL>> select semester_tid, semester_bezeichnung from costage_st_semester  where today()-365 between date(semester_anfang)  and date(semester_ende);^
 43112^Studiengang^9^0^0^130^150^50^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('COSTAGE-Studiengang-Sicht') order by 3,2;^ ^ ^
 43113^Staatsangehörigkeit^36^0^0^130^150^10^sql^30^0^1^<<SQL>> SELECT st_land_nr, name from costage_st_laender order by 2;^ ^ ^
 43114^Zulassungsart^14^350^-1^140^180^1^integer^30^0^1^<<SQL>> select nr,  name\
 FROM costage_bw_zulassungsarten  order by 2^ ^ ^
-43115^Person-Nr.^25^350^-1^150^180^1^integer^200^0^0^^^^
+43115^Bewerbernummer^25^350^-1^150^180^1^char^200^0^0^^ ^ ^
 43116^Weitere Tabellen^123^0^0^140^140^10^char^30^0^1^<<SQL>> \
 --freemarker template\
 select name,string_not_null(caption) || ' - ' || name from sx_tables where  name in ('costage_st_studierendenstammdaten','costage_dim_studiengang')\
--- a/src-modules/module/costage/masken/43110_maskeninfo.unl
+++ b/src-modules/module/costage/masken/43110_maskeninfo.unl
@ -1,79 +1,90 @@
				@@ -1,79 +1,90 @@
 43110^Bewerbungen Datenblatt (CO)^--Freemarker Template\
 <#include "SQL_lingua_franca"/>\
 <#include "SuperX_general"/>\
-<#include "SQL_multitable_output"/>\
+<#include "DatenblattSQLGenerator"/>\
 \
 --ram excelexport \
 \
 <sqlvars>\
-<sqlvar name="get_tables"><![CDATA[\
-SELECT distinct name,name\
+<sqlvar name="basetable" ><![CDATA[\
+SELECT distinct name\
      from sx_tables\
-  where name in ('costage_bw_antr_aggr'\
+  where name in ('costage_bw_antr_aggr');]]>\
+</sqlvar>\
+<sqlvar name="getJoinTables" type="hashsequence"><![CDATA[\
+SELECT distinct name\
+      from sx_tables\
+  where name in (''\
   ${DatenblattTables(<<tablestylesheet>>,"<<Weitere Tabellen>>",.vars["Weitere TabellenObject"].allKeys)}\
     \
    )\
-   order by 2;]]>\
+   order by 1;]]>\
 </sqlvar>\
-<sqlvar name="get_table_joins"><![CDATA[\
-select table_name || '.' || name || '=' || foreignkey_tab || '.' || foreignkey_col,table_name \
-from sx_fields where table_name in ('costage_bw_antr_aggr'\
+<sqlvar name="getJoinWhereClauses" type="hashsequence"><![CDATA[\
+select table_name || '.' || name || '=' || foreignkey_tab || '.' || foreignkey_col as condition,\
+table_name ,\
+foreignkey_tab\
+from sx_fields where table_name in ('${basetable}'\
  ${DatenblattTables(<<tablestylesheet>>,"<<Weitere Tabellen>>",.vars["Weitere TabellenObject"].allKeys)} )\
-and foreignkey_tab in ('costage_bw_antr_aggr'\
+and foreignkey_tab in ('-xy'\
  ${DatenblattTables(<<tablestylesheet>>,"<<Weitere Tabellen>>",.vars["Weitere TabellenObject"].allKeys)})\
 ;]]>\
 </sqlvar>\
-<sqlvar name="get_felder"><![CDATA[\
+<sqlvar name="getSelectClause" type="hashsequence"><![CDATA[\
 SELECT name,\
       caption,\
-       (trim(field_type) || '#' || is_primarykey || '#' || trim(string_not_null(foreignkey_tab)) || '#' || trim(string_not_null(foreignkey_col))\
-       || '#' || trim(string_not_null(foreignkey_cap))\
-       || '#' || trim(string_not_null(foreignkey_cond))\
-       || '#' || trim(string_not_null(foreignkey_func))\
-       || '#' || trim(string_not_null(table_name))\
-       || '#' || trim(string_not_null(foreignkey_uniquename)))::char(255) as strukturStr\
+       field_type,\
+       is_primarykey,\
+       foreignkey_tab,\
+       foreignkey_col,\
+       foreignkey_cap,\
+       foreignkey_cond,\
+       foreignkey_func,\
+       table_name,\
+       foreignkey_uniquename\
 from sx_fields\
-  where table_name in ('costage_bw_antr_aggr'\
+  where table_name in ('${basetable}'\
    ${DatenblattTables(<<tablestylesheet>>,"<<Weitere Tabellen>>",.vars["Weitere TabellenObject"].allKeys)}\
    )\
  and currentlyused=1\
   ${DatenblattFields(<<tablestylesheet>>,"<<Felder>>",FelderObject.allKeys)}\
  order by 2,3;]]>\
 </sqlvar>\
-<sqlvar name="get_felder_fk"><![CDATA[\
-SELECT name,\
-       caption,\
-       (trim(table_name)\
-       || '#' || trim(string_not_null(foreignkey_tab))\
-       || '#' || trim(string_not_null(foreignkey_uniquename)))::char(255) as strukturStr\
- from sx_fields\
-  where table_name in ('costage_bw_antr_aggr'  ${DatenblattTables(<<tablestylesheet>>,"<<Weitere Tabellen>>",.vars["Weitere TabellenObject"].allKeys)}\
-  )\
-   and currentlyused=1\
-    ${DatenblattFields(<<tablestylesheet>>,"<<Felder>>",FelderObject.allKeys)}\
-  order by 2,3;]]>\
-</sqlvar>\
 </sqlvars>\
 \
-<@generate_multitable_list />\
-<@generate_field_list_multitable aggregationsfeld="summe" aggregatfunktion="sum("  />\
-<@generate_foreign_fields_multitable  />\
+<#assign person_nr_filter="1=1" />\
+<#assign person_nr_feldwert="" />\
+/* <#assign person_nr_feldwert=<<Bewerbernummer>> />*/\
+<#if person_nr_feldwert?starts_with("2-")>\
+<#assign person_nr_feldwert=person_nr_feldwert?replace("2-","") />\
+</#if>\
+/* <#assign person_nr_filter="st_studstamm_nr = "+ person_nr_feldwert />  --<<Bewerbernummer>> */\
+\
+<#assign antrags_nr_filter="1=1" />\
+<#assign antrags_nr_feldwert="" />\
+/* <#assign antrags_nr_feldwert=<<Antragsnummer>> />*/\
+<#if antrags_nr_feldwert?starts_with("1-")>\
+<#assign antrags_nr_feldwert=antrags_nr_feldwert?replace("1-","") />\
+</#if>\
+/* <#assign antrags_nr_filter="costage_bw_antr_aggr.nr= " + antrags_nr_feldwert />  --<<Antragsnummer>> */\
+\
 \
 \
 <#assign filter="and bw_typ_kb not in ('MBW')\
 /* AND bw_zul_art_nr in (<<Zulassungsart>>) */\
 /* and costage_bw_antr_aggr.st_studiengang_nr in (select G.st_studiengang_nr from costage_st_studiengaenge G where G.abschluss in (<<Abschluss>>)) */\
-/* and studiengang_nr =<<Studiengang-Nr.>> */\
-/* and fach_nr =<<Fach-Nr.>> */\
 /* and costage_bw_antr_aggr.st_studstamm_nr in (select S.st_studstamm_nr from costage_st_studierendenstammdaten S where S.st_land1_nr in (<<Staatsangehörigkeit>>) ) */\
 /* and costage_bw_antr_aggr.st_studstamm_nr in (select S2.st_studstamm_nr from costage_st_studierendenstammdaten S2 where S2.geschlecht = <<Geschlecht>> ) */\
 /* and costage_bw_antr_aggr.unikey=<<Hochschule>> */\
 /* and semester >= <<Seit Semester>> */\
 /* and semester <= <<Bis Semester>> */\
 /* and fachsemester <= <<bis Fachsemester>> */\
-/* and st_studstamm_nr =<<Person-Nr.>> */\
 " />\
 \
+<#assign filter = filter + " and " + person_nr_filter />\
+<#assign filter = filter + " and " + antrags_nr_filter />\
+\
+\
 /* <#assign filter = filter + " and 's_' || costage_bw_antr_aggr.st_studiengang_nr in "+Studiengang.allNeededKeysList /> --<<Studiengang>> */ \
 \
 <#if "<<Matrikel-Nr.>>"!="">\
@ -89,50 +100,36 @@ SELECT name,\
				@@ -89,50 +100,36 @@ SELECT name,\
 \
 <#assign filter=filter +" and " + fach_filter />\
 \
- <@generate_resultset_multitable tabellen=table_list\
-p_show_keys=<<Schlüssel anzeigen>>\
-p_field_list_select=field_list_select\
-p_foreign_fields=foreign_fields\
+--\
+\
+<@generateDatenblatt \
+p_basetable = basetable\
+p_joinTables = getJoinTables\
+p_joinWhereClauses = getJoinWhereClauses\
+p_selectClause = getSelectClause\
+p_aggregationsfeld ="summe"\
+p_aggregatfunktion = "sum("\
 p_filter = filter\
-p_field_list_groupby=field_list_groupby\
-p_join_clause=join_clause\
+p_show_keys= <<Schlüssel anzeigen>>\
+p_postProcessing= ""\
 />^--Freemarker Template \
-<sqlvars>\
-<sqlvar name="basetable">select 'costage_bw_antr_aggr' from xdummy</sqlvar>\
-<sqlvar name="restriction"><![CDATA[\
-<#assign restrict=DatenblattTables(<<tablestylesheet>>,"<<Weitere Tabellen>>",.vars["Weitere TabellenObject"].allKeys)/>;\
-select '${restrict?replace("\\x0027","\\x0027\\x0027")}' from xdummy;]]>\
-</sqlvar>\
-<sqlvar name="get_felder"><![CDATA[\
-SELECT caption,\
-       foreignkey_tab,\
-       description as strukturStr\
- from sx_fields\
- where table_name in ('${basetable}'\
-    ${restriction}\
-    )\
-  and currentlyused=1\
-${DatenblattFields(<<tablestylesheet>>,"<<Felder>>",FelderObject.allKeys)}\
-order by 1;]]>\
-</sqlvar>\
-</sqlvars>\
 XIL List\
   sizable_columns horizontal_scrolling\
   white_space_color=COLOR_WHITE fixed_columns=1\
   min_heading_height=35\
 <#assign i=1 />\
-<#if get_felder?has_content >\
-<#foreach myfield in get_felder>\
+<#if getSelectClause?has_content >\
+<#foreach myfield in getSelectClause>\
 <#assign i=i+1 />\
-Column CID=${i} heading_text="${myfield.key}" explanation="${myfield.strukturStr}" center_heading\
+Column CID=${i} heading_text="${myfield.caption}" explanation="" center_heading\
   row_selectable col_selectable rightJust heading_platform readonly\
   width=20\
-<#if myfield.name != '' && <<Schlüssel anzeigen>>==1>\
+<#if myfield.foreignkey_tab != '' && <<Schlüssel anzeigen>>==1>\
 <#assign i=i+1 />\
-Column CID=${i} heading_text="${myfield.key}\\n(Schlüssel)" explanation="Schlüssel des Feldes ${myfield.key}" center_heading\
+Column CID=${i} heading_text="${myfield.caption}\\n(Schlüssel)" explanation="" center_heading\
   row_selectable col_selectable rightJust heading_platform readonly\
   width=20\
 </#if>\
 </#foreach>\
 </#if>\
-@@@^Altersgruppe^Anzahl^Bewerbungen Datenblatt aus CO^drop table tmp_tabelle;^ ^2^700^360^0^1^ ^
+@@@^Altersgruppe^Anzahl^Bewerbungen Datenblatt aus CO^drop table tmp_tabelle;^^2^700^360^^1^^
--- a/src-modules/module/costage/rohdaten/COSTAGE_ENV.sam
+++ b/src-modules/module/costage/rohdaten/COSTAGE_ENV.sam
@ -2,6 +2,8 @@
				@@ -2,6 +2,8 @@

 #Entladeumgebung für SuperX
 #Die folgenden Parameter müssen angepasst werden
+VERSION=232
+export VERSION

 # SX_CLIENT ist die Client-Anwendung zum Zugriff auf die DB
 SX_CLIENT=jdbc; export SX_CLIENT
@ -21,6 +23,10 @@ COSTAGE_start_bw_sem=20001
				@@ -21,6 +23,10 @@ COSTAGE_start_bw_sem=20001
 export COSTAGE_start_bw_sem
 COSTAGE_start_leistungen_sem=20001
 export COSTAGE_start_leistungen_sem
+COSTAGE_start_lv_sem=20001
+export COSTAGE_start_lv_sem
+COSTAGE_start_hssem=20001
+export COSTAGE_start_hssem

 ##Pfad für Entladedaten:
 #COSTAGE_LOAD_PFAD=.
--- a/src-modules/module/costage/rohdaten/costage_unload.xml
+++ b/src-modules/module/costage/rohdaten/costage_unload.xml
@ -1,6 +1,6 @@
				@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <superx-unload version="4.0">
-<module id="costage" version="0.3b" systeminfo_id="310">COSTAGE-Modul</module>
+<module id="costage" version="0.4b" systeminfo_id="310">COSTAGE-Modul</module>

 <parameters>
 <param name="VERSION" defaultValue="2" description="Datenbank-Version"><comment>CO-Version, wird derzeit ignoriert</comment></param>
@ -8,6 +8,7 @@
				@@ -8,6 +8,7 @@
 <param name="COSTAGE_start_bw_sem" defaultValue="19911" description="Startsemester Bewerbungen"><comment>Ab welchem Semester sollen Bewerbungen entladen werden? z.B. 20011 für SS 2001</comment></param>
 <param name="COSTAGE_start_leistungen_sem" defaultValue="19911" description="Startsemester Prüfungen"><comment>Ab welchem Semester sollen Leistungen entladen werden? z.B. 20011 für SS 2001</comment></param>
 <param name="COSTAGE_start_lv_sem" defaultValue="19911" description="Startsemester Lehrveranstaltungen"><comment>Ab welchem Semester sollen Lehrveranstaltungen entladen werden? z.B. 20011 für SS 2001</comment></param>
+<param name="COSTAGE_start_hssem" defaultValue="19911" description="Startsemester Hochschulsemester"><comment>Ab welchem Semester sollen Hochschulsemester entladen werden? z.B. 20011 für SS 2001</comment></param>
 </parameters>
 <sourcesystems>
 <sourcesystem name="co" description="CampusOnline-Datenbank"  default="true"/>
@ -115,6 +116,7 @@ where S.st_sem_nr=H.st_sem_nr
				@@ -115,6 +116,7 @@ where S.st_sem_nr=H.st_sem_nr
 and to_number('20' || replace(replace(S.semester_id,'S','1'),'W','2')) >= $COSTAGE_start_st_sem
 and current_date+365 > S.semester_anfang
 and extract(year from S.semester_anfang) > 2000
+and H.hoererstatus_kb !='E' --status "nicht immatrikuliert" interessiert nicht
 ;

 ]]>
@ -205,7 +207,8 @@ SELECT st_studium_nr,
				@@ -205,7 +207,8 @@ SELECT st_studium_nr,
       st_studstamm_nr,
       st_studiengang_nr,
       studienform_name,
-       studienform_statistik_code
+       studienform_statistik_code,
+       hauptstudium_flag
 FROM px_st_studien_v 
 

@ -357,6 +360,57 @@ SELECT st_studstamm_nr,
				@@ -357,6 +360,57 @@ SELECT st_studstamm_nr,
 FROM px_st_studierendenstammdaten_v
 ;

+]]>
+</extraction-sql>
+</unload-job>
+<unload-job id="px_st_hzb_v" target-table="costage_st_hzb" extraction-script="" transfer-unload-file="unl/costage_st_hzb.unl" >
+<comment> </comment>
+<extraction-sql sourcesystem="co"  database="" version="232">
+<![CDATA[ select 
+nr,
+       hzb_land_nr,
+       hzb_land_sub_r_nr,
+       hzb_art_nr,
+       hzb_jahr,
+       hzb_datum,
+       hzb_note,
+       st_person_nr,
+       hzb_note
+FROM px_st_hzb_v 
+ ;
+
+]]>
+</extraction-sql>
+<extraction-sql sourcesystem="co"  database="" version="233">
+<![CDATA[ select 
+nr,
+       hzb_land_nr,
+       hzb_land_sub_r_nr,
+       hzb_art_nr,
+       hzb_jahr,
+       hzb_datum,
+       hzb_note_numerisch,
+       st_person_nr,
+       hzb_note
+FROM px_st_hzb_v 
+ ;
+
+]]>
+</extraction-sql>
+<extraction-sql sourcesystem="co"  database="" version="234">
+<![CDATA[ select 
+nr,
+       hzb_land_nr,
+       hzb_land_sub_r_nr,
+       hzb_art_nr,
+       hzb_jahr,
+       hzb_datum,
+       hzb_note,
+       st_person_nr,
+       hzb_note_original
+FROM px_st_hzb_v 
+ ;
+
 ]]>
 </extraction-sql>
 </unload-job>
@ -632,7 +686,7 @@ SELECT H.st_studstamm_nr,
				@@ -632,7 +686,7 @@ SELECT H.st_studstamm_nr,
 FROM px_st_hochschulsemester_v H,px_st_semester_v S
 where S.st_sem_nr=H.st_sem_nr
 and H.anzahl_hochschulsemester >0
-and to_number('20' || replace(replace(S.semester_id,'S','1'),'W','2')) >= $COSTAGE_start_st_sem
+and to_number('20' || replace(replace(S.semester_id,'S','1'),'W','2')) >= $COSTAGE_start_hssem
 and current_date+365 > S.semester_anfang
 and extract(year from S.semester_anfang) > 2000
 ;
@ -679,8 +733,9 @@ SELECT leistung_nr,
				@@ -679,8 +733,9 @@ SELECT leistung_nr,
       anerkannt_flag,
       zusatzleistung_flag,
       leistungsstatus_nr,
-       leistungsstatus_map_kb
-FROM sx_leistungen_v 
+       null ,--leistungsstatus_map_kb,
+       null --abs_fach_st_studium_nr
+FROM px_leistungen_v 
 --da das Semester bei Leistungen nicht immer gefuellt ist bzw. der Datum der Leistung nach dem Studium sein kann, hier keine Where Bedingung aufs Startsemester
 ;
 ]]>
@ -745,16 +800,16 @@ FROM px_leistungen_status_typen_v
				@@ -745,16 +800,16 @@ FROM px_leistungen_status_typen_v
 ]]>
 </extraction-sql>
 </unload-job>
-<unload-job id="k_hzbart" target-table="costage_k_hzbart" extraction-script="" transfer-unload-file="unl/costage_k_hzbart.unl" >
-<comment>HZB-Arten (amtlich), mit Mit R224 SP10 verfügbar </comment>
+<unload-job id="px_bw_hzb_arten_v" target-table="costage_bw_hzb_arten" extraction-script="" transfer-unload-file="unl/costage_bw_hzb_arten.unl" >
+<comment>HZB-Arten (intern und amtlich), mit Mit R224 SP10 verfügbar </comment>
 <extraction-sql sourcesystem="co"  database="" version="">
 <![CDATA[
-SELECT distinct hzb_art_stla_code as apnr,
-name_kurz as kurztext,
-name as drucktext,
-name as langtext
+SELECT  hzb_nr,
+substr(name,1,255),
+substr(name_kurz,1,255),
+hzb_art_stla_code,
+kurzbezeichnung
 FROM px_bw_hzb_arten_v 
-where hzb_art_stla_code is not null
 ;

 
@ -877,6 +932,22 @@ FROM px_studienplankontexte_v
				@@ -877,6 +932,22 @@ FROM px_studienplankontexte_v
 where 1=0
 ;
 
+]]>
+</extraction-sql>
+</unload-job>
+<unload-job id="px_bewerb_mzb_v" target-table="costage_bewerb_mzb" extraction-script="" transfer-unload-file="unl/costage_bewerb_mzb.unl" >
+<comment>Bewerbungen zugeordnete MZB</comment>
+<extraction-sql sourcesystem="co"  database="" version="">
+<![CDATA[
+SELECT
+    bw_bewerbng_nr,
+    mzb_typ_kb,
+    abschluss_status_flag,
+    abschluss_note
+FROM
+    px_bewerb_mzb_v
+ ;
+ 
 ]]>
 </extraction-sql>
 </unload-job>
--- a/src-modules/module/costage/rohdaten/csv_unloads2unl.sql
+++ b/src-modules/module/costage/rohdaten/csv_unloads2unl.sql
@ -19,6 +19,7 @@
				@@ -19,6 +19,7 @@
  {"srcfile":"px_st_studien_spoversionen_v.csv", "targettable":"costage_st_studien_spoversionen", "targetfile":"costage_st_studien_spoversionen.unl"},
  {"srcfile":"px_st_studien_v.csv", "targettable":"costage_st_studien", "targetfile":"costage_st_studien.unl"},
  {"srcfile":"px_st_studierendenstammdaten_v.csv", "targettable":"costage_st_studierendenstammdaten_neu", "targetfile":"costage_st_studierendenstammdaten.unl", "specialrule":"update costage_st_studierendenstammdaten_neu set aufnahmedatum=now() where st_studstamm_nr=419856"},
+  {"srcfile":"px_st_hzb_v.csv", "targettable":"costage_st_hzb", "targetfile":"costage_st_hzb.unl", "specialrule":""},
  {"srcfile":"px_bw_bewerbungen_v.csv", "targettable":"costage_bw_bewerbungen", "targetfile":"costage_bw_bewerbungen.unl"},
  {"srcfile":"px_bw_bewerbung_kombination_v.csv", "targettable":"costage_bw_bewerbung_kombination", "targetfile":"costage_bw_bewerbung_kombination.unl"},
  {"srcfile":"px_bw_bewerb_hzb_v.csv", "targettable":"costage_bw_bewerb_hzb", "targetfile":"costage_bw_bewerb_hzb.unl"},
@ -35,13 +36,13 @@
				@@ -35,13 +36,13 @@
  {"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"},
  {"srcfile":"px_leistungen_status_typen_v.csv", "targettable":"costage_leistungen_status_typen", "targetfile":"costage_leistungen_status_typen.unl"},
-  {"srcfile":"k_hzbart.csv", "targettable":"costage_k_hzbart", "targetfile":"costage_k_hzbart.unl"}
+  {"srcfile":"px_bw_hzb_arten_v.csv", "targettable":"costage_bw_hzb_arten", "targetfile":"costage_bw_hzb_arten.unl"}
  ] />

 \! echo "Folgende Dateien lassen sich laden:"
--- a/src-modules/module/costage/rohdaten/db-co.properties.sam
+++ b/src-modules/module/costage/rohdaten/db-co.properties.sam
@ -3,7 +3,7 @@ driverName=oracle.jdbc.OracleDriver
				@@ -3,7 +3,7 @@ driverName=oracle.jdbc.OracleDriver
 maxIdle=
 logLevelXML=FINEST
 maxActive=
-connectionName=CO_INTERFACE_PX_SUPERX
+connectionName=CO_INTERFACE_PUBLIC_EXTERNAL
 minIdle=5
 logLevelSQL=FINEST
 connectionURL=jdbc\:oracle\:thin\:@192.168.0.11\:1521\:coprod
--- a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.x
+++ b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.x
@ -364,8 +364,10 @@ fgrep -i -s "error" $ERR >/dev/null
				@@ -364,8 +364,10 @@ fgrep -i -s "error" $ERR >/dev/null
 FLAG3=$? >/dev/null
 fgrep -i -s "exception" $ERR >/dev/null 
 FLAG4=$? >/dev/null
+fgrep -i -s "fehler" $ERR >/dev/null 
+FLAG5=$? >/dev/null

-if [ $FLAG1 -eq 0 -o $FLAG2 -eq 0 -o $FLAG3 -eq 0 -o $FLAG4 -eq 0 ]
+if [ $FLAG1 -eq 0 -o $FLAG2 -eq 0 -o $FLAG3 -eq 0 -o $FLAG4 -eq 0  -o $FLAG5 -eq 0]
 then
 	echo "Fehler beim Entladen. Das Datum wird zurückgesetzt." 
 	echo "---------------------------------------" 
--- a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml
+++ b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml
@ -98,7 +98,7 @@ null::integer ,--poplz,
				@@ -98,7 +98,7 @@ null::integer ,--poplz,
 null::integer ,--poort,
 date(aufnahmedatum) as immdat,
 null::integer ,--beugrund as gdbu,
-null::char(1) as gdex,
+abm_art_p as gdex,
 ca12_staat,
 null::integer as bland,
 null::char(1) ,--hssem,
@ -162,9 +162,30 @@ and semester_max >= $start_stud_sem
				@@ -162,9 +162,30 @@ and semester_max >= $start_stud_sem
 <![CDATA[


-select * from xdummy where 1=0
-;
-
+SELECT distinct matrikelnummer,
+       A.hzb_art_stla_code as hzbart,
+       H.hzb_jahr,
+       L.statistik_code as hzbkfzkz,
+       (select R.statistik_code from costage_land_subregionen R where R.land_sub_reg_nr = H.hzb_land_sub_r_nr) as hzbkfz,
+       H.hzb_datum as hzbdatum,
+       (case when substring(H.hzb_note from 1 for 1) ~ '[0-9]'
+and substring(H.hzb_note from 2 for 1)  in (',','.')
+and substring(H.hzb_note from 3  for 1) ~ '[0-9]'
+and (substring(H.hzb_note from 4 for 1) ~ '[0-9]' or substring(H.hzb_note from 4 for 1)='')
+and length(H.hzb_note)<=4 then to_number(replace(H.hzb_note,',','.'),'9.99') 
+when H.hzb_note ~ '[0-9]'  and length(H.hzb_note) <=4  then decval(H.hzb_note)
+else null::decimal(8,4) end )  as hzbnote,
+       null::char(1) as ersthzbart,
+       null::char(1) as ersthzbjahr,
+       null::char(1) as ersthzbkfzkz,
+       null::char(1) as ersthzbkfz,
+       null::char(1) as ersthzbdatum,
+       null::char(1) as ersthzbnote
+from costage_bw_hzb_arten A, costage_st_studierendenstammdaten S,costage_st_hzb H
+left outer join costage_st_laender L
+on (L.st_land_nr=H.hzb_land_nr)
+where A.hzb_nr=H.hzb_art_nr
+and S.st_studstamm_nr=H.st_person_nr

 ]]>
 </extraction-sql>
@ -182,20 +203,20 @@ G.skz_key as stg,
				@@ -182,20 +203,20 @@ G.skz_key as stg,
 '' ,--schwp,
 G.fachkennzeichen,
 '' ,--fb,
-val(G.pversion),
+F.po_stp_stp_version_kb as pversion,
 F.semester,
 F.studiengang_nr,
 F.fach_nr,
 F.kz_rueck_beur_ein AS status,
-null::char(1) ,--F.beugrund as gdbu,
-null::char(1) ,--F.endegrd as gdex,
+F.urlaub_art::char(10) as gdbu,
+F.abm_art_p as gdex,
 F.fachsemester::integer,
 F.hrst,
-null::integer as klinsem,
+F.klinsem,
 F.hssem,
-'' ,--stuart,
+(case when praxissemester >0 then '3' else '' end) as stuart,
 '' ,--stutyp,
-G.stufrm,
+F.stufrm,
 G.stort_nr ,--stort,
 F.ruebeudat,
 null::char(1) ,--semgewicht,
@ -214,8 +235,20 @@ null::char(1) , --Art der Promotion
				@@ -214,8 +235,20 @@ null::char(1) , --Art der Promotion
 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 
+po_regelstudienzeit ,-- individual_number_of_semesters
+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,
+endedat_tsg,
+(case when G.studiengangs_typ_kb='TSG' then abm_art_s_msg  
+else abm_art_s end) as abmeldegrund,
+(case when G.studiengangs_typ_kb='TSG' then abm_art_s 
+else null::char(10)
+end) as abmeldegrund_tsg,
+(case when G.studiengangs_typ_kb='TSG' then F.studiengangs_identifikator_msg
+else G.studiengangs_identifikator end) as  degree_program_uniquename
+
 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
@ -259,19 +292,19 @@ P.studiengang_nr,
				@@ -259,19 +292,19 @@ P.studiengang_nr,
 P.fach_nr,
 G.abschluss,
 P.semester,
-P.leistungsdatum,
+(case when  leistungsdetailtyp_kb!='TSAB' then P.leistungsdatum else null::date end),
 G.skz_key as stg,
 null::integer as vert,
 null::integer as schwp,
 string_not_null(G.fachkennzeichen),
-round(P.note::decimal(15,4),2) as note,
+(case when  leistungsdetailtyp_kb!='TSAB' then round(P.note::decimal(15,4),2) else null::decimal end) as note,
 null::integer as vken1,
 null::char(7), --pruefungsamt_nr
 P.abschnitt as pnr,
-val(G.pversion),
-P.leistungsstatus_map_kb as pstatus,
-P.fachsemester ,
-null::char(7) as part,
+P.po_stp_stp_version_kb as pversion,
+(case when  leistungsdetailtyp_kb!='TSAB' then P.leistungsstatus_map_kb else null::char(10) end) as pstatus,
+(case when  leistungsdetailtyp_kb!='TSAB' then P.fachsemester else null::integer end) as fachsemester,
+P.leistungsdetailtyp_kb as part,
 P.leistung_nr,
 null::integer as pversuch,
 null::char(7)as ppruef1,
@ -302,7 +335,12 @@ null::char(1) as  ut_top_unit_id,
				@@ -302,7 +335,12 @@ 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,
+(case when  leistungsdetailtyp_kb='TSAB' then semester else null::integer end) as sem_der_pruefung_exa,
+(case when  leistungsdetailtyp_kb='TSAB' then leistungsdatum else null::date end) as d_abg_pruefung_exa,
+(case when  leistungsdetailtyp_kb='TSAB' then leistungsstatus_map_kb else null::char(10) end) as pstatus_tsg,
+(case when  leistungsdetailtyp_kb='TSAB' then note else null::float end) as note_tsg,
+(case when  leistungsdetailtyp_kb='TSAB' then fachsemester else null::integer end) as fach_sem_zahl_tsg 
 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
@ -429,7 +467,7 @@ SELECT distinct
				@@ -429,7 +467,7 @@ SELECT distinct
   po_stp_stp_version_kb,
   null , --astat
   null,
-   '' ,--sortc1
+   po_stp_stp_version_kb ,--uniquename
   null,
   '' --sprache
   FROM costage_st_studien_spoversionen
@ -442,7 +480,7 @@ SELECT distinct
				@@ -442,7 +480,7 @@ SELECT distinct
   druck,
    null , --astat
   null,
-   '' ,--sortc1
+   uniquename,
   null,
   '' --sprache
   from cif
@ -457,7 +495,7 @@ SELECT distinct
				@@ -457,7 +495,7 @@ SELECT distinct
   'Hauptprüfung' as lang,
    null , --astat
   null,
-   '' ,--sortc1
+   '2'  as uniquename, 
   null,
   '' --sprache
   from xdummy
@ -479,7 +517,7 @@ K.skz_name as dtxt,
				@@ -479,7 +517,7 @@ K.skz_name as dtxt,
 K.skz_name as ltxt ,
 F.statistik_code::char(10) as astat,
 null::char(10) as parent,
-K.skz_key, --uniquename
+K.skz_key, --sortc1
 ' ',
 ' ', --sprache
 null::date  as gueltig_von,
@ -550,24 +588,24 @@ null as sortorder
				@@ -550,24 +588,24 @@ null as sortorder
    SELECT distinct 
    612,
 -1,
-    studienform_statistik_code,
-    studienform_statistik_code as ktxt,
-    studienform_name,
-    studienform_name,
- studienform_statistik_code as astat,
+    statistik_code,
+    kurzbezeichnung as ktxt,
+    name,
+    name,
+ statistik_code as astat,
 '',
- studienform_statistik_code ,
+ statistik_code ,
 '',
 '',
 null::date  as gueltig_von,
 null::date  as gueltig_bis,
- studienform_statistik_code , --sourcesystem_id
- '', --hiskey_id
+ statistik_code , --sourcesystem_id
+ ''|| nr, --hiskey_id
 '' , --struktur_c
 null as lid,
 null as parent_lid,
 null as sortorder
-    FROM costage_st_studien
+    FROM costage_st_studienformen
   union
   SELECT distinct 
   613,
@ -819,7 +857,53 @@ null as lid,
				@@ -819,7 +857,53 @@ null as lid,
 null as parent_lid,
 null as sortorder
   FROM costage_st_studiengaenge
-;
+    union
+    --stuart
+SELECT
+   616, 
+0,
+   '3',--praxissem,
+   'Praxis' as ktxt,
+   'Praxissemester' as dtxt,
+   'Praxissemester' as ltxt ,
+'3' as astat,
+' ',
+'3',--Praxissemester,
+' ',
+' ',
+null::date  as gueltig_von,
+null::date  as gueltig_bis,
+'3', --sourcesystem_id
+' ' , --hiskey_id
+' ' , --struktur_c
+null as lid,
+null as parent_lid,
+null as sortorder
+   FROM xdummy
+union
+    SELECT
+   9002,
+-1,
+   leistungsdetailtyp_kb as apnr,
+   substring(name_de from 1 for 10),--ktxt,
+   substring(name_de from 1 for 255) as dtxt,
+   substring(name_de from 1 for 255) as ltxt,
+null::char(10) as astat,
+null::char(10)  as parent,
+leistungsdetailtyp_kb,--sortc1 wird später uniquename
+' ',
+null as sprache,
+null::date as gueltig_von,
+null::date  as gueltig_bis,
+leistungsdetailtyp_kb::varchar(255), --sourcesystem_id
+' ', --hiskey_id
+'A', --struktur_c
+null as lid,
+null as parent_lid,
+null as sortorder
+   FROM costage_leistungen_detail_typen 
+   WHERE leistungsdetailtyp_kb is not null
+   

 ]]>
 </extraction-sql>
@ -864,15 +948,15 @@ select * from k_stg where 1=0;
				@@ -864,15 +948,15 @@ select * from k_stg where 1=0;
 </extraction-sql>
 </unload-job>
 <unload-job id="k_abstgv" extraction-table="" extraction-script="" transfer-unload-file="unl/k_abstgv.unl" database="" version="">
-<comment>Studiengänge aus SOS. </comment>
+<comment>Studiengänge aus CO. </comment>
 <extraction-sql sourcesystem="co"  database="" version="">
 <![CDATA[
-SELECT  substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
+SELECT distinct substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
       'A' as aikz,
       '' ,--ktxt,
       substring(G.studiengangs_bezeichnung from 1 for 25) as dtxt,
       substring(G.studiengangs_bezeichnung from 1 for 255) as ltxt,
-       val(G.pversion),
+       coalesce(A.po_stp_stp_version_kb,G.pversion) as pversion,
       null::integer ,--frist1,
       null::integer ,--frist2,
       null::integer ,--frist3,
@ -883,7 +967,7 @@ SELECT  substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
				@@ -883,7 +967,7 @@ SELECT  substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
       null::integer,--astgrp,
       null::integer, --prfgamt,
       null::integer,--vglgrp,
-       K.struktur_c as fb,
+       G.fakultaet_key as fb,
       null::integer,--stutyp,
       string_not_null(G.fachkennzeichen) as kzfa,
       null::integer,--immsemkz,
@ -895,24 +979,26 @@ SELECT  substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
				@@ -895,24 +979,26 @@ SELECT  substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
       null::integer,--stkkurs3,
       null::integer,--prax1fsem,
       null::integer,--prax2fsem,
-       abschluss,
+       G.abschluss_code as abschluss,
       G.skz_key as stg,
       null::integer,--vert,
       null::integer,--schwp,
       null::integer,--stuart,
       null::integer,--stufrm,
       null::integer,--abstitel,
-       st_studiengang_nr as abstgvnr,
-       null::integer,--efh,
-       G.rsz, --regelstz,
+       G.st_studiengang_nr as abstgvnr,
+       G.unikey,--efh,
+       coalesce(A.po_regelstudienzeit,G.rsz), --regelstz,
       null::integer,-- email_part,
       null::integer,--login_part,
       null::date as sem_gueltigbis,
-       null::integer -- ects
-       FROM costage_st_studiengaenge G, cifx K
-       where K.key=30
-       and K.apnr=G.skz_key
-       ;
+       null::integer, -- ects,
+       G.skz_name
+       FROM costage_dim_studiengang G, costage_st_studien_aggr A
+       where A.st_studiengang_nr=G.st_studiengang_nr
+      and ($EXTERNAL_SUBJECTS ='true'
+or G.unikey=(select H.hs_nr::char(10) from hochschulinfo H)
+)
 ]]>
 </extraction-sql>
 </unload-job>
@ -978,8 +1064,18 @@ select * from k_stg where 1=0;
				@@ -978,8 +1064,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>
@ -1084,6 +1180,25 @@ select * from k_stg where 1=0;
				@@ -1084,6 +1180,25 @@ 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="sos_student_archive_check_del_person" extraction-table="" extraction-script="" transfer-unload-file="unl/sos_student_archive_check_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="">
--- a/src-modules/module/costage/rohdaten_zul/zul_costage_unload.xml
+++ b/src-modules/module/costage/rohdaten_zul/zul_costage_unload.xml
@ -52,9 +52,9 @@ null,--bew_efh,
				@@ -52,9 +52,9 @@ null,--bew_efh,
       null,--bew_vorname,
       null,--bew_gebname,
       null,--bew_gebort,
-       d_geburt as bew_gebdat,
-       geschlecht as geschl,
-       ca12_staat as staat,
+       date(S.geburtsdatum) as bew_gebdat,
+       S.geschlecht as geschl,
+        val(L.statistik_code)  as staat,
       null,--pozusatz,
       null,--postrasse,
       null,--poplz,
@ -126,7 +126,7 @@ null,--bew_efh,
				@@ -126,7 +126,7 @@ null,--bew_efh,
       null,--zusastrasse,
       null,--zusaort,
       null,--ord_kuenstname,
-       ca12_staat as gebland,
+        val(L.statistik_code)  as gebland,
       null,--dokvorname,
       null,--bew_zvs_zusatz,
       null,--bew_bewnrhist,
@ -158,10 +158,12 @@ null,--bew_efh,
				@@ -158,10 +158,12 @@ null,--bew_efh,
       null, --zvs_ekritpaket_18,
       null --zvs_spezkrit
 FROM  
- costage_bw_antr_aggr B,costage_st_studierendenstammdaten S
-where S.st_studstamm_nr=B.st_studstamm_nr
-and B.bw_typ_kb !='MBW'
-;
+ costage_bw_antr_aggr B left outer join costage_st_studierendenstammdaten_neu S
+ on (S.st_studstamm_nr=B.st_studstamm_nr)
+ left outer join
+ costage_st_laender L
+on( L.st_land_nr=S.st_land1_nr)
+where  B.bw_typ_kb !='MBW'

 ]]>
 </extraction-sql>
@ -186,7 +188,7 @@ A.fachsemester as stgsem,
				@@ -186,7 +188,7 @@ A.fachsemester as stgsem,
       null,--stgspz,
       null,--dowunsch1,
       null,--dowunsch2,
-       G.stort_nr, --antr_stort,
+       (case when exists(select id from sx_repository R where R.id='COSTAGE_STORT' and aktiv=1) then G.stort_nr else null::char(10) end ) as antr_stort,
       null,--haerteantr,
       null,--haerte,
       null,--haertegrd,
@ -455,7 +457,6 @@ null as parent_lid
				@@ -455,7 +457,6 @@ null as parent_lid
   FROM costage_st_abschlussziele_lokal L left outer join costage_st_abschlussziele_amtstat F
   on (F.st_absz_amtstat_nr=L.st_absz_amtstat_nr)
   WHERE L.code is not null
-
 union
    SELECT distinct 
    612,
--- a/src-modules/module/costage/schluesseltabellen/costage_dim_studiengang_fuellen.sql
+++ b/src-modules/module/costage/schluesseltabellen/costage_dim_studiengang_fuellen.sql
@ -24,7 +24,9 @@ insert into costage_dim_studiengang(st_studiengang_nr,
				@@ -24,7 +24,9 @@ insert into costage_dim_studiengang(st_studiengang_nr,
       abschluss_code,
       abschluss_name,
       fakultaet_kurztext,
-       fakultaet_drucktext)
+       fakultaet_drucktext,
+       stort_nr,
+       stort_name)

 SELECT  G.st_studiengang_nr,
 substring(G.studiengangs_identifikator from 1 for 255) as studiengangs_identifikator,
@ -50,8 +52,9 @@ SKZ.fakultaet_key,
				@@ -50,8 +52,9 @@ SKZ.fakultaet_key,
 A.code as abschluss_code,
 A.name as abschluss_name,
 null::varchar(255) as fakultaet_kurztext,
-null::varchar(255) as fakultaet_drucktext
-
+null::varchar(255) as fakultaet_drucktext,
+G.stort_nr,
+G.stort_name
 FROM costage_st_studiengaenge G left outer join  costage_st_studienkennzahlen SKZ
 on ( SKZ.st_skz_nr=G.st_skz_nr)
 left outer join costage_st_abschlussziele_lokal A on (A.st_absz_nr=G.st_absz_nr);
--- a/src-modules/module/costage/schluesseltabellen/konstanten_fuellen.sql
+++ b/src-modules/module/costage/schluesseltabellen/konstanten_fuellen.sql
@ -41,7 +41,7 @@ beschreibung,
				@@ -41,7 +41,7 @@ beschreibung,
 'Teilstudiengänge Status aus MSG ausdehnen',

 310,
- '',--doku link
+ 'https://www.superx-projekt.de/doku/costage_modul/admin/f_Konstanten.htm',--doku link
 0,
 '1,Ja'|| ${newline} || '0,Nein',
 '>0.3',
@ -65,14 +65,38 @@ beschreibung,
				@@ -65,14 +65,38 @@ beschreibung,
 'Anzahl der Semester, für die rückwirkend Einzelprüfungen berechnet werden',
 310,

- 'Modul_Studienerfolg_Admin-HISinOne.xhtml#Konstanten',
+ 'https://www.superx-projekt.de/doku/costage_modul/admin/f_Konstanten.htm',

 0 ,
 null::Char(1),
- '2023.06',
+ '0.3',
 'Datenquelle, Entladestartzeitpunkt, -umfang',
- 120);
+ 310);
+
+insert into tmp_konstanten(apnr,
+beschreibung,
+ defaultvalue,
+ description,
+ systeminfo_id,
+ doku_link,
+ read_only,
+ wertebereich,
+ ab_version,
+ gruppe,
+ sachgebiete_id)
+ values (0,
+'SOS_CO_allow_external',
+ 0,
+ 'Erlaube externe Hochschuldaten',
+ 310,

+ 'https://www.superx-projekt.de/doku/costage_modul/admin/f_Konstanten.htm',
+
+0 ,
+'1,Ja'|| ${newline} || '0,Nein',
+ '0.5',
+ 'Datenquelle, Entladestartzeitpunkt, -umfang',
+ 310);
 
 --vorhandene Schlüssel Metadaten updaten:

--- a/src-modules/module/costage/schluesseltabellen/sx_repository.unl
+++ b/src-modules/module/costage/schluesseltabellen/sx_repository.unl
@ -1,2 +1,20 @@
				@@ -1,2 +1,20 @@
 1^COSTAGE_STUDENT_FILTER^1=1^Filter Studierende für CO^Hier werden Studierende für Auswertungen aus CO gefiltert^^COSTAGE_STUD_FILTER^^^310^1^0^0^^1^01.01.1900^31.12.3000^
 2^COSTAGE_STORT^^Standorte^Hier werden Standorte konfiguriert^^COSTAGE_STORT^^^310^1^0^0^^0^01.01.1900^31.12.3000^
+2^COSTAGE_LEISTUNGSSTATUS_MAP^case when leistungstyp_nr=1 --reale Prüfung\
+and leistungsstatus_nr=1 --in Bearbeitung\
+then 'AN' --angemeldet\
+when leistungstyp_nr=1 --reale Prüfung\
+and leistungsstatus_nr=5 --gelöscht\
+then 'AB' --abgemeldet\
+when note_negativ_flag='J' \
+and leistungstyp_nr in (4,9) -- AP Abschlussprüfung, AAP anerkannte Abschlussprüfung\
+then 'EN' --endgültig nicht bestanden\
+when note_negativ_flag='J' \
+then 'NB' --nicht bestanden\
+when note='Q' --keine Beurteilung\
+and note_zusatz='Q' --Rücktritt mit anerkanntem Grund\
+then 'R' --Rücktritt von der Prüfungsanmeldung\
+when note='Q' --keine Beurteilung\
+then 'NE' --nicht erschienen\
+else 'BE' --bestanden\
+end^Leistungsstatus-Gruppen (CO)^Hier werden Leistungsstatus-Gruppen (CO) konfiguriert. Beispiel der UZK für sx_leistungen_v^^COSTAGE_LEISTUNGSSTATUS^^^310^1^0^0^^1^01.01.1900^31.12.3000^
--- a/src-modules/module/costage/schluesseltabellen/trans_costage_st_studiengaenge.sql
+++ b/src-modules/module/costage/schluesseltabellen/trans_costage_st_studiengaenge.sql
@ -56,7 +56,8 @@ rsz=P.po_regelstudienzeit
				@@ -56,7 +56,8 @@ rsz=P.po_regelstudienzeit
 from costage_st_studien_spoversionen P, costage_st_studien S
 where S.st_studium_nr = P.st_studium_nr
 and S.st_studiengang_nr=costage_st_studiengaenge.st_studiengang_nr
-and P.stp_stp_nr=costage_st_studiengaenge.stp_stp_nr;
+--paßt nicht zusammen: and P.stp_stp_nr=costage_st_studiengaenge.stp_stp_nr
+;

 --Standorte name:
Author	SHA1	Message	Date
Daniel Quathamer	34c626a5ad	Bugfix Übernahme SPO-Version von COSTAGE zu SOS #18	2 weeks ago
Daniel Quathamer	e13da265be	px_leistungen_v statt sx_leistungen_v laden #22	1 month ago
Daniel Quathamer	6ad01f9cf5	Merge branch 'bew_mzb' #24	2 months ago
Daniel Quathamer	7440ee0d75	Neues Feld costage_st_studien_aggr.st_studium_nr_msg #16	2 months ago
Daniel Quathamer	a93bb1d706	Enladen klin. Semester, Umgang mit gleichzeitigen Statusänderungen #23	2 months ago
Alexander Bien	b0b90e7f0b	Unload der View px_bewerb_mzb_v	2 months ago
Daniel Quathamer	806fd8565e	Laden klin. Semester #23	3 months ago
Daniel Quathamer	ffa899542a	Bugfix Abmeldegrund personbezogen, Laden Standorte, unload Praxissemester und klin. Semester #5	3 months ago
Daniel Quathamer	8a1f00265b	Bugfix Abmeldegrund personbezogen #5	4 months ago
Daniel Quathamer	b47a1cef96	px_leistungen_v statt sx_leistungen_v laden #22	4 months ago
Daniel Quathamer	d62ee23ce6	STP-Version entladen #18	4 months ago
Daniel Quathamer	6fa0d5db9c	Bewerbungen Datenblatt Feld Antragsnummer #21	4 months ago
Daniel Quathamer	568c02cd73	Merge branch 'bew_feldnamen_korrektur'	5 months ago
Daniel Quathamer	e0daa2502b	Bewerbungen Datenblatt Feld Antragsnummer impl., Suchlogik geändert #10	5 months ago
Alexander Bien	80f8dfcbfb	Relation von Studienstammdaten entfernt	5 months ago
Alexander Bien	e971afd816	Feldbezeichnung Bewerbernummer in Antragsnummer geändert	5 months ago
Daniel Quathamer	83ffe002dc	Ermittlung Abmeldegrund TSG/MSG #5	6 months ago
Daniel Quathamer	b551156feb	New fields for CO #307900	6 months ago
Daniel Quathamer	4ec8558bf0	Neue Felder fürs SOS Modul #20	6 months ago
Daniel Quathamer	f5828a3dcd	Merge branch 'COStage_0.4_Release'	6 months ago
Daniel Quathamer	2d9a04a796	Bugfix TSG bei mehreren gleichzeitigen MSG #16	6 months ago
Daniel Quathamer	90ed852d5c	remove obsolete code #15	7 months ago
Daniel Quathamer	c96e23a21c	Versionsspez. Entladen px_st_hzb_v #19	7 months ago
Daniel Quathamer	994144cf6d	Laden HZB-Daten aus schulischer Vorbildung (statt Bewerbung) Versionsspezifisch #19	7 months ago
Daniel Quathamer	6c6e30c4c1	Laden HZB-Daten aus schulischer Vorbildung (statt Bewerbung) Versionsspezifisch #19	7 months ago
Daniel Quathamer	09ec4c4026	Generierung bei Status Z korrigiert #16	7 months ago
Daniel Quathamer	5a2674331e	Status und Primärflag TSG bei länger laufendem MSG anpassen #16	7 months ago
Daniel Quathamer	5a57bb716e	TSG Generierung Korrektur stgnr, Bewerbungen Datenblatt left outer join #16	8 months ago
Daniel Quathamer	e3735619b8	Geschlossene TSG nach MSG verlängern #16	8 months ago
Daniel Quathamer	b9ff3caa9c	Beschleunigung Laderoutine, Status zum Semesterende Examtr. zählt als immatr. #16	9 months ago
Daniel Quathamer	719b498ab2	Hochschulsem. inkrementell entladen, neues Feld abs_fach_st_studium_nr #1	9 months ago
Daniel Quathamer	e6f3f72118	Bugfix Übergabe SPO Version nach SOS #18	9 months ago
Daniel Quathamer	e1711b81a9	Schließung zum Semesterende abfangen, HH-Sem. inkrementell laden #16	10 months ago
Daniel Quathamer	49736d01b2	Neues feld sx_leistungen_v.abs_fach_st_studium_nr #7 (cherry picked from commit 1ec3c90cad7cb72b6976a689d82dbdf5f2522c8d)	11 months ago
Daniel Quathamer	933b2e4d6f	Status TSG anpassen bei längerem MSG #16	11 months ago
Daniel Quathamer	2f7b0cb641	Bugfixes merge 0.3 #15	11 months ago
Daniel Quathamer	571eac1ba3	MSG Status Z auswerten	11 months ago
Daniel Quathamer	9899dfcb17	Primärflag aus px_st_studien_v laden #15	12 months ago
Daniel Quathamer	43cea2c88c	Neue Tabelle costage_st_hzb, neue Spalte costage_st_studien.hauptstudium_flag	1 year ago
Daniel Quathamer	6717b6d4d8	Status von TSG nach SOS übergeben	1 year ago
Daniel Quathamer	1a32527998	Inkrementelles Laden erlauben, Bugfix TSG Status bei Generierung #1	1 year ago
danielq	736c56cad7	SQL_ENV erw.	1 year ago