From 0d1a2bfc84c891d9a818a2f9f06a9e0cceb7a460 Mon Sep 17 00:00:00 2001 From: Imo John Date: Tue, 9 Sep 2025 13:00:27 +0200 Subject: [PATCH 1/5] Release 0.4 --- src-modules/module/rpta/conf/rpta.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml index ec23bf0..4b3c4df 100644 --- a/src-modules/module/rpta/conf/rpta.xml +++ b/src-modules/module/rpta/conf/rpta.xml @@ -1,6 +1,6 @@ - From ac64704b116bfd344df3b93155af143acec35557 Mon Sep 17 00:00:00 2001 From: Imo John Date: Tue, 9 Sep 2025 15:38:14 +0200 Subject: [PATCH 2/5] Sachgebiet korrigiert --- src-modules/module/rpta/masken/48280_sachgeb_maske_bez.unl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-modules/module/rpta/masken/48280_sachgeb_maske_bez.unl b/src-modules/module/rpta/masken/48280_sachgeb_maske_bez.unl index d2d2431..bba1d7a 100644 --- a/src-modules/module/rpta/masken/48280_sachgeb_maske_bez.unl +++ b/src-modules/module/rpta/masken/48280_sachgeb_maske_bez.unl @@ -1 +1 @@ -200^48280^ +360^48280^ From f354dff888df787aefad85f4ec47084c3136d35c Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Sat, 13 Sep 2025 07:58:21 +0200 Subject: [PATCH 3/5] Exportassistent Bugfix, Anpassung LM Datentyp #9 (cherry picked from commit 7d9ff1d2e0b9cff275f5a30c1052d2bc64ec1348) --- .../hilfstabellen/rpta_exam_unit_fuellen.sql | 2 +- superx/WEB-INF/reports/simple_table.jrtx | 36 +++++++++++++++++++ superx/xml/rpta_groupLayout.xml | 1 + superx/xml/rpta_templates.xsl | 8 +++-- 4 files changed, 43 insertions(+), 4 deletions(-) mode change 100755 => 100644 superx/xml/rpta_templates.xsl diff --git a/src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql b/src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql index f2b5d60..743e852 100644 --- a/src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql +++ b/src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql @@ -58,7 +58,7 @@ SELECT elementnr, summe, <#if TableFieldExists?exists && TableFieldExists('lm_exam_unit','shortcomment')> - shortcomment, + substring(shortcomment from 1 for 255) as shortcomment, <#else> null::varchar(255) as shortcomment, diff --git a/superx/WEB-INF/reports/simple_table.jrtx b/superx/WEB-INF/reports/simple_table.jrtx index e7f63a5..7c9ad70 100644 --- a/superx/WEB-INF/reports/simple_table.jrtx +++ b/superx/WEB-INF/reports/simple_table.jrtx @@ -65,4 +65,40 @@ + + + + diff --git a/superx/xml/rpta_groupLayout.xml b/superx/xml/rpta_groupLayout.xml index 01f9299..677871b 100644 --- a/superx/xml/rpta_groupLayout.xml +++ b/superx/xml/rpta_groupLayout.xml @@ -1,4 +1,5 @@ + diff --git a/superx/xml/rpta_templates.xsl b/superx/xml/rpta_templates.xsl old mode 100755 new mode 100644 index 6e5627b..f5a8e80 --- a/superx/xml/rpta_templates.xsl +++ b/superx/xml/rpta_templates.xsl @@ -694,7 +694,7 @@ weil es Rundungsfehler bei der Spaltenbreite geben kann.--> - + @@ -764,7 +764,7 @@ weil es Rundungsfehler bei der Spaltenbreite geben kann.--> - + @@ -1068,7 +1068,7 @@ genommen. Wenn nicht, wird mit colspan multipliziert.--> - + @@ -1109,7 +1109,9 @@ genommen. Wenn nicht, wird mit colspan multipliziert.--> + + From ff3bb4c9daf7e8fa51108ce282ede5232c855984 Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Mon, 15 Sep 2025 07:24:24 +0200 Subject: [PATCH 4/5] =?UTF-8?q?Erweiterung=20Felder=20f=C3=BCr=20neue=20vi?= =?UTF-8?q?rtuelle=20Tabelle=20Bewerbungen=20#18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit fd9879649dc568a4e86d594058a09db35ccd3f85) --- .../module/rpta/masken/48430_felderinfo.unl | 2 +- .../bewerbungen_datenblatt_virtuell.sql | 69 ++++++++++++++----- 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/src-modules/module/rpta/masken/48430_felderinfo.unl b/src-modules/module/rpta/masken/48430_felderinfo.unl index ffd5975..18d8ba9 100644 --- a/src-modules/module/rpta/masken/48430_felderinfo.unl +++ b/src-modules/module/rpta/masken/48430_felderinfo.unl @@ -14,7 +14,7 @@ and R.systeminfo_id=130);^ (select case when tid % 10 = 1 then tid+1 else tid+9 end from semester where today() between sem_beginn and sem_ende)) \ from semester \ where today() between sem_beginn and sem_ende;^ -48432^Fächer^30^0^0^130^200^6^integer^1000^0^12^<> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^ +48432^Fächer^30^0^0^130^200^6^char^1000^0^12^<> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^ 48433^Abschluss^40^0^0^100^200^3^char^1500^0^12^<> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^ 48434^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^999^^ ^ ^ 48435^Semestertyp^22^350^-1^140^80^1^integer^255^0^1^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^ ^ ^ diff --git a/src-modules/module/rpta/schluesseltabellen/bewerbungen_datenblatt_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/bewerbungen_datenblatt_virtuell.sql index 3163bc9..d7a2422 100644 --- a/src-modules/module/rpta/schluesseltabellen/bewerbungen_datenblatt_virtuell.sql +++ b/src-modules/module/rpta/schluesseltabellen/bewerbungen_datenblatt_virtuell.sql @@ -9,6 +9,23 @@ select name +select 10::smallint as sortnr, +name, trim(name) ||'_' as prefix, +caption, +'zul_antr_aggr.stg=zul_k_stg.apnr' as joinclause + from sx_tables where name in ('zul_k_stg') +union +select 20::smallint as sortnr, +name, trim(name) ||'_' as prefix, +caption, +'zul_antr_aggr.abschl=zul_k_abint.apnr' as joinclause + from sx_tables where name in ('zul_k_abint') +union +select 30::smallint as sortnr, +name, trim(name) ||'_' as prefix, +caption, +'zul_antr_aggr.stort=zul_k_stort.apnr' as joinclause + from sx_tables where name in ('zul_k_stort') Date: Thu, 30 Oct 2025 16:17:56 +0100 Subject: [PATCH 5/5] =?UTF-8?q?Bewerbungen=20auch=20mit=20Studieng=C3=A4ng?= =?UTF-8?q?en,=20wo=20es=20noch=20keine=20Studis=20gibt=20#18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-modules/module/rpta/masken/48000_felderinfo.unl | 11 ++++++----- .../module/rpta/masken/48000_masken_felder_bez.unl | 1 + src-modules/module/rpta/masken/48000_maskeninfo.unl | 1 + src-modules/module/rpta/masken/48430_maskeninfo.unl | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src-modules/module/rpta/masken/48000_felderinfo.unl b/src-modules/module/rpta/masken/48000_felderinfo.unl index 422af63..6112856 100644 --- a/src-modules/module/rpta/masken/48000_felderinfo.unl +++ b/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\ - ;^^<>SELECT uniquename,\ + ;^ ^<>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^<> select tid, eintrag from semester order by tid DESC;^hidden^ ^ 48011^Stichtag^23^330^-1^130^100^1^sql^30^1^1^<> select tid, name from sos_stichtag where stichtagsart='Studierende';^ ^<> 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^<> select apnr, eintrag from hoererstatus order by 2^ ^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ -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^<> 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;^^^ +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^<> 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^<> 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^<> select apnr, eintrag from koepfe_oder_faelle order by 2^ ^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^ +48019^Status^340^330^-1^130^180^1^sql^30^0^1^<> select apnr,eintrag from sos_status order by 2^ ^ ^ 48022^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<> 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^<>\ 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;^^^ +(select tid from rpta_column_layout where uniquename=<>) order by 2;^ ^ ^ diff --git a/src-modules/module/rpta/masken/48000_masken_felder_bez.unl b/src-modules/module/rpta/masken/48000_masken_felder_bez.unl index 46da9aa..4a25858 100644 --- a/src-modules/module/rpta/masken/48000_masken_felder_bez.unl +++ b/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^ diff --git a/src-modules/module/rpta/masken/48000_maskeninfo.unl b/src-modules/module/rpta/masken/48000_maskeninfo.unl index 2abb834..5ff03e6 100644 --- a/src-modules/module/rpta/masken/48000_maskeninfo.unl +++ b/src-modules/module/rpta/masken/48000_maskeninfo.unl @@ -118,6 +118,7 @@ and substring('' || tid from 5 for 1)='<>'\ /* and <>*/\ /* and geschlecht = <> */\ /* and fach_sem_zahl <= <> */\ +/* and kz_rueck_beur_ein in(<>) */\ /* and substring('' || sem_rueck_beur_ein from 5 for 1)='<>' */\ /* and ${<>} */\ " />\ diff --git a/src-modules/module/rpta/masken/48430_maskeninfo.unl b/src-modules/module/rpta/masken/48430_maskeninfo.unl index f4367e1..471336d 100644 --- a/src-modules/module/rpta/masken/48430_maskeninfo.unl +++ b/src-modules/module/rpta/masken/48430_maskeninfo.unl @@ -113,7 +113,7 @@ and substring('' || tid from 5 for 1)='<>'\ <#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 /> --<> */\ /* <#assign filter = filter + " and stg in "+Fächer.allNeededKeysList /> --<> */\ /* <#assign filter = filter + " and tid_stg in (select L2.tid from lehr_stg_ab L2 where L2.abschluss in "+Abschluss.allNeededKeysList +")" /> --<> */\