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

ects-Spaltenlayout auf max(ects_soll) und max(ects_ist)

master
Imo John 1 week ago
parent
a7f0673726
commit
8b020e8010
8 changed files with 91 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src-modules/module/rpta/conf/rpta.xml
  2. 20
      src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql
  3. 18
      src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql
  4. 36
      src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste.sql
  5. 28
      src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste_diagnose.sql
  6. 2
      src-modules/module/rpta/schluesseltabellen/rpta_column_rpta_lm_ects_soll_ist_fuellen.sql
  7. 3
      src-modules/module/rpta/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql
  8. 4
      src-modules/module/rpta/schluesseltabellen/sx_repository.unl

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

@ -717,7 +717,6 @@ gueltig_bis DATE
<!--<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_rpta_exam_unit_dim_studiengang_exam_written.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/rpta_column_layout_cob_busa_aggr_stamm_kost_fuellen.sql" database="" /> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_cob_busa_aggr_stamm_kost_fuellen.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/macro_masken_bez_fuellen.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> </action>
</install-step> </install-step>
</install> </install>
@ -825,7 +824,6 @@ gueltig_bis DATE
<!--<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_rpta_exam_unit_dim_studiengang_exam_written.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/rpta_column_layout_cob_busa_aggr_stamm_kost_fuellen.sql" database="" /> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_cob_busa_aggr_stamm_kost_fuellen.sql" database="" />
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/macro_masken_bez_fuellen.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> </action>
</upgrade-step> </upgrade-step>
</upgrade> </upgrade>

20
src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_matrikelnummer_sicht.sql
Unescape View File

