README.md

@@ -10,8 +10,6 @@ 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
 

src-modules/module/costage/conf/costage.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module name="costage" version="0.7b" sachgebiet_id="310"
+<module name="costage" version="0.3" 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">
@@ -290,8 +290,6 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 <column name="stufrm" type ="CHAR" size ="10" default ="" notnull ="false" description="Studienform"/>
 <column name="pversion" type ="VARCHAR" size ="255" default ="" notnull ="false" description="SPO-Version" currentlyUsed="false"/>
 <column name="rsz" type ="INTEGER" size ="255" default ="" notnull ="false" description="Regelstudienzeit"/>
-<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>
@@ -315,9 +313,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="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="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="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,8 +324,6 @@ 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>
@@ -424,14 +420,13 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 </table>
 
 
-<table name="costage_st_studien" thema="Studierende und Gebühren" caption="Persönliche Studien (CO)" typ="Datentabelle" releaseUnload="empty">
+<table name="costage_st_studien" thema="Studierende und Gebühren" caption="Studienverläufe (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>
@@ -483,43 +478,16 @@ 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>
-</rs></primaryKeys>
-<foreignKeys><rs>
-</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">
 <columns><column name="st_studium_nr" type ="INTEGER" size ="8" default ="" notnull ="true" description="Studium (ID)" />
 <column name="st_studstamm_nr" type ="INTEGER" size ="8" default ="" notnull ="true" description="Studierendenstammdaten (ID)" />
@@ -543,6 +511,26 @@ 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>
@@ -573,34 +561,11 @@ 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_studien_spoversionen.st_studium_nr, hierbei die jeweils letzte  (max(gueltig_ab)  </comment>
+  <comment>Lookup via: st_studium_nr - costage_st_adressen.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>
 
@@ -640,10 +605,6 @@ 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">
@@ -726,27 +687,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="Antragsnummer"/>
-<column name="st_studstamm_nr" type ="INTEGER" size ="8" default ="" notnull ="true" description="Bewerbernummer" />
+<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="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"  currentlyUsed="false"><comment>nur bei TSG</comment></column>
+<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="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" 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="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="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" />
@@ -1111,7 +1072,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 <columns><column name="leistung_nr" type ="INTEGER" size ="4" default ="" notnull ="true" />
 <column name="leistungstyp_nr" type ="INTEGER" size ="4" default ="" notnull ="true" />
 <column name="leistungsdetailtyp_kb" type ="VARCHAR" size ="10" default ="" notnull ="false" />
-<column name="matrikelnummer" type ="INTEGER" size ="12" default ="" notnull ="false" />
+<column name="matrikelnummer" type ="VARCHAR" size ="12" default ="" notnull ="false" />
 <column name="vorname" type ="VARCHAR" size ="255" default ="" notnull ="true" />
 <column name="nachname" type ="VARCHAR" size ="255" default ="" notnull ="true" />
 <column name="st_studium_nr" type ="INTEGER" size ="4" default ="" notnull ="true" />
@@ -1143,7 +1104,6 @@ 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>
@@ -1386,23 +1346,6 @@ 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" />
@@ -1421,12 +1364,11 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
 
 </rs></privileges>
 </table>
-<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" />
+<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" />
 </columns>
 <indexes></indexes>
 <primaryKeys><rs>
@@ -1708,15 +1650,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_land_sub_r_nr" />
+	<relation-column from="land_sub_reg_nr" to="hzb_ort" />
 </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_land_nr" />
+	<relation-column from="st_land_nr" to="hzb_staat" />
 </relation>
-<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 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>
 <relation from="costage_st_abmeldungsarten" to="costage_st_studien_aggr" delete="FALSE"
 	displayType="select" visibleFields="name" format="%s">
@@ -1744,17 +1686,6 @@ 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"
@@ -1848,6 +1779,10 @@ 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">
@@ -1892,7 +1827,6 @@ 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>
@@ -1903,7 +1837,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_bw_hzb_arten"><file path="$COSTAGE_LOAD_PFAD/unl/costage_bw_hzb_arten.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_abgeltungen"><file path="$COSTAGE_LOAD_PFAD/unl/costage_abgeltungen.unl"/></loadtable>
 -->
 
@@ -1914,7 +1848,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_neu"><file path="$COSTAGE_LOAD_PFAD/unl/costage_st_hochschulsemester.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_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>
@@ -1939,8 +1873,6 @@ 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>

src-modules/module/costage/datentabellen/trans_costage_leistungen.sql

@@ -1,12 +0,0 @@
---freemarker template
---(c) 2025 D.Quathamer
-
-<#if COSTAGE_LEISTUNGSSTATUS_MAP?exists>
-
-update costage_leistungen set leistungsstatus_map_kb=${COSTAGE_LEISTUNGSSTATUS_MAP}
-;
-
-</#if>
-
-
-

src-modules/module/costage/datentabellen/trans_costage_st_hochschulsemester.sql

@@ -1,14 +0,0 @@
-
-
-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;
-

src-modules/module/costage/datentabellen/trans_costage_st_studierendenstammdaten.sql

@@ -18,7 +18,6 @@ d_geburt DATE ,
 ca12_staat INTEGER , 
 second_nationality INTEGER , 
 d_exmatr DATE , 
-abm_art_p char(10),
 semester_max INTEGER 
 ) 
 ;
@@ -58,7 +57,7 @@ insert into tmp_st_studierendenstammdaten(
  --      ca12_staat,
  --      second_nationality,
        d_geburt,
---       d_exmatr,
+       d_exmatr,
        semester_max)
 select 
 S.st_studstamm_nr,
@@ -78,6 +77,7 @@ 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,16 +85,6 @@ 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;
@@ -125,7 +115,6 @@ insert into costage_st_studierendenstammdaten(
        second_nationality,
        d_geburt,
        d_exmatr,
-       abm_art_p,
        semester_max)
 select 
 st_studstamm_nr,
