Neue Felder fürs SOS Modul #20

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

@@ -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.5b" 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">
@@ -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>
@@ -582,6 +584,8 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[CO]" />
  <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)"  />
 
 </columns>
 <indexes>

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

@@ -932,6 +932,7 @@ st_studium_nr,
        anfdat,
        ruebeudat,
        endedat,
+       endedat_tsg,
        stufrm,
        kz_rueck_beur_ein,
        kz_rueck_beur_ein_tsg,
@@ -944,6 +945,7 @@ st_studium_nr,
        abm_art_s,
        po_stp_stp_version_kb,
        po_regelstudienzeit,
+       studiengangs_identifikator_msg,
        summe
        )
        
@@ -979,6 +981,8 @@ select st_studium_nr,
        else null::date  end) as ruebeudat,
        (case when studienstatustyp in ('Z','X') then gueltig_ab 
        else null::date end) as endedat,
+       (case when statustyp_tsg in ('Z','X') then gueltig_ab 
+       else null::date end) as endedat_tsg,
        studienform_statistik_code as stufrm,
        kz_rueck_beur_ein,
        kz_rueck_beur_ein_tsg,
@@ -991,6 +995,7 @@ select st_studium_nr,
        abm_art_s,
        po_stp_stp_version_kb,
        po_regelstudienzeit,
+       studiengangs_identifikator_msg,
        1 as summe
        from tmp_studien3
        where kz_rueck_beur_ein is not null
@@ -1019,6 +1024,7 @@ st_studium_nr,
        anfdat,
        ruebeudat,
        endedat,
+       endedat_tsg,
        stufrm,
        kz_rueck_beur_ein,
        kz_rueck_beur_ein_tsg,
@@ -1031,6 +1037,7 @@ st_studium_nr,
        abm_art_s,
        po_stp_stp_version_kb,
        po_regelstudienzeit,
+       studiengangs_identifikator_msg,
        summe
        )
        
@@ -1067,6 +1074,8 @@ cast (NULL as int)   as studiengang_nr2,
        else null::date  end) as ruebeudat,
        (case when studienstatustyp in ('Z','X') then gueltig_ab 
        else null::date end) as endedat,
+       (case when statustyp_tsg in ('Z','X') then gueltig_ab 
+       else null::date end) as endedat_tsg,
        studienform_statistik_code as stufrm,
        kz_rueck_beur_ein,
        kz_rueck_beur_ein_tsg,
@@ -1079,6 +1088,7 @@ cast (NULL as int)   as studiengang_nr2,
        abm_art_s,
        po_stp_stp_version_kb,
        po_regelstudienzeit,
+       studiengangs_identifikator_msg,
        1 as summe
        from tmp_studien3
       where  kz_rueck_beur_ein is  null

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

@@ -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 "---------------------------------------" 

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

@@ -232,7 +232,12 @@ unikey ,
 po_regelstudienzeit ,-- individual_number_of_semesters
 F.st_studium_nr as degree_program_id ,
 null::char(10) as hssem_valid,
-F.kz_rueck_beur_ein_tsg
+F.kz_rueck_beur_ein_tsg,
+endedat_tsg,
+urlaub_art as  ch27_grund_beurl_tsg,
+abm_art_s as ch62_grund_exmatr_tsg,
+F.studiengangs_identifikator_msg 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
@@ -321,7 +326,8 @@ 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 sem_der_pruefung_exa,
-null::char(1) as d_abg_pruefung_exa
+null::char(1) as d_abg_pruefung_exa,
+null::char(1) as pstatus_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
@@ -816,7 +822,28 @@ 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
 ;
 
 ]]>
@@ -881,19 +908,19 @@ SELECT distinct 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,
        null::integer,--kzfaarray,
-       null::integer,--stort,
+       G.stort_nr,--stort,
        '', -- lehreinh,
        null::integer,--stkkurs1,
        null::integer,--stkkurs2,
        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,
@@ -901,16 +928,18 @@ SELECT distinct substring(G.studiengangs_identifikator from 1 for 10) ,--abstgv,
        null::integer,--stufrm,
        null::integer,--abstitel,
        G.st_studiengang_nr as abstgvnr,
-       null::integer,--efh,
+       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, costage_st_studien_aggr A
+       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 K.key=30
-       and K.apnr=G.skz_key
+      and ($EXTERNAL_SUBJECTS ='true'
+or G.unikey=(select H.hs_nr::char(10) from hochschulinfo H)
+)
 ]]>
 </extraction-sql>
 </unload-job>
@@ -1090,6 +1119,17 @@ 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/schluesseltabellen/costage_dim_studiengang_fuellen.sql

@@ -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,
 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);