Browse Source

Datenblätter Bugfix Filter auf Fach #3

COStage_0.3_Release
Daniel Quathamer 2 years ago
parent
commit
57549ac6b5
  1. 1
      src-modules/module/costage/hilfstabellen/vacuum_pg.sql
  2. 2
      src-modules/module/costage/masken/43040_maskeninfo.unl
  3. 6
      src-modules/module/costage/masken/43080_felderinfo.unl
  4. 16
      src-modules/module/costage/masken/43080_maskeninfo.unl
  5. 2
      src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml

1
src-modules/module/costage/hilfstabellen/vacuum_pg.sql

@ -7,3 +7,4 @@ vacuum costage_st_studierendenstammdaten;
vacuum costage_st_studiengaenge; vacuum costage_st_studiengaenge;
vacuum costage_st_studien_aggr; vacuum costage_st_studien_aggr;
vacuum costage_st_pruef_aggr; vacuum costage_st_pruef_aggr;
vacuum costage_bw_antr_aggr;

2
src-modules/module/costage/masken/43040_maskeninfo.unl

@ -70,7 +70,7 @@ SELECT name,\
/* AND fachsemester <= <<bis Fachsemester>> */\ /* AND fachsemester <= <<bis Fachsemester>> */\
/* and statustyp in(<<Status>>) */\ /* and statustyp in(<<Status>>) */\
/* and costage_st_studien_aggr.st_studiengang_nr in (select G.st_studiengang_nr from costage_st_studiengaenge G where G.abschluss in (<<Abschluss>>)) */\ /* and costage_st_studien_aggr.st_studiengang_nr in (select G.st_studiengang_nr from costage_st_studiengaenge G where G.abschluss in (<<Abschluss>>)) */\
/* and costage_st_studien_aggr.st_studiengang_nr in (select G.st_studiengang_nr from costage_st_studiengaenge G where G.stg in (<<Fach>>)) */\ /* and costage_st_studien_aggr.st_studiengang_nr in (select G.st_studiengang_nr from costage_st_studiengaenge G where G.skz_key in (<<Fach>>)) */\
/* and studiengang_nr =<<Studiengang-Nr.>> */\ /* and studiengang_nr =<<Studiengang-Nr.>> */\
/* and fach_nr =<<Fach-Nr.>> */\ /* and fach_nr =<<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 (<<Staatsangehörigkeit>>) ) */\ /* 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 (<<Staatsangehörigkeit>>) ) */\

6
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^<<SQL>> select semester_tid, semester_bezeichnung from costage_st_semester order by 1 DESC;^ ^<<SQL>> select semester_tid, semester_bezeichnung from costage_st_semester where today()-365 between date(semester_anfang) and date(semester_ende);^ 43081^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> select semester_tid, semester_bezeichnung from costage_st_semester order by 1 DESC;^ ^<<SQL>> 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^<<SQL>> SELECT st_land_nr, name from costage_st_laender order by 2;^^^ 43083^Staatsangehörigkeit^36^0^0^130^150^10^sql^30^0^1^<<SQL>> 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^<<SQL>> select apnr,druck from cifx where key=622 order by 2^^ ^ 43084^Prüfungsstatus^14^350^-1^140^180^1^char^30^0^1^<<SQL>> 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^<<SQL>> select 'G','Gesamtabschluss' from xdummy\ 43085^Auswertungsebene Prüfungen^25^330^-1^130^150^1^char^4^1^1^<<SQL>> select 'G','Gesamtabschluss' from xdummy\
union select 'F','Absolvent*innenfachfälle' from xdummy\ union select 'F','Absolvent*innenfachfälle' from xdummy\
union select 'T','Teilstudienabschluss' from xdummy\ union select 'T','Teilstudienabschluss' from xdummy\
order by 1;^^ ^ order by 1;^^<<SQL>> select 'T','Teilstudienabschluss' from xdummy;^
43086^Weitere Tabellen^123^0^0^140^140^10^char^30^0^1^<<SQL>> \ 43086^Weitere Tabellen^123^0^0^140^140^10^char^30^0^1^<<SQL>> \
--freemarker template\ --freemarker template\
select name,string_not_null(caption) || ' - ' || name from sx_tables where name in ('costage_st_studierendenstammdaten','costage_st_studiengaenge')\ 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;^ ^<<SQL>> select distinct K.unikey,K.unikey\
from costage_st_studienkennzahlen K, hochschulinfo H\ from costage_st_studienkennzahlen K, hochschulinfo H\
where K.unikey=H.hs_nr::char(10)^ where K.unikey=H.hs_nr::char(10)^
43100^##line##^10^0^0^100^100^1^char^5000^0^8^^^1^ 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^<<SQL>> SELECT \ 43101^Abschluss^7^0^0^140^170^20^char^30^0^1^<<SQL>> SELECT \
code,\ code,\
name\ name\
FROM costage_st_abschlussziele_lokal\ FROM costage_st_abschlussziele_lokal\

