From c245d32a873c3ac6ae2ee31f6861c5168e97363c Mon Sep 17 00:00:00 2001
From: Imo John <john@memtext.de>
Date: Thu, 20 Feb 2025 09:16:11 +0100
Subject: [PATCH] =?UTF-8?q?Erg=C3=A4nze=20rpta=5Fexam=5Funit.sourcesystem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-modules/module/rpta/conf/rpta.xml         | 24 +++++++++++--------
 .../hilfstabellen/rpta_exam_unit_fuellen.sql  | 17 +++++++++++++
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml
index 2ca1fbf..2e51a40 100644
--- a/src-modules/module/rpta/conf/rpta.xml
+++ b/src-modules/module/rpta/conf/rpta.xml
@@ -238,9 +238,12 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[RPTA]" />
 </indexes>
 </table>
 
-<table name="rpta_exam_unit">
+<table name="rpta_exam_unit" thema="Berichtsassistent" typ="Hilfstabelle" caption="Berichtsassistent">
 <columns><column name="matrikel_nr" type ="INTEGER" size ="10" default ="" notnull ="false" />
 <column name="labnr" type ="INTEGER" size ="10" default ="" notnull ="false" />
+<column name="sourcesystem" type ="INTEGER" size ="4" default ="" notnull ="false" description="Quellsystem der Prüfung">
+   <comment>z.B. 5=sospos,6=HISinOne</comment>
+</column>
 <column name="tid_stg" type ="INTEGER" size ="10" default ="" notnull ="false" />
 <column name="sem_der_pruefung" type ="SMALLINT" size ="5" default ="" notnull ="false" />
 <column name="note" type ="DOUBLE" size ="17" default ="" notnull ="false" />
@@ -373,12 +376,21 @@ parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent </t
 <!-- ********************* Liste der RPTA-Prozesse ************************** -->
 
 <etl>
+<etl-step name="Upload der RPTA-Modul-Rohdaten" type="load" rohdaten="no">
+<!-- hier dürfen keine Actions stehen, damit in HIS1 das Ladedatum aktualisiert wird -->
+</etl-step>
+
 <etl-step name="Transformation" type="trans">
 <action>
-
 <nativeaction sql="update systeminfo set datum=today() where tid in (280)" scriptfile="" database=""/>
 </action>
 </etl-step>
+
+<etl-step name="Aggregation" type="aggr">
+<action>
+<nativeaction sql="" scriptfile="$RPTA_PFAD/hilfstabellen/rpta_exam_unit_fuellen.sql" database=""/>
+</action>
+</etl-step>
 </etl>
 <!-- Elemente nur für die neue KV von HIS:-->
 <install_upgrade_job>
@@ -428,15 +440,7 @@ parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent </t
     <action error="stop"/>
   </install-upgrade-step>
 </install_upgrade_job>
-<!-- ********************* Liste der ETL-Prozesse ************************** -->
 
-<etl>
-<etl-step name="Aggregation" type="aggr">
-<action>
-<nativeaction sql="" scriptfile="$RPTA_PFAD/hilfstabellen/rpta_exam_unit_fuellen.sql" database=""/>
-</action>
-</etl-step>
-</etl>
 <install>
 <install-step name="Füllen der Modul-Tabellen">
 <action>
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 affd5d9..dde7112 100644
--- a/src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql
+++ b/src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql
@@ -1,7 +1,21 @@
+--freemarker Template
+
+<sqlvars>
+	<sqlvar name="lm_exam_unit_exists">
+		select sp_table_exists('lm_exam_unit') from xdummy;
+	</sqlvar>
+	<sqlvar name="sos_lab_pord_exists">
+		select sp_table_exists('sos_lab_pord') from xdummy;
+	</sqlvar>
+</sqlvars>
+
+<#if lm_exam_unit_exists=1 && sos_lab_pord_exists=1>
+
 insert into rpta_exam_unit 
 SELECT 
     matrikel_nr, 
     labnr,
+    sourcesystem,
     tid_stg, 
     sem_der_pruefung, 
     note,
@@ -24,6 +38,7 @@ FROM lm_exam_unit
 UNION SELECT 
     matrikel_nr, 
     labnr,
+    sourcesystem,
     tid_stg, 
     sem_der_pruefung, 
     note,
@@ -44,3 +59,5 @@ UNION SELECT
 FROM sos_lab_pord
 WHERE sourcesystem = 5
 ;
+
+</#if>
\ No newline at end of file