@@ -145,7 +134,6 @@ st_studstamm_nr,
        second_nationality,
        d_geburt,
        d_exmatr,
-       abm_art_p,
        semester_max
 FROM tmp_st_studierendenstammdaten
  ;

src-modules/module/costage/hilfstabellen/costage_bw_antr_aggr_fuellen.sql

@@ -8,11 +8,6 @@ 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>
 
 
@@ -73,7 +68,6 @@ 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
@@ -179,9 +173,7 @@ from costage_st_laender L
 where L.st_land_nr=tmp_bew.hzb_st_land_nr
 ;
 
-delete from costage_bw_antr_aggr
-where semester >= ${beginn_semester}
-;
+truncate table costage_bw_antr_aggr;
 insert into costage_bw_antr_aggr( nr,
        st_studstamm_nr,
        matrikelnummer,

src-modules/module/costage/hilfstabellen/costage_st_einzpruef_aggr_fuellen.sql

@@ -14,7 +14,7 @@ select min(S.tid) from semester S where S.sem_beginn >= today()-(182*${anz_sem})
 SELECT 
 L.st_studium_nr,
 S.st_studstamm_nr,
-L.matrikelnummer::integer as matrikelnummer,
+val(L.matrikelnummer) as matrikelnummer,
 null::integer as st_studiengang_nr,
 null::integer as studiengang_nr,
 null::integer as fach_nr,
@@ -65,7 +65,7 @@ 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
 and T.leistungstyp_nr=L.leistungstyp_nr
-and S.matrikelnummer=L.matrikelnummer
+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
@@ -83,7 +83,7 @@ insert into tmp_pruef
 SELECT 
 L.st_studium_nr,
 S.st_studstamm_nr,
-L.matrikelnummer::integer as matrikelnummer,
+val(L.matrikelnummer) as matrikelnummer,
 null::integer as st_studiengang_nr,
 null::integer as studiengang_nr,
 null::integer as fach_nr,
@@ -134,7 +134,7 @@ FROM costage_st_semester E, costage_leistungen_typen T, costage_leistungen L, co
 where L.leistungsdatum between E.semester_anfang and  E.semester_ende
    and L.veranstaltung_semester is null
 and T.leistungstyp_nr=L.leistungstyp_nr
-and S.matrikelnummer=L.matrikelnummer
+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

src-modules/module/costage/hilfstabellen/costage_st_lv_aggr_fuellen.sql

@@ -1,11 +1,3 @@
---freemarker template
-<sqlvars>
-<sqlvar name="beginn_semester"><![CDATA[
-select param_val from unload_params
-where param_id='COSTAGE_start_lv_sem';
-]]>
-</sqlvar>
-</sqlvars>
 
 
 
@@ -35,16 +27,13 @@ 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
 ;
-delete from costage_st_lv_aggr
-where semester >= ${beginn_semester};
-
+truncate table costage_st_lv_aggr;
 insert into costage_st_lv_aggr(st_studium_nr,
        st_studstamm_nr,
        matrikelnummer,

src-modules/module/costage/hilfstabellen/costage_st_pruef_aggr_fuellen.sql

@@ -1,18 +1,10 @@
---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:
 SELECT 
 L.st_studium_nr,
 S.st_studstamm_nr,
-L.matrikelnummer::integer as matrikelnummer,
+val(L.matrikelnummer) as matrikelnummer,
 null::integer as st_studiengang_nr,
 null::integer as studiengang_nr,
 null::integer as fach_nr,
@@ -25,6 +17,7 @@ L.leistung_nr,
 L.leistungstyp_nr,
 L.leistungsdetailtyp_kb,
 L.studienidentifikator,
+L.spov_abschluss,
 L.stp_sp_nr,
 L.veranstaltung_nummer,
 L.veranstaltung_semester,
@@ -56,13 +49,12 @@ 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,
-L.spov_abschluss as po_stp_stp_version_kb 
+null::integer as semester_msg
 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
 and T.leistungstyp_nr=L.leistungstyp_nr
-and S.matrikelnummer=L.matrikelnummer
+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
@@ -72,7 +64,6 @@ 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:
@@ -80,7 +71,7 @@ insert into tmp_pruef
 SELECT 
 L.st_studium_nr,
 S.st_studstamm_nr,
-L.matrikelnummer::integer as matrikelnummer,
+val(L.matrikelnummer) as matrikelnummer,
 null::integer as st_studiengang_nr,
 null::integer as studiengang_nr,
 null::integer as fach_nr,
@@ -93,6 +84,7 @@ L.leistung_nr,
 L.leistungstyp_nr,
 L.leistungsdetailtyp_kb,
 L.studienidentifikator,
+L.spov_abschluss,
 L.stp_sp_nr,
 L.veranstaltung_nummer,
 L.veranstaltung_semester,
@@ -124,17 +116,15 @@ 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,
-L.spov_abschluss
+null::integer as semester_msg
 FROM costage_st_semester E, costage_leistungen_typen T, costage_leistungen L, costage_st_studierendenstammdaten S
 where L.leistungsdatum between E.semester_anfang and  E.semester_ende
    and L.veranstaltung_semester is null
 and T.leistungstyp_nr=L.leistungstyp_nr
-and S.matrikelnummer=L.matrikelnummer
+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
@@ -149,14 +139,6 @@ 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 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
-;
 
 --Prüfung kann nach letztem eingeschr. Semester sein, daher zuerst letztes Sem. ermitteln:
 select S.st_studium_nr,
@@ -174,10 +156,9 @@ and S.matrikelnummer=P.matrikelnummer
 group by 1,2
 ;
 --Dann Studium vom letzten Semester in den Prüfungs-Datensatz schreiben:
---TODO langsam:
 update tmp_pruef set 
 st_studienstatus_nr=S.st_studienstatus_nr,
---fachsemester = S.fachsemester, --wird oben ermittelt, ab 0.6 nicht mehr aus letztem Studiums-Semester
+fachsemester = S.fachsemester,
 studiengang_nr=S.studiengang_nr,
 fach_nr=S.fach_nr,
 unikey=S.unikey,
@@ -222,24 +203,6 @@ 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
@@ -249,11 +212,7 @@ and K.st_skz_nr=G.st_skz_nr
 and tmp_pruef.unikey is null
 ;
 
-
-
-delete from costage_st_pruef_aggr
-where semester >= ${beginn_semester};
-
+truncate table costage_st_pruef_aggr;
 insert into costage_st_pruef_aggr(st_studium_nr,
        st_studstamm_nr,
        matrikelnummer,
@@ -272,7 +231,6 @@ insert into costage_st_pruef_aggr(st_studium_nr,
        pnr,
        abschnitt,
        stp_sp_nr,
-       po_stp_stp_version_kb,
        note,
        credits,
        leistungsdatum,
@@ -302,7 +260,6 @@ 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,
@@ -314,7 +271,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,28;
+       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;
 
 drop table tmp_pruef;
 drop table tmp_pruef2;

src-modules/module/costage/masken/43040_felderinfo.unl

@@ -52,22 +52,8 @@ order by 2\
 43054^Schlüssel anzeigen^150^0^0^100^100^1^integer^30^1^1^<<SQL>> select 1,'Ja' from xdummy union select 0,'Nein' from xdummy^^<<SQL>>  select 1,'Ja' from xdummy^
 43055^tablestylesheet^121^0^0^100^200^1^char^200^1^1^<<SQL>> select distinct filename,X.caption,ord from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=43040 order by ord^^<<SQL>> select distinct filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=43040 and S.ord=1^
 43056^Ausgabeformat^2001^0^0^100^150^1^char^200^1^1^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and nature::smallint<100 order by nature::smallint^^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and description='HTML'^
-43059^Hochschule / Standort^5^350^-1^140^80^1^char^255^0^1^<<SQL>> --freemarker template \
-<#if COSTAGE_STORT?exists && COSTAGE_STORT !="">\
-<#assign inlineTemplate=COSTAGE_STORT?interpret />\
-<@inlineTemplate/>\
-</#if>\
-<#if stort?exists>\
-<#foreach st in stort>\
-select '${st.nr}','${st.name}' from xdummy\
-<#if st?has_next>\
-union\
-</#if>\
-</#foreach>\
-<#else>\
-select distinct K.unikey,K.unikey\
+43059^Hochschule^5^350^-1^140^80^1^char^255^0^1^<<SQL>>select distinct K.unikey,K.unikey\
 from costage_st_studienkennzahlen K\
-</#if>\
 order by 2;^ ^<<SQL>> select distinct K.unikey,K.unikey\
 from costage_st_studienkennzahlen K, hochschulinfo H\
 where K.unikey=H.hs_nr::char(10)^

src-modules/module/costage/masken/43040_maskeninfo.unl

@@ -75,7 +75,7 @@ SELECT name,\
 /* and fach_nr =<<Fach-Nr.>> */\
 /* and costage_st_studien_aggr.st_studstamm_nr in (select S.st_studstamm_nr from costage_st_studierendenstammdaten S where S.st_land1_nr in (<<Staatsangehörigkeit>>) ) */\
 /* and costage_st_studien_aggr.st_studstamm_nr in (select S2.st_studstamm_nr from costage_st_studierendenstammdaten S2 where S2.geschlecht = <<Geschlecht>> ) */\
-/* and costage_st_studien_aggr.unikey=<<Hochschule / Standort>> */\
+/* and costage_st_studien_aggr.unikey=<<Hochschule>> */\
 " />\
 \
 \

src-modules/module/costage/masken/43110_felderinfo.unl

@@ -1,26 +1,31 @@
-43110^Antragsnummer^32^0^0^140^180^1^char^30^0^0^ ^ ^ ^
+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^ ^^
 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;^ ^ ^
+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^Bewerbernummer^25^350^-1^150^180^1^char^200^0^0^^ ^ ^
+FROM costage_bw_zulassungsarten  order by 2^^ ^
+43115^Person-Nr.^25^350^-1^150^180^1^integer^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')\
 <#if <<tablestylesheet>>!='tabelle_html_datenblatt.xsl'>\
  and  name in (select distinct tablename from stylesheet_field where stylesheet_id in (select tid from sx_stylesheets where filename=<<tablestylesheet>>)) \
 </#if>\
-order by 2^ ^ ^
-43117^bis Fachsemester^20^350^-1^140^10^1^integer^30^0^0^^ ^ ^
+order by 2^^^
+43117^bis Fachsemester^20^350^-1^140^10^1^integer^30^0^0^ ^ ^ ^
 43119^Bis Semester^4^350^-1^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() between date(semester_anfang)  and date(semester_ende);^
 43120^Fach-Nr.^119^0^0^140^150^1^integer^20^0^13^<<SQL>> --Freemarker template\
 <#list 1..10 as i>\
  select ${i},'${i}. Fach' from xdummy\
  <#if i_has_next> union </#if>\
 </#list>\
-order by 1^ ^ ^
-43121^Geschlecht^37^0^0^140^80^1^integer^30^0^1^<<SQL>>  SELECT apnr,druck FROM cif WHERE cif.key = 9003 order by 2;^ ^ ^
+order by 1^ ^^
+43121^Geschlecht^37^0^0^140^80^1^integer^30^0^1^<<SQL>>  SELECT apnr,druck FROM cif WHERE cif.key = 9003 order by 2;^^^
 43122^Felder^125^0^0^150^190^10^char^30^0^1^<<SQL>>\
 --freemarker template\
  select trim(F.table_name) || '.' || F.name,trim(T.caption) || ':' || trim(F.caption) || ' - ' || trim(F.name) from sx_fields F,\
@@ -32,7 +37,7 @@ order by 1^ ^ ^
 and trim(F.table_name) || '.' || F.name in (select trim(tablename)||'.'||trim(fieldname) from stylesheet_field where stylesheet_id in \
 (select tid from sx_stylesheets where filename=<<tablestylesheet>>))\
 </#if>\
-  order by 2;^ ^ ^
+  order by 2;^^^
 43123^Fach^6^0^0^140^150^50^char^30^0^1^<<SQL>>\
 SELECT \
        skz_key,\
@@ -40,20 +45,20 @@ SELECT \
 FROM costage_st_studienkennzahlen\
 /* where unikey=<<Hochschule>> */\
 order by 2\
-;^ ^ ^
-43124^Schlüssel anzeigen^150^0^0^100^100^1^integer^30^1^1^<<SQL>> select 1,'Ja' from xdummy union select 0,'Nein' from xdummy^ ^<<SQL>>  select 1,'Ja' from xdummy^
-43125^tablestylesheet^121^0^0^100^200^1^char^200^1^1^<<SQL>> select distinct filename,X.caption,ord from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=43080 order by ord^ ^<<SQL>> select distinct filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=43080 and S.ord=1^
-43126^Ausgabeformat^2001^0^0^100^150^1^char^200^1^1^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and nature::smallint<100 order by nature::smallint^ ^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and description='HTML'^
+;^^^
+43124^Schlüssel anzeigen^150^0^0^100^100^1^integer^30^1^1^<<SQL>> select 1,'Ja' from xdummy union select 0,'Nein' from xdummy^^<<SQL>>  select 1,'Ja' from xdummy^
+43125^tablestylesheet^121^0^0^100^200^1^char^200^1^1^<<SQL>> select distinct filename,X.caption,ord from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=43080 order by ord^^<<SQL>> select distinct filename,X.caption from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=43080 and S.ord=1^
+43126^Ausgabeformat^2001^0^0^100^150^1^char^200^1^1^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and nature::smallint<100 order by nature::smallint^^<<SQL>> select element_value,description from menu_element where element='Ausgabeformat' and description='HTML'^
 43129^Hochschule^5^350^-1^140^80^1^char^255^0^1^<<SQL>>select distinct K.unikey,K.unikey\
 from costage_st_studienkennzahlen K\
 order by 2;^ ^<<SQL>> select distinct K.unikey,K.unikey\
 from costage_st_studienkennzahlen K, hochschulinfo H\
 where K.unikey=H.hs_nr::char(10)^
-43130^##line##^10^0^0^100^100^1^char^5000^0^8^^ ^1^
+43130^##line##^10^0^0^100^100^1^char^5000^0^8^^^1^
 43131^Abschluss^7^0^0^140^170^5^char^30^0^1^<<SQL>> SELECT \
        code,\
        name\
 FROM costage_st_abschlussziele_lokal\
-order by 2;^ ^ ^
-43132^Matrikel-Nr.^30^350^-1^150^180^1^char^200^0^0^^ ^ ^
-43133^##line##^40^0^0^100^100^1^char^5000^0^8^^ ^1^
+order by 2;^^^
+43132^Matrikel-Nr.^30^350^-1^150^180^1^char^200^0^0^^^^
+43133^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^

src-modules/module/costage/masken/43110_maskeninfo.unl

@@ -1,90 +1,79 @@
 43110^Bewerbungen Datenblatt (CO)^--Freemarker Template\
 <#include "SQL_lingua_franca"/>\
 <#include "SuperX_general"/>\
-<#include "DatenblattSQLGenerator"/>\
+<#include "SQL_multitable_output"/>\
 \
 --ram excelexport \
 \
 <sqlvars>\
-<sqlvar name="basetable" ><![CDATA[\
-SELECT distinct name\
+<sqlvar name="get_tables"><![CDATA[\
+SELECT distinct name,name\
       from sx_tables\
-  where name in ('costage_bw_antr_aggr');]]>\
-</sqlvar>\
-<sqlvar name="getJoinTables" type="hashsequence"><![CDATA[\
-SELECT distinct name\
-      from sx_tables\
-  where name in (''\
+  where name in ('costage_bw_antr_aggr'\
    ${DatenblattTables(<<tablestylesheet>>,"<<Weitere Tabellen>>",.vars["Weitere TabellenObject"].allKeys)}\
      \
     )\
-   order by 1;]]>\
+   order by 2;]]>\
 </sqlvar>\
-<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}'\
+<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'\
   ${DatenblattTables(<<tablestylesheet>>,"<<Weitere Tabellen>>",.vars["Weitere TabellenObject"].allKeys)} )\
-and foreignkey_tab in ('-xy'\
+and foreignkey_tab in ('costage_bw_antr_aggr'\
   ${DatenblattTables(<<tablestylesheet>>,"<<Weitere Tabellen>>",.vars["Weitere TabellenObject"].allKeys)})\
 ;]]>\
 </sqlvar>\
-<sqlvar name="getSelectClause" type="hashsequence"><![CDATA[\
+<sqlvar name="get_felder"><![CDATA[\
 SELECT name,\
        caption,\
-       field_type,\
-       is_primarykey,\
-       foreignkey_tab,\
-       foreignkey_col,\
-       foreignkey_cap,\
-       foreignkey_cond,\
-       foreignkey_func,\
-       table_name,\
-       foreignkey_uniquename\
+       (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\
  from sx_fields\
-  where table_name in ('${basetable}'\
+  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>\
+<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>\
 \
-<#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>> */\
-\
+<@generate_multitable_list />\
+<@generate_field_list_multitable aggregationsfeld="summe" aggregatfunktion="sum("  />\
+<@generate_foreign_fields_multitable  />\
 \
 \
 <#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.>>"!="">\
@@ -100,36 +89,50 @@ SELECT name,\
 \
 <#assign filter=filter +" and " + fach_filter />\
 \
---\
-\
-<@generateDatenblatt \
-p_basetable = basetable\
-p_joinTables = getJoinTables\
-p_joinWhereClauses = getJoinWhereClauses\
-p_selectClause = getSelectClause\
-p_aggregationsfeld ="summe"\
-p_aggregatfunktion = "sum("\
-p_filter = filter\
-p_show_keys= <<Schlüssel anzeigen>>\
-p_postProcessing= ""\
+ <@generate_resultset_multitable tabellen=table_list\
+p_show_keys=<<Schlüssel anzeigen>>\
+p_field_list_select=field_list_select\
+p_foreign_fields=foreign_fields\
+p_filter=filter\
+p_field_list_groupby=field_list_groupby\
+p_join_clause=join_clause\
 />^--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 getSelectClause?has_content >\
-<#foreach myfield in getSelectClause>\
+<#if get_felder?has_content >\
+<#foreach myfield in get_felder>\
 <#assign i=i+1 />\
-Column CID=${i} heading_text="${myfield.caption}" explanation="" center_heading\
+Column CID=${i} heading_text="${myfield.key}" explanation="${myfield.strukturStr}" center_heading\
    row_selectable col_selectable rightJust heading_platform readonly\
    width=20\
-<#if myfield.foreignkey_tab != '' && <<Schlüssel anzeigen>>==1>\
+<#if myfield.name != '' && <<Schlüssel anzeigen>>==1>\
 <#assign i=i+1 />\
-Column CID=${i} heading_text="${myfield.caption}\\n(Schlüssel)" explanation="" center_heading\
+Column CID=${i} heading_text="${myfield.key}\\n(Schlüssel)" explanation="Schlüssel des Feldes ${myfield.key}" 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^^1^^
+@@@^Altersgruppe^Anzahl^Bewerbungen Datenblatt aus CO^drop table tmp_tabelle;^ ^2^700^360^0^1^ ^

src-modules/module/costage/rohdaten/COSTAGE_ENV.sam

@@ -2,8 +2,6 @@
 
 #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
@@ -23,10 +21,6 @@ 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=.

src-modules/module/costage/rohdaten/costage_unload.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <superx-unload version="4.0">
-<module id="costage" version="0.7b" systeminfo_id="310">COSTAGE-Modul</module>
+<module id="costage" version="0.3b" systeminfo_id="310">COSTAGE-Modul</module>
 
 <parameters>
 <param name="VERSION" defaultValue="2" description="Datenbank-Version"><comment>CO-Version, wird derzeit ignoriert</comment></param>
@@ -8,7 +8,6 @@
 <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"/>
@@ -116,7 +115,6 @@ 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
  ;
 
 ]]>
@@ -207,8 +205,7 @@ SELECT st_studium_nr,
        st_studstamm_nr,
        st_studiengang_nr,
        studienform_name,
-       studienform_statistik_code,
-       hauptstudium_flag
+       studienform_statistik_code
 FROM px_st_studien_v 
  
 
@@ -360,57 +357,6 @@ 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>
@@ -686,7 +632,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_hssem
+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
 ;
@@ -733,9 +679,8 @@ SELECT leistung_nr,
        anerkannt_flag,
        zusatzleistung_flag,
        leistungsstatus_nr,
-       null ,--leistungsstatus_map_kb,
-       null --abs_fach_st_studium_nr
-FROM px_leistungen_v 
+       leistungsstatus_map_kb
+FROM sx_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
  ;
 ]]>
@@ -800,16 +745,16 @@ FROM px_leistungen_status_typen_v
 ]]>
 </extraction-sql>
 </unload-job>
-<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>
+<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>
 <extraction-sql sourcesystem="co"  database="" version="">
 <![CDATA[
-SELECT  hzb_nr,
-substr(name,1,255),
-substr(name_kurz,1,255),
-hzb_art_stla_code,
-kurzbezeichnung
+SELECT distinct hzb_art_stla_code as apnr,
+name_kurz as kurztext,
+name as drucktext,
+name as langtext
 FROM px_bw_hzb_arten_v 
+where hzb_art_stla_code is not null
  ;
 
  
@@ -932,22 +877,6 @@ 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>

src-modules/module/costage/rohdaten/csv_unloads2unl.sql

@@ -19,7 +19,6 @@
   {"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"},
@@ -36,13 +35,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":"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_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":"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":"px_bw_hzb_arten_v.csv", "targettable":"costage_bw_hzb_arten", "targetfile":"costage_bw_hzb_arten.unl"}
+  {"srcfile":"k_hzbart.csv", "targettable":"costage_k_hzbart", "targetfile":"costage_k_hzbart.unl"}
   ] />
 
 \! echo "Folgende Dateien lassen sich laden:"

src-modules/module/costage/rohdaten/db-co.properties.sam

@@ -3,7 +3,7 @@ driverName=oracle.jdbc.OracleDriver
 maxIdle=
 logLevelXML=FINEST
 maxActive=
-connectionName=CO_INTERFACE_PUBLIC_EXTERNAL
+connectionName=CO_INTERFACE_PX_SUPERX
 minIdle=5
 logLevelSQL=FINEST
 connectionURL=jdbc\:oracle\:thin\:@192.168.0.11\:1521\:coprod

src-modules/module/costage/rohdaten_sos/sos_costage_unload.x

@@ -364,10 +364,8 @@ 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  -o $FLAG5 -eq 0]
+if [ $FLAG1 -eq 0 -o $FLAG2 -eq 0 -o $FLAG3 -eq 0 -o $FLAG4 -eq 0 ]
 then
 	echo "Fehler beim Entladen. Das Datum wird zurückgesetzt." 
 	echo "---------------------------------------" 

src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml

@@ -98,7 +98,7 @@ null::integer ,--poplz,
 null::integer ,--poort,
 date(aufnahmedatum) as immdat,
 null::integer ,--beugrund as gdbu,
-abm_art_p as gdex,
+null::char(1) as gdex,
 ca12_staat,
 null::integer as bland,
 null::char(1) ,--hssem,
@@ -162,30 +162,9 @@ and semester_max >= $start_stud_sem
 <![CDATA[
 
 
-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
+select * from xdummy where 1=0
+;
+
 
 ]]>
 </extraction-sql>
@@ -203,21 +182,21 @@ G.skz_key as stg,
 '' ,--schwp,
 G.fachkennzeichen,
 '' ,--fb,
-F.po_stp_stp_version_kb as pversion,
+val(G.pversion),
 F.semester,
 F.studiengang_nr,
 F.fach_nr,
 F.kz_rueck_beur_ein AS status,
-F.urlaub_art::char(10) as gdbu,
-F.abm_art_p as gdex,
+null::char(1) ,--F.beugrund as gdbu,
+null::char(1) ,--F.endegrd as gdex,
 F.fachsemester::integer,
 F.hrst,
-F.klinsem,
+null::integer as klinsem,
 F.hssem,
-(case when praxissemester >0 then '3' else '' end) as stuart,
+'' ,--stuart,
 '' ,--stutyp,
-F.stufrm,
-G.stort_nr ,--stort,
+G.stufrm,
+'' ,--stort,
 F.ruebeudat,
 null::char(1) ,--semgewicht,
 null::char(1) ,--stggewicht,
@@ -235,20 +214,8 @@ null::char(1) , --Art der Promotion
 null::char(1) as field_of_study,
 primaerflag as primaerfach,
 unikey ,
-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
-
+null::numeric(9,6) ,-- individual_number_of_semesters
+F.st_studium_nr as degree_program_id 
 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
@@ -257,7 +224,6 @@ and F.kz_rueck_beur_ein is not null
 AND F.semester >= $start_stud_sem
 and ($EXTERNAL_SUBJECTS ='true'
 or F.unikey=(select H.hs_nr::char(10) from hochschulinfo H)
-or exists(select id from sx_repository R where R.id='COSTAGE_STORT' and aktiv=1)
 )
 
 ;
@@ -292,19 +258,19 @@ P.studiengang_nr,
 P.fach_nr,
 G.abschluss,
 P.semester,
-(case when  leistungsdetailtyp_kb!='TSAB' then P.leistungsdatum else null::date end),
+P.leistungsdatum,
 G.skz_key as stg,
 null::integer as vert,
 null::integer as schwp,
 string_not_null(G.fachkennzeichen),
-(case when  leistungsdetailtyp_kb!='TSAB' then round(P.note::decimal(15,4),2) else null::decimal end) as note,
+round(P.note::decimal(15,4),2) as note,
 null::integer as vken1,
 null::char(7), --pruefungsamt_nr
 P.abschnitt as pnr,
-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,
+val(G.pversion),
+P.leistungsstatus_map_kb as pstatus,
+P.fachsemester ,
+null::char(7) as part,
 P.leistung_nr,
 null::integer as pversuch,
 null::char(7)as ppruef1,
@@ -316,7 +282,7 @@ null::integer as psws,
 null::char(1), --relation_id nur bei HIS1
 null::integer as pvermerk,
 null::integer as prueck,
-G.studiengangs_typ_kb as zeitabschnitt, --term_segment
+null::integer as ptermin, --term_segment
 null::integer as pform,
 null::char(1), --anger. fs insg.
 null::char(1), --berufspraktische taetigkeit
@@ -335,17 +301,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,
-(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 
+null::char(1) as k_unit_purpose_id
 FROM costage_st_pruef_aggr P, costage_st_studiengaenge G
 where G.st_studiengang_nr=P.st_studiengang_nr
-and ($EXTERNAL_SUBJECTS ='true'
-or P.unikey=(select H.hs_nr::char(10) from hochschulinfo H)
-)
 AND P.semester >= $start_pruef_sem
 ;
 
@@ -470,7 +428,7 @@ SELECT distinct
    po_stp_stp_version_kb,
    null , --astat
    null,
-   po_stp_stp_version_kb ,--uniquename
+   '' ,--sortc1
    null,
    '' --sprache
    FROM costage_st_studien_spoversionen
@@ -483,7 +441,7 @@ SELECT distinct
    druck,
     null , --astat
    null,
-   uniquename,
+   '' ,--sortc1
    null,
    '' --sprache
    from cif
@@ -498,7 +456,7 @@ SELECT distinct
    'Hauptprüfung' as lang,
     null , --astat
    null,
-   '2'  as uniquename, 
+   '' ,--sortc1
    null,
    '' --sprache
    from xdummy
@@ -520,7 +478,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, --sortc1
+'', --sortc1
 ' ',
 ' ', --sprache
 null::date  as gueltig_von,
@@ -535,7 +493,6 @@ null as sortorder
    on ( F.st_stdfach_nr=K.st_stdfach_nr)
    where ($EXTERNAL_SUBJECTS ='true'
 or unikey=(select H.hs_nr::char(10) from hochschulinfo H)
-or exists(select id from sx_repository R where R.id='COSTAGE_STORT' and aktiv=1)
 )
 
 union
@@ -591,24 +548,24 @@ null as sortorder
     SELECT distinct 
     612,
  -1,
-    statistik_code,
-    kurzbezeichnung as ktxt,
-    name,
-    name,
- statistik_code as astat,
+    studienform_statistik_code,
+    studienform_statistik_code as ktxt,
+    studienform_name,
+    studienform_name,
+ studienform_statistik_code as astat,
  '',
- statistik_code ,
+ studienform_statistik_code ,
  '',
  '',
 null::date  as gueltig_von,
 null::date  as gueltig_bis,
- statistik_code , --sourcesystem_id
- ''|| nr, --hiskey_id
+ studienform_statistik_code , --sourcesystem_id
+ '', --hiskey_id
  '' , --struktur_c
 null as lid,
 null as parent_lid,
 null as sortorder
-    FROM costage_st_studienformen
+    FROM costage_st_studien
    union
    SELECT distinct 
    613,
@@ -838,76 +795,8 @@ null as lid,
 null as parent_lid,
 null as sortorder
    FROM xdummy
-union
- SELECT distinct
-   9012,
-0,
-   stort_nr,
-   stort_nr as ktxt,
-   stort_name as dtxt,
-  stort_name as ltxt ,
-stort_nr as astat,
-' ',
-stort_nr,
-' ',
-' ',
-null::date  as gueltig_von,
-null::date  as gueltig_bis,
-'5', --sourcesystem_id
-' ' , --hiskey_id
-' ' , --struktur_c
-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
-(case when leistungsdetailtyp_kb in ('BAKN','MAGN','STEX','ERGAB','RIGZP','TSAB') then '99'
-when leistungsdetailtyp_kb in ('AP1','AP2','ZVP','ZW1','SCHW') then '98' else null::char(1) end) as 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>
@@ -952,15 +841,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 CO. </comment>
+<comment>Studiengänge aus SOS. </comment>
 <extraction-sql sourcesystem="co"  database="" version="">
 <![CDATA[
-SELECT distinct substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
+SELECT  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,
-       coalesce(A.po_stp_stp_version_kb,G.pversion) as pversion,
+       val(G.pversion),
        null::integer ,--frist1,
        null::integer ,--frist2,
        null::integer ,--frist3,
@@ -971,38 +860,36 @@ SELECT distinct substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
        null::integer,--astgrp,
        null::integer, --prfgamt,
        null::integer,--vglgrp,
-       G.fakultaet_key as fb,
+       K.struktur_c as fb,
        null::integer,--stutyp,
        string_not_null(G.fachkennzeichen) as kzfa,
        null::integer,--immsemkz,
        null::integer,--kzfaarray,
-       G.stort_nr,--stort,
+       null::integer,--stort,
        '', -- lehreinh,
        null::integer,--stkkurs1,
        null::integer,--stkkurs2,
        null::integer,--stkkurs3,
        null::integer,--prax1fsem,
        null::integer,--prax2fsem,
-       G.abschluss_code as abschluss,
+       abschluss,
        G.skz_key as stg,
        null::integer,--vert,
        null::integer,--schwp,
        null::integer,--stuart,
        null::integer,--stufrm,
        null::integer,--abstitel,
-       G.st_studiengang_nr as abstgvnr,
-       G.unikey,--efh,
-       coalesce(A.po_regelstudienzeit,G.rsz), --regelstz,
+       st_studiengang_nr as abstgvnr,
+       null::integer,--efh,
+       G.rsz, --regelstz,
        null::integer,-- email_part,
        null::integer,--login_part,
        null::date as sem_gueltigbis,
-       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)
-)
+       null::integer -- ects
+       FROM costage_st_studiengaenge G, cifx K
+       where K.key=30
+       and K.apnr=G.skz_key
+       ;
 ]]>
 </extraction-sql>
 </unload-job>
@@ -1068,18 +955,8 @@ 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 
-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
-;
+<![CDATA[
+select * from k_stg where 1=0;
 ]]>
 </extraction-sql>
 </unload-job>
@@ -1184,25 +1061,6 @@ 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="">

src-modules/module/costage/rohdaten_zul/zul_costage_unload.xml

@@ -52,9 +52,9 @@ null,--bew_efh,
        null,--bew_vorname,
        null,--bew_gebname,
        null,--bew_gebort,
-       date(S.geburtsdatum) as bew_gebdat,
-       S.geschlecht as geschl,
-        val(L.statistik_code)  as staat,
+       d_geburt as bew_gebdat,
+       geschlecht as geschl,
+       ca12_staat as staat,
        null,--pozusatz,
        null,--postrasse,
        null,--poplz,
@@ -126,7 +126,7 @@ null,--bew_efh,
        null,--zusastrasse,
        null,--zusaort,
        null,--ord_kuenstname,
-        val(L.statistik_code)  as gebland,
+       ca12_staat as gebland,
        null,--dokvorname,
        null,--bew_zvs_zusatz,
        null,--bew_bewnrhist,
@@ -158,12 +158,10 @@ null,--bew_efh,
        null, --zvs_ekritpaket_18,
        null --zvs_spezkrit
 FROM  
- 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'
+ costage_bw_antr_aggr B,costage_st_studierendenstammdaten S
+where S.st_studstamm_nr=B.st_studstamm_nr
+and B.bw_typ_kb !='MBW'
+;
 
 ]]>
 </extraction-sql>
