SuperX
/
rpta
7
0
Fork 0
Code Issues 20 Pull Requests Projects Releases Wiki Activity
Browse Source

Spaltenlayout ABschlussarbeiten; fm_templates Bugfix

master
Imo John 6 days ago
parent
0a99b46f15
commit
65129b9251
7 changed files with 149 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src-modules/module/rpta/conf/rpta.xml
  2. 9
      src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql
  3. 13
      src-modules/module/rpta/schluesseltabellen/fm_templates.unl
  4. 74
      src-modules/module/rpta/schluesseltabellen/rpta_column_layout_rpta_exam_unit_dim_studiengang_exam_written.sql
  5. 32
      src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_exam_unit_dim_studiengang_fuellen.sql
  6. 10
      src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql
  7. 1
      src-modules/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen.sql

18
src-modules/module/rpta/conf/rpta.xml
Unescape View File

@ -270,6 +270,7 @@ @@ -270,6 +270,7 @@
<column name="summe" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="panerk" type ="CHAR" size ="10" default ="" notnull ="false" />
<column name="shortcomment" type ="VARCHAR" size ="255" default ="" notnull ="false" />
<column name="d_abg_pruefung" type ="DATE" size ="" default ="" notnull ="false" />
</columns>
<indexes>
<index name="rpta_exam_unit1" unique="false">
@ -582,10 +583,12 @@ @@ -582,10 +583,12 @@
<nativeaction sql="" scriptfile="$RPTA_PFAD/conf/sx_fields_fuellen.sql" database="" />
<!--nun sind die Metadaten vorhanden-->
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/studierende_datenblatt_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/studierende_datenblatt_historisiert_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/absolvierende_datenblatt_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/stellen_besetzung_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/personal_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_nach_ppruef_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_nach_ppruef_historisiert_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_im_detail_datenblatt_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_im_detail_datenblatt_historisiert_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/management_datenblatt_virtuell.sql" database="" />
@ -599,6 +602,9 @@ @@ -599,6 +602,9 @@
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/absolvierende_gewichtet_datenblatt_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_im_detail_gewichtet_datenblatt_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/finanzen_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_rpta_exam_unit_dim_studiengang_fuellen.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_fuellen.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sgd_pbe_pbv_fuellen.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_lab_pord_pruef_fuellen.sql" database="" />
@ -617,6 +623,9 @@ @@ -617,6 +623,9 @@
<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/rpta_column_layout_sos_stud_hssem1_repo_fuellen_generated.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_rpta_exam_unit_dim_studiengang_exam_written.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>
@ -656,13 +665,16 @@ @@ -656,13 +665,16 @@
<!--nun sind die Metadaten vorhanden-->
<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/studierende_datenblatt_historisiert_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/absolvierende_datenblatt_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/stellen_besetzung_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/personal_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_nach_ppruef_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_nach_ppruef_historisiert_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_im_detail_datenblatt_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_im_detail_datenblatt_historisiert_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/management_datenblatt_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/sxconnect_kennzahlen_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/erfolg_ba_ma_uebergang_datenblatt_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/bewerbungen_datenblatt_virtuell.sql" database="" />
@ -672,6 +684,9 @@ @@ -672,6 +684,9 @@
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/absolvierende_gewichtet_datenblatt_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_im_detail_gewichtet_datenblatt_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/finanzen_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_rpta_exam_unit_dim_studiengang_fuellen.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_fuellen.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sgd_pbe_pbv_fuellen.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_lab_pord_pruef_fuellen.sql" database="" />
@ -690,6 +705,9 @@ @@ -690,6 +705,9 @@
<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/rpta_column_layout_sos_stud_hssem1_repo_fuellen_generated.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_rpta_exam_unit_dim_studiengang_exam_written.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>

9
src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql
Unescape View File

