diff --git a/src-modules/module/rpta/masken/48110_felderinfo.unl b/src-modules/module/rpta/masken/48110_felderinfo.unl index 6ed66ae..d52602c 100644 --- a/src-modules/module/rpta/masken/48110_felderinfo.unl +++ b/src-modules/module/rpta/masken/48110_felderinfo.unl @@ -17,7 +17,8 @@ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rp 48116^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^999^hs_zugangsber^apnr, eintrag^ ^ 48117^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^ ^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ 48118^Staatsangehörigkeit^150^0^0^140^150^10^char^30^0^999^<> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^ -48119^Studiengang^25^0^0^140^150^50^char^1000^0^12^<> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^ ^ ^ +48119^Studiengang^25^0^0^140^150^50^char^1000^0^12^<> select tid,name,-1000 from sichten where name_intern ='sos_kst_fb_stgabint'\ +union select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^ ^ ^ 48121^Stichtag^23^330^-1^130^100^1^sql^30^1^999^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^ 48122^Hörerstatus^200^330^-1^140^150^1^sql^30^0^999^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ 48128^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^999^<> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^ diff --git a/src-modules/module/rpta/masken/48140_felderinfo.unl b/src-modules/module/rpta/masken/48140_felderinfo.unl index 4528e77..6d15127 100644 --- a/src-modules/module/rpta/masken/48140_felderinfo.unl +++ b/src-modules/module/rpta/masken/48140_felderinfo.unl @@ -12,17 +12,19 @@ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rp 48141^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^ ^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ 48142^Fächer^30^0^0^130^200^6^char^1000^0^999^<> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^ 48143^Abschluss^40^0^0^100^200^3^char^1500^0^999^<> select apnr, druck from cifx where key=35 order by 2;^ ^ ^ -48144^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^0^^ ^ ^ +48144^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^999^ ^ ^ ^ 48145^Semestertyp^22^350^-1^140^80^1^integer^255^0^1^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^Eintrag^<> select 2,'nur Wintersemester' from xdummy^ 48146^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^999^hs_zugangsber^apnr, eintrag^ ^ 48147^Bis Semester^20^350^-1^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^ ^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ 48148^Staatsangehörigkeit^150^0^0^140^150^10^char^30^0^999^<> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^ 48149^Studiengang^25^0^0^140^150^50^char^1000^0^999^<> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^ ^ ^ +48150^tablestylesheet^4000^0^0^100^200^1^char^200^1^1^<> select distinct filename,X.caption,ord from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=48140 order by ord;^^<> select distinct filename,X.caption,ord from sx_stylesheets X,sx_mask_style S where X.tid=S.stylesheet_id and S.maskeninfo_id=48140 order by ord limit 1;^ 48151^Stichtag^23^330^-1^130^100^1^sql^30^1^999^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> select tid, name from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^ 48152^Hörerstatus^200^330^-1^140^150^1^sql^30^0^999^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ +48153^Ausgabeformat^4010^0^0^100^150^1^char^200^1^1^<> select element_value,description from menu_element where element='Ausgabeformat' and (nature::smallint<100 or nature::smallint=101) order by nature::smallint^ ^<> select element_value,description from menu_element where element='Ausgabeformat' and description='XLSX'^ 48158^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^999^<> select apnr, eintrag from koepfe_oder_faelle order by 2^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^ 48162^Geschlecht^110^0^0^140^80^1^integer^30^0^999^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^ -48163^Spalten^3001^0^0^150^190^10^char^30^0^1^<>\ +48163^Spalten^3001^0^0^150^190^10^char^30^0^999^<>\ 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=<>) order by 2;^ ^ ^ -48164^Fächer^30^0^0^130^200^6^char^1000^1^1^<> select stg,dtxt from k_stg order by 2;^ ^ ^ +48164^Fachbereich^30^0^0^130^200^6^char^1000^1^1^<> select apnr,druck from cifx where key=90 and today() between d_akt_von and d_akt_bis order by 2;^ ^ ^ diff --git a/src-modules/module/rpta/masken/48140_masken_felder_bez.unl b/src-modules/module/rpta/masken/48140_masken_felder_bez.unl index 3a20f93..9aac533 100644 --- a/src-modules/module/rpta/masken/48140_masken_felder_bez.unl +++ b/src-modules/module/rpta/masken/48140_masken_felder_bez.unl @@ -8,8 +8,10 @@ 48140^48147^ 48140^48148^ 48140^48149^ +48140^48150^ 48140^48151^ 48140^48152^ +48140^48153^ 48140^48158^ 48140^48162^ 48140^48163^ diff --git a/src-modules/module/rpta/schluesseltabellen/macro_masken_bez_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/macro_masken_bez_fuellen.sql index 5a25845..384f3a6 100644 --- a/src-modules/module/rpta/schluesseltabellen/macro_masken_bez_fuellen.sql +++ b/src-modules/module/rpta/schluesseltabellen/macro_masken_bez_fuellen.sql @@ -3,7 +3,7 @@ {"tid":"48140"} ] /> <#assign masken = [ -{"makro":"48140", "tid":"48110", "sortnr":"10", "schleifenrelation":"<>select ''s_'' || tid,text from lehr_stg_ab where stg in (<>) order by 2", +{"makro":"48140", "tid":"48110", "sortnr":"10", "schleifenrelation":"<> select ''_''||COALESCE(c.lid, btrim(l.fb))||''_''||btrim(l.stg)||''_''||btrim(l.abschluss),l.text FROM lehr_stg_ab l LEFT JOIN cifx c ON c.key = 90 AND c.sourcesystem in (5, 6, 10, 12, 15) AND c.apnr=l.fb WHERE c.apnr=<>", "schleifenfeldname":"Studiengang","schleifenfstand":"12.03.2025", "schleifenfsicht":"<>"} ] /> <#assign felder = [ diff --git a/src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql index 2907312..346b019 100644 --- a/src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql +++ b/src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql @@ -11,7 +11,7 @@ select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studi <#assign rpta_column_layouts = [{"uniquename":"rpta_exam_unit_dim_studiengang_note", "caption":"Prüfungsergebnisse", "rpta_resultset":"rpta_exam_unit_dim_studiengang", -"whereclause":"modulart=''P''", +"whereclause":"((modulart=''P'' and sourcesystem=6) or (part=''MP'' and sourcesystem=5))", "description":"Prüfung und Noten" }] /> @@ -26,7 +26,7 @@ select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studi "caption":"pnr", "is_visible":"1", "is_aggregate":0, -"visible_size":5, +"visible_size":10, "description":""}, {"uniquename":"pdtxt", @@ -37,7 +37,7 @@ select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studi "caption":"", "is_visible":"1", "is_aggregate":0, -"visible_size":5, +"visible_size":40, "description":""}, {"uniquename":"summe", @@ -48,7 +48,7 @@ select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studi "caption":"Teilnehmer", "is_visible":"1", "is_aggregate":1, -"visible_size":5, +"visible_size":15, "description":""}, {"uniquename":"note_schnitt", @@ -72,7 +72,7 @@ select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studi "caption":"Durchschnittsnote *", "is_visible":"1", "is_aggregate":1, -"visible_size":5, +"visible_size":25, "description":""}, {"uniquename":"pstatus_nb", @@ -108,7 +108,7 @@ select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studi "caption":"Durchfallquote in % *", "is_visible":"1", "is_aggregate":1, -"visible_size":5, +"visible_size":25, "description":""}, {"uniquename":"pvermerk_ne", @@ -132,7 +132,7 @@ select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studi "caption":"Nicht erschienen", "is_visible":"1", "is_aggregate":1, -"visible_size":5, +"visible_size":25, "description":""}