@@ -180,7 +178,6 @@ SELECT  A.st_studstamm_nr as bewnr,
        G.fachkennzeichen as kzfa,
 G.skz_key as stg,
 G.abschluss,
-null, --schwerpunkt
        null,--antr_vert,
        null,--antr_stuart,
        null,--antr_stutyp,
@@ -189,7 +186,7 @@ A.fachsemester as stgsem,
        null,--stgspz,
        null,--dowunsch1,
        null,--dowunsch2,
-       (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, --antr_stort,
        null,--haerteantr,
        null,--haerte,
        null,--haertegrd,
@@ -282,7 +279,6 @@ where A.st_studiengang_nr=G.st_studiengang_nr
 and A.bw_typ_kb !='MBW'
 and ($EXTERNAL_SUBJECTS ='true'
 or A.unikey=(select H.hs_nr::char(10) from hochschulinfo H)
-or exists(select id from sx_repository R where R.id='COSTAGE_STORT' and aktiv=1)
 )
 
 ;
@@ -458,7 +454,8 @@ 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
+
+  union
     SELECT distinct 
     612,
  -1,
@@ -552,29 +549,7 @@ from costage_st_land_regionen R, costage_st_laender L
 where L.st_land_nr=R.st_land_nr
 and L.statistik_code='000'
 and R.statistik_code is not null
-union
- SELECT distinct
-   9012,
-0,
-   stort_nr,
-   stort_nr as ktxt,
-   stort_name as dtxt,
-  stort_name as ltxt ,
-stort_nr as astat,
-' ',
-stort_nr as uniquename,
-null::integer as sortorder,
-' ' as bund_apnr,
-' ', --sprache
-null::date  as gueltig_von,
-null::date  as gueltig_bis,
-stort_nr::varchar(255), --sourcesystem_id
-null::char(10) , --hiskey_id
-null as struktur_c,
-null as lid,
-null as parent_lid   
-FROM costage_st_studiengaenge
-;
+
 
 ]]>
 </extraction-sql>