@ -57,15 +57,29 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
"visible_size":"5", "visible_size":"5",
"description_in_ergebnistabelle":"" "description_in_ergebnistabelle":""
}, },
{"uniquename":"ects_soll", {"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", "caption_in_ergebnistabelle":"Soll-ECTS",
"is_visible":"1", "is_visible":"1",
"format_code":"", "format_code":"",
"visible_size":"5", "visible_size":"5",
"description_in_ergebnistabelle":"" "description_in_ergebnistabelle":""
}, },
{"uniquename":"ects_ist", {"uniquename":"ects_ist_prep",
"caption_in_ergebnistabelle":"Ist-ECTS", "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", "is_visible":"1",
"format_code":"", "format_code":"",
"visible_size":"5", "visible_size":"5",

18
src-modules/module/rpta/schluesseltabellen/rpta_column_layout_lm_ects_soll_ist_sicht.sql
Unescape View File

@ -50,14 +50,28 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
"visible_size":"5", "visible_size":"5",
"description_in_ergebnistabelle":"" "description_in_ergebnistabelle":""
}, },
{"uniquename":"ects_soll", {"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", "caption_in_ergebnistabelle":"Soll-ECTS",
"is_visible":"1", "is_visible":"1",
"format_code":"", "format_code":"",
"visible_size":"5", "visible_size":"5",
"description_in_ergebnistabelle":"" "description_in_ergebnistabelle":""
}, },
{"uniquename":"ects_ist", {"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", "caption_in_ergebnistabelle":"Ist-ECTS gesamt",
"is_visible":"1", "is_visible":"1",
"format_code":"", "format_code":"",

36
src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste.sql
Unescape View File

@ -13,7 +13,7 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
and ((fach_sem_zahl_max_student = 3 and ects_ist >= 40) and ((fach_sem_zahl_max_student = 3 and ects_ist >= 40)
or (fach_sem_zahl_max_student = 4 and ects_ist >= 60))", or (fach_sem_zahl_max_student = 4 and ects_ist >= 60))",
"description":"", "description":"",
"sortclause":"ects_ist/ects_soll desc,note_elementnr_30,note_pnr_30" "sortclause":"ects_ist_max/ects_soll_max desc,note_elementnr_30,note_pnr_30"
} }
/> />
@ -40,15 +40,43 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
"visible_size":"5", "visible_size":"5",
"description_in_ergebnistabelle":"" "description_in_ergebnistabelle":""
}, },
{"uniquename":"ects_soll", {"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":"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", "caption_in_ergebnistabelle":"Soll-ECTS",
"is_visible":"1", "is_visible":"1",
"format_code":"", "format_code":"",
"visible_size":"5", "visible_size":"5",
"description_in_ergebnistabelle":"" "description_in_ergebnistabelle":""
}, },
{"uniquename":"ects_ist", {"uniquename":"ects_ist_prep",
"caption_in_ergebnistabelle":"Ist-ECTS", "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", "is_visible":"1",
"format_code":"", "format_code":"",
"visible_size":"5", "visible_size":"5",

28
src-modules/module/rpta/schluesseltabellen/rpta_column_layout_studienstiftung_rangliste_diagnose.sql
Unescape View File

@ -13,7 +13,7 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
and ((fach_sem_zahl_max_student = 3 and ects_ist >= 40) and ((fach_sem_zahl_max_student = 3 and ects_ist >= 40)
or (fach_sem_zahl_max_student = 4 and ects_ist >= 60))", or (fach_sem_zahl_max_student = 4 and ects_ist >= 60))",
"description":"", "description":"",
"sortclause":"ects_ist/ects_soll desc,note_elementnr_30,note_pnr_30" "sortclause":"ects_ist_max/ects_soll_max desc,note_elementnr_30,note_pnr_30"
} }
/> />
@ -40,22 +40,29 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
"visible_size":"5", "visible_size":"5",
"description_in_ergebnistabelle":"" "description_in_ergebnistabelle":""
}, },
{"uniquename":"ects_soll", {"uniquename":"ects_soll_prep",
"caption_in_ergebnistabelle":"Soll-ECTS", "caption_in_ergebnistabelle":"Soll-ECTS",
"is_visible":"1", "is_visible":"0",
"format_code":"", "format_code":"",
"visible_size":"5", "visible_size":"5",
"description_in_ergebnistabelle":"" "description_in_ergebnistabelle":""
}, },
{"uniquename":"ects_ist", {"uniquename":"ects_soll_max",
"caption_in_ergebnistabelle":"Ist-ECTS", "caption_in_ergebnistabelle":"Soll-ECTS",
"is_visible":"1", "is_visible":"1",
"format_code":"", "format_code":"",
"visible_size":"5", "visible_size":"5",
"description_in_ergebnistabelle":"" "description_in_ergebnistabelle":""
}, },
{"uniquename":"dim_studiengang_abschluss", {"uniquename":"ects_ist_prep",
"caption_in_ergebnistabelle":"Abschluss", "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", "is_visible":"1",
"format_code":"", "format_code":"",
"visible_size":"5", "visible_size":"5",
@ -68,6 +75,13 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
"visible_size":"5", "visible_size":"5",
"description_in_ergebnistabelle":"" "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", {"uniquename":"dim_studiengang_pversion_uniquename",
"caption_in_ergebnistabelle":"PO-Version", "caption_in_ergebnistabelle":"PO-Version",
"is_visible":"1", "is_visible":"1",

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

@ -160,7 +160,7 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist';
"srcfieldname":"", "srcfieldname":"",
"targetfieldname":"ects_ist_anteil", "targetfieldname":"ects_ist_anteil",
"column_type":"computedColumn", "column_type":"computedColumn",
"col_function":"(ects_ist/ects_soll*100)", "col_function":"(ects_ist_max/ects_soll_max*100)",
"is_aggregate":"1", "is_aggregate":"1",
"description_der_spalte":"Anteil der Ist-ECTS and den Soll-ECTS" "description_der_spalte":"Anteil der Ist-ECTS and den Soll-ECTS"
}, },

3
src-modules/module/rpta/schluesseltabellen/rpta_lm_ects_soll_ist_virtuell.sql
Unescape View File

@ -23,6 +23,7 @@ select tid, table_name,
name as targetname name as targetname
from sx_fields where table_name ='${fact_table_source}' from sx_fields where table_name ='${fact_table_source}'
and currentlyused=1 and currentlyused=1
and name not like '%_gew' --keine Lehrverflechtung, wird nur fürs MKW NRW genutzt
<#foreach added_table in added_tables> <#foreach added_table in added_tables>
union union
select tid,table_name, select tid,table_name,
@ -217,7 +218,7 @@ joinclause='${fact_table_source}
<#foreach added_table in added_tables> <#foreach added_table in added_tables>
left outer join ${added_table.name} on (${added_table.joinclause}) left outer join ${added_table.name} on (${added_table.joinclause})
</#foreach>', </#foreach>',
whereclause=''; whereclause='(lehr_eigen=lehr_dienst or (lehr_eigen is null and lehr_dienst is null)) and aktiv=1';
select * into temp tmp_rs1 select * into temp tmp_rs1
from rpta_resultset from rpta_resultset

4
src-modules/module/rpta/schluesseltabellen/sx_repository.unl
Unescape View File

@ -1,2 +1,2 @@
1^RPTA_SOS_Notenkonto^part in (select apnr from cifx where key=9013 and hiskey_id='3' and druck='Konto')^Konto mit Gesamtnote^Filter für Konto zur Ermittlung der Gesamtnote^^RPTA_LEISTUNG_FILTER^^^331^1^0^0^^1^01.01.1900^31.12.3000^ 1^RPTA_SOS_Notenkonto^part in (select apnr from cifx where key=9013 and hiskey_id='3' and druck='Konto')^Konto mit Gesamtnote^Filter für Konto zur Ermittlung der Gesamtnote^^RPTA_LEISTUNG_FILTER^^^330^1^0^0^^1^01.01.1900^31.12.3000^
2^RPTA_LM_Notenkonto^part in (select apnr from cifx where key=9013 and hiskey_id='3' and druck='Konto')^Konto mit Gesamtnote^Filter für Konto zur Ermittlung der Gesamtnote^^RPTA_LEISTUNG_FILTER^^^331^1^0^0^^1^01.01.1900^31.12.3000^ 2^RPTA_LM_Notenkonto^part in (select apnr from cifx where key=9013 and hiskey_id='3' and druck='Konto')^Konto mit Gesamtnote^Filter für Konto zur Ermittlung der Gesamtnote^^RPTA_LEISTUNG_FILTER^^^330^1^0^0^^1^01.01.1900^31.12.3000^

Write Preview
Loading…
Cancel
Save