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

Kompatiblität zu altem SOS Modul hergestellt

master
Andre Knieschewski 2 days ago
parent
35b2a4fa21
commit
d5e954f802
4 changed files with 92 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      src-modules/module/rpta/masken/48000_felderinfo.unl
  2. 24
      src-modules/module/rpta/masken/48000_maskeninfo.unl
  3. 39
      src-modules/module/rpta/masken/48490_felderinfo.unl
  4. 34
      src-modules/module/rpta/masken/48490_maskeninfo.unl

39
src-modules/module/rpta/masken/48000_felderinfo.unl
Unescape View File

@ -3,30 +3,32 @@ SELECT uniquename, caption, sortnr\ @@ -3,30 +3,32 @@ SELECT uniquename, caption, sortnr\
FROM rpta_column_layout \
where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat_gew')\
and R.systeminfo_id=7)\
and 1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA_GEW' and id='<<Köpfe oder Fälle ?>>')\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA_GEW' and 'R_' || id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where 'K_' || tid='<<Köpfe oder Fälle ?>>' AND apnr ILIKE '%gew%')\
)\
union\
SELECT uniquename, caption, sortnr\
FROM rpta_column_layout \
where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat','sos_stud_astat_archiv')\
and R.systeminfo_id=7)\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA' and id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where apnr='<<Köpfe oder Fälle ?>>')\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA' and 'R_' || id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where 'K_' || tid='<<Köpfe oder Fälle ?>>' AND apnr NOT ILIKE '%gew%')\
)\
order by sortnr, caption;^ ^<<SQL>> --Freemarker Template\
SELECT uniquename, caption, sortnr\
FROM rpta_column_layout \
where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat_gew')\
and R.systeminfo_id=7)\
and 1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA_GEW' and id='<<Köpfe oder Fälle ?>>')\
\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA_GEW' and 'R_' || id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where 'K_' || tid='<<Köpfe oder Fälle ?>>' AND apnr ILIKE '%gew%')\
)\
union\
\
SELECT uniquename, caption, sortnr\
FROM rpta_column_layout \
where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('sos_stud_astat','sos_stud_astat_archiv')\
and R.systeminfo_id=7) and uniquename='sos_stud_astat_rsz'\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA' and id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where apnr='<<Köpfe oder Fälle ?>>')\
and R.systeminfo_id=7)\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA' and 'R_' || id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where 'K_' || tid='<<Köpfe oder Fälle ?>>' AND apnr NOT ILIKE '%gew%')\
)\
order by sortnr, caption\
limit 1;^
@ -48,7 +50,7 @@ limit 1;^ @@ -48,7 +50,7 @@ limit 1;^
48016^Matrikel-Nr.^35^350^-1^140^80^1^char^30^0^13^^ ^ ^
48018^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<<SQL>>SELECT id, caption\
FROM (\
SELECT sort1, id, caption\
SELECT sort1, 'R_' || id as id, caption\
FROM sx_repository\
WHERE aktiv = 1\
AND today() BETWEEN gueltig_seit AND gueltig_bis\
@ -56,9 +58,10 @@ FROM (\ @@ -56,9 +58,10 @@ FROM (\
\
UNION ALL\
\
SELECT 999999 AS sort1, apnr AS id, eintrag AS caption\
SELECT 999999 AS sort1, 'K_' || tid AS id, eintrag AS caption\
FROM koepfe_oder_faelle\
WHERE apnr NOT ILIKE '%gew%'\
WHERE 1=1\
--AND apnr NOT ILIKE '%gew%'\
AND NOT EXISTS (\
SELECT 1\
FROM sx_repository\
@ -68,25 +71,29 @@ FROM (\ @@ -68,25 +71,29 @@ FROM (\
)\
) x\
ORDER BY sort1, caption;^ ^<<SQL>>SELECT id, caption\
FROM (\
SELECT sort1, 'R_' || id as id, caption\
FROM sx_repository\
WHERE aktiv = 1\
AND today() BETWEEN gueltig_seit AND gueltig_bis\
AND art = 'SOS_KOEPFE_FAELLE_RPTA'\
AND art IN ('SOS_KOEPFE_FAELLE_RPTA','SOS_KOEPFE_FAELLE_RPTA_GEW')\
AND caption = 'Fälle'\
\
UNION ALL\
\
SELECT apnr AS id, eintrag AS caption\
SELECT 999999 AS sort1, 'K_' || tid AS id, eintrag AS caption\
FROM koepfe_oder_faelle\
WHERE eintrag = 'Fälle'\
AND apnr NOT ILIKE '%gew%'\
--AND apnr NOT ILIKE '%gew%'\
AND NOT EXISTS (\
SELECT 1\
FROM sx_repository\
WHERE aktiv = 1\
AND today() BETWEEN gueltig_seit AND gueltig_bis\
AND art IN ('SOS_KOEPFE_FAELLE_RPTA','SOS_KOEPFE_FAELLE_RPTA_GEW')\
);^
)\
) x\
ORDER BY sort1, caption;^
48019^Status^340^330^-1^130^180^1^sql^30^0^1^<<SQL>> select apnr,eintrag from sos_status order by 2^ ^ ^
48022^Geschlecht^110^0^0^140^80^1^integer^30^0^1^<<SQL>> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^
48023^Spalten^3001^0^0^150^190^10^char^30^0^1^<<SQL>>\

24
src-modules/module/rpta/masken/48000_maskeninfo.unl
Unescape View File

@ -85,6 +85,15 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\ @@ -85,6 +85,15 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
;\
\
]]></sqlvar>\
<sqlvar name="koepfe_oder_faelle_prep"><![CDATA[\
\
select apnr from koepfe_oder_faelle where 'K_' || tid='<<Köpfe oder Fälle ?>>'\
union\
select content from sx_repository where 'R_' || tid='<<Köpfe oder Fälle ?>>'\
limit 1;\
]]>\
</sqlvar>\
\
</sqlvars>\
\
<#assign jahr_param="" />\
@ -111,8 +120,7 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\ @@ -111,8 +120,7 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
<#assign semester_filter = semester_filter+ " and 1=1 and sem_rueck_beur_ein = "+endsemester /> \
</#if>\
\
<#if "<<Köpfe oder Fälle ?>>"?contains("KoF_RPTA")>\
<#assign filter="${<<Köpfe oder Fälle ?>>}\
<#assign filter="${(koepfe_oder_faelle_prep?has_content)?then(koepfe_oder_faelle_prep, '1=1')}\
/* and sem_rueck_beur_ein = <<Semester>> */\
/* and stichtag = <<Stichtag>> */\
/* and <<Hochschulzugangsberechtigung>> */\
@ -122,18 +130,6 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\ @@ -122,18 +130,6 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
/* and substring('' || sem_rueck_beur_ein from 5 for 1)='<<Semestertyp>>' */\
/* and ${<<Filter Studierende>>} */\
" />\
<#else>\
<#assign filter="<<Köpfe oder Fälle ?>>\
/* and sem_rueck_beur_ein = <<Semester>> */\
/* and stichtag = <<Stichtag>> */\
/* and <<Hochschulzugangsberechtigung>> */\
/* and <<Hörerstatus>>*/\
/* and geschlecht = <<Geschlecht>> */\
/* and fach_sem_zahl <= <<bis Fachsemester>> */\
/* and substring('' || sem_rueck_beur_ein from 5 for 1)='<<Semestertyp>>' */\
/* and ${<<Filter Studierende>>} */\
" />\
</#if>\
\
--die Maske 48000 wird auch im dashboard benutzt.\
--dort gibt es die Spalte kz_rueck_beur_ein nicht im optimierten Resultset, daher:\

39
src-modules/module/rpta/masken/48490_felderinfo.unl
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
48490^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<<SQL>>SELECT id, caption\
FROM (\
SELECT sort1, id, caption\
SELECT sort1, 'R_' || id as id, caption\
FROM sx_repository\
WHERE aktiv = 1\
AND today() BETWEEN gueltig_seit AND gueltig_bis\
@ -8,9 +8,10 @@ FROM (\ @@ -8,9 +8,10 @@ FROM (\
\
UNION ALL\
\
SELECT 999999 AS sort1, apnr AS id, eintrag AS caption\
SELECT 999999 AS sort1, 'K_' || tid AS id, eintrag AS caption\
FROM koepfe_oder_faelle\
WHERE apnr NOT ILIKE '%gew%'\
WHERE 1=1\
--AND apnr NOT ILIKE '%gew%'\
AND NOT EXISTS (\
SELECT 1\
FROM sx_repository\
@ -20,25 +21,29 @@ FROM (\ @@ -20,25 +21,29 @@ FROM (\
)\
) x\
ORDER BY sort1, caption;^ ^<<SQL>>SELECT id, caption\
FROM (\
SELECT sort1, 'R_' || id as id, caption\
FROM sx_repository\
WHERE aktiv = 1\
AND today() BETWEEN gueltig_seit AND gueltig_bis\
AND art = 'SOS_KOEPFE_FAELLE_RPTA'\
AND art IN ('SOS_KOEPFE_FAELLE_RPTA','SOS_KOEPFE_FAELLE_RPTA_GEW')\
AND caption = 'Fälle'\
\
UNION ALL\
\
SELECT apnr AS id, eintrag AS caption\
SELECT 999999 AS sort1, 'K_' || tid AS id, eintrag AS caption\
FROM koepfe_oder_faelle\
WHERE eintrag = 'Fälle'\
AND apnr NOT ILIKE '%gew%'\
--AND apnr NOT ILIKE '%gew%'\
AND NOT EXISTS (\
SELECT 1\
FROM sx_repository\
WHERE aktiv = 1\
AND today() BETWEEN gueltig_seit AND gueltig_bis\
AND art IN ('SOS_KOEPFE_FAELLE_RPTA','SOS_KOEPFE_FAELLE_RPTA_GEW')\
);^
)\
) x\
ORDER BY sort1, caption;^
48491^Seit Semester^3^0^0^140^80^1^integer^30^0^1^<<SQL>> --freemarker template \
select tid, eintrag from semester \
<#if K_VIZ_ZEITR_SEM_ANZ?exists>\
@ -67,30 +72,32 @@ SELECT uniquename, caption, sortnr\ @@ -67,30 +72,32 @@ SELECT uniquename, caption, sortnr\
FROM rpta_column_layout \
where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('rpta_sos_lab_stg_gew')\
and R.systeminfo_id=7)\
and 1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA_GEW' and id='<<Köpfe oder Fälle ?>>')\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA_GEW' and 'R_' || id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where 'K_' || tid='<<Köpfe oder Fälle ?>>' AND apnr ILIKE '%gew%')\
)\
union\
SELECT uniquename, caption, sortnr\
FROM rpta_column_layout \
where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('rpta_sos_lab_aggr','rpta_sos_lab_stg','rpta_sos_lab_stg_archiv')\
and R.systeminfo_id=7)\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA' and id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where apnr='<<Köpfe oder Fälle ?>>')\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA' and 'R_' || id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where 'K_' || tid='<<Köpfe oder Fälle ?>>' AND apnr NOT ILIKE '%gew%')\
)\
order by sortnr, caption;^ ^<<SQL>> --Freemarker Template\
SELECT uniquename, caption, sortnr\
FROM rpta_column_layout \
where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('rpta_sos_lab_stg_gew')\
and R.systeminfo_id=7)\
and 1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA_GEW' and id='<<Köpfe oder Fälle ?>>')\
\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA_GEW' and 'R_' || id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where 'K_' || tid='<<Köpfe oder Fälle ?>>' AND apnr ILIKE '%gew%')\
)\
union\
\
SELECT uniquename, caption, sortnr\
FROM rpta_column_layout \
where resultset_id in (select R.tid from rpta_resultset R where R.uniquename in ('rpta_sos_lab_aggr')\
and R.systeminfo_id=7) and uniquename='rpta_sos_lab_aggr_sem'\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA' and id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where apnr='<<Köpfe oder Fälle ?>>')\
and R.systeminfo_id=7)\
and (1=(select 1 from sx_repository where art='SOS_KOEPFE_FAELLE_RPTA' and 'R_' || id='<<Köpfe oder Fälle ?>>')\
or 1=(select 1 from koepfe_oder_faelle where 'K_' || tid='<<Köpfe oder Fälle ?>>' AND apnr NOT ILIKE '%gew%')\
)\
order by sortnr, caption\
limit 1;^