@ -34,7 +34,8 @@ insert into rpta_exam_unit (matrikel_nr, @@ -34,7 +34,8 @@ insert into rpta_exam_unit (matrikel_nr,
elementnr,
summe,
shortcomment,
panerk
panerk,
d_abg_pruefung
)
SELECT
matrikel_nr,
@ -62,7 +63,8 @@ SELECT @@ -62,7 +63,8 @@ SELECT
<#else>
null::varchar(255) as shortcomment,
</#if>
panerk
panerk,
d_abg_pruefung
FROM lm_exam_unit
@ -88,7 +90,8 @@ UNION SELECT @@ -88,7 +90,8 @@ UNION SELECT
pnr::varchar(255) as elementnr,
summe,
null::varchar(255) as shortcomment,
(select L.panerk from sos_lab L where L.labnr=sos_lab_pord.labnr and L.sourcesystem = 5)
(select L.panerk from sos_lab L where L.labnr=sos_lab_pord.labnr and L.sourcesystem = 5),
d_abg_pruefung
FROM sos_lab_pord
WHERE sourcesystem = 5
;

13
src-modules/module/rpta/schluesseltabellen/fm_templates.unl
Unescape View File

@ -530,15 +530,18 @@ select '${removeEmptyLines}';\ @@ -530,15 +530,18 @@ select '${removeEmptyLines}';\
</#if> \
</#foreach>\
from tmp_stud2\
where 1=1 \
<#if removeEmptyLines=="true" >and (1=0\
<#if removeEmptyLines=="true" >where 1=0\
<#foreach column in columns>\
<#assign count_aggregate=0>\
<#if column.is_aggregate==1>\
<#assign count_aggregate=count_aggregate+1>\
or ${column.targetfieldname} is not null\
\
-- folgende elseif sorgt dafür, dass Spaltenlayouts ohne Aggregate immer true sind\
-- denn ohne diese elseif wären Spaltenlayout ohne Aggregate immer false\
<#elseif column.is_aggregate==0 && column?is_last && count_aggregate=0>\
or 1=1\
</#if>\
</#foreach>\
)\
</#foreach>\
</#if>\
order by \
<#if rpta_column_layout.sortclause?has_content>\

74
src-modules/module/rpta/schluesseltabellen/rpta_column_layout_rpta_exam_unit_dim_studiengang_exam_written.sql
Unescape View File

@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
--freemarker template
<#include "RPTA-Makros"/>
<sqlvars>
<sqlvar name="rpta_exam_unit_dim_studiengang_exists">
select count(*) from rpta_resultset where uniquename='rpta_exam_unit_dim_studiengang';
</sqlvar>
</sqlvars>
<#assign rpta_column_layout = {"uniquename":"rpta_exam_unit_dim_studiengang_exam_written",
"caption":"Abschlussarbeiten",
"rpta_resultset":"rpta_exam_unit_dim_studiengang",
"whereclause":"part in (select K.apnr from sos_k_part K where K.hiskey_id=''99'')
and pstatus in (''BE'')
and (((panerk != ''J'' and sourcesystem=6) or (panerk is null and sourcesystem=6))
or ((panerk != ''I'' and panerk != ''J'' and panerk != ''H'' and sourcesystem=5) or (panerk is null and sourcesystem=5)))",
"description":"",
"sortclause":""
}
/>
<#assign rpta_columns = [
{"uniquename":"dim_studiengang_stg",
"caption_in_ergebnistabelle":"Fach",
"is_visible":"1",
"format_code":"",
"visible_size":"5",
"description_in_ergebnistabelle":""
},
{"uniquename":"dim_studiengang_abschluss",
"caption_in_ergebnistabelle":"Abschluss",
"is_visible":"1",
"format_code":"",
"visible_size":"5",
"description_in_ergebnistabelle":""
},
{"uniquename":"exam_instructor_1",
"caption_in_ergebnistabelle":"Betreuer 1",
"is_visible":"1",
"format_code":"",
"visible_size":"5",
"description_in_ergebnistabelle":""
},
{"uniquename":"exam_instructor_2",
"caption_in_ergebnistabelle":"Betreuer 2",
"is_visible":"1",
"format_code":"",
"visible_size":"5",
"description_in_ergebnistabelle":""
},
{"uniquename":"exam_written_title",
"caption_in_ergebnistabelle":"Titel der Arbeit",
"is_visible":"1",
"format_code":"",
"visible_size":"5",
"description_in_ergebnistabelle":""
},
{"uniquename":"d_abg_pruefung",
"caption_in_ergebnistabelle":"Prüfungsdatum",
"is_visible":"1",
"format_code":"",
"visible_size":"5",
"description_in_ergebnistabelle":""
},
{"uniquename":"note",
"caption_in_ergebnistabelle":"Note",
"is_visible":"1",
"format_code":"",
"visible_size":"5",
"description_in_ergebnistabelle":""
}
]
/>
<@rpta_column2layout_fuellen />

