diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml
index c50c8b1..291c6c6 100644
--- a/src-modules/module/rpta/conf/rpta.xml
+++ b/src-modules/module/rpta/conf/rpta.xml
@@ -716,6 +716,8 @@ gueltig_bis DATE
+
+
@@ -823,6 +825,8 @@ gueltig_bis DATE
+
+
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste.sql
index 0272fe6..1977f53 100644
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste.sql
+++ b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste.sql
@@ -9,11 +9,10 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
"caption":"Studienstiftung Rangliste",
"rpta_resultset":"rpta_lm_ects_soll_ist",
"whereclause":"1=1
- -- and (lehr_eigen=lehr_dienst or (lehr_eigen is null and lehr_dienst is null)) and aktiv=1
and ((fach_sem_zahl_max_student = 3 and ects_ist >= 40)
or (fach_sem_zahl_max_student = 4 and ects_ist >= 60))",
"description":"",
-"sortclause":"ects_ist_max/ects_soll_max desc,note_elementnr_30,note_pnr_30"
+"sortclause":"ects_ist/ects_soll desc,note_elementnr_30,note_pnr_30"
}
/>
diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste_diagnose.sql b/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste_diagnose.sql
deleted file mode 100644
index 09b9748..0000000
--- a/src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste_diagnose.sql
+++ /dev/null
@@ -1,108 +0,0 @@
---freemarker template
-<#include "RPTA-Makros"/>
-
-
-select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
-
-
-<#assign rpta_column_layout = {"uniquename":"rpta_lm_ects_soll_ist_studienstiftung_rangliste_diagnose",
-"caption":"Studienstiftung Rangliste (Diagnose)",
-"rpta_resultset":"rpta_lm_ects_soll_ist",
-"whereclause":"1=1
- -- and (lehr_eigen=lehr_dienst or (lehr_eigen is null and lehr_dienst is null)) and aktiv=1
- and ((fach_sem_zahl_max_student = 3 and ects_ist >= 40)
- or (fach_sem_zahl_max_student = 4 and ects_ist >= 60))",
-"description":"",
-"sortclause":"ects_ist_max/ects_soll_max desc,note_elementnr_30,note_pnr_30"
-}
- />
-
-<#assign rpta_columns = [
-
-{"uniquename":"matrikel_nr",
-"caption_in_ergebnistabelle":"Matrikelnummer",
-"is_visible":"1",
-"format_code":"INT_NO_SEP",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-},
-{"uniquename":"surname",
-"caption_in_ergebnistabelle":"Nachname",
-"is_visible":"1",
-"format_code":"",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-},
-{"uniquename":"fach_sem_zahl_max_student",
-"caption_in_ergebnistabelle":"Fachsemester",
-"is_visible":"1",
-"format_code":"",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-},
-{"uniquename":"ects_soll_prep",
-"caption_in_ergebnistabelle":"Soll-ECTS",
-"is_visible":"0",
-"format_code":"",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-},
-{"uniquename":"ects_soll_max",
-"caption_in_ergebnistabelle":"Soll-ECTS",
-"is_visible":"1",
-"format_code":"",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-},
-{"uniquename":"ects_ist_prep",
-"caption_in_ergebnistabelle":"Ist-ECTS gesamt",
-"is_visible":"0",
-"format_code":"",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-},
-{"uniquename":"ects_ist_max",
-"caption_in_ergebnistabelle":"Ist-ECTS gesamt",
-"is_visible":"1",
-"format_code":"",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-},
-{"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":"dim_studiengang_pversion_uniquename",
-"caption_in_ergebnistabelle":"PO-Version",
-"is_visible":"1",
-"format_code":"",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-},
-{"uniquename":"note_elementnr_30",
-"caption_in_ergebnistabelle":"Note (EXA)",
-"is_visible":"1",
-"format_code":"",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-},
-{"uniquename":"note_pnr_30",
-"caption_in_ergebnistabelle":"Note (POS)",
-"is_visible":"1",
-"format_code":"",
-"visible_size":"5",
-"description_in_ergebnistabelle":""
-}
-]
- />
-<@rpta_column2layout_fuellen />