ANpassung schleifenrelation und Spaltenlayout Prüfungsergebnisse

src-modules/module/rpta/schluesseltabellen/macro_masken_bez_fuellen.sql

@@ -1,10 +1,27 @@
 --freemarker template
+
+-- für das RPTA-Makro wird schleifenrelation type text benötigt
+-- Umstellung auf schleifenrelation type text erfolgt in Kern 5.3
+-- nach kern 5.3-Installation kann folgender alter table entfernt werden
+alter table macro_masken_bez alter column schleifenrelation type text;
+
 <#assign makros = [
 {"tid":"48140"}
 ] />
 <#assign masken = [
-{"makro":"48140", "tid":"48110", "sortnr":"10", "schleifenrelation":"<<SQL>> select ''_''||COALESCE(c.lid, btrim(l.fb))||''_''||btrim(l.stg)||''_''||btrim(l.abschluss),l.text FROM lehr_stg_ab l LEFT JOIN cifx c ON c.key = 90 AND c.sourcesystem in (5, 6, 10, 12, 15) AND c.apnr=l.fb WHERE c.apnr=<<Fachbereich>>",
+{"makro":"48140", "tid":"48110", "sortnr":"10", 
-	"schleifenfeldname":"Studiengang","schleifenfstand":"12.03.2025", "schleifenfsicht":"<<Studiengang-Sicht>>"}
+"schleifenrelation":"<<SQL>> 
+	SELECT DISTINCT 
+		((((''_''::text || COALESCE(c.lid, btrim(l.fb::text)::character varying)::text) || ''_''::text) || btrim(l.stg::text)) || ''_''::text) || btrim(l.abschluss::text) AS apnr,
+		(btrim(k.dtxt::text) || '' ''::text) || ((( SELECT a.druck FROM cifx a WHERE a.key = 35 AND a.apnr = l.abschluss))::text) AS druck
+	FROM 
+		k_stg k,
+		lehr_stg_ab l
+		LEFT JOIN cifx c ON c.key = 90 AND (c.sourcesystem = ANY (ARRAY[5, 6, 10, 12, 15])) AND c.apnr = l.fb
+	WHERE k.stg = l.stg
+			and c.apnr=<<Fachbereich>>
+			and l.abschluss in (''BA'',''MA'')",
+"schleifenfeldname":"Studiengang","schleifenfstand":"12.03.2025", "schleifenfsicht":"<<Studiengang-Sicht>>"}
 ] />
 <#assign felder = [
 ] />

src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql

@@ -34,7 +34,7 @@ select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studi
 "column_type":"physicalColumn",
 "col_function":"",
 "format_code":"",
-"caption":"",
+"caption":"Name der Prüfung",
 "is_visible":"1",
 "is_aggregate":0,
 "visible_size":40,
@@ -51,10 +51,22 @@ select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studi
 "visible_size":15,
 "description":""},
 
-  {"uniquename":"note_schnitt",
+  {"uniquename":"note_case",
 "srcfieldname":"note",
+"targetfieldname":"note_case",
+"column_type":"logicalColumn",
+"col_function":"(case when note > 6 then null else note end)",
+"format_code":"",
+"caption":"Durchschnittsnote % *",
+"is_visible":"0",
+"is_aggregate":0,
+"visible_size":5,
+"description":""},
+
+  {"uniquename":"note_schnitt",
+"srcfieldname":"note_case",
 "targetfieldname":"note_schnitt",
-"column_type":"physicalColumn",
+"column_type":"processingColumn",
 "col_function":"avg",
 "format_code":"",
 "caption":"Durchschnittsnote *",