From b862ece51f72208910a3bb965dd3e4b487547872 Mon Sep 17 00:00:00 2001 From: Andre Knieschewski Date: Fri, 14 Feb 2025 10:25:08 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderung=20Nummernkreis=20von=2045xxx=20na?= =?UTF-8?q?ch=2048xxx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-modules/module/rpta/conf/rpta.xml | 10 ++--- .../rpta/masken/45000_maske_system_bez.unl | 1 - .../rpta/masken/45000_masken_felder_bez.unl | 15 ------- .../rpta/masken/45000_sachgeb_maske_bez.unl | 1 - .../rpta/masken/45040_maske_system_bez.unl | 1 - .../rpta/masken/45040_masken_felder_bez.unl | 8 ---- .../rpta/masken/45040_sachgeb_maske_bez.unl | 1 - .../rpta/masken/45080_maske_system_bez.unl | 1 - .../rpta/masken/45080_masken_felder_bez.unl | 20 ---------- .../rpta/masken/45080_sachgeb_maske_bez.unl | 1 - ...00_felderinfo.unl => 48000_felderinfo.unl} | 30 +++++++------- .../rpta/masken/48000_maske_system_bez.unl | 1 + .../rpta/masken/48000_masken_felder_bez.unl | 15 +++++++ ...00_maskeninfo.unl => 48000_maskeninfo.unl} | 2 +- .../rpta/masken/48000_sachgeb_maske_bez.unl | 1 + ...40_felderinfo.unl => 48040_felderinfo.unl} | 16 ++++---- .../rpta/masken/48040_maske_system_bez.unl | 1 + .../rpta/masken/48040_masken_felder_bez.unl | 8 ++++ ...40_maskeninfo.unl => 48040_maskeninfo.unl} | 2 +- .../rpta/masken/48040_sachgeb_maske_bez.unl | 1 + ...80_felderinfo.unl => 48080_felderinfo.unl} | 40 +++++++++---------- .../rpta/masken/48080_maske_system_bez.unl | 1 + .../rpta/masken/48080_masken_felder_bez.unl | 20 ++++++++++ ...80_maskeninfo.unl => 48080_maskeninfo.unl} | 2 +- .../rpta/masken/48080_sachgeb_maske_bez.unl | 1 + .../module/rpta/upgrade/rpta_upgrade_man.sql | 24 +++++++++++ 26 files changed, 122 insertions(+), 102 deletions(-) delete mode 100644 src-modules/module/rpta/masken/45000_maske_system_bez.unl delete mode 100644 src-modules/module/rpta/masken/45000_masken_felder_bez.unl delete mode 100644 src-modules/module/rpta/masken/45000_sachgeb_maske_bez.unl delete mode 100644 src-modules/module/rpta/masken/45040_maske_system_bez.unl delete mode 100644 src-modules/module/rpta/masken/45040_masken_felder_bez.unl delete mode 100644 src-modules/module/rpta/masken/45040_sachgeb_maske_bez.unl delete mode 100644 src-modules/module/rpta/masken/45080_maske_system_bez.unl delete mode 100644 src-modules/module/rpta/masken/45080_masken_felder_bez.unl delete mode 100644 src-modules/module/rpta/masken/45080_sachgeb_maske_bez.unl rename src-modules/module/rpta/masken/{45000_felderinfo.unl => 48000_felderinfo.unl} (67%) create mode 100644 src-modules/module/rpta/masken/48000_maske_system_bez.unl create mode 100644 src-modules/module/rpta/masken/48000_masken_felder_bez.unl rename src-modules/module/rpta/masken/{45000_maskeninfo.unl => 48000_maskeninfo.unl} (99%) create mode 100644 src-modules/module/rpta/masken/48000_sachgeb_maske_bez.unl rename src-modules/module/rpta/masken/{45040_felderinfo.unl => 48040_felderinfo.unl} (50%) create mode 100644 src-modules/module/rpta/masken/48040_maske_system_bez.unl create mode 100644 src-modules/module/rpta/masken/48040_masken_felder_bez.unl rename src-modules/module/rpta/masken/{45040_maskeninfo.unl => 48040_maskeninfo.unl} (98%) create mode 100644 src-modules/module/rpta/masken/48040_sachgeb_maske_bez.unl rename src-modules/module/rpta/masken/{45080_felderinfo.unl => 48080_felderinfo.unl} (67%) create mode 100644 src-modules/module/rpta/masken/48080_maske_system_bez.unl create mode 100644 src-modules/module/rpta/masken/48080_masken_felder_bez.unl rename src-modules/module/rpta/masken/{45080_maskeninfo.unl => 48080_maskeninfo.unl} (99%) create mode 100644 src-modules/module/rpta/masken/48080_sachgeb_maske_bez.unl diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml index 987dccd..c4a028e 100644 --- a/src-modules/module/rpta/conf/rpta.xml +++ b/src-modules/module/rpta/conf/rpta.xml @@ -253,20 +253,20 @@ parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent - + Berichtsassistent verwalten $RPTA_PFAD/masken - + Spaltenlayouts verwalten $RPTA_PFAD/masken - + Stellenbesetzung und Beschäftigung (Liste) $RPTA_PFAD/masken @@ -409,10 +409,6 @@ parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent - - - - diff --git a/src-modules/module/rpta/masken/45000_maske_system_bez.unl b/src-modules/module/rpta/masken/45000_maske_system_bez.unl deleted file mode 100644 index 4b9d115..0000000 --- a/src-modules/module/rpta/masken/45000_maske_system_bez.unl +++ /dev/null @@ -1 +0,0 @@ -45000^7^ diff --git a/src-modules/module/rpta/masken/45000_masken_felder_bez.unl b/src-modules/module/rpta/masken/45000_masken_felder_bez.unl deleted file mode 100644 index 3fa443d..0000000 --- a/src-modules/module/rpta/masken/45000_masken_felder_bez.unl +++ /dev/null @@ -1,15 +0,0 @@ -45000^45000^ -45000^45001^ -45000^45002^ -45000^45003^ -45000^45004^ -45000^45005^ -45000^45006^ -45000^45007^ -45000^45008^ -45000^45009^ -45000^45011^ -45000^45012^ -45000^45018^ -45000^45022^ -45000^45023^ diff --git a/src-modules/module/rpta/masken/45000_sachgeb_maske_bez.unl b/src-modules/module/rpta/masken/45000_sachgeb_maske_bez.unl deleted file mode 100644 index 085486c..0000000 --- a/src-modules/module/rpta/masken/45000_sachgeb_maske_bez.unl +++ /dev/null @@ -1 +0,0 @@ -16^45000^ diff --git a/src-modules/module/rpta/masken/45040_maske_system_bez.unl b/src-modules/module/rpta/masken/45040_maske_system_bez.unl deleted file mode 100644 index 0c7ed6e..0000000 --- a/src-modules/module/rpta/masken/45040_maske_system_bez.unl +++ /dev/null @@ -1 +0,0 @@ -45040^330^ diff --git a/src-modules/module/rpta/masken/45040_masken_felder_bez.unl b/src-modules/module/rpta/masken/45040_masken_felder_bez.unl deleted file mode 100644 index 4a805ca..0000000 --- a/src-modules/module/rpta/masken/45040_masken_felder_bez.unl +++ /dev/null @@ -1,8 +0,0 @@ -45040^45040^ -45040^45041^ -45040^45042^ -45040^45043^ -45040^45044^ -45040^45045^ -45040^45046^ -45040^45047^ diff --git a/src-modules/module/rpta/masken/45040_sachgeb_maske_bez.unl b/src-modules/module/rpta/masken/45040_sachgeb_maske_bez.unl deleted file mode 100644 index 783e78e..0000000 --- a/src-modules/module/rpta/masken/45040_sachgeb_maske_bez.unl +++ /dev/null @@ -1 +0,0 @@ -331^45040^ diff --git a/src-modules/module/rpta/masken/45080_maske_system_bez.unl b/src-modules/module/rpta/masken/45080_maske_system_bez.unl deleted file mode 100644 index 85f2478..0000000 --- a/src-modules/module/rpta/masken/45080_maske_system_bez.unl +++ /dev/null @@ -1 +0,0 @@ -45080^6^ diff --git a/src-modules/module/rpta/masken/45080_masken_felder_bez.unl b/src-modules/module/rpta/masken/45080_masken_felder_bez.unl deleted file mode 100644 index 54ad831..0000000 --- a/src-modules/module/rpta/masken/45080_masken_felder_bez.unl +++ /dev/null @@ -1,20 +0,0 @@ -45080^45080^ -45080^45081^ -45080^45082^ -45080^45083^ -45080^45084^ -45080^45085^ -45080^45086^ -45080^45087^ -45080^45088^ -45080^45089^ -45080^45090^ -45080^45091^ -45080^45092^ -45080^45093^ -45080^45094^ -45080^45095^ -45080^45096^ -45080^45097^ -45080^45098^ -45080^45099^ diff --git a/src-modules/module/rpta/masken/45080_sachgeb_maske_bez.unl b/src-modules/module/rpta/masken/45080_sachgeb_maske_bez.unl deleted file mode 100644 index 6eb2990..0000000 --- a/src-modules/module/rpta/masken/45080_sachgeb_maske_bez.unl +++ /dev/null @@ -1 +0,0 @@ -100^45080^ diff --git a/src-modules/module/rpta/masken/45000_felderinfo.unl b/src-modules/module/rpta/masken/48000_felderinfo.unl similarity index 67% rename from src-modules/module/rpta/masken/45000_felderinfo.unl rename to src-modules/module/rpta/masken/48000_felderinfo.unl index ffd1244..f52f34e 100644 --- a/src-modules/module/rpta/masken/45000_felderinfo.unl +++ b/src-modules/module/rpta/masken/48000_felderinfo.unl @@ -1,4 +1,4 @@ -45000^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>SELECT uniquename,\ +48000^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>SELECT uniquename,\ caption\ FROM rpta_column_layout \ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sos_stud_astat'\ @@ -9,19 +9,19 @@ order by sortnr, caption\ FROM rpta_column_layout \ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sos_stud_astat'\ and R.systeminfo_id=7) and uniquename='sos_stud_astat_rsz';^ -45001^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;^ -45002^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;^ ^ ^ -45003^Abschluss^40^0^0^100^200^3^char^1500^0^1^<> select apnr, druck from cifx where key=35 order by 2;^ ^ ^ -45004^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^0^^ ^ ^ -45005^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^ -45006^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^1^hs_zugangsber^apnr, eintrag^ ^ -45007^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;^ -45008^Staatsangehörigkeit^150^0^0^140^150^10^char^30^0^12^<> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^ -45009^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;^ ^ ^ -45011^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';^ -45012^Hörerstatus^200^330^-1^140^150^1^sql^30^0^1^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ -45018^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^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^ -45022^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;^ ^ ^ -45023^Spalten^3001^0^0^150^190^10^char^30^0^1^<>\ +48001^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;^ +48002^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;^ ^ ^ +48003^Abschluss^40^0^0^100^200^3^char^1500^0^1^<> select apnr, druck from cifx where key=35 order by 2;^ ^ ^ +48004^bis Fachsemester^1000^300^-1^200^100^1^integer^30^0^0^^ ^ ^ +48005^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^ +48006^Hochschulzugangsberechtigung^120^300^-1^200^200^1^sql^30^0^1^hs_zugangsber^apnr, eintrag^ ^ +48007^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;^ +48008^Staatsangehörigkeit^150^0^0^140^150^10^char^30^0^12^<> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^ ^ ^ +48009^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;^ ^ ^ +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^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ +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^apnr, eintrag^<> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^ +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;^^^ diff --git a/src-modules/module/rpta/masken/48000_maske_system_bez.unl b/src-modules/module/rpta/masken/48000_maske_system_bez.unl new file mode 100644 index 0000000..23ab49a --- /dev/null +++ b/src-modules/module/rpta/masken/48000_maske_system_bez.unl @@ -0,0 +1 @@ +48000^7^ diff --git a/src-modules/module/rpta/masken/48000_masken_felder_bez.unl b/src-modules/module/rpta/masken/48000_masken_felder_bez.unl new file mode 100644 index 0000000..d5d348d --- /dev/null +++ b/src-modules/module/rpta/masken/48000_masken_felder_bez.unl @@ -0,0 +1,15 @@ +48000^48000^ +48000^48001^ +48000^48002^ +48000^48003^ +48000^48004^ +48000^48005^ +48000^48006^ +48000^48007^ +48000^48008^ +48000^48009^ +48000^48011^ +48000^48012^ +48000^48018^ +48000^48022^ +48000^48023^ diff --git a/src-modules/module/rpta/masken/45000_maskeninfo.unl b/src-modules/module/rpta/masken/48000_maskeninfo.unl similarity index 99% rename from src-modules/module/rpta/masken/45000_maskeninfo.unl rename to src-modules/module/rpta/masken/48000_maskeninfo.unl index b206442..578f4a7 100644 --- a/src-modules/module/rpta/masken/45000_maskeninfo.unl +++ b/src-modules/module/rpta/masken/48000_maskeninfo.unl @@ -1,4 +1,4 @@ -45000^Tabellenausgabe Studierende (amtlich und intern)^--Freemarker Template\ +48000^Tabellenausgabe Studierende (amtlich und intern)^--Freemarker Template\ <#include "SQL_lingua_franca"/>\ <#include "SuperX_general"/>\ --\ diff --git a/src-modules/module/rpta/masken/48000_sachgeb_maske_bez.unl b/src-modules/module/rpta/masken/48000_sachgeb_maske_bez.unl new file mode 100644 index 0000000..a391ef6 --- /dev/null +++ b/src-modules/module/rpta/masken/48000_sachgeb_maske_bez.unl @@ -0,0 +1 @@ +16^48000^ diff --git a/src-modules/module/rpta/masken/45040_felderinfo.unl b/src-modules/module/rpta/masken/48040_felderinfo.unl similarity index 50% rename from src-modules/module/rpta/masken/45040_felderinfo.unl rename to src-modules/module/rpta/masken/48040_felderinfo.unl index e210282..bc9638a 100644 --- a/src-modules/module/rpta/masken/45040_felderinfo.unl +++ b/src-modules/module/rpta/masken/48040_felderinfo.unl @@ -1,8 +1,8 @@ -45040^Benutzer/in^50^0^0^150^200^1^integer^200^0^1^<> select tid,nvl(name,benutzer) from userinfo order by 2;^hidden^^ -45041^Spaltenlayout^10^0^0^150^80^1^integer^200^0^1^<> select tid,caption from rpta_column_layout where 1=1 /* and resultset_id=<> */ order by 2;^^^ -45042^Spaltenlayouts verwalten^110^0^0^140^80^1^char^255^0^18^ ^ ^<> select '../edit/rpta/rpta_column_layout_list.jsp' from xdummy;^ -45043^Stichwort^20^0^0^150^150^1^sql^50^0^0^^^^ -45044^Komponente^1^0^0^150^200^1^integer^200^0^1^<> select tid,name from systeminfo order by 2;^ ^^ -45045^Virtuelle Tabellen bearbeiten^100^0^0^140^80^1^char^255^0^18^ ^ ^<> select '../edit/rpta/rpta_resultset_list.jsp' from xdummy;^ -45046^Virtuelle Tabelle^5^0^0^150^200^1^integer^200^0^1^<> select tid,caption from rpta_resultset where 1=1 /* and systeminfo_id=<> */ order by 2;^^^ -45047^Spaltentyp^200^0^0^150^200^1^integer^200^0^1^<> select tid,caption from rpta_column_type order by 2;^^ ^ +48040^Benutzer/in^50^0^0^150^200^1^integer^200^0^1^<> select tid,nvl(name,benutzer) from userinfo order by 2;^hidden^^ +48041^Spaltenlayout^10^0^0^150^80^1^integer^200^0^1^<> select tid,caption from rpta_column_layout where 1=1 /* and resultset_id=<> */ order by 2;^^^ +48042^Spaltenlayouts verwalten^110^0^0^140^80^1^char^255^0^18^ ^ ^<> select '../edit/rpta/rpta_column_layout_list.jsp' from xdummy;^ +48043^Stichwort^20^0^0^150^150^1^sql^50^0^0^^^^ +48044^Komponente^1^0^0^150^200^1^integer^200^0^1^<> select tid,name from systeminfo order by 2;^ ^^ +48045^Virtuelle Tabellen bearbeiten^100^0^0^140^80^1^char^255^0^18^ ^ ^<> select '../edit/rpta/rpta_resultset_list.jsp' from xdummy;^ +48046^Virtuelle Tabelle^5^0^0^150^200^1^integer^200^0^1^<> select tid,caption from rpta_resultset where 1=1 /* and systeminfo_id=<> */ order by 2;^^^ +48047^Spaltentyp^200^0^0^150^200^1^integer^200^0^1^<> select tid,caption from rpta_column_type order by 2;^^ ^ diff --git a/src-modules/module/rpta/masken/48040_maske_system_bez.unl b/src-modules/module/rpta/masken/48040_maske_system_bez.unl new file mode 100644 index 0000000..22d2cf4 --- /dev/null +++ b/src-modules/module/rpta/masken/48040_maske_system_bez.unl @@ -0,0 +1 @@ +48040^330^ diff --git a/src-modules/module/rpta/masken/48040_masken_felder_bez.unl b/src-modules/module/rpta/masken/48040_masken_felder_bez.unl new file mode 100644 index 0000000..15c1565 --- /dev/null +++ b/src-modules/module/rpta/masken/48040_masken_felder_bez.unl @@ -0,0 +1,8 @@ +48040^48040^ +48040^48041^ +48040^48042^ +48040^48043^ +48040^48044^ +48040^48045^ +48040^48046^ +48040^48047^ diff --git a/src-modules/module/rpta/masken/45040_maskeninfo.unl b/src-modules/module/rpta/masken/48040_maskeninfo.unl similarity index 98% rename from src-modules/module/rpta/masken/45040_maskeninfo.unl rename to src-modules/module/rpta/masken/48040_maskeninfo.unl index ce0b220..3a8001e 100644 --- a/src-modules/module/rpta/masken/45040_maskeninfo.unl +++ b/src-modules/module/rpta/masken/48040_maskeninfo.unl @@ -1,4 +1,4 @@ -45040^Spalten und Spaltenlayouts verwalten^--Autor: D. Quathamer\ +48040^Spalten und Spaltenlayouts verwalten^--Autor: D. Quathamer\ --Datum: 15.3.2024\ --freemarker template\ create temp table tmp_rpta_column (\ diff --git a/src-modules/module/rpta/masken/48040_sachgeb_maske_bez.unl b/src-modules/module/rpta/masken/48040_sachgeb_maske_bez.unl new file mode 100644 index 0000000..baa539d --- /dev/null +++ b/src-modules/module/rpta/masken/48040_sachgeb_maske_bez.unl @@ -0,0 +1 @@ +331^48040^ diff --git a/src-modules/module/rpta/masken/45080_felderinfo.unl b/src-modules/module/rpta/masken/48080_felderinfo.unl similarity index 67% rename from src-modules/module/rpta/masken/45080_felderinfo.unl rename to src-modules/module/rpta/masken/48080_felderinfo.unl index b597ba0..1632a68 100644 --- a/src-modules/module/rpta/masken/45080_felderinfo.unl +++ b/src-modules/module/rpta/masken/48080_felderinfo.unl @@ -1,16 +1,16 @@ -45080^Institution (Stelle)^1^0^0^150^150^0^char^30^0^12^<>select tid,type,name,sortnr from sichten where art in ('SVA-Kostenstellen-Sicht','SVA-spez-Besch./Kostenstellen-Sicht','SVA-spez-Kostenstellen-Sicht') and aktiv=1 order by sortnr,type,name;^^^ -45081^Datum^0^350^-1^150^80^1^date^10^1^0^^^<> select today() from xdummy^ -45082^Stellenkategorie^2^0^0^150^150^3^char^30^0^12^<>select tid,type,name from sichten where art ='SVA Kategorie' and aktiv=1 order by type,name;^hidden^^ -45083^Spalten^3001^0^0^150^190^10^char^30^0^1^<>\ +48080^Institution (Stelle)^1^0^0^150^150^0^char^30^0^12^<>select tid,type,name,sortnr from sichten where art in ('SVA-Kostenstellen-Sicht','SVA-spez-Besch./Kostenstellen-Sicht','SVA-spez-Kostenstellen-Sicht') and aktiv=1 order by sortnr,type,name;^^^ +48081^Datum^0^350^-1^150^80^1^date^10^1^0^^^<> select today() from xdummy^ +48082^Stellenkategorie^2^0^0^150^150^3^char^30^0^12^<>select tid,type,name from sichten where art ='SVA Kategorie' and aktiv=1 order by type,name;^hidden^^ +48083^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 tid=<>) order by 2;^^^ -45084^Lehreinheit (Stelle)^4^0^0^150^150^1^char^4^0^12^<> select tid,type,name from sichten where art ='SVA-Lehreinheiten-Sicht' and aktiv=1 order by type,name;^hidden^^ -45085^Stellen-Nr.^50^350^-1^150^80^1^integer^10^0^0^^^^ -45086^Amtsbezeichnung^55^0^0^150^160^3^char^30^0^12^<>select tid,type,name from sichten where art ='SVA Amtsdienstbez.' and aktiv=1 order by type,name;^hidden^^ -45087^Beschäftigungsstelle (Person)^65^0^0^150^150^1^char^30^0^12^<>select tid,type,name,sortnr from sichten where art in ('SVA-Kostenstellen-Sicht','SVA-spez-Besch./Kostenstellen-Sicht') and aktiv=1 order by sortnr,type,name;^hidden^^ -45088^Kostenstelle (Person)^70^350^-1^150^150^1^char^30^0^12^<> select tid,type,name,sortnr from sichten where art in ('SVA-Kostenstellen-Sicht','SVA-spez-Kostenstellen-Sicht','SVA-Kst-spezial') and aktiv=1 order by sortnr,type,name;^hidden^^ -45089^Haushaltsvermerk^60^350^-1^150^200^3^char^4^0^12^<>select tid,type,name from sichten where art ='SVA HHV' and aktiv=1 order by type,name;^hidden^^ -45090^Spaltenlayout^3000^350^-1^140^180^1^integer^50^1^1^<>SELECT tid,\ +48084^Lehreinheit (Stelle)^4^0^0^150^150^1^char^4^0^12^<> select tid,type,name from sichten where art ='SVA-Lehreinheiten-Sicht' and aktiv=1 order by type,name;^hidden^^ +48085^Stellen-Nr.^50^350^-1^150^80^1^integer^10^0^0^^^^ +48086^Amtsbezeichnung^55^0^0^150^160^3^char^30^0^12^<>select tid,type,name from sichten where art ='SVA Amtsdienstbez.' and aktiv=1 order by type,name;^hidden^^ +48087^Beschäftigungsstelle (Person)^65^0^0^150^150^1^char^30^0^12^<>select tid,type,name,sortnr from sichten where art in ('SVA-Kostenstellen-Sicht','SVA-spez-Besch./Kostenstellen-Sicht') and aktiv=1 order by sortnr,type,name;^hidden^^ +48088^Kostenstelle (Person)^70^350^-1^150^150^1^char^30^0^12^<> select tid,type,name,sortnr from sichten where art in ('SVA-Kostenstellen-Sicht','SVA-spez-Kostenstellen-Sicht','SVA-Kst-spezial') and aktiv=1 order by sortnr,type,name;^hidden^^ +48089^Haushaltsvermerk^60^350^-1^150^200^3^char^4^0^12^<>select tid,type,name from sichten where art ='SVA HHV' and aktiv=1 order by type,name;^hidden^^ +48090^Spaltenlayout^3000^350^-1^140^180^1^integer^50^1^1^<>SELECT tid,\ caption\ FROM rpta_column_layout \ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sva_pbe_aggr_sgd'\ @@ -24,12 +24,12 @@ and R.systeminfo_id=6)\ order by sortnr, caption\ limit 1 \ ;^ -45091^Filter Stellen^120^350^-1^150^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='SVA_STELL_FILTER' order by 2;^hidden^^ -45092^Dienstart^3^350^-1^150^150^3^char^30^0^12^<>select tid,type,name from sichten where art ='SVA Dienstart' and aktiv=1 order by type,name;^hidden^^ -45093^BVL-Gruppe (Stelle)^74^0^0^150^120^10^char^30^0^12^<>select tid,type,name from sichten where art ='SVA BVL-Gruppen' and aktiv=1 order by type,name;^hidden^^ -45094^BVL-Gruppe (Person)^80^350^-1^150^120^10^char^30^0^12^<>select tid,type,name from sichten where art ='SVA BVL-Gruppen' and aktiv=1 order by type,name;^hidden^^ -45095^Filter Besetzung^130^0^0^150^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='SVA_BESETZ_FILTER' order by 2;^hidden^^ -45096^Finanzierungsquelle^302^0^0^100^200^3^char^30^0^1^<> select id,caption from sx_repository where art='SVA_FINANZIERUNGSQUELLE' and aktiv=1 and gueltig_seit<=date_val(<>) and gueltig_bis>=date_val(<>) order by sort1^hidden^^ -45097^Personalkategorie^310^0^0^100^200^3^char^30^0^1^<> select id,caption from sx_repository where art='SVA_PERSONALKATEGORIE' and aktiv=1 and gueltig_seit<=date_val(<>) and gueltig_bis>=date_val(<>) order by sort1^hidden^^ -45098^Stellenanzeige^1000^0^0^100^200^1^char^20^0^1^<> select 'besetzt','nur besetzte' from xdummy union select 'frei','nur freie' from xdummy^hidden^^ -45099^Stellen-Nr. im HHPlan^52^350^-1^150^80^1^char^25^0^0^^^^ +48091^Filter Stellen^120^350^-1^150^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='SVA_STELL_FILTER' order by 2;^hidden^^ +48092^Dienstart^3^350^-1^150^150^3^char^30^0^12^<>select tid,type,name from sichten where art ='SVA Dienstart' and aktiv=1 order by type,name;^hidden^^ +48093^BVL-Gruppe (Stelle)^74^0^0^150^120^10^char^30^0^12^<>select tid,type,name from sichten where art ='SVA BVL-Gruppen' and aktiv=1 order by type,name;^hidden^^ +48094^BVL-Gruppe (Person)^80^350^-1^150^120^10^char^30^0^12^<>select tid,type,name from sichten where art ='SVA BVL-Gruppen' and aktiv=1 order by type,name;^hidden^^ +48095^Filter Besetzung^130^0^0^150^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='SVA_BESETZ_FILTER' order by 2;^hidden^^ +48096^Finanzierungsquelle^302^0^0^100^200^3^char^30^0^1^<> select id,caption from sx_repository where art='SVA_FINANZIERUNGSQUELLE' and aktiv=1 and gueltig_seit<=date_val(<>) and gueltig_bis>=date_val(<>) order by sort1^hidden^^ +48097^Personalkategorie^310^0^0^100^200^3^char^30^0^1^<> select id,caption from sx_repository where art='SVA_PERSONALKATEGORIE' and aktiv=1 and gueltig_seit<=date_val(<>) and gueltig_bis>=date_val(<>) order by sort1^hidden^^ +48098^Stellenanzeige^1000^0^0^100^200^1^char^20^0^1^<> select 'besetzt','nur besetzte' from xdummy union select 'frei','nur freie' from xdummy^hidden^^ +48099^Stellen-Nr. im HHPlan^52^350^-1^150^80^1^char^25^0^0^^^^ diff --git a/src-modules/module/rpta/masken/48080_maske_system_bez.unl b/src-modules/module/rpta/masken/48080_maske_system_bez.unl new file mode 100644 index 0000000..cc55ebc --- /dev/null +++ b/src-modules/module/rpta/masken/48080_maske_system_bez.unl @@ -0,0 +1 @@ +48080^6^ diff --git a/src-modules/module/rpta/masken/48080_masken_felder_bez.unl b/src-modules/module/rpta/masken/48080_masken_felder_bez.unl new file mode 100644 index 0000000..9783ec4 --- /dev/null +++ b/src-modules/module/rpta/masken/48080_masken_felder_bez.unl @@ -0,0 +1,20 @@ +48080^48080^ +48080^48081^ +48080^48082^ +48080^48083^ +48080^48084^ +48080^48085^ +48080^48086^ +48080^48087^ +48080^48088^ +48080^48089^ +48080^48090^ +48080^48091^ +48080^48092^ +48080^48093^ +48080^48094^ +48080^48095^ +48080^48096^ +48080^48097^ +48080^48098^ +48080^48099^ diff --git a/src-modules/module/rpta/masken/45080_maskeninfo.unl b/src-modules/module/rpta/masken/48080_maskeninfo.unl similarity index 99% rename from src-modules/module/rpta/masken/45080_maskeninfo.unl rename to src-modules/module/rpta/masken/48080_maskeninfo.unl index 2b09fe7..eeaa0af 100644 --- a/src-modules/module/rpta/masken/45080_maskeninfo.unl +++ b/src-modules/module/rpta/masken/48080_maskeninfo.unl @@ -1,4 +1,4 @@ -45080^Stellenbesetzung und Beschäftigung (Liste)^--Freemarker Template\ +48080^Stellenbesetzung und Beschäftigung (Liste)^--Freemarker Template\ <#include "SQL_lingua_franca"/>\ <#include "SuperX_general"/>\ --\ diff --git a/src-modules/module/rpta/masken/48080_sachgeb_maske_bez.unl b/src-modules/module/rpta/masken/48080_sachgeb_maske_bez.unl new file mode 100644 index 0000000..ebddb07 --- /dev/null +++ b/src-modules/module/rpta/masken/48080_sachgeb_maske_bez.unl @@ -0,0 +1 @@ +100^48080^ diff --git a/src-modules/module/rpta/upgrade/rpta_upgrade_man.sql b/src-modules/module/rpta/upgrade/rpta_upgrade_man.sql index 5380d4f..b673e5e 100644 --- a/src-modules/module/rpta/upgrade/rpta_upgrade_man.sql +++ b/src-modules/module/rpta/upgrade/rpta_upgrade_man.sql @@ -1,5 +1,29 @@ --Freemarker Template + +--Nummernkreis wurde von 45xxx auf 48xxx geändert +create temp table tmp_delete_mask(maskeninfo_id integer); + +insert into tmp_delete_mask(maskeninfo_id) +select tid from maskeninfo +where (tid=45000 and name='Tabellenausgabe Studierende (amtlich und intern)') +or (tid=45040 and name='Spalten und Spaltenlayouts verwalten') +or (tid=45080 and name='Stellenbesetzung und Beschäftigung (Liste)'); + +delete from maskeninfo where tid in (select maskeninfo_id from tmp_delete_mask); +delete from felderinfo where tid in (select felderinfo_id from masken_felder_bez where maskeninfo_id in (select maskeninfo_id from tmp_delete_mask)); + +delete from sachgeb_maske_bez where maskeninfo_id in (select maskeninfo_id from tmp_delete_mask); +delete from masken_felder_bez where maskeninfo_id in (select maskeninfo_id from tmp_delete_mask); +delete from maske_system_bez where maskeninfo_id in (select maskeninfo_id from tmp_delete_mask); +delete from themenbaum where maskeninfo_id in (select maskeninfo_id from tmp_delete_mask); +delete from macro_masken_bez where maskeninfo_id1 in (select maskeninfo_id from tmp_delete_mask); +delete from macro_masken_bez where maskeninfo_id2 in (select maskeninfo_id from tmp_delete_mask); +delete from macro_feld_wert where macro in (select maskeninfo_id from tmp_delete_mask); + +drop table tmp_delete_mask; + + <#if '${SQLdialect}'='Postgres' > alter table rpta_resultset alter column fieldclause type text;