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

rpta_update.x einrichten, hilfstabelle rpta_exam_unit anlegen und entsprechende Umbenennung von virtueller Tabelle und Dateien

rpta_0.3_Release
Imo John 9 months ago
parent
cc286b5d0b
commit
d33ba56e4c
8 changed files with 194 additions and 25 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. 67
      src-modules/module/rpta/conf/rpta.xml
  2. 46
      src-modules/module/rpta/hilfstabellen/rpta_exam_unit_fuellen.sql
  3. 6
      src-modules/module/rpta/masken/48110_felderinfo.unl
  4. 2
      src-modules/module/rpta/masken/48110_maskeninfo.unl
  5. 65
      src-modules/module/rpta/rpta_update.x
  6. 12
      src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql
  7. 20
      src-modules/module/rpta/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql
  8. 1
      src-modules/module/rpta/schluesseltabellen/rpta_format_code.unl

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

@ -238,7 +238,55 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[RPTA]" />
</indexes> </indexes>
</table> </table>
<table name="rpta_exam_unit">
<columns><column name="matrikel_nr" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="labnr" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="tid_stg" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="sem_der_pruefung" type ="SMALLINT" size ="5" default ="" notnull ="false" />
<column name="note" type ="DOUBLE" size ="17" default ="" notnull ="false" />
<column name="fach_sem_zahl" type ="NUMERIC" size ="(10,2)" default ="" notnull ="false" />
<column name="pstatus" type ="CHAR" size ="10" default ="" notnull ="false" />
<column name="prueck" type ="SMALLINT" size ="5" default ="" notnull ="false" />
<column name="pvermerk" type ="CHAR" size ="10" default ="" notnull ="false" />
<column name="bonus" type ="DOUBLE" size ="17" default ="" notnull ="false" />
<column name="pordnr" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="part" type ="CHAR" size ="10" default ="" notnull ="false" />
<column name="ppflicht" type ="CHAR" size ="10" default ="" notnull ="false" />
<column name="modulart" type ="CHAR" size ="10" default ="" notnull ="false" />
<column name="pktxt" type ="CHAR" size ="255" default ="" notnull ="false" />
<column name="pdtxt" type ="CHAR" size ="255" default ="" notnull ="false" />
<column name="pversuch" type ="INTEGER" size ="10" default ="" notnull ="false" />
<column name="elementnr" type ="VARCHAR" size ="255" default ="" notnull ="false" />
<column name="summe" type ="INTEGER" size ="10" default ="" notnull ="false" />
</columns>
<indexes>
<index name="rpta_exam_unit1" unique="false">
<index-column name="labnr"/>
<index-column name="pordnr"/>
<index-column name="matrikel_nr"/>
</index>
<index name="rpta_exam_unit2" unique="false">
<index-column name="modulart"/>
</index>
<index name="rpta_exam_unit3" unique="false">
<index-column name="sem_der_pruefung"/>
</index>
<index name="rpta_exam_unit4" unique="false">
<index-column name="tid_stg"/>
</index>
<index name="rpta_exam_unit5" unique="false">
<index-column name="part"/>
</index>
</indexes>
<primaryKeys><rs>
</rs></primaryKeys>
<foreignKeys><rs>
</rs></foreignKeys>
<importedKeys><rs>
</rs></importedKeys>
<privileges><rs>
</rs></privileges>
</table>
<views> <views>
@ -380,6 +428,15 @@ parent="Berichtsassistent">Abfragen zur Administration von Berichtsassistent </t
<action error="stop"/> <action error="stop"/>
</install-upgrade-step> </install-upgrade-step>
</install_upgrade_job> </install_upgrade_job>
<!-- ********************* Liste der ETL-Prozesse ************************** -->
<etl>
<etl-step name="Aggregation" type="aggr">
<action>
<nativeaction sql="" scriptfile="$RPTA_PFAD/hilfstabellen/rpta_exam_unit_fuellen.sql" database=""/>
</action>
</etl-step>
</etl>
<install> <install>
<install-step name="Füllen der Modul-Tabellen"> <install-step name="Füllen der Modul-Tabellen">
<action> <action>
@ -404,10 +461,10 @@ scriptfile="" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/studierende_datenblatt_virtuell.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/studierende_datenblatt_virtuell.sql" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/stellen_besetzung_virtuell.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/stellen_besetzung_virtuell.sql" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_nach_ppruef_virtuell.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_nach_ppruef_virtuell.sql" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/lm_exam_unit_dim_studiengang_virtuell.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_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_sgd_pbe_pbv_fuellen.sql" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rptaColLay_lm_exam_unit_dim_studiengang_note_fuellen.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql" database=""/>
</action> </action>
</install-step> </install-step>
</install> </install>
@ -438,10 +495,10 @@ scriptfile="" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/studierende_datenblatt_virtuell.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/studierende_datenblatt_virtuell.sql" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/stellen_besetzung_virtuell.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/stellen_besetzung_virtuell.sql" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_nach_ppruef_virtuell.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/pruefungen_nach_ppruef_virtuell.sql" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/lm_exam_unit_dim_studiengang_virtuell.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_fuellen.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rpta_column_layout_sos_stud_astat_rsz_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_sgd_pbe_pbv_fuellen.sql" database=""/>
<nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rptaColLay_lm_exam_unit_dim_studiengang_note_fuellen.sql" database=""/> <nativeaction sql="" scriptfile="$RPTA_PFAD/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql" database=""/>
</action> </action>
</upgrade-step> </upgrade-step>

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

