Filter auf Feld Jahr ermöglicht #5

src-modules/module/rpta/masken/44630_felderinfo.unl

@@ -0,0 +1,13 @@
+44630^Bis Semester^4^350^-1^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^Eintrag^<<SQL>> select tid,eintrag from semester where today() between sem_beginn  and sem_ende;^
+44631^Studiengang^6^0^0^140^150^50^char^30^0^12^<<SQL>> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^^^
+44632^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
+44645^tablestylesheet^150^0^0^100^100^1^char^255^1^1^<<SQL>> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44190 order by ord^ ^<<SQL>> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44190 order by ord limit 1^
+44647^Grafik^1000^300^-1^170^150^1^integer^30^0^1^<<SQL>> select tid, caption from viz_chart order by 2;^hidden^ ^
+44649^Spaltenanzahl^5^350^-1^140^80^1^integer^255^0^1^<<SQL>>  SELECT 0,'Dynamisch' from xdummy \
+union SELECT 1,'1-spaltig' from xdummy \
+union SELECT 2,'2-spaltig' from xdummy \
+union SELECT 3,'3-spaltig' from xdummy \
+union SELECT 4,'4-spaltig' from xdummy \
+order by 1;^ ^<<SQL>> SELECT 2,'2-spaltig' from xdummy;^
+44650^Kachelbreite^30^0^0^100^100^1^integer^5000^0^0^^^800^
+44653^Kachelhöhe^40^0^0^100^100^1^integer^5000^0^0^^^600^

src-modules/module/rpta/masken/44630_maske_system_bez.unl

@@ -0,0 +1 @@
+44630^320^

src-modules/module/rpta/masken/44630_masken_felder_bez.unl

@@ -0,0 +1,8 @@
+44630^44630^
+44630^44631^
+44630^44632^
+44630^44645^
+44630^44647^
+44630^44649^
+44630^44650^
+44630^44653^

src-modules/module/rpta/masken/44630_maskeninfo.unl

@@ -0,0 +1,106 @@
+44630^Dashboard Kopfzeile^--Freemarker Template\
+<#include "SQL_lingua_franca"/>\
+<#include "SuperX_general"/>\
+--\
+--Autor D. Quathamer 2024\
+<#assign jahr_filter="1=1" />\
+--Akad. Jahr 2022: WS + SS - Beispiel: WS 22/23 + SS 2023\
+<#if "<<Jahr>>" !="">\
+<#assign jahr_filter="(" />\
+<#assign jahr_filter=jahr_filter + "(substring('' || sem_rueck_beur_ein from 5 for 1)='2' and  val(substring('' || sem_rueck_beur_ein from 1 for 4))=<<Jahr>>)" />\
+<#assign jahr_filter=jahr_filter + " or "/>\
+<#assign jahr_filter=jahr_filter + "(substring('' || sem_rueck_beur_ein from 5 for 1)='1' and  (val(substring('' || sem_rueck_beur_ein from 1 for 4))-1)=<<Jahr>>)" />\
+<#assign jahr_filter=jahr_filter + ")" />\
+</#if>\
+\
+<#assign filter="1=1\
+/* and sem_rueck_beur_ein = <<Bis Semester>> */\
+" />\
+\
+<#assign filter= filter + " and " + jahr_filter />\
+\
+<#assign stg_filter =  " and 's_' || tid_stg in "+Studiengang.allNeededKeysList /> \
+\
+create temp table tmp_erg(\
+ord integer,\
+kennz varchar(255),\
+wert integer,\
+link_maskeninfo_id integer\
+);\
+\
+insert into tmp_erg(ord,kennz,wert)\
+select 1,'Bewerbungen',sum(summe)\
+from zul_antr_aggr A\
+where A.bewsem=<<Bis Semester>>\
+and A.stg in (select L.stg from lehr_stg_ab L where 's_' || L.tid  in <@printkeys Studiengang.allNeededKeysList/>)\
+and A.abschl in (select L.abschluss from lehr_stg_ab L where 's_' || L.tid  in <@printkeys Studiengang.allNeededKeysList/>)\
+group by 1,2;\
+\
+\
+insert into tmp_erg(ord,kennz,wert)\
+select 10,'Studienanfänger*innen im 1. HS',sum(summe)\
+from sos_stg_aggr S, sos_stichtag I\
+where ${filter}\
+and S.studiengang_nr=1\
+and S.fach_nr=1\
+and S.stichtag=I.tid\
+and I.appl_key='0'\
+and 's_' || S.tid_stg  in <@printkeys Studiengang.allNeededKeysList/>\
+and S.hssem=1\
+group by 1,2;\
+\
+\
+insert into tmp_erg(ord,kennz,wert)\
+select 20,'Studierende gesamt',sum(summe)\
+from sos_stg_aggr S, sos_stichtag I\
+where ${filter}\
+and S.studiengang_nr=1\
+and S.fach_nr=1\
+and S.stichtag=I.tid\
+and I.appl_key='0'\
+and 's_' || S.tid_stg  in <@printkeys Studiengang.allNeededKeysList/>\
+group by 1,2;\
+\
+\
+insert into tmp_erg(ord,kennz,wert)\
+select 30,'Studierende im Lehramt',sum(summe)\
+from sos_stg_aggr S, sos_stichtag I, dim_studiengang D\
+where ${filter}\
+and S.studiengang_nr=1\
+and S.fach_nr=1\
+and S.stichtag=I.tid\
+and D.tid=S.tid_stg\
+and D.ist_lehramt=1\
+and I.appl_key='0'\
+and 's_' || S.tid_stg  in <@printkeys Studiengang.allNeededKeysList/>\
+group by 1,2;\
+\
+insert into tmp_erg(ord,kennz,wert)\
+select 30,'Absolvent*innen',sum(summe)\
+from sos_lab_aggr S, sos_stichtag I, dim_studiengang D\
+where S.sem_der_pruefung=<<Bis Semester>>\
+and S.studiengang_nr=1\
+and S.fach_nr=1\
+and S.stichtag=I.tid\
+and D.tid=S.tid_stg\
+and I.appl_key='2'\
+and 's_' || S.tid_stg  in <@printkeys Studiengang.allNeededKeysList/>\
+group by 1,2;\
+\
+select kennz,wert,link_maskeninfo_id\
+from tmp_erg\
+order by ord;^XIL List\
+   sizable_columns horizontal_scrolling\
+   white_space_color=COLOR_WHITE fixed_columns=1\
+   drop_and_delete movable_columns\
+   min_heading_height=55\
+Column CID=0 heading_text="Kennzahl" explanation="" center_heading\
+   row_selectable heading_platform readonly\
+   width=10\
+Column CID=0 heading_text="Wert" explanation="" center_heading\
+   row_selectable heading_platform readonly\
+   width=30\
+Column CID=0 heading_text="Maske" explanation="" center_heading\
+   row_selectable heading_platform readonly\
+   width=30\
+@@@^ ^ ^Dashboard Inistialisierung^drop table tmp_erg;^^3^700^360^0^1^^

