diff --git a/src-modules/module/costage/masken/43110_felderinfo.unl b/src-modules/module/costage/masken/43110_felderinfo.unl index 10d7e63..fd44804 100644 --- a/src-modules/module/costage/masken/43110_felderinfo.unl +++ b/src-modules/module/costage/masken/43110_felderinfo.unl @@ -1,15 +1,10 @@ -43110^Studiengang-Nr.^110^0^0^140^150^1^integer^70^0^13^<> --Freemarker template\ -<#list 1..6 as i>\ - select ${i},'${i}. Studiengang' from xdummy\ - <#if i_has_next> union \ -\ -order by 1^ ^ ^ +43110^Antragsnummer^32^0^0^140^180^1^char^30^0^0^ ^ ^ ^ 43111^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<> select semester_tid, semester_bezeichnung from costage_st_semester order by 1 DESC;^ ^<> 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^<> 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^<> SELECT st_land_nr, name from costage_st_laender order by 2;^ ^ ^ 43114^Zulassungsart^14^350^-1^140^180^1^integer^30^0^1^<> select nr, name\ FROM costage_bw_zulassungsarten order by 2^ ^ ^ -43115^Person-Nr.^25^350^-1^150^180^1^integer^200^0^0^^ ^ ^ +43115^Person-Nr.^25^350^-1^150^180^1^char^200^0^0^^ ^ ^ 43116^Weitere Tabellen^123^0^0^140^140^10^char^30^0^1^<> \ --freemarker template\ select name,string_not_null(caption) || ' - ' || name from sx_tables where name in ('costage_st_studierendenstammdaten','costage_dim_studiengang')\ diff --git a/src-modules/module/costage/masken/43110_maskeninfo.unl b/src-modules/module/costage/masken/43110_maskeninfo.unl index a98e7a4..3c5d57c 100644 --- a/src-modules/module/costage/masken/43110_maskeninfo.unl +++ b/src-modules/module/costage/masken/43110_maskeninfo.unl @@ -52,20 +52,39 @@ SELECT name,\ \ \ \ +<#assign person_nr_filter="1=1" />\ +<#assign person_nr_feldwert="" />\ +/* <#assign person_nr_feldwert=<> />*/\ +<#if person_nr_feldwert?starts_with("2-")>\ +<#assign person_nr_feldwert=person_nr_feldwert?replace("2-","") />\ +\ +/* <#assign person_nr_filter="st_studstamm_nr = "+ person_nr_feldwert /> --<> */\ +\ +<#assign antrags_nr_filter="1=1" />\ +<#assign antrags_nr_feldwert="" />\ +/* <#assign antrags_nr_feldwert=<> />*/\ +<#if antrags_nr_feldwert?starts_with("1-")>\ +<#assign antrags_nr_feldwert=antrags_nr_feldwert?replace("1-","") />\ +\ +/* <#assign antrags_nr_filter="costage_bw_antr_aggr.nr= " + antrags_nr_feldwert /> --<> */\ +\ +\ +\ <#assign filter="and bw_typ_kb not in ('MBW')\ /* AND bw_zul_art_nr in (<>) */\ /* and costage_bw_antr_aggr.st_studiengang_nr in (select G.st_studiengang_nr from costage_st_studiengaenge G where G.abschluss in (<>)) */\ -/* and studiengang_nr =<> */\ -/* and 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 (<>) ) */\ /* and costage_bw_antr_aggr.st_studstamm_nr in (select S2.st_studstamm_nr from costage_st_studierendenstammdaten S2 where S2.geschlecht = <> ) */\ /* and costage_bw_antr_aggr.unikey=<> */\ /* and semester >= <> */\ /* and semester <= <> */\ /* and fachsemester <= <> */\ -/* and st_studstamm_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 /> --<> */ \ \ <#if "<>"!="">\ diff --git a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml index 99d31eb..3161278 100644 --- a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml +++ b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml @@ -168,7 +168,13 @@ SELECT distinct matrikelnummer, 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, - null::char(1) as hzbnote, --substring(replace(replace(H.hzb_note,',',''),'.','') from 1 for 10) as hzbnote, + (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, @@ -232,9 +238,9 @@ unikey , po_regelstudienzeit ,-- individual_number_of_semesters 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, -urlaub_art as ch27_grund_beurl_tsg, abm_art_s_msg as abmeldegrund, abm_art_s as abmeldegrund_tsg, F.studiengangs_identifikator_msg as degree_program_uniquename @@ -328,7 +334,9 @@ 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 pstatus_tsg +null::char(1) as pstatus_tsg, +null::char(1) as note_tsg, +null::char(1) as fach_sem_zahl_tsg FROM costage_st_pruef_aggr P, costage_st_studiengaenge G where G.st_studiengang_nr=P.st_studiengang_nr AND P.semester >= $start_pruef_sem