Feldabhängigkeiten in Absolventinnenmaske

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\
-;^ ^ ^
+;^ ^<<SQL>> 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\
+;^

src-modules/module/viz/masken/44720_felderinfo.unl

@@ -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\
- ;^^<<SQL>>SELECT uniquename,\
+ ;^hidden^ ^
-       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';^
 44739^Semestertyp^25^350^-1^140^80^1^integer^255^0^1^<<SQL>> 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^
 44741^Abschluss^7^0^0^100^200^3^char^1500^0^12^<<SQL>> 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^
+44744^_customVorbelegung^40^0^0^100^100^1^char^5000^0^1^<<SQL>> select 'splitFields(''Grafikausgabe'')','Ausgabe';^{InputCheck:disabled}^<<SQL>> select 'splitFields(''Grafikausgabe'')','Ausgabe';^
+44745^Grafikausgabe^1000^300^-1^170^150^1^char^30^0^1^<<SQL>> 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\
+;^ ^<<SQL>> 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\
+;^

src-modules/module/viz/masken/44720_masken_felder_bez.unl

@@ -19,3 +19,5 @@
 44720^44741^
 44720^44742^
 44720^44743^
+44720^44744^
+44720^44745^

src-modules/module/viz/masken/44720_maskeninfo.unl

@@ -39,7 +39,9 @@ select  caption,\
 <sqlvar name="rpta_column_layout" type="hash"><![CDATA[\
 select L.uniquename,\
        L.caption,\
-       L.whereclause\
+       L.whereclause,\
+       R.is_virtual,\
+       L.sortclause\
        from rpta_resultset R, rpta_column_layout L\
        where L.resultset_id=R.tid\
        and R.uniquename='${basetable.name}'\
@@ -54,10 +56,12 @@ C.is_aggregate,\
 (case when string_not_null(CL.caption)='' then C.caption else CL.caption end) as caption,\
 CL.is_visible,\
 CL.visible_size as visible_width,\
-(select F.sql_code from rpta_format_code F where F.tid=CL.format_code_id) as format_sql,\
+F.sql_code as format_sql,\
+F.uniquename as format_uniquename,\
 C.col_function as colfunction,\
 (case when string_not_null(CL.description)='' then C.description else CL.description end) as description\
-FROM rpta_column_layout L, rpta_column2layout CL, rpta_column C, rpta_column_type T\
+FROM rpta_column_layout L,  rpta_column C, rpta_column_type T,rpta_column2layout CL \
+left outer join rpta_format_code F on (F.tid=CL.format_code_id)\
 where L.tid=CL.layout_id\
 and C.tid=CL.column_id\
 and T.tid=C.column_type\
@@ -138,107 +142,7 @@ and ${filter}\
 \
 \
 \
-select \
+<@rpta_interpret_column_layout  nonvirtualTableFilter=filter />\
---zuerst die Basisdaten:\
-<#foreach column in columns>\
-<#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},\
-</#if>\
-</#foreach>\
-null::char(1) as dummycol\
-into temp tmp_stud\
-from ${basetable.runtime_tablename}\
-<#if rpta_column_layout.whereclause !="">\
-where ${rpta_column_layout.whereclause}\
-</#if>\
-;\
-\
-\
---ergebnistabelle:\
-select \
---zuerst die nicht-Aggregate:\
-<#assign groupby=0 />\
-<#foreach column in columns>\
-<#if column.is_aggregate==0>\
-<#assign groupby=groupby+1 />\
-${column.targetfieldname},\
-</#if>\
-</#foreach>\
---dann die Aggregate:\
-<#foreach column in columns>\
-<#if column.is_aggregate==1 &&  column.coltype!="computedColumn">\
-sum(${column.targetfieldname}) as ${column.targetfieldname},\
-</#if>\
-</#foreach>\
-null::char(1) as dummycol\
-into temp tmp_stud2\
-from tmp_stud\
-where 1=1\
-/*  ${<<Zusatzfilter>>} */\
-group by\
-<#list 1..groupby as i>${i}\
-<#if i != groupby>\
-,\
-</#if>\
-</#list>\
-;\
---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},\
-</#if>\
-</#foreach>\
-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 />\
-</#if>\
-</#foreach>\
-<#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>\
-\
-<#if column.coltype=="computedColumn">\
-(${column.colfunction})${format_sql} as ${column.targetfieldname}\
-<#else>\
-${column.targetfieldname}${format_sql} as ${column.targetfieldname}\
-</#if>\
-\
-<#if colnr &lt; number_of_visible_colums>,</#if>\
-</#if> --wenn sichtbar\
-</#foreach>\
-from tmp_stud2\
-order by <#list 1..number_of_visible_colums as i>${i}\
-<#if i != number_of_visible_colums>\
-,\
-</#if>\
-</#list>\
-;\
-<#if basetable.is_virtual==1>\
-drop table if exists ${basetable.runtime_tablename};\
-</#if>\
-\
-\
-drop table if exists tmp_stud;\
-drop table if exists tmp_gesamt;\
 \
 \
 </#if> --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\
 </#if>\
 </#foreach>\
-@@@^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^<<SQL>>SELECT description FROM rpta_column_layout where uniquename=<<Spaltenlayout>>;^
+@@@^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^<<SQL>>SELECT description FROM rpta_column_layout where uniquename=<<Spaltenlayout>>;^

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"}
 
 ] />