src-modules/module/costage/schluesseltabellen/costage_dim_studiengang_fuellen.sql

@@ -24,9 +24,7 @@ insert into costage_dim_studiengang(st_studiengang_nr,
        abschluss_code,
        abschluss_name,
        fakultaet_kurztext,
-       fakultaet_drucktext,
-       stort_nr,
-       stort_name)
+       fakultaet_drucktext)
 
 SELECT  G.st_studiengang_nr,
 substring(G.studiengangs_identifikator from 1 for 255) as studiengangs_identifikator,
@@ -52,9 +50,8 @@ 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,
-G.stort_nr,
-G.stort_name
+null::varchar(255) as fakultaet_drucktext
+
 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);

src-modules/module/costage/schluesseltabellen/konstanten_fuellen.sql

@@ -41,7 +41,7 @@ beschreibung,
 'Teilstudiengänge Status aus MSG ausdehnen',
 
 310,
- 'https://www.superx-projekt.de/doku/costage_modul/admin/f_Konstanten.htm',--doku link
+ '',--doku link
 0,
 '1,Ja'|| ${newline} || '0,Nein',
  '>0.3',
@@ -65,39 +65,15 @@ beschreibung,
  'Anzahl der Semester, für die rückwirkend Einzelprüfungen berechnet werden',
  310,
 
