From b989961307f93deb033f7f4a31dee45f10452856 Mon Sep 17 00:00:00 2001
From: Imo John <john@memtext.de>
Date: Mon, 11 May 2026 13:31:32 +0200
Subject: [PATCH] Bugfix sxc.xml; Sachgebiete einfuegen; Anpassung
 Spaltenlayout default

---
 src-modules/module/sxc/conf/sxc.xml           | 108 ++++++++++++++----
 .../module/sxc/masken/47140_felderinfo.unl    |   2 +-
 .../sachgebiete_fuellen.sql                   |  15 +++
 3 files changed, 100 insertions(+), 25 deletions(-)
 create mode 100644 src-modules/module/sxc/schluesseltabellen/sachgebiete_fuellen.sql

diff --git a/src-modules/module/sxc/conf/sxc.xml b/src-modules/module/sxc/conf/sxc.xml
index daadcb4..210ceb9 100644
--- a/src-modules/module/sxc/conf/sxc.xml
+++ b/src-modules/module/sxc/conf/sxc.xml
@@ -1267,26 +1267,65 @@ parent="SuperX-Connect">Abfragen zur Administration von SuperX-Connect </thema>
 
 <!-- ********************* Liste der SXC-Prozesse ************************** -->
 
-<etl>
-<etl-step name="Transformation" type="trans">
-<action>
-
-<nativeaction sql="update systeminfo set datum=today() where tid in (360)" scriptfile="" database=""/>
-</action>
-</etl-step>
-<etl-step name="Aggregation" type="aggr">
-<action>
 
-<nativeaction sql="" scriptfile="$SXC_PFAD/hilfstabellen/sxc_stud_sem_da_geschl_hs_aggr_fuellen.sql" database=""/>
-<nativeaction sql="" scriptfile="$SXC_PFAD/hilfstabellen/sxc_lab_jahr_da_geschl_hs_aggr_fuellen.sql" database=""/>
+<install_upgrade_job>
+  <install-upgrade-step name="pre_upgrade" type="container" id="sxc_preupgrade_containernode">
+    <action error="stop"/>
+  </install-upgrade-step>
+  <install-upgrade-step name="upgrade_tables" type="" id="sxc_upgrade_tables_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$SXC_PFAD/upgrade/sxc_upgrade_tables_pg.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="upgrade_fields" type="" id="sxc_upgrade_fields_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$SXC_PFAD/upgrade/sxc_upgrade_fields_pg.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="upgrade_views" type="" id="sxc_upgrade_views_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$SXC_PFAD/upgrade/sxc_upgrade_views_pg.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="install_functions" type="container" id="sxc_install_functions_containernode">
+    <action error="stop"/>
+  </install-upgrade-step>
+  <install-upgrade-step name="upgrade_indices" type="" id="sxc_upgrade_indices_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$SXC_PFAD/upgrade/sxc_upgrade_indexes_pg.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="fill_tables" type="" id="sxc_fill_tables_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$SXC_PFAD/conf/sx_tables_fuellen.sql" database=""/>
+      <nativeaction sql="" scriptfile="$SXC_PFAD/conf/sx_fields_fuellen.sql" database=""/>
 
-</action>
-</etl-step>
-</etl>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="fill_unload_parameter" type="" id="sxc_fill_unload_parameter_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$SXC_PFAD/conf/unload_params_fuellen.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="Update Module Metadata" type="container" id="sxc_update_module_metadata_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$SXC_PFAD/conf/module_metadata.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="update_topic_tree" type="" id="sxc_update_topictree_actionstep">
+    <action error="stop">
+      <nativeaction sql="" scriptfile="$SXC_PFAD/upgrade/sxc_upgrade_themenbaum.sql" database=""/>
+    </action>
+  </install-upgrade-step>
+  <install-upgrade-step name="install_masks" type="container" id="sxc_install_masks_containernode">
+    <action error="stop"/>
+  </install-upgrade-step>
 
+</install_upgrade_job>
 <install>
 <install-step name="Füllen der Modul-Tabellen">
 <action>
+<nativeaction sql="drop table if exists tmp_viz_chart;" scriptfile="" database=""/>
 <nativeaction sql="create table tmp_viz_chart(
 tid SERIAL  not null, 
 uniquename VARCHAR(255)  not null, 
@@ -1303,10 +1342,10 @@ renderer_id INTEGER ,
 chartmodel_miniature TEXT , 
 chart_position CHAR(10) , 
 chart_active SMALLINT  default 1 , 
-chart_width varchar(255)   default '600' , 
-chart_height varchar(255)   default '400' , 
-chart_miniature_width varchar(255)   default '200' , 
-chart_miniature_height varchar(255)   default '100' ,
+chart_width integer  default 600 , 
+chart_height integer  default 400 , 
+chart_miniature_width integer  default 200 , 
+chart_miniature_height integer  default 100 ,
 is_custom SMALLINT
 ) 
 ;" scriptfile="" database=""/>
@@ -1340,6 +1379,9 @@ is_custom SMALLINT
 <file path="$SXC_PFAD/rohdaten/destatis/sxc_lab_jahr_da_geschl_hs.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="tmp_viz_chart"><file path="$SXC_PFAD/schluesseltabellen/viz_chart.unl"/></loadtable>
 
+
+<nativeaction sql="" scriptfile="$SXC_PFAD/schluesseltabellen/sachgebiete_fuellen.sql" database=""/>
+
 <nativeaction sql="" scriptfile="$SXC_PFAD/schluesseltabellen/sx_stylesheets_einfuegen.sql" database=""/>
 <nativeaction sql="" scriptfile="$SXC_PFAD/schluesseltabellen/sichten_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$SXC_PFAD/schluesseltabellen/sx_captions_fuellen.sql" database=""/>
