From 811e2d042de3610af8a2b2d5aaf6f0dcd3b9f81c Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Tue, 30 Apr 2024 14:19:19 +0200
Subject: [PATCH] Version 0.2 #4

---
 src-modules/module/rpta/conf/rpta.xml         | 17 +++----
 .../module/rpta/masken/45000_felderinfo.unl   | 14 +++---
 ...lumn_layout_sos_stud_astat_rsz_fuellen.sql | 46 +++++++++++++++++--
 3 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml
index 60303e1..a6d5bac 100644
--- a/src-modules/module/rpta/conf/rpta.xml
+++ b/src-modules/module/rpta/conf/rpta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--<!DOCTYPE module SYSTEM "../../../conf/superx-module.dtd"> -->
-<module name="rpta" version="0.2b" sachgebiet_id="330"
+<module name="rpta" version="0.2" sachgebiet_id="330"
 sachgebiet="Berichtsassistent" systeminfo_id="330"
 system="Berichtsassistent" thema="Berichtsassistent" thema_parent="Abfragen">
 <database name="superx" system="superx">
@@ -16,8 +16,8 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[RPTA]" />
 		<column name="tid" type="SERIAL" size="" default=""	notnull="true" description="tid" isKey="true"/>
 		<column name="uniquename" type="VARCHAR" size="255" default=""	notnull="true" description="Schlüssel" />
 		<column name="caption" type="VARCHAR" size="255" default=""	notnull="" description="Bezeichnung" />
-		<column name="srcfieldname" type="VARCHAR" size="255" default=""	notnull="true" description="Feldname (Quelle)" />
-		<column name="targetfieldname" type="VARCHAR" size="255" default=""	notnull="true" description="Feldname (Ziel)" />
+		<column name="srcfieldname" type="VARCHAR" size="255" default=""	notnull="false" description="Feldname (Quelle)" />
+		<column name="targetfieldname" type="VARCHAR" size="255" default=""	notnull="false" description="Feldname (Ziel)" />
 		<column name="column_type" type="INTEGER" size="" default=""	notnull="true" description="Spaltentyp" ><comment>Physische Spalte/Logische Spalte/Lookup</comment></column>
 		<column name="col_function" type="TEXT" size="255" default=""	notnull="" description="Funktion" ><comment>Bei logischen Spalten/Lookup</comment></column>
 		<column name="is_aggregate" type="SMALLINT" size="2" default=""	notnull="" description="Aggregierte Spalte" ></column>
@@ -95,11 +95,12 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[RPTA]" />
 	<columns>
 		<column name="tid" type="SERIAL" size="" default=""	notnull="true" description="tid" isKey="true"/>
 		<column name="uniquename" type="VARCHAR" size="255" default=""	notnull="true" description="Schlüssel" />
-		<column name="caption" type="VARCHAR" size="255" default=""	notnull="" description="Bezeichnung" />
+		<column name="caption" type="VARCHAR" size="255" default=""	notnull="" description="Bezeichnung"  sortable="true"/>
 		<column name="resultset_id" type="INTEGER" size="255" default=""	notnull="" description="Resultset" />
 		<column name="whereclause" type="TEXT" size="255" default=""	notnull="false" description="Bedingung (optional)" />
 		<column name="description" type="TEXT" size="255" default=""	notnull="" description="Beschreibung" ><comment>Erläuterungstext</comment></column>
 		<column name="userinfo_id" type="INTEGER" size="255" default=""	notnull="" description="Angelegt von" ></column>
+		<column name="sortnr" type="INTEGER" size="255" default=""	notnull="" description="Sortiernummer" sortable="true"><comment>Kann leer bleiben, wenn nach Bezeichnung sortiert wird.</comment></column>
 			
 	</columns>
 	<primaryKeys><rs>
@@ -153,7 +154,7 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[RPTA]" />
 		<column name="visible_size" type="SMALLINT" size="2" default=""	notnull="" description="Breite in Zeichen" ><comment>Bei String-Spalten</comment></column>
 		<column name="format_code_id" type="INTEGER" size="255" default=""	notnull="" description="Format-Code" ><comment>Bei DECIMAL- und Datumsspalten</comment></column>
 		<column name="targetfieldname" type="VARCHAR" size="255" default=""	notnull="" description="Zielfeld" currentlyUsed="false" />
-		<column name="caption" type="VARCHAR" size="255" default=""	notnull="" description="Bezeichnung der Spalte"  />
+		<column name="caption" type="VARCHAR" size="255" default=""	notnull="" description="Bezeichnung der Spalte"><comment>Kann leer bleiben wenn der Spaltenname der Quellspalte übernommen werden soll.</comment></column>
 		<column name="description" type="TEXT" size="255" default=""	notnull="" description="Beschreibung" ><comment>Erläuterungstext</comment></column>
 		
 	</columns>
@@ -328,7 +329,6 @@ parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent </t
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/sx_stylesheets_einfuegen.sql" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/studierende_datenblatt_virtuell.sql" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql" database=""/>
-<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_schnellmeldung_fuellen.sql" database=""/>
 </action>
 </install-step>
 </install>