- 'https://www.superx-projekt.de/doku/costage_modul/admin/f_Konstanten.htm',
+ 'Modul_Studienerfolg_Admin-HISinOne.xhtml#Konstanten',
 
 0 ,
 null::Char(1),
- '0.3',
+ '2023.06',
  'Datenquelle, Entladestartzeitpunkt, -umfang',
- 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,
+ 120);
 
- '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:
 
 <#if SQLdialect='Postgres'>

src-modules/module/costage/schluesseltabellen/sx_repository.unl

@@ -1,21 +1 @@
 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^
-3^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^
-4^COSTAGE_STUDIENSTATUS_FILTER^studienstatustyp not in ('a','o','z')^Filter Studienstatus für CO^Hier werden Studienstatus-Typen für Auswertungen aus CO gefiltert^^COSTAGE_STUD_STATUS_FILTER^^^310^1^0^0^^1^01.01.1900^31.12.3000^

src-modules/module/costage/schluesseltabellen/trans_costage_st_studiengaenge.sql

@@ -1,10 +1,3 @@
---freemarker template 
-<#if COSTAGE_STORT?exists && COSTAGE_STORT !="">
-<#assign inlineTemplate=COSTAGE_STORT?interpret />
-<@inlineTemplate/>
-</#if>
-
-
 
 delete from costage_st_studiengaenge;
 
