Merge branch 'rpta_0.4_Release'

src-modules/module/rpta/masken/48000_felderinfo.unl

@@ -4,7 +4,7 @@ FROM rpta_column_layout \
 where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat','sos_stud_astat_gew')\
 and R.systeminfo_id=7)\
 order by sortnr, caption\
- ;^^<<SQL>>SELECT uniquename,\
+ ;^ ^<<SQL>>SELECT uniquename,\
        caption\
 FROM rpta_column_layout \
 where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sos_stud_astat'\
@@ -21,12 +21,13 @@ and R.systeminfo_id=7) and uniquename='sos_stud_astat_rsz';^
 48010^Semester^100^0^0^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^hidden^ ^
 48011^Stichtag^23^330^-1^130^100^1^sql^30^1^1^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende';^ ^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
 48012^Hörerstatus^200^330^-1^140^150^1^sql^30^0^1^<<SQL>> select apnr, eintrag from hoererstatus order by 2^ ^<<SQL>> select apnr, eintrag from hoererstatus  where eintrag='alle';^
-48013^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
+48013^Jahr^110^0^0^140^80^1^integer^30^0^13^^ ^ ^
-48014^Filter Studierende^100^0^0^140^150^1^sql^20^0^1^<<SQL>> SELECT id,caption from sx_repository where aktiv =1 and today() between gueltig_seit and gueltig_bis and art='SOS_STUD_FILTER' order by 2;^^^
+48014^Filter Studierende^100^0^0^140^150^1^sql^20^0^1^<<SQL>> SELECT id,caption from sx_repository where aktiv =1 and today() between gueltig_seit and gueltig_bis and art='SOS_STUD_FILTER' order by 2;^ ^ ^
 48015^Nur Endsemester^21^0^0^140^80^1^integer^30^0^1^<<SQL>> select 1,'ja' from xdummy^Eintrag^ ^
-48016^Matrikel-Nr.^35^350^-1^140^80^1^char^30^0^13^^^^
+48016^Matrikel-Nr.^35^350^-1^140^80^1^char^30^0^13^^ ^ ^
 48018^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<<SQL>> select apnr, eintrag from koepfe_oder_faelle order by 2^ ^<<SQL>> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^
+48019^Status^340^330^-1^130^180^1^sql^30^0^1^<<SQL>> select apnr,eintrag from sos_status order by 2^ ^ ^
 48022^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<<SQL>> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^
 48023^Spalten^3001^0^0^150^190^10^char^30^0^1^<<SQL>>\
 select C.uniquename, C.caption ,L.layout_id from rpta_column C, rpta_column2layout L where C.tid=L.column_id and layout_id in\
-(select tid from rpta_column_layout where uniquename=<<Spaltenlayout>>) order by 2;^^^
+(select tid from rpta_column_layout where uniquename=<<Spaltenlayout>>) order by 2;^ ^ ^

src-modules/module/rpta/masken/48000_masken_felder_bez.unl

@@ -16,5 +16,6 @@
 48000^48015^
 48000^48016^
 48000^48018^
+48000^48019^
 48000^48022^
 48000^48023^

src-modules/module/rpta/masken/48000_maskeninfo.unl

@@ -118,6 +118,7 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
 /* and <<Hörerstatus>>*/\
 /* and geschlecht = <<Geschlecht>> */\
 /* and fach_sem_zahl <= <<bis Fachsemester>> */\
+/* and kz_rueck_beur_ein in(<<Status>>) */\
 /* and substring('' || sem_rueck_beur_ein from 5 for 1)='<<Semestertyp>>' */\
 /* and ${<<Filter Studierende>>} */\
 " />\

src-modules/module/rpta/masken/48430_maskeninfo.unl

@@ -113,7 +113,7 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
 <#assign filter= filter + " and " + semester_filter />\
 \
 \
-<#assign filter = filter + " and 's_' || tid_stg in "+Studiengang.allNeededKeysList /> \
+<#assign filter = filter + " and ('s_' || tid_stg in "+Studiengang.allNeededKeysList +" or tid_stg is null)"/> \
 /* <#assign filter = filter + " and '' || ca12_staat in "+Staatsangehörigkeit.allNeededKeysList /> --<<Staatsangehörigkeit>> */\
 /* <#assign filter = filter + " and stg in "+Fächer.allNeededKeysList /> --<<Fächer>> */\
 /* <#assign filter = filter + " and tid_stg in (select L2.tid from lehr_stg_ab L2 where L2.abschluss in "+Abschluss.allNeededKeysList +")" /> --<<Abschluss>> */\