@@ -346,7 +346,6 @@ parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent </t
 <nativeaction sql="" scriptfile="$RPTA_PFAD/upgrade/rpta_upgrade_man.sql" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/studierende_datenblatt_virtuell.sql" database=""/>
 <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql" database=""/>
-<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_schnellmeldung_fuellen.sql" database=""/>
 
 </action>
 <action>
@@ -376,7 +375,7 @@ parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent </t
  path="/edit/rpta/rpta_column_layout_list.jsp"
  followUp=""
  caption="Spaltenlayouts verwalten"
- orderBy="caption"
+ orderBy="sortnr,caption"
  gotoHt=""
  helpfile=""
  maxRows="*"
@@ -388,6 +387,7 @@ parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent </t
 <customfield name="tid" nullFieldValue="" />
 <customfield name="caption" nullFieldValue="" visibleSize="30" />
 <customfield name="uniquename" nullFieldValue="" visibleSize="30" />
+<customfield name="sortnr" nullFieldValue="" visibleSize="30" />
 <customfield type="link" name="Details" path="/superx/edit/rpta/rpta_column_layout_edit.jsp" linkid="tid"/>
 </form>
 
@@ -413,6 +413,7 @@ mode="full">
 <customfield name="resultset_id" visibleSize="50" nullFieldValue="" />
 <customfield name="whereclause" visibleSize="50" nullFieldValue="" />
 <customfield name="description" visibleSize="50" nullFieldValue="" />
+<customfield name="sortnr" visibleSize="10" nullFieldValue="" />
 
 <customfield name="Spalten" type="subform"  multipart="false" autoUpdate="false" 
  maxRows="*" table="rpta_column2layout" parentField="tid" childField="layout_id"
diff --git a/src-modules/module/rpta/masken/45000_felderinfo.unl b/src-modules/module/rpta/masken/45000_felderinfo.unl
index 3064764..9e0afb5 100644
--- a/src-modules/module/rpta/masken/45000_felderinfo.unl
+++ b/src-modules/module/rpta/masken/45000_felderinfo.unl
@@ -1,13 +1,15 @@
 45000^Spaltenlayout^3000^350^-1^140^180^1^integer^30^1^1^<<SQL>>SELECT tid,\
-       caption,\
-       resultset_id\
+       caption\
 FROM rpta_column_layout \
-order by 2\
+where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sos_stud_astat'\
+and R.systeminfo_id=7)\
+order by sortnr, caption\
  ;^^<<SQL>>SELECT tid,\
-       caption,\
-       resultset_id\
+       caption\
 FROM rpta_column_layout \
-order by 2\
+where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='sos_stud_astat'\
+and R.systeminfo_id=7)\
+order by sortnr, caption\
  ;^
 45001^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;^
 45002^Fächer^30^0^0^130^200^6^char^1000^0^12^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql
index c35d9ea..98e142e 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql
@@ -165,8 +165,8 @@ and T.uniquename='${column.column_type}';
 </#foreach>
 
 
-  
-delete from rpta_column2layout
+select * into temp tmp_rpta_column2layout
+from rpta_column2layout
 where layout_id in (select L.tid
 from rpta_column_layout L,rpta_resultset R
 where R.tid=L.resultset_id 
@@ -174,8 +174,9 @@ and R.uniquename='${rpta_column_layout.rpta_resultset}'
 and L.uniquename='${rpta_column_layout.uniquename}'
 )
 ; 
-
-delete from rpta_column_layout
+  
+select * into temp tmp_rpta_column_layout_target
+from rpta_column_layout
 where resultset_id in (select tid
 FROM rpta_resultset
 where uniquename='${rpta_column_layout.rpta_resultset}')
@@ -193,8 +194,20 @@ insert into rpta_column_layout
        resultset_id,
        whereclause,
   description
-FROM tmp_rpta_column_layout;
+FROM tmp_rpta_column_layout T
+where 0=(select count(*) from tmp_rpta_column_layout_target T2
+where T.uniquename=T2.uniquename);
 
+drop table tmp_rpta_column_layout_target;
+
+delete from rpta_column2layout
+where layout_id in (select L.tid
+from rpta_column_layout L,rpta_resultset R
+where R.tid=L.resultset_id 
+and R.uniquename='${rpta_column_layout.rpta_resultset}'
+and L.uniquename='${rpta_column_layout.uniquename}'
+)
+; 
 
 select * into temp tmp_rpta_column2 from rpta_column ;
 
@@ -227,6 +240,29 @@ where (resultset_id,uniquename) not in
 from tmp_rpta_column2 T)
 ;
 
+update rpta_column set (  caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_aggregate,
+  description)
+  = (select   caption,
+  srcfieldname,
+  targetfieldname,
+  column_type,
+  col_function,
+  is_aggregate,
+  description
+  from tmp_rpta_column T
+  where T.resultset_id=rpta_column.resultset_id
+  and T.uniquename=rpta_column.uniquename)
+  where custom=0
+  and  (resultset_id,uniquename) in
+(select T.resultset_id,T.uniquename
+from tmp_rpta_column2 T)
+;
+
 drop table tmp_rpta_column2;
 
 insert into rpta_column2layout(column_id,