@@ -40,9 +33,6 @@ st_studiengang_nr,
 --transformiere Fach/Abschluss etc. nach SuperX Notation
 --Fach:
 update costage_st_studiengaenge set skz_key=SKZ.skz_key
-<#if stort?exists>
-,stort_nr=SKZ.unikey
-</#if>
 from costage_st_studienkennzahlen SKZ
 where SKZ.st_skz_nr=costage_st_studiengaenge.st_skz_nr;
 --Abschluss:
@@ -56,15 +46,5 @@ 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
---paßt nicht zusammen: and P.stp_stp_nr=costage_st_studiengaenge.stp_stp_nr
-;
-
---Standorte name:
-
-<#if stort?exists>
-<#foreach st in stort>
-update costage_st_studiengaenge set stort_name='${st.name}'
-where stort_nr='${st.nr}';
-</#foreach>
-</#if>
+and P.stp_stp_nr=costage_st_studiengaenge.stp_stp_nr;
 

src-modules/module/costage/schluesseltabellen/trans_costage_st_studienkennzahlen.sql

@@ -1,8 +1,3 @@
---freemarker template 
-<#if COSTAGE_STORT?exists && COSTAGE_STORT !="">
-<#assign inlineTemplate=COSTAGE_STORT?interpret />
-<@inlineTemplate/>
-</#if>
 
 delete from costage_st_studienkennzahlen;
 
