diff --git a/src-modules/module/rpta/schluesseltabellen/fm_templates.unl b/src-modules/module/rpta/schluesseltabellen/fm_templates.unl index ad18526..e948575 100644 --- a/src-modules/module/rpta/schluesseltabellen/fm_templates.unl +++ b/src-modules/module/rpta/schluesseltabellen/fm_templates.unl @@ -549,10 +549,11 @@ drop TABLE tmp_rpta_column2layout;\ <#function sichtHasAdditionalGrouping treeColumnTargetFieldnameParam>\ <#assign ret="" />\ <#foreach column in columns>\ - <#if column.targetfieldname !=treeColumnTargetFieldnameParam\ + <#if (column.targetfieldname !=treeColumnTargetFieldnameParam\ && column.targetfieldname!="ebene"\ && column.is_aggregate==0 \ - && column.coltype!="preparingColumn">\ + && column.coltype!="preparingColumn")\ + || column.coltype=="computedColumn">\ <#if column?is_first>\ <#assign ret=column.targetfieldname/>\ <#else>\ diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql new file mode 100644 index 0000000..00f564a --- /dev/null +++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql @@ -0,0 +1,83 @@ +--freemarker template +<#include "RPTA-Makros"/> + + +select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist'; + + +<#assign rpta_column_layout = {"uniquename":"lm_ects_soll_ist_matrikelnummer_sicht", +"caption":"ECTS-Soll-IST Vergleich nach Studiengang + Matrikelnummern", +"rpta_resultset":"rpta_lm_ects_soll_ist", +"whereclause":"aktiv=1", +"description":"ECTS-Soll-IST Vergleich mit Baumstruktur nach Studiengang-Sicht", +"sortclause":"sortnr" +} + /> + +<#assign rpta_columns = [ + +{"uniquename":"dim_studiengang_s_tid_stg", +"caption_in_ergebnistabelle":"Studiengang Sichtelement-ID", +"is_visible":"0", +"visible_size":"4", +"description_in_ergebnistabelle":"Studiengang Sichtelement-ID" +}, +{"uniquename":"dim_studiengang_s_tid_stg_ebene", +"caption_in_ergebnistabelle":"Ebene", +"is_visible":"1", +"format_code":"", +"visible_size":"5", +"description_in_ergebnistabelle":"Studiengang" +}, +{"uniquename":"dim_studiengang_sicht_kind", +"caption_in_ergebnistabelle":"Studiengang", +"is_visible":"1", +"format_code":"", +"visible_size":"30", +"description_in_ergebnistabelle":"Studiengang" +}, +{"uniquename":"matrikel_nr", +"caption_in_ergebnistabelle":"Matrikelnr./Pseudonym", +"is_visible":"1", +"format_code":"INT_NO_SEP", +"visible_size":"5", +"description_in_ergebnistabelle":"Matrikelnr./Pseudonym" +}, +{"uniquename":"dim_studiengang_regel", +"caption_in_ergebnistabelle":"Regelstudienzeit", +"is_visible":"1", +"format_code":"", +"visible_size":"5", +"description_in_ergebnistabelle":"" +}, +{"uniquename":"dim_studiengang_lehr_str", +"caption_in_ergebnistabelle":"Lehreinheit", +"is_visible":"1", +"format_code":"", +"visible_size":"5", +"description_in_ergebnistabelle":"" +}, +{"uniquename":"ects_soll", +"caption_in_ergebnistabelle":"Soll-ECTS", +"is_visible":"1", +"format_code":"", +"visible_size":"5", +"description_in_ergebnistabelle":"" +}, +{"uniquename":"ects_ist", +"caption_in_ergebnistabelle":"Ist-ECTS", +"is_visible":"1", +"format_code":"", +"visible_size":"5", +"description_in_ergebnistabelle":"" +}, +{"uniquename":"ects_ist_anteil", +"caption_in_ergebnistabelle":"Ist-ECTS Anteil", +"is_visible":"1", +"format_code":"INT_PERCENT", +"visible_size":"5", +"description_in_ergebnistabelle":"" +} +] + /> +<@rpta_column2layout_fuellen /> diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql index d44f0c8..8fbd1e7 100644 --- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql +++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql @@ -8,7 +8,7 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist'; <#assign rpta_column_layout = {"uniquename":"lm_ects_soll_ist_sicht", "caption":"ECTS-Soll-IST Vergleich nach Studiengang", "rpta_resultset":"rpta_lm_ects_soll_ist", -"whereclause":"", +"whereclause":"aktiv=1", "description":"ECTS-Soll-IST Vergleich mit Baumstruktur nach Studiengang-Sicht", "sortclause":"sortnr" } @@ -36,20 +36,6 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist'; "visible_size":"30", "description_in_ergebnistabelle":"Studiengang" }, -{"uniquename":"matrikel_nr", -"caption_in_ergebnistabelle":"Matrikelnr./Pseudonym", -"is_visible":"1", -"format_code":"", -"visible_size":"5", -"description_in_ergebnistabelle":"Matrikelnr./Pseudonym" -}, -{"uniquename":"dim_studiengang_text", -"caption_in_ergebnistabelle":"Studiengang", -"is_visible":"1", -"format_code":"", -"visible_size":"5", -"description_in_ergebnistabelle":"" -}, {"uniquename":"dim_studiengang_regel", "caption_in_ergebnistabelle":"Regelstudienzeit", "is_visible":"1", @@ -57,45 +43,31 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist'; "visible_size":"5", "description_in_ergebnistabelle":"" }, -{"uniquename":"lehr_eigen", -"caption_in_ergebnistabelle":"Lehreinheit (eigen)", +{"uniquename":"dim_studiengang_lehr_str", +"caption_in_ergebnistabelle":"Lehreinheit", "is_visible":"1", "format_code":"", "visible_size":"5", "description_in_ergebnistabelle":"" }, -{"uniquename":"fach_sem_zahl_max_student", -"caption_in_ergebnistabelle":"Letztes Fachsem.", +{"uniquename":"ects_soll", +"caption_in_ergebnistabelle":"Soll-ECTS", "is_visible":"1", "format_code":"", "visible_size":"5", "description_in_ergebnistabelle":"" }, -{"uniquename":"endsemester", -"caption_in_ergebnistabelle":"Endsemester", +{"uniquename":"ects_ist", +"caption_in_ergebnistabelle":"Ist-ECTS gesamt", "is_visible":"1", "format_code":"", "visible_size":"5", "description_in_ergebnistabelle":"" }, -{"uniquename":"ects_soll_prep", -"caption_in_ergebnistabelle":"Soll-ECTS Vorbereitung", -"is_visible":"0", -"format_code":"", -"visible_size":"5", -"description_in_ergebnistabelle":"Vorbereitung für Aggregation max(ects_soll)" -}, -{"uniquename":"ects_soll_max", -"caption_in_ergebnistabelle":"Max Soll-ECTS", -"is_visible":"1", -"format_code":"", -"visible_size":"5", -"description_in_ergebnistabelle":"Aggregation max(ects_soll)" -}, -{"uniquename":"ects_ist", -"caption_in_ergebnistabelle":"Ist-ECTS", +{"uniquename":"ects_ist_anteil", +"caption_in_ergebnistabelle":"Ist-ECTS Anteil", "is_visible":"1", -"format_code":"", +"format_code":"INT_PERCENT", "visible_size":"5", "description_in_ergebnistabelle":"" } diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql index 5fb7283..3639721 100644 --- a/src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql +++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql @@ -38,6 +38,15 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist'; "is_aggregate":"0", "description_der_spalte":"Studiengang" }, +{"uniquename":"dim_studiengang_sicht_kind", +"caption_der_spalte":"Studiengang", +"srcfieldname":"s_tid_stg", +"targetfieldname":"studiengang", +"column_type":"treechildColumn", +"col_function":"Studiengang", +"is_aggregate":"0", +"description_der_spalte":"Studiengang" +}, {"uniquename":"matrikel_nr", "caption_der_spalte":"Matrikelnr./Pseudonym", "srcfieldname":"matrikel_nr", @@ -127,6 +136,33 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist'; "col_function":"", "is_aggregate":"1", "description_der_spalte":"" +}, +{"uniquename":"ects_ist_prep", +"caption_der_spalte":"Ist-ECTS Vorbereitung", +"srcfieldname":"", +"targetfieldname":"ects_ist_prep", +"column_type":"preparingColumn", +"col_function":"ects_ist", +"is_aggregate":"0", +"description_der_spalte":"Vorbereitung für Aggregation max(ects_ist)" +}, +{"uniquename":"ects_ist_max", +"caption_der_spalte":"Max Ist-ECTS", +"srcfieldname":"ects_ist_prep", +"targetfieldname":"ects_ist_max", +"column_type":"processingColumn", +"col_function":"max(ects_ist_prep)", +"is_aggregate":"1", +"description_der_spalte":"Aggregation max(ects_ist)" +}, +{"uniquename":"ects_ist_anteil", +"caption_der_spalte":"Anteil Ist-ECTS", +"srcfieldname":"", +"targetfieldname":"ects_ist_anteil", +"column_type":"computedColumn", +"col_function":"(ects_ist/ects_soll*100)", +"is_aggregate":"1", +"description_der_spalte":"Anteil der Ist-ECTS and den Soll-ECTS" } ]