16
src-modules/module/costage/masken/43080_maskeninfo.unl

@ -91,30 +91,30 @@ SELECT name,\
\ \
<#assign fach_filter="1=1" />\ <#assign fach_filter="1=1" />\
--Default: TSG\ --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 (<<Fach>>)) "/> \ /* <#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 (<<Fach>>)) "/> \
*/\ */\
\ \
\ \
\ \
<#assign ldt_filter="1=1" />\ <#assign ldt_filter="1=1" />\
/*<#if <<Auswertungsebene Prüfungen>>=="G">\ <#if <<Auswertungsebene Prüfungen>>=="G">\
<#assign ldt_filter="leistungsdetailtyp_kb in ('BAKN', 'MAGN', 'STEX', 'ERGAB')" />\ <#assign ldt_filter="leistungsdetailtyp_kb in ('BAKN', 'MAGN', 'STEX', 'ERGAB')" />\
<#assign semester_feld="semester_msg" />\ <#assign semester_feld="semester_msg" />\
/* <#assign fach_filter="costage_st_pruef_aggr.st_studiengang_nr in \ /* <#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\ (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\ where M.st_studiengang_nr_tsg=G.st_studiengang_nr\
and G.stg in (<<Fach>>)) "/> \ and G.skz_key in (<<Fach>>)) "/> \
*/\ */\
\ \
\ \
</#if> */\ </#if> \
/*<#if <<Auswertungsebene Prüfungen>>=="F">\ <#if <<Auswertungsebene Prüfungen>>=="F">\
<#assign ldt_filter="leistungsdetailtyp_kb in ('TSAB')" />\ <#assign ldt_filter="leistungsdetailtyp_kb in ('TSAB')" />\
<#assign semester_feld="semester_msg" />\ <#assign semester_feld="semester_msg" />\
</#if> */\ </#if> \
/*<#if <<Auswertungsebene Prüfungen>>=="T">\ <#if <<Auswertungsebene Prüfungen>>=="T">\
<#assign ldt_filter="leistungsdetailtyp_kb in ('TSAB')" />\ <#assign ldt_filter="leistungsdetailtyp_kb in ('TSAB')" />\
</#if> */\ </#if> \
\ \
\ \
/* <#assign semester_filter=semester_filter + " and "+semester_feld + " >= <<Seit Semester>>" /> */\ /* <#assign semester_filter=semester_filter + " and "+semester_feld + " >= <<Seit Semester>>" /> */\

2
src-modules/module/costage/rohdaten_sos/sos_costage_unload.xml

@ -2511,7 +2511,7 @@ P.matrikelnummer,
P.studiengang_nr, P.studiengang_nr,
P.fach_nr, P.fach_nr,
G.abschluss, G.abschluss,
P.semester, P.semester_veranst,
P.leistungsdatum, P.leistungsdatum,
G.stg, G.stg,
null::integer as vert, null::integer as vert,

Loading…
Cancel
Save