@ -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
;

6
src-modules/module/rpta/masken/48110_felderinfo.unl
Unescape View File

@ -1,14 +1,14 @@
48110^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<<SQL>>SELECT uniquename,\ 48110^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<<SQL>>SELECT uniquename,\
caption\ caption\
FROM rpta_column_layout \ 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\ order by sortnr, caption\
;^ ^<<SQL>>SELECT uniquename,\ ;^ ^<<SQL>>SELECT uniquename,\
caption\ caption\
FROM rpta_column_layout \ 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'\
) and uniquename='lm_exam_unit_dim_studiengang_note';^ ) and uniquename='rpta_exam_unit_dim_studiengang_note';^
48111^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^ ^<<SQL>> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ 48111^Seit Semester^10^0^0^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^ ^<<SQL>> 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^<<SQL>> select tid,name,sortnr from sichten where art='Fächer-Sicht' order by 3,2;^ ^ ^ 48112^Fächer^30^0^0^130^200^6^char^1000^0^12^<<SQL>> 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^<<SQL>> select apnr, druck from cifx where key=35 order by 2;^ ^ ^ 48113^Abschluss^40^0^0^100^200^3^char^1500^0^1^<<SQL>> select apnr, druck from cifx where key=35 order by 2;^ ^ ^

2
src-modules/module/rpta/masken/48110_maskeninfo.unl
Unescape View File