@@ -1355,7 +1397,7 @@ is_custom SMALLINT
 
 </action>
 <action>
-<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_chart_fuellen.sql" database=""/>
+<nativeaction sql="" scriptfile="$SXC_PFAD/schluesseltabellen/viz_chart_fuellen.sql" database=""/>
 
 
 </action>
@@ -1366,6 +1408,7 @@ is_custom SMALLINT
 <upgrade>
 <upgrade-step>
 <action>
+<nativeaction sql="drop table if exists tmp_viz_chart;" scriptfile="" database=""/>
 <nativeaction sql="create table tmp_viz_chart(
 tid SERIAL  not null, 
 uniquename VARCHAR(255)  not null, 
@@ -1382,10 +1425,10 @@ renderer_id INTEGER ,
 chartmodel_miniature TEXT , 
 chart_position CHAR(10) , 
 chart_active SMALLINT  default 1 , 
-chart_width varchar(255)   default '600' , 
-chart_height varchar(255)   default '400' , 
-chart_miniature_width varchar(255)   default '200' , 
-chart_miniature_height varchar(255)   default '100' ,
+chart_width integer  default 600 , 
+chart_height integer  default 400 , 
+chart_miniature_width integer  default 200 , 
+chart_miniature_height integer  default 100 ,
 is_custom SMALLINT
 ) 
 ;" scriptfile="" database=""/>
@@ -1419,6 +1462,8 @@ is_custom SMALLINT
 <file path="$SXC_PFAD/rohdaten/destatis/sxc_lab_jahr_da_geschl_hs.unl"/></loadtable>
 <loadtable refresh="true" delimiter="^" header="false" tabname="tmp_viz_chart"><file path="$SXC_PFAD/schluesseltabellen/viz_chart.unl"/></loadtable>
 
+<nativeaction sql="" scriptfile="$SXC_PFAD/schluesseltabellen/sachgebiete_fuellen.sql" database=""/>
+
 <nativeaction sql="" scriptfile="$SXC_PFAD/schluesseltabellen/sx_stylesheets_einfuegen.sql" database=""/>
 <nativeaction sql="" scriptfile="$SXC_PFAD/schluesseltabellen/sichten_fuellen.sql" database=""/>
 <nativeaction sql="" scriptfile="$SXC_PFAD/schluesseltabellen/sx_captions_fuellen.sql" database=""/>
@@ -1436,12 +1481,27 @@ is_custom SMALLINT
 </action>
 <action>
 
-<nativeaction sql="" scriptfile="$VIZ_PFAD/schluesseltabellen/viz_chart_fuellen.sql" database=""/>
+<nativeaction sql="" scriptfile="$SXC_PFAD/schluesseltabellen/viz_chart_fuellen.sql" database=""/>
 
 </action>
 </upgrade-step>
 </upgrade>
+<etl>
+<etl-step name="Transformation" type="trans">
+<action>
+
+<nativeaction sql="update systeminfo set datum=today() where tid in (360)" scriptfile="" database=""/>
+</action>
+</etl-step>
+<etl-step name="Aggregation" type="aggr">
+<action>
+
+<nativeaction sql="" scriptfile="$SXC_PFAD/hilfstabellen/sxc_stud_sem_da_geschl_hs_aggr_fuellen.sql" database=""/>
+<nativeaction sql="" scriptfile="$SXC_PFAD/hilfstabellen/sxc_lab_jahr_da_geschl_hs_aggr_fuellen.sql" database=""/>
 
+</action>
+</etl-step>
+</etl>
 <uninstall-step name="Deinstalliere Schlüssel">
 <action error="stop">
 </action>
diff --git a/src-modules/module/sxc/masken/47140_felderinfo.unl b/src-modules/module/sxc/masken/47140_felderinfo.unl
index 9407544..0c9a9e9 100644
--- a/src-modules/module/sxc/masken/47140_felderinfo.unl
+++ b/src-modules/module/sxc/masken/47140_felderinfo.unl
@@ -9,7 +9,7 @@ order by sortnr, caption\
        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_geschl_sxc';^
+and R.systeminfo_id=7) and uniquename='sos_stud_anf_sxc';^
 47141^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
 47142^Fächer^30^0^0^130^200^6^integer^1000^0^12^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^
 47143^Abschluss^40^0^0^100^200^3^char^1500^0^12^<<SQL>> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^
diff --git a/src-modules/module/sxc/schluesseltabellen/sachgebiete_fuellen.sql b/src-modules/module/sxc/schluesseltabellen/sachgebiete_fuellen.sql
new file mode 100644
index 0000000..6731e82
--- /dev/null
+++ b/src-modules/module/sxc/schluesseltabellen/sachgebiete_fuellen.sql
@@ -0,0 +1,15 @@
+--Das Sachgebiet 360 wird installiert
+
+delete from sachgebiete where tid in (361);
+insert into sachgebiete(tid,name,rightname) values (361,'SuperX-Connect Administr.','CS_BIA_STANDARDREPORTS_ADMIN[SXC]');
+
+
+delete from group_sachgeb_bez where sachgebiete_id in (360,361)
+and groupinfo_id in (select G.tid from groupinfo G where G.name='Administratoren' or G.name='superx') ;
+
+insert into group_sachgeb_bez 
+select G.tid,360 from groupinfo G where G.name='Administratoren' or G.name='superx';
+
+insert into group_sachgeb_bez 
+select G.tid,361 from groupinfo G where G.name='Administratoren' or G.name='superx';
+