From c04e7d52caf241f106f17dac6cfaf7aac65885b6 Mon Sep 17 00:00:00 2001 From: Imo John Date: Fri, 24 Jul 2026 10:32:25 +0200 Subject: [PATCH] =?UTF-8?q?Feldabh=C3=A4ngigkeiten=20in=20Absolventinnenma?= =?UTF-8?q?ske?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/viz/masken/44570_felderinfo.unl | 11 +- .../module/viz/masken/44720_felderinfo.unl | 45 ++++--- .../viz/masken/44720_masken_felder_bez.unl | 2 + .../module/viz/masken/44720_maskeninfo.unl | 114 ++---------------- .../macro_masken_bez_fuellen.sql | 20 ++- 5 files changed, 65 insertions(+), 127 deletions(-) diff --git a/src-modules/module/viz/masken/44570_felderinfo.unl b/src-modules/module/viz/masken/44570_felderinfo.unl index 3908187..54e7b54 100644 --- a/src-modules/module/viz/masken/44570_felderinfo.unl +++ b/src-modules/module/viz/masken/44570_felderinfo.unl @@ -48,5 +48,12 @@ and R.systeminfo_id=7) and uniquename='sos_stud_sem_dashboard';^ where C.tid=CL.chart_id\ and CL.layout_id=L.tid\ and C.maskeninfo_id=44570 \ - order by 2\ -;^ ^ ^ + order by CL.sortnr,2\ +;^ ^<> select 'Grafik='||C.uniquename||'*Spaltenlayout='||L.uniquename, CL.caption\ + from viz_chart C, viz_chart2layout CL, rpta_column_layout L\ + where C.tid=CL.chart_id\ + and CL.layout_id=L.tid\ + and C.maskeninfo_id=44570 \ + order by CL.sortnr,2\ +limit 1\ +;^ diff --git a/src-modules/module/viz/masken/44720_felderinfo.unl b/src-modules/module/viz/masken/44720_felderinfo.unl index c25e571..4713b4f 100644 --- a/src-modules/module/viz/masken/44720_felderinfo.unl +++ b/src-modules/module/viz/masken/44720_felderinfo.unl @@ -6,11 +6,11 @@ where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\ \ and sem_beginn <=today()\ order by tid DESC;^Eintrag^<> select tid,eintrag from semester where today()-(4*365) between sem_beginn and sem_ende;^ -44722^Stichtag Prüfungen^21^350^-1^140^100^1^sql^30^0^1^<> select tid, name from sos_stichtag where stichtagsart='Prüfungen';^^<> select tid, name from sos_stichtag where stichtagsart='Prüfungen' and appl_key='2';^ -44723^Staatsangehörigkeit^36^0^0^130^150^10^char^30^0^12^<> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^hidden^^ -44724^viz_label_Studiengang^5^350^-1^150^180^1^char^200^0^8^^{InputCheck:matrikelnummern}^^ +44722^Stichtag Prüfungen^21^350^-1^140^100^1^sql^30^0^1^<> select tid, name from sos_stichtag where stichtagsart='Prüfungen';^ ^<> select tid, name from sos_stichtag where stichtagsart='Prüfungen' and appl_key='2';^ +44723^Staatsangehörigkeit^36^0^0^130^150^10^char^30^0^12^<> select tid,name,sortnr from sichten where art='SOS-Staaten-Sicht' order by 3,2;^hidden^ ^ +44724^viz_label_Studiengang^5^350^-1^150^180^1^char^200^0^8^^{InputCheck:matrikelnummern}^ ^ 44725^Hörerstatus^33^0^0^140^170^1^sql^255^0^13^<> select apnr, eintrag from hoererstatus order by 2^apnr, eintrag^<> select apnr, eintrag from hoererstatus where eintrag='alle';^ -44727^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^13^^^^ +44727^bis Fachsemester^35^350^-1^140^100^1^integer^30^0^13^^ ^ ^ 44729^Bis Semester^24^350^-1^140^80^1^integer^30^0^1^<> --freemarker template \ select tid, eintrag from semester \ <#if K_VIZ_ZEITR_SEM_ANZ?exists>\ @@ -18,12 +18,12 @@ where sem_beginn >= today()-(182*${K_VIZ_ZEITR_SEM_ANZ} )\ \ and sem_beginn <=today()\ order by tid DESC;^Eintrag^<> select tid,eintrag from semester where today() between sem_beginn and sem_ende;^ -44730^viz_label_koepfe_faelle^1^350^-1^150^180^1^char^200^0^8^^{InputCheck:matrikelnummern}^^ -44731^Geschlecht^37^0^0^140^80^1^integer^30^0^999^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^^^ -44733^Studiengang^6^0^0^140^150^50^char^30^0^12^<> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^^^ -44734^Jahr^110^0^0^140^80^1^integer^30^0^13^ ^ ^ ^ +44730^viz_label_koepfe_faelle^1^350^-1^150^180^1^char^200^0^8^^{InputCheck:matrikelnummern}^ ^ +44731^Geschlecht^37^0^0^140^80^1^integer^30^0^999^<> SELECT apnr,druck FROM cif where key = 9003 and apnr between 1 and 4 order by 1;^ ^ ^ +44733^Studiengang^6^0^0^140^150^50^char^30^0^12^<> select tid,name,sortnr from sichten where art in ('SOS-Kostenstellen-Sicht', 'SOS-Studiengang-Sicht') order by 3,2;^ ^ ^ +44734^Jahr^110^0^0^140^80^1^integer^30^0^13^^ ^ ^ 44735^tablestylesheet^150^0^0^100^100^1^char^255^1^1^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44720 order by ord^ ^<> select filename,caption from sx_stylesheets S, sx_mask_style M where S.tid=M.stylesheet_id and M.maskeninfo_id=44720 order by ord limit 1^ -44736^Grafiktitel^1010^0^0^100^100^1^char^255^0^0^ ^{InputCheck:disabled}^ ^ +44736^Grafiktitel^1010^0^0^100^100^1^char^255^0^0^^{InputCheck:disabled}^ ^ 44737^Grafik^1000^300^-1^170^150^1^char^30^0^1^<> select uniquename, caption from viz_chart where maskeninfo_id=44720 order by 2;^ ^<> select uniquename, caption from viz_chart where maskeninfo_id=44720 order by 2 limit 1;^ 44738^Spaltenlayout^3000^350^-1^140^180^1^char^30^1^1^<>SELECT uniquename,\ caption\ @@ -31,13 +31,24 @@ FROM rpta_column_layout \ where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rpta_sos_lab_aggr'\ and R.systeminfo_id=7)\ order by sortnr, caption\ - ;^^<>SELECT uniquename,\ - caption\ -FROM rpta_column_layout \ -where resultset_id in (select R.tid from rpta_resultset R where R.uniquename='rpta_sos_lab_aggr'\ -and R.systeminfo_id=7) and uniquename='rpta_sos_lab_aggr_sem';^ + ;^hidden^ ^ 44739^Semestertyp^25^350^-1^140^80^1^integer^255^0^1^<> select 1,'nur Sommersemester' from xdummy union select 2,'nur Wintersemester' from xdummy^Eintrag^ ^ -44740^##line##^30^0^0^100^100^1^char^5000^0^8^^^1^ +44740^##line##^30^0^0^100^100^1^char^5000^0^8^^ ^1^ 44741^Abschluss^7^0^0^100^200^3^char^1500^0^12^<> select tid,name,sortnr from sichten where art='SOS-Abschluss-Sicht' order by 3,2;^ ^ ^ -44742^viz_label_Zeitraum^20^350^-1^150^180^1^char^200^0^8^^{InputCheck:matrikelnummern}^^ -44743^##line##^40^0^0^100^100^1^char^5000^0^8^^^1^ +44742^viz_label_Zeitraum^20^350^-1^150^180^1^char^200^0^8^^{InputCheck:matrikelnummern}^ ^ +44743^##line##^40^0^0^100^100^1^char^5000^0^8^^ ^1^ +44744^_customVorbelegung^40^0^0^100^100^1^char^5000^0^1^<> select 'splitFields(''Grafikausgabe'')','Ausgabe';^{InputCheck:disabled}^<> select 'splitFields(''Grafikausgabe'')','Ausgabe';^ +44745^Grafikausgabe^1000^300^-1^170^150^1^char^30^0^1^<> select 'Grafik='||C.uniquename||'*Spaltenlayout='||L.uniquename, CL.caption\ + from viz_chart C, viz_chart2layout CL, rpta_column_layout L\ + where C.tid=CL.chart_id\ + and CL.layout_id=L.tid\ + and C.maskeninfo_id=44720 \ + order by CL.sortnr,2\ +;^ ^<> select 'Grafik='||C.uniquename||'*Spaltenlayout='||L.uniquename, CL.caption\ + from viz_chart C, viz_chart2layout CL, rpta_column_layout L\ + where C.tid=CL.chart_id\ + and CL.layout_id=L.tid\ + and C.maskeninfo_id=44720 \ + order by CL.sortnr,2\ +limit 1\ +;^ diff --git a/src-modules/module/viz/masken/44720_masken_felder_bez.unl b/src-modules/module/viz/masken/44720_masken_felder_bez.unl index a5298b1..8c6e54b 100644 --- a/src-modules/module/viz/masken/44720_masken_felder_bez.unl +++ b/src-modules/module/viz/masken/44720_masken_felder_bez.unl @@ -19,3 +19,5 @@ 44720^44741^ 44720^44742^ 44720^44743^ +44720^44744^ +44720^44745^ diff --git a/src-modules/module/viz/masken/44720_maskeninfo.unl b/src-modules/module/viz/masken/44720_maskeninfo.unl index 70aaab1..1c5a867 100644 --- a/src-modules/module/viz/masken/44720_maskeninfo.unl +++ b/src-modules/module/viz/masken/44720_maskeninfo.unl @@ -39,7 +39,9 @@ select caption,\ \ -<#if column.coltype="physicalColumn">\ -${column.srcfieldname},\ -<#elseif column.coltype="logicalColumn">\ -${column.colfunction} as ${column.targetfieldname},\ -<#elseif column.coltype="lookupColumn">\ -(${column.colfunction}) as ${column.targetfieldname},\ -<#elseif column.coltype="computedColumn">\ -null::decimal(19,6) as ${column.targetfieldname},\ -\ -\ -null::char(1) as dummycol\ -into temp tmp_stud\ -from ${basetable.runtime_tablename}\ -<#if rpta_column_layout.whereclause !="">\ -where ${rpta_column_layout.whereclause}\ -\ -;\ -\ -\ ---ergebnistabelle:\ -select \ ---zuerst die nicht-Aggregate:\ -<#assign groupby=0 />\ -<#foreach column in columns>\ -<#if column.is_aggregate==0>\ -<#assign groupby=groupby+1 />\ -${column.targetfieldname},\ -\ -\ ---dann die Aggregate:\ -<#foreach column in columns>\ -<#if column.is_aggregate==1 && column.coltype!="computedColumn">\ -sum(${column.targetfieldname}) as ${column.targetfieldname},\ -\ -\ -null::char(1) as dummycol\ -into temp tmp_stud2\ -from tmp_stud\ -where 1=1\ -/* ${<>} */\ -group by\ -<#list 1..groupby as i>${i}\ -<#if i != groupby>\ -,\ -\ -\ -;\ ---für Prozentwerte alle Aggregate summieren:\ -select <#foreach column in columns>\ -<#if column.is_aggregate==1 && column.coltype!="computedColumn">\ -sum(${column.targetfieldname})::float as ${column.targetfieldname},\ -\ -\ -null::char(1) as dummycol\ -into temp tmp_gesamt\ -from tmp_stud2\ -where 1=1\ -;\ -\ -<#assign number_of_visible_colums=0 />\ -<#foreach column in columns>\ -<#if column.is_visible!=0>\ -<#assign number_of_visible_colums=number_of_visible_colums+1 />\ -\ -\ -<#assign colnr=0 />\ -select \ -<#foreach column in columns>\ -<#if column.is_visible!=0>\ -<#assign colnr=colnr+1 />\ -<#assign format_sql="" />\ -<#if column.format_sql?string != "">\ -<#assign format_sql=column.format_sql />\ -\ -\ -<#if column.coltype=="computedColumn">\ -(${column.colfunction})${format_sql} as ${column.targetfieldname}\ -<#else>\ -${column.targetfieldname}${format_sql} as ${column.targetfieldname}\ -\ -\ -<#if colnr < number_of_visible_colums>,\ - --wenn sichtbar\ -\ -from tmp_stud2\ -order by <#list 1..number_of_visible_colums as i>${i}\ -<#if i != number_of_visible_colums>\ -,\ -\ -\ -;\ -<#if basetable.is_virtual==1>\ -drop table if exists ${basetable.runtime_tablename};\ -\ -\ -\ -drop table if exists tmp_stud;\ -drop table if exists tmp_gesamt;\ +<@rpta_interpret_column_layout nonvirtualTableFilter=filter />\ \ \ --wenn columns?has_content^--Freemarker Template\ @@ -254,4 +158,4 @@ Column CID=0 heading_text="${column.caption}" center_heading explanation="${colu width=${column.visible_width} text_size=60\ \ \ -@@@^Altersgruppe^Anzahl^Studienanfänger_innen als Zeitreihe, nach Gesschlecht und Fakultät in verschiedenen Visualisierungen^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^3^700^360^0^1^<>SELECT description FROM rpta_column_layout where uniquename=<>;^ +@@@^Altersgruppe^Anzahl^Studienanfänger_innen als Zeitreihe, nach Gesschlecht und Fakultät in verschiedenen Visualisierungen^drop table if exists tmp_stud2; drop table if exists tmp_stud3;^^3^700^360^^1^<>SELECT description FROM rpta_column_layout where uniquename=<>;^ diff --git a/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql b/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql index f1e38f1..9d80edf 100644 --- a/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql +++ b/src-modules/module/viz/schluesseltabellen/macro_masken_bez_fuellen.sql @@ -18,7 +18,8 @@ select tid from sos_stichtag where appl_key='4'; {"tid":"44070"}, {"tid":"44190"}, {"tid":"44660"}, -{"tid":"44690"} +{"tid":"44690"}, +{"tid":"1801100000"} ] /> @@ -57,7 +58,11 @@ select tid from sos_stichtag where appl_key='4'; {"makro":"44690", "tid":"44570", "sortnr":"30"}, {"makro":"44690", "tid":"44720", "sortnr":"40"}, {"makro":"44690", "tid":"44720", "sortnr":"50"}, -{"makro":"44690", "tid":"44720", "sortnr":"60"} +{"makro":"44690", "tid":"44720", "sortnr":"60"}, + +{"makro":"1801100000", "tid":"44630", "sortnr":"0"}, +{"makro":"1801100000", "tid":"44750", "sortnr":"5"}, +{"makro":"1801100000", "tid":"44570", "sortnr":"10"} @@ -226,7 +231,16 @@ select tid from sos_stichtag where appl_key='4'; {"makro":"44690", "sortnr":"60", "feldname":"Köpfe oder Fälle ?", "value":"1=1"}, {"makro":"44690", "sortnr":"60", "feldname":"Spaltenlayout", "value":"rpta_sos_lab_aggr_abgrp_sem"}, {"makro":"44690", "sortnr":"60", "feldname":"Grafik", "value":"ABSOLV_ABGRP_SEM_AREA"}, -{"makro":"44690", "sortnr":"60", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"} +{"makro":"44690", "sortnr":"60", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"}, + +{"makro":"1801100000", "sortnr":"0", "feldname":"Dashboard", "value":"STUDABSOLV"}, +{"makro":"1801100000", "sortnr":"5", "feldname":"Dashboard", "value":"STUDABSOLV"}, + +{"makro":"1801100000", "sortnr":"10", "feldname":"Köpfe oder Fälle ?", "value":"studiengang_nr = 1 and fach_nr = 1"}, +{"makro":"1801100000", "sortnr":"10", "feldname":"Spaltenlayout", "value":"sos_stud_fak_dashboard"}, +{"makro":"1801100000", "sortnr":"10", "feldname":"Stichtag", "value":sos_stud_stichtag_tagesaktuell}, +{"makro":"1801100000", "sortnr":"10", "feldname":"Grafik", "value":"hms_torte_stud_fak"}, +{"makro":"1801100000", "sortnr":"10", "feldname":"tablestylesheet", "value":"tabelle_html_datenblatt.xsl"} ] />