diff --git a/src-modules/module/rpta/conf/rpta.xml b/src-modules/module/rpta/conf/rpta.xml index 54c2723..9e302a6 100644 --- a/src-modules/module/rpta/conf/rpta.xml +++ b/src-modules/module/rpta/conf/rpta.xml @@ -519,6 +519,35 @@ + + + + + + + + + + + @@ -597,6 +626,25 @@ version integer default 1 ) ;" scriptfile="" database="" /> + @@ -607,12 +655,16 @@ + + + + @@ -679,6 +731,25 @@ comment char(200) , version integer default 1 ) ;" scriptfile="" database="" /> + @@ -690,12 +761,16 @@ + + + + @@ -757,6 +832,7 @@ + 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 c0c6281..544110c 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 @@ -173,7 +173,7 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist'; where tmp_rpta_lm_ects_soll_ist.matrikel_nr=E.matrikel_nr and tmp_rpta_lm_ects_soll_ist.dim_studiengang_abschluss=E.ch35_ang_abschluss and tmp_rpta_lm_ects_soll_ist.dim_studiengang_stg=E.ch30_fach - and ${'${'}LM_Notenkonto}", + and ${'${'}RPTA_LM_Notenkonto}", "is_aggregate":0, "description_der_spalte":""}, @@ -186,7 +186,7 @@ select count(*) from rpta_resultset where uniquename='rpta_lm_ects_soll_ist'; where tmp_rpta_lm_ects_soll_ist.matrikel_nr=E.matrikel_nr and tmp_rpta_lm_ects_soll_ist.dim_studiengang_abschluss=E.ch35_ang_abschluss and tmp_rpta_lm_ects_soll_ist.dim_studiengang_stg=E.ch30_fach - and ${'${'}SOS_Notenkonto}", + and ${'${'}RPTA_SOS_Notenkonto}", "is_aggregate":0, "description_der_spalte":""}, diff --git a/src-modules/module/rpta/schluesseltabellen/sx_repository.unl b/src-modules/module/rpta/schluesseltabellen/sx_repository.unl new file mode 100644 index 0000000..0cffe3c --- /dev/null +++ b/src-modules/module/rpta/schluesseltabellen/sx_repository.unl @@ -0,0 +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^ +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^ diff --git a/src-modules/module/rpta/schluesseltabellen/sx_repository_fuellen.sql b/src-modules/module/rpta/schluesseltabellen/sx_repository_fuellen.sql index be93320..01c1409 100644 --- a/src-modules/module/rpta/schluesseltabellen/sx_repository_fuellen.sql +++ b/src-modules/module/rpta/schluesseltabellen/sx_repository_fuellen.sql @@ -1,3 +1,57 @@ +--freemarker template + +<#if SQLdialect='Postgres'> +select sp_update_sequence('sx_repository'); +select sp_update_sequence('tmp_repository'); + + +delete from tmp_repository where id in (select id from sx_repository); + +insert into sx_repository +( + id, + content, + caption, + comment, + version, + art, + art2, + art3, + sachgebiete_id, + sort1, + sort2, + sort3, + geaendert_am, + aktiv, + gueltig_seit, + gueltig_bis +) + +SELECT + id, + content, + caption, + comment, + version, + art, + art2, + art3, + sachgebiete_id, + sort1, + sort2, + sort3, + geaendert_am, + aktiv, + gueltig_seit, + gueltig_bis +FROM tmp_repository; + +<#if SQLdialect='Postgres'> +select sp_update_sequence('sx_repository'); + + +drop table tmp_repository; + INSERT INTO sx_repository (id, content, caption, comment, art, sachgebiete_id, sort1, sort2, sort3, aktiv) SELECT diff --git a/src-modules/module/rpta/schluesseltabellen/sx_repository_fuellen.x b/src-modules/module/rpta/schluesseltabellen/sx_repository_fuellen.x new file mode 100755 index 0000000..0741d02 --- /dev/null +++ b/src-modules/module/rpta/schluesseltabellen/sx_repository_fuellen.x @@ -0,0 +1,28 @@ +#!/bin/bash + + +DOQUERY "create table tmp_repository( + tid SERIAL not null, +id CHAR(200) not null, +content TEXT , +caption CHAR(200) , +comment TEXT , +version SMALLINT , +art CHAR(200) , +art2 CHAR(200) , +art3 CHAR(200) , +sachgebiete_id INTEGER , +sort1 INTEGER , +sort2 INTEGER , +sort3 INTEGER , +geaendert_am DATE , +aktiv smallint , +gueltig_seit DATE , +gueltig_bis DATE +);" + +sx_auto_upload_table.x tmp_repository $SOS_PFAD/schluesseltabellen/sx_repository.unl + +DOSQL $SOS_PFAD/schluesseltabellen/sx_repository_fuellen.sql + + diff --git a/src-modules/module/rpta/schluesseltabellen/sx_repository_loeschen.sql b/src-modules/module/rpta/schluesseltabellen/sx_repository_loeschen.sql new file mode 100644 index 0000000..c5679ad --- /dev/null +++ b/src-modules/module/rpta/schluesseltabellen/sx_repository_loeschen.sql @@ -0,0 +1,2 @@ +delete from sx_repository where sachgebiete_id in (331); +