32
src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_exam_unit_dim_studiengang_fuellen.sql
Unescape View File

@ -63,6 +63,38 @@ select count(*) from rpta_resultset where uniquename='rpta_exam_unit_dim_studien @@ -63,6 +63,38 @@ select count(*) from rpta_resultset where uniquename='rpta_exam_unit_dim_studien
"col_function":"select surname from sos_stud_address A
where tmp_rpta_exam_unit_dim_studiengang.matrikel_nr=A.matrikel_nr",
"is_aggregate":0,
"description_der_spalte":""},
{"uniquename":"exam_written_title",
"caption_der_spalte":"Titel der Abschlussarbeit",
"srcfieldname":"",
"targetfieldname":"exam_written_title",
"column_type":"lookupColumn",
"col_function":"select title from lm_exam_written W
where tmp_rpta_exam_unit_dim_studiengang.labnr=W.examplan_id",
"is_aggregate":0,
"description_der_spalte":""},
{"uniquename":"exam_instructor_1",
"caption_der_spalte":"Betreuer",
"srcfieldname":"",
"targetfieldname":"exam_instructor_1",
"column_type":"lookupColumn",
"col_function":"select distinct lastname||'', ''||firstname from lm_exam_instructor I
where tmp_rpta_exam_unit_dim_studiengang.labnr=I.examplan_id
and ordnr=1",
"is_aggregate":0,
"description_der_spalte":""},
{"uniquename":"exam_instructor_2",
"caption_der_spalte":"Betreuer",
"srcfieldname":"",
"targetfieldname":"exam_instructor_2",
"column_type":"lookupColumn",
"col_function":"select distinct lastname||'', ''||firstname from lm_exam_instructor I
where tmp_rpta_exam_unit_dim_studiengang.labnr=I.examplan_id
and ordnr=2",
"is_aggregate":0,
"description_der_spalte":""}
]

10
src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql
Unescape View File

@ -163,6 +163,16 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist'; @@ -163,6 +163,16 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
"col_function":"(ects_ist/ects_soll*100)",
"is_aggregate":"1",
"description_der_spalte":"Anteil der Ist-ECTS and den Soll-ECTS"
},
{"uniquename":"surname",
"caption_der_spalte":"Nachname",
"srcfieldname":"",
"targetfieldname":"surname",
"column_type":"lookupColumn",
"col_function":"select surname from sos_stud_address A
where tmp_rpta_lm_ects_soll_ist.matrikel_nr=A.matrikel_nr",
"is_aggregate":0,
"description_der_spalte":""
}
]

1
src-modules/module/rpta/schluesseltabellen/sx_stylesheets_einfuegen.sql
Unescape View File

@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
{"mask":"48110", "filename":"tabelle_html.xsl", "ord":"10"},
{"mask":"48460", "filename":"tabelle_html.xsl", "ord":"10"},
{"mask":"48490", "filename":"tabelle_html.xsl", "ord":"10"}
{"mask":"48520", "filename":"tabelle_html.xsl", "ord":"10"}
] />

Write Preview
Loading…
Cancel
Save