diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml index 5691ab5..2ca1fbf 100644 --- a/src-modules/module/rpta/conf/rpta.xml +++ b/src-modules/module/rpta/conf/rpta.xml @@ -238,7 +238,55 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[RPTA]" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -380,6 +428,15 @@ parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent + + + + + + + + + @@ -404,10 +461,10 @@ scriptfile="" database=""/> - + - + @@ -438,10 +495,10 @@ scriptfile="" database=""/> - + - + diff --git a/src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql b/src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql new file mode 100644 index 0000000..affd5d9 --- /dev/null +++ b/src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql @@ -0,0 +1,46 @@ +insert into rpta_exam_unit +SELECT + matrikel_nr, + labnr, + tid_stg, + sem_der_pruefung, + note, + fach_sem_zahl, + pstatus, + prueck, + pvermerk, + bonus, + pordnr, + part, + ppflicht, + modulart, + pktxt, + pdtxt, + pversuch, + elementnr, + summe +FROM lm_exam_unit + +UNION SELECT + matrikel_nr, + labnr, + tid_stg, + sem_der_pruefung, + note, + fach_sem_zahl, + pstatus, + prueck, + pvermerk, + bonus, + pordnr, + part, + ppflicht, + modulart, + pktxt, + pdtxt, + pversuch, + pnr::varchar(255) as elementnr, + summe +FROM sos_lab_pord +WHERE sourcesystem = 5 +; diff --git a/src-modules/module/rpta/masken/48110_felderinfo.unl b/src-modules/module/rpta/masken/48110_felderinfo.unl index ff1fb31..2f66733 100644 --- a/src-modules/module/rpta/masken/48110_felderinfo.unl +++ b/src-modules/module/rpta/masken/48110_felderinfo.unl @@ -1,14 +1,14 @@ 48110^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>SELECT uniquename,\ caption\ FROM rpta_column_layout \ -where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='lm_exam_unit_dim_studiengang'\ +where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rpta_exam_unit_dim_studiengang'\ )\ order by sortnr, caption\ ;^ ^<>SELECT uniquename,\ caption\ FROM rpta_column_layout \ -where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='lm_exam_unit_dim_studiengang'\ -) and uniquename='lm_exam_unit_dim_studiengang_note';^ +where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rpta_exam_unit_dim_studiengang'\ +) and uniquename='rpta_exam_unit_dim_studiengang_note';^ 48111^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<> select tid, eintrag from semester order by tid DESC;^ ^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ 48112^Fächer^30^0^0^130^200^6^char^1000^0^12^<> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^ 48113^Abschluss^40^0^0^100^200^3^char^1500^0^1^<> select apnr, druck from cifx where key=35 order by 2;^ ^ ^ diff --git a/src-modules/module/rpta/masken/48110_maskeninfo.unl b/src-modules/module/rpta/masken/48110_maskeninfo.unl index 3d2bdcc..dbd6ff9 100644 --- a/src-modules/module/rpta/masken/48110_maskeninfo.unl +++ b/src-modules/module/rpta/masken/48110_maskeninfo.unl @@ -5,7 +5,7 @@ --Autor D. Quathamer 2024\ \ \ +<#assign my_base_rs='rpta_exam_unit_dim_studiengang' />\ SELECT distinct name,\ 0::smallint as is_virtual,\ name as runtime_tablename\ diff --git a/src-modules/module/rpta/rpta_update.x b/src-modules/module/rpta/rpta_update.x new file mode 100644 index 0000000..9d2874c --- /dev/null +++ b/src-modules/module/rpta/rpta_update.x @@ -0,0 +1,65 @@ +#!/bin/bash + +#Arbeitsverzeichnis fuer crontab +PFAD=$2 +if [ "$PFAD" != "" ] +then + +cd $PFAD + +fi +#Umgebung einlesen: +if [ "$RPTA_PFAD" = "" ] +then +echo "ACHTUNG: Die Umgebungsvariable RPTA_PFAD ist nicht gesetzt. Bitte prüfen Sie $SUPERX_DIR/db/bin/SQL_ENV" + +exit 1 + +fi +if [ "$RPTA_ERRORMAIL" != "" ] +then +ERRORMAIL=$RPTA_ERRORMAIL +export ERRORMAIL +fi +if [ "$RPTA_LOGMAIL" != "" ] +then +LOGMAIL=$RPTA_LOGMAIL +export LOGMAIL +fi +if [ "$RPTA_BACKUP" != "" ] +then +MODULE_BACKUP=$RPTA_BACKUP +export MODULE_BACKUP +fi + +#hier geht es los +#runAndCheck.x path command (EXIT_ON_ERROR|CONT_ON_ERROR) (SEND_ERRORMAIL|NO_ERRORMAIL) (SEND_LOGMAIL|NO_LOGMAIL) [description] " +echo "rpta-Update startet" >$RPTA_ERRORDAT +#Tagesdatum für Systeminfo +date +'%d.%m.%Y' > $RPTA_LOAD_PFAD/superx.datum + +runAndCheck.x $RPTA_PFAD "module_etl.x rpta $RPTA_PFAD $RPTA_LOAD_PFAD" EXIT_ON_ERROR SEND_ERRORMAIL SEND_LOGMAIL "RPTA update$MANDANTID" +cat $RPTA_PFAD/L_RPTA_update$MANDANTID.log >>$RPTA_ERRORDAT + + +fgrep -s "not found" $RPTA_ERRORDAT +FLAG1=$? +fgrep -i -s "error" $RPTA_ERRORDAT +FLAG2=$? +fgrep -i -s "nicht gefunden" $RPTA_ERRORDAT +FLAG3=$? +if [ $FLAG1 -eq 0 -o $FLAG2 -eq 0 -o $FLAG3 -eq 0 ] +then + echo "Fehler beim RPTA-Update " + echo "---------------------------------------" + echo "Fehlerprotokoll in $RPTA_ERRORDAT" + echo "---------------------------------------" + cp $RPTA_LOAD_PFAD/superx.datum.alt $RPTA_LOAD_PFAD/superx.datum +else + echo "RPTA-Update erfolgreich" +fi + +echo "---------------------------Beginn Prüfroutine-----------------------------------" >>$RPTA_ERRORDAT +#cat $RPTA_PFAD/L_rpta_Test$MANDANTID.log >>$RPTA_ERRORDAT +pruefmail.x $RPTA_PFAD/L_rpta_Test$MANDANTID.log $ERRORMAIL + diff --git a/src-modules/module/rpta/schluesseltabellen/rptaColLay_lm_exam_unit_dim_studiengang_note_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql similarity index 95% rename from src-modules/module/rpta/schluesseltabellen/rptaColLay_lm_exam_unit_dim_studiengang_note_fuellen.sql rename to src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql index bc777dd..afd2138 100644 --- a/src-modules/module/rpta/schluesseltabellen/rptaColLay_lm_exam_unit_dim_studiengang_note_fuellen.sql +++ b/src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql @@ -1,16 +1,16 @@ --freemarker template <#include "RPTA-Makros"/> - -select count(*) from rpta_resultset where uniquename='lm_exam_unit_dim_studiengang'; + +select count(*) from rpta_resultset where uniquename='rpta_exam_unit_dim_studiengang'; -select uniquename from rpta_resultset where uniquename='lm_exam_unit_dim_studiengang'; +select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studiengang'; -<#assign rpta_column_layouts = [{"uniquename":"lm_exam_unit_dim_studiengang_note", +<#assign rpta_column_layouts = [{"uniquename":"rpta_exam_unit_dim_studiengang_note", "caption":"Prüfungsergebnisse", -"rpta_resultset":"lm_exam_unit_dim_studiengang", +"rpta_resultset":"rpta_exam_unit_dim_studiengang", "whereclause":"modulart=''P''", "description":"Prüfung und Noten" }] @@ -104,7 +104,7 @@ select uniquename from rpta_resultset where uniquename='lm_exam_unit_dim_studien "targetfieldname":"pstatus_nb_quote", "column_type":"computedColumn", "col_function":"case when summe < 5 then null else pstatus_nb_sum/summe*100 end", -"format_code":"", +"format_code":"DEC_2", "caption":"Durchfallquote in % *", "is_visible":"1", "is_aggregate":1, diff --git a/src-modules/module/rpta/schluesseltabellen/lm_exam_unit_dim_studiengang_virtuell.sql b/src-modules/module/rpta/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql similarity index 93% rename from src-modules/module/rpta/schluesseltabellen/lm_exam_unit_dim_studiengang_virtuell.sql rename to src-modules/module/rpta/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql index 8f56eac..24567cf 100644 --- a/src-modules/module/rpta/schluesseltabellen/lm_exam_unit_dim_studiengang_virtuell.sql +++ b/src-modules/module/rpta/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql @@ -1,18 +1,18 @@ --freemarker template - -select sp_table_exists('lm_exam_unit') from xdummy; + +select sp_table_exists('rpta_exam_unit') from xdummy; select name - from sx_tables where name ='lm_exam_unit' + from sx_tables where name ='rpta_exam_unit' = semester_von and lm_exam_unit.sem_der_pruefung <= semester_bis' as joinclause +'dim_studiengang.tid=rpta_exam_unit.tid_stg and rpta_exam_unit.sem_der_pruefung >= semester_von and rpta_exam_unit.sem_der_pruefung <= semester_bis' as joinclause from sx_tables where name in ('dim_studiengang') ]]> @@ -37,12 +37,12 @@ select tid, table_name, -<#if lm_exam_unit_exists==1> +<#if rpta_exam_unit_exists==1> -<#assign fact_table_target = {"name":"lm_exam_unit_dim_studiengang", "caption":"Einzelprüfungen und Studiengänge"} +<#assign fact_table_target = {"name":"rpta_exam_unit_dim_studiengang", "caption":"Einzelprüfungen und Studiengänge"} /> -drop index if exists ix_lm_exam_unit_is_modul; +drop index if exists ix_rpta_exam_unit_is_modul; CREATE temp table tmp_tables( @@ -82,11 +82,11 @@ foreignkey_uniquename VARCHAR(255) update sx_fields set is_sum=0 - where table_name='lm_exam_unit' + where table_name='rpta_exam_unit' and name!='summe'; update sx_fields set is_sum=1 - where table_name='lm_exam_unit' + where table_name='rpta_exam_unit' and name='summe'; @@ -381,4 +381,4 @@ T.custom drop table tmp_rpta_column; drop table tmp_rc1; - --wenn lm_exam_unit_exists=1 + --wenn rpta_exam_unit_exists=1 diff --git a/src-modules/module/rpta/schluesseltabellen/rpta_format_code.unl b/src-modules/module/rpta/schluesseltabellen/rpta_format_code.unl index 7f73700..71008f7 100644 --- a/src-modules/module/rpta/schluesseltabellen/rpta_format_code.unl +++ b/src-modules/module/rpta/schluesseltabellen/rpta_format_code.unl @@ -1,3 +1,4 @@ 1^INTEGER^Ganzzahlig^::integer^ 2^INT_NO_SEP^Ganzzahlig ohne 1000er Trenner^::varchar^ 3^INT_PERCENT^Ganzzahlig %^::integer || ' %'^ +4^DEC_2^Dezimal mit 2 Nachkommastellen^::decimal(18,2)^