@ -5,7 +5,7 @@
--Autor D. Quathamer 2024\ --Autor D. Quathamer 2024\
<sqlvars>\ <sqlvars>\
<sqlvar name="basetable" type="hash"><![CDATA[\ <sqlvar name="basetable" type="hash"><![CDATA[\
<#assign my_base_rs='lm_exam_unit_dim_studiengang' />\ <#assign my_base_rs='rpta_exam_unit_dim_studiengang' />\
SELECT distinct name,\ SELECT distinct name,\
0::smallint as is_virtual,\ 0::smallint as is_virtual,\
name as runtime_tablename\ name as runtime_tablename\

65
src-modules/module/rpta/rpta_update.x
Unescape View File

@ -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

12
src-modules/module/rpta/schluesseltabellen/rptaColLay_lm_exam_unit_dim_studiengang_note_fuellen.sql → src-modules/module/rpta/schluesseltabellen/rptaColLay_rpta_exam_unit_dim_studiengang_note_fuellen.sql
Unescape View File

@ -1,16 +1,16 @@
--freemarker template --freemarker template
<#include "RPTA-Makros"/> <#include "RPTA-Makros"/>
<sqlvars> <sqlvars>
<sqlvar name="lm_exam_unit_dim_studiengang_exists"> <sqlvar name="rpta_exam_unit_dim_studiengang_exists">
select count(*) from rpta_resultset where uniquename='lm_exam_unit_dim_studiengang'; select count(*) from rpta_resultset where uniquename='rpta_exam_unit_dim_studiengang';
</sqlvar> </sqlvar>
<sqlvar name="rpta_resultset"> <sqlvar name="rpta_resultset">
select uniquename from rpta_resultset where uniquename='lm_exam_unit_dim_studiengang'; select uniquename from rpta_resultset where uniquename='rpta_exam_unit_dim_studiengang';
</sqlvar> </sqlvar>
</sqlvars> </sqlvars>
<#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", "caption":"Prüfungsergebnisse",
"rpta_resultset":"lm_exam_unit_dim_studiengang", "rpta_resultset":"rpta_exam_unit_dim_studiengang",
"whereclause":"modulart=''P''", "whereclause":"modulart=''P''",
"description":"Prüfung und Noten" "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", "targetfieldname":"pstatus_nb_quote",
"column_type":"computedColumn", "column_type":"computedColumn",
"col_function":"case when summe < 5 then null else pstatus_nb_sum/summe*100 end", "col_function":"case when summe < 5 then null else pstatus_nb_sum/summe*100 end",
"format_code":"", "format_code":"DEC_2",
"caption":"Durchfallquote in % *", "caption":"Durchfallquote in % *",
"is_visible":"1", "is_visible":"1",
"is_aggregate":1, "is_aggregate":1,

20
src-modules/module/rpta/schluesseltabellen/lm_exam_unit_dim_studiengang_virtuell.sql → src-modules/module/rpta/schluesseltabellen/rpta_exam_unit_dim_studiengang_virtuell.sql
Unescape View File

@ -1,18 +1,18 @@
--freemarker template --freemarker template
<sqlvars> <sqlvars>
<sqlvar name="lm_exam_unit_exists"> <sqlvar name="rpta_exam_unit_exists">
select sp_table_exists('lm_exam_unit') from xdummy; select sp_table_exists('rpta_exam_unit') from xdummy;
</sqlvar> </sqlvar>
<sqlvar name="fact_table_source" type="hash"> <sqlvar name="fact_table_source" type="hash">
select name select name
from sx_tables where name ='lm_exam_unit' from sx_tables where name ='rpta_exam_unit'
</sqlvar> </sqlvar>
<sqlvar name="added_tables" type="hashsequence"><![CDATA[ <sqlvar name="added_tables" type="hashsequence"><![CDATA[
select 1::smallint as sortnr, select 1::smallint as sortnr,
name, trim(name) ||'_' as prefix, name, trim(name) ||'_' as prefix,
caption, caption,
'dim_studiengang.tid=lm_exam_unit.tid_stg and lm_exam_unit.sem_der_pruefung >= 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') from sx_tables where name in ('dim_studiengang')
]]></sqlvar> ]]></sqlvar>
@ -37,12 +37,12 @@ select tid, table_name,
</sqlvar> </sqlvar>
</sqlvars> </sqlvars>
<#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( CREATE temp table tmp_tables(
@ -82,11 +82,11 @@ foreignkey_uniquename VARCHAR(255)
update sx_fields set update sx_fields set
is_sum=0 is_sum=0
where table_name='lm_exam_unit' where table_name='rpta_exam_unit'
and name!='summe'; and name!='summe';
update sx_fields set update sx_fields set
is_sum=1 is_sum=1
where table_name='lm_exam_unit' where table_name='rpta_exam_unit'
and name='summe'; and name='summe';
@ -381,4 +381,4 @@ T.custom
drop table tmp_rpta_column; drop table tmp_rpta_column;
drop table tmp_rc1; drop table tmp_rc1;
</#if> --wenn lm_exam_unit_exists=1 </#if> --wenn rpta_exam_unit_exists=1

1
src-modules/module/rpta/schluesseltabellen/rpta_format_code.unl
Unescape View File

@ -1,3 +1,4 @@
1^INTEGER^Ganzzahlig^::integer^ 1^INTEGER^Ganzzahlig^::integer^
2^INT_NO_SEP^Ganzzahlig ohne 1000er Trenner^::varchar^ 2^INT_NO_SEP^Ganzzahlig ohne 1000er Trenner^::varchar^
3^INT_PERCENT^Ganzzahlig %^::integer || ' %'^ 3^INT_PERCENT^Ganzzahlig %^::integer || ' %'^
4^DEC_2^Dezimal mit 2 Nachkommastellen^::decimal(18,2)^

Write Preview
Loading…
Cancel
Save