34
src-modules/module/rpta/masken/48490_maskeninfo.unl
Unescape View File

@ -82,6 +82,14 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\ @@ -82,6 +82,14 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
;\
\
]]></sqlvar>\
<sqlvar name="koepfe_oder_faelle_prep"><![CDATA[\
\
select apnr from koepfe_oder_faelle where 'K_' || tid='<<Köpfe oder Fälle ?>>'\
union\
select content from sx_repository where 'R_' || tid='<<Köpfe oder Fälle ?>>'\
limit 1;\
]]>\
</sqlvar>\
</sqlvars>\
\
<#assign jahr_param="" />\
@ -109,30 +117,9 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\ @@ -109,30 +117,9 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
</#if>\
\
\
<#if "<<Köpfe oder Fälle ?>>"?contains("KoF_RPTA")>\
<#if my_base_rs = "rpta_sos_lab_aggr">\
<#assign filter="${<<Köpfe oder Fälle ?>>}\
/* and sem_der_pruefung = <<Semester>> */\
/* and stichtag = <<Stichtag>> */\
/* and geschlecht = <<Geschlecht>> */\
/* and fach_sem_zahl <= <<bis Fachsemester>> */\
/* and substring('' || sem_der_pruefung from 5 for 1)='<<Semestertyp>>' */\
/* and pstatus=<<Prüfungsstatus>> */\
" />\
<#elseif my_base_rs = "rpta_sos_lab_stg">\
<#assign filter="${<<Köpfe oder Fälle ?>>}\
/* and sem_d_abg_pruefung = <<Semester>> */\
/* and stichtag = <<Stichtag>> */\
/* and geschlecht = <<Geschlecht>> */\
/* and fach_sem_zahl <= <<bis Fachsemester>> */\
/* and substring('' || sem_der_pruefung from 5 for 1)='<<Semestertyp>>' */\
/* and pstatus=<<Prüfungsstatus>> */\
" />\
</#if>\
\
<#else>\
<#if my_base_rs = "rpta_sos_lab_aggr">\
<#assign filter="<<Köpfe oder Fälle ?>>\
<#assign filter="${(koepfe_oder_faelle_prep?has_content)?then(koepfe_oder_faelle_prep, '1=1')}\
/* and sem_der_pruefung = <<Semester>> */\
/* and stichtag = <<Stichtag>> */\
/* and geschlecht = <<Geschlecht>> */\
@ -141,7 +128,7 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\ @@ -141,7 +128,7 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
/* and pstatus=<<Prüfungsstatus>> */\
" />\
<#elseif my_base_rs = "rpta_sos_lab_stg">\
<#assign filter="<<Köpfe oder Fälle ?>>\
<#assign filter="${(koepfe_oder_faelle_prep?has_content)?then(koepfe_oder_faelle_prep, '1=1')}\
/* and sem_d_abg_pruefung = <<Semester>> */\
/* and stichtag = <<Stichtag>> */\
/* and geschlecht = <<Geschlecht>> */\
@ -151,7 +138,6 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\ @@ -151,7 +138,6 @@ and substring('' || tid from 5 for 1)='<<Semestertyp>>'\
" />\
</#if>\
\
</#if>\
\
\
\

Write Preview
Loading…
Cancel
Save