From 57549ac6b58b48ccfe905b6dfeb3c9772f07718b Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Wed, 18 Jan 2023 08:53:48 +0100 Subject: [PATCH] =?UTF-8?q?Datenbl=C3=A4tter=20Bugfix=20Filter=20auf=20Fac?= =?UTF-8?q?h=20#3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/costage/hilfstabellen/vacuum_pg.sql | 1 + .../module/costage/masken/43040_maskeninfo.unl | 2 +- .../module/costage/masken/43080_felderinfo.unl | 6 +++--- .../module/costage/masken/43080_maskeninfo.unl | 16 ++++++++-------- .../costage/rohdaten_sos/sos_costage_unload.xml | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src-modules/module/costage/hilfstabellen/vacuum_pg.sql b/src-modules/module/costage/hilfstabellen/vacuum_pg.sql index 262255b..9718ca9 100644 --- a/src-modules/module/costage/hilfstabellen/vacuum_pg.sql +++ b/src-modules/module/costage/hilfstabellen/vacuum_pg.sql @@ -7,3 +7,4 @@ vacuum costage_st_studierendenstammdaten; vacuum costage_st_studiengaenge; vacuum costage_st_studien_aggr; vacuum costage_st_pruef_aggr; +vacuum costage_bw_antr_aggr; diff --git a/src-modules/module/costage/masken/43040_maskeninfo.unl b/src-modules/module/costage/masken/43040_maskeninfo.unl index 1514301..3dcd0f6 100644 --- a/src-modules/module/costage/masken/43040_maskeninfo.unl +++ b/src-modules/module/costage/masken/43040_maskeninfo.unl @@ -70,7 +70,7 @@ SELECT name,\ /* AND fachsemester <= <> */\ /* and statustyp in(<>) */\ /* and costage_st_studien_aggr.st_studiengang_nr in (select G.st_studiengang_nr from costage_st_studiengaenge G where G.abschluss in (<>)) */\ -/* and costage_st_studien_aggr.st_studiengang_nr in (select G.st_studiengang_nr from costage_st_studiengaenge G where G.stg in (<>)) */\ +/* and costage_st_studien_aggr.st_studiengang_nr in (select G.st_studiengang_nr from costage_st_studiengaenge G where G.skz_key in (<>)) */\ /* and studiengang_nr =<> */\ /* and fach_nr =<> */\ /* and costage_st_studien_aggr.st_studstamm_nr in (select S.st_studstamm_nr from costage_st_studierendenstammdaten S where S.st_land1_nr in (<>) ) */\ diff --git a/src-modules/module/costage/masken/43080_felderinfo.unl b/src-modules/module/costage/masken/43080_felderinfo.unl index acbb48c..f9f86ea 100644 --- a/src-modules/module/costage/masken/43080_felderinfo.unl +++ b/src-modules/module/costage/masken/43080_felderinfo.unl @@ -7,10 +7,10 @@ order by 1^ ^^ 43081^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<> select semester_tid, semester_bezeichnung from costage_st_semester order by 1 DESC;^ ^<> select semester_tid, semester_bezeichnung from costage_st_semester where today()-365 between date(semester_anfang) and date(semester_ende);^ 43083^Staatsangehörigkeit^36^0^0^130^150^10^sql^30^0^1^<> SELECT st_land_nr, name from costage_st_laender order by 2;^^^ 43084^Prüfungsstatus^14^350^-1^140^180^1^char^30^0^1^<> select apnr,druck from cifx where key=622 order by 2^^ ^ -43085^Auswertungsebene Prüfungen^25^330^-1^130^150^1^char^4^0^1^<> select 'G','Gesamtabschluss' from xdummy\ +43085^Auswertungsebene Prüfungen^25^330^-1^130^150^1^char^4^1^1^<> select 'G','Gesamtabschluss' from xdummy\ union select 'F','Absolvent*innenfachfälle' from xdummy\ union select 'T','Teilstudienabschluss' from xdummy\ -order by 1;^^ ^ +order by 1;^^<> select 'T','Teilstudienabschluss' from xdummy;^ 43086^Weitere Tabellen^123^0^0^140^140^10^char^30^0^1^<> \ --freemarker template\ select name,string_not_null(caption) || ' - ' || name from sx_tables where name in ('costage_st_studierendenstammdaten','costage_st_studiengaenge')\ @@ -61,7 +61,7 @@ order by 2;^ ^<> select distinct K.unikey,K.unikey\ from costage_st_studienkennzahlen K, hochschulinfo H\ where K.unikey=H.hs_nr::char(10)^ 43100^##line##^10^0^0^100^100^1^char^5000^0^8^^^1^ -43101^Abschluss^7^0^0^140^170^5^char^30^0^1^<> SELECT \ +43101^Abschluss^7^0^0^140^170^20^char^30^0^1^<> SELECT \ code,\ name\ FROM costage_st_abschlussziele_lokal\ diff --git a/src-modules/module/costage/masken/43080_maskeninfo.unl b/src-modules/module/costage/masken/43080_maskeninfo.unl index 2b55d19..891d500 100644 --- a/src-modules/module/costage/masken/43080_maskeninfo.unl +++ b/src-modules/module/costage/masken/43080_maskeninfo.unl @@ -91,30 +91,30 @@ SELECT name,\ \ <#assign fach_filter="1=1" />\ --Default: TSG\ -/* <#assign fach_filter="costage_st_pruef_aggr.st_studiengang_nr in (select G.st_studiengang_nr from costage_st_studiengaenge G where G.stg in (<>)) "/> \ +/* <#assign fach_filter="costage_st_pruef_aggr.st_studiengang_nr in (select G.st_studiengang_nr from costage_st_studiengaenge G where G.skz_key in (<>)) "/> \ */\ \ \ \ <#assign ldt_filter="1=1" />\ -/*<#if <>=="G">\ +<#if <>=="G">\ <#assign ldt_filter="leistungsdetailtyp_kb in ('BAKN', 'MAGN', 'STEX', 'ERGAB')" />\ <#assign semester_feld="semester_msg" />\ /* <#assign fach_filter="costage_st_pruef_aggr.st_studiengang_nr in \ (select M.st_studiengang_nr_msg from costage_st_studiengaenge G , costage_st_studiengaenge_mtsg M\ where M.st_studiengang_nr_tsg=G.st_studiengang_nr\ -and G.stg in (<>)) "/> \ +and G.skz_key in (<>)) "/> \ */\ \ \ - */\ - /*<#if <>=="F">\ + \ +<#if <>=="F">\ <#assign ldt_filter="leistungsdetailtyp_kb in ('TSAB')" />\ <#assign semester_feld="semester_msg" />\ - */\ - /*<#if <>=="T">\ + \ +<#if <>=="T">\ <#assign ldt_filter="leistungsdetailtyp_kb in ('TSAB')" />\ - */\ + \ \ \ /* <#assign semester_filter=semester_filter + " and "+semester_feld + " >= <>" /> */\ diff --git a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml index 4244cf0..5bf6bcb 100644 --- a/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml +++ b/src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml @@ -2511,7 +2511,7 @@ P.matrikelnummer, P.studiengang_nr, P.fach_nr, G.abschluss, -P.semester, +P.semester_veranst, P.leistungsdatum, G.stg, null::integer as vert,