src-modules/module/rpta/masken/44630_sachgeb_maske_bez.unl

@@ -0,0 +1 @@
+320^44630^

src-modules/module/rpta/masken/48000_felderinfo.unl

@@ -21,7 +21,7 @@ and R.systeminfo_id=7) and uniquename='sos_stud_astat_rsz';^
 48010^Semester^100^0^0^140^80^1^integer^30^0^1^<<SQL>> select tid, eintrag from semester order by tid DESC;^hidden^ ^
 48011^Stichtag^23^330^-1^130^100^1^sql^30^1^1^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende';^ ^<<SQL>> select tid, name  from sos_stichtag where stichtagsart='Studierende' and appl_key='0';^
 48012^Hörerstatus^200^330^-1^140^150^1^sql^30^0^1^<<SQL>> select apnr, eintrag from hoererstatus order by 2^ ^<<SQL>> select apnr, eintrag from hoererstatus  where eintrag='alle';^
-48013^Jahr^110^0^0^140^80^1^integer^30^0^0^ ^ ^ ^
+48013^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^
 48018^Köpfe oder Fälle ?^0^0^0^140^150^1^sql^70^0^1^<<SQL>> select apnr, eintrag from koepfe_oder_faelle order by 2^ ^<<SQL>> select apnr, eintrag from koepfe_oder_faelle where eintrag = 'Fälle';^
 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>>\

src-modules/module/rpta/masken/48000_maskeninfo.unl

@@ -63,20 +63,32 @@ order by CL.sortnr\
 ]]></sqlvar>\
 </sqlvars>\
 \
+\
+<#assign jahr_filter="1=1" />\
+--Akad. Jahr 2022: WS + SS - Beispiel: WS 22/23 + SS 2023\
+<#if "<<Jahr>>" !="">\
+<#assign jahr_filter="(" />\
+<#assign jahr_filter=jahr_filter + "(substring('' || sem_rueck_beur_ein from 5 for 1)='2' and  val(substring('' || sem_rueck_beur_ein from 1 for 4))=<<Jahr>>)" />\
+<#assign jahr_filter=jahr_filter + " or "/>\
+<#assign jahr_filter=jahr_filter + "(substring('' || sem_rueck_beur_ein from 5 for 1)='1' and  (val(substring('' || sem_rueck_beur_ein from 1 for 4))-1)=<<Jahr>>)" />\
+<#assign jahr_filter=jahr_filter + ")" />\
+</#if>\
+\
 <#assign filter="<<Köpfe oder Fälle ?>>\
 /* and sem_rueck_beur_ein >= <<Seit Semester>> */\
 /* and sem_rueck_beur_ein <= <<Bis Semester>> */\
 /* and sem_rueck_beur_ein = <<Semester>> */\
-/* and val(substring('' || sem_rueck_beur_ein from 1 for 4))=<<Jahr>> */\
 /* and stichtag = <<Stichtag>> */\
 /* and <<Hochschulzugangsberechtigung>> */\
 /* and <<Hörerstatus>>*/\
-/* and abschluss  in (<<Abschluss>>) */\
+/* and abschluss in (<<Abschluss>>) */\
 /* and geschlecht = <<Geschlecht>> */\
 /* and fach_sem_zahl <= <<bis Fachsemester>> */\
 /* and substring('' || sem_rueck_beur_ein from 5 for 1)='<<Semestertyp>>' */\
 " />\
 \
+<#assign filter= filter + " and " + jahr_filter />\
+\
 <#assign filter = filter + " and 's_' || tid_stg in "+Studiengang.allNeededKeysList /> \
 /* <#assign filter = filter + " and '' || ca12_staat in "+Staatsangehörigkeit.allNeededKeysList /> --<<Staatsangehörigkeit>> */\
 /* <#assign filter = filter + " and stg in "+Fächer.allNeededKeysList /> --<<Fächer>> */\