SuperX-Connect-Bericht aus Themenbaum entfernen; Bugfixes

src-modules/module/rpta/conf/rpta.xml

@@ -381,13 +381,13 @@
           <path>$RPTA_PFAD/masken</path>
         </src>
       </maske>
-      <maske tid="48280" name="SuperX-Connect Kennzahlen" thema="Berichtsassistent">
+      <maske tid="48280" name="SuperX-Connect Kennzahlen" thema="">
         <description />
         <src>
           <path>$RPTA_PFAD/masken</path>
         </src>
       </maske>
-      <maske tid="48310" name="Übergang Bachelor-Master" thema="Berichtsassistent">
+      <maske tid="48310" name="Übergang Bachelor-Master bzw. vorheriger Abschluss bei Master-Studienbeginn" thema="Berichtsassistent">
         <description />
         <src>
           <path>$RPTA_PFAD/masken</path>
@@ -417,7 +417,7 @@
           <path>$RPTA_PFAD/masken</path>
         </src>
       </maske>
-      <maske tid="48490" name="Absolvierende nach Studiengang" thema="Berichtsassistent">
+      <maske tid="48490" name="Absolvent*innen nach Studiengang" thema="Berichtsassistent">
         <description />
         <src>
           <path>$RPTA_PFAD/masken</path>
@@ -602,6 +602,7 @@
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_ba_ma_uebergang_nach_abschluss_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_ba_ma_uebergang_nach_abschluss_fach_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_rsz_2_fuellen.sql" database="" />
+        <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout__fin_einnahmen_dm_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/macro_masken_bez_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/sx_repository_fuellen.sql" database=""/>
       </action>
@@ -666,6 +667,7 @@
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_ba_ma_uebergang_nach_abschluss_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_ba_ma_uebergang_nach_abschluss_fach_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_rpta_sos_lab_aggr_rsz_2_fuellen.sql" database="" />
+        <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout__fin_einnahmen_dm_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/macro_masken_bez_fuellen.sql" database="" />
         <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/sx_repository_fuellen.sql" database=""/>
       </action>

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

@@ -24,7 +24,7 @@ order by sortnr, caption\
        caption\
 FROM rpta_column_layout \
 where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rpta_man_kennz_aggr'\
-and R.systeminfo_id=200) and uniquename='man_kennz_aggr_tuhh_behoerdenbericht';^
+and R.systeminfo_id=200) limit 1;^
 48227^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;^^^

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

@@ -3,7 +3,7 @@
 48252^Vertragsart^10^380^-1^200^160^3^char^30^0^12^<<SQL>>select tid,type,name from sichten where art ='SVA-Vertragsart-Sicht' and aktiv=1 order by type,name;^^^
 48253^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 tid=<<Spaltenlayout>>) order by 2;^^^
+(select tid from rpta_column_layout where uniquename=<<Spaltenlayout>>) order by 2;^^^
 48254^Geschlecht^81^310^-1^100^70^1^integer^4^0^1^<<SQL>> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^^^
 48255^Personal-Nr.^50^350^-1^150^80^1^integer^10^0^0^^^^
 48256^Amtsbezeichnung^55^0^0^150^160^3^char^30^0^12^<<SQL>>select tid,type,name from sichten where art ='SVA Amtsdienstbez.' and aktiv=1 order by type,name;^hidden^^

src-modules/module/rpta/upgrade/rpta_upgrade_man.sql

@@ -33,6 +33,10 @@ alter table rpta_column2layout ALTER COLUMN  is_visible SET DEFAULT 1;
 
 </#if>
 
+-- SuperX-Connect Kennzahlen wurde erstmal nur für UDE (Stammdaten) entwickelt, daher ausblenden
+delete from themenbaum where maskeninfo_id = 48280;
+
+
 --update current sos module to most recent version:
 
 update sx_fields set is_sum=0