@@ -25,16 +20,7 @@ S.st_stdfach_nr,
 S.gesetzliche_grundlage_kb
 FROM costage_st_studienkennzahlen_neu S, hochschulinfo H
 where H.hs_nr::char(10)=S.unikey or S.unikey is null
-or 1=0
-<#if stort?exists>
-<#foreach st in stort>
-or S.unikey ='${st.nr}'
-</#foreach>
-</#if>
  ;
- 
-<#if stort?exists == false>
-
 --wg. Eindeutigkeit kombinierter Schlüssel SKZ+UNIKEY:
 insert into costage_st_studienkennzahlen(
  st_skz_nr,
@@ -56,5 +42,5 @@ S.gesetzliche_grundlage_kb
 FROM costage_st_studienkennzahlen_neu S, hochschulinfo H
 where H.hs_nr::char(10)!=S.unikey
  ;
-</#if>
+ 
 --TODO: Duplikatssuche bei Fächern ("skz_key").

src-modules/module/costage/upgrade/costage_upgrade_man.sql

@@ -11,7 +11,6 @@ alter table costage_bw_bewerb_hzb alter column hzb_punkte_max type float;
 alter table costage_leistungen alter column note_zahl type float;
 alter table costage_leistungen alter column credits type float;
 alter table costage_leistungen alter column semesterstunden type float;
-alter table costage_leistungen alter column matrikelnummer type integer using val(matrikelnummer)::integer;
 
 ALTER TABLE costage_st_studierendenstammdaten
 ALTER COLUMN matrikelnummer drop not null;