diff --git a/src-modules/module/viz/schluesseltabellen/#studierende_datenblatt_dashboard.sql# b/src-modules/module/viz/schluesseltabellen/#studierende_datenblatt_dashboard.sql#
new file mode 100644
index 0000000..3e1b861
--- /dev/null
+++ b/src-modules/module/viz/schluesseltabellen/#studierende_datenblatt_dashboard.sql#
@@ -0,0 +1,440 @@
+--freemarker template
+<sqlvars>
+<sqlvar name="sos_stg_aggr_exists">
+select sp_table_exists('sos_stg_aggr') from xdummy;
+</sqlvar>
+<sqlvar name="fact_table_source">
+select name
+       from sx_tables where name ='sos_stg_aggr'
+       
+</sqlvar>
+<sqlvar name="added_tables" type="hashsequence">
+select 1::smallint as sortnr,
+name, trim(name) ||'_'   as prefix,
+caption,
+'dim_studiengang.tid=sos_stg_aggr.tid_stg' as joinclause
+       from sx_tables where name  in ('dim_studiengang')
+
+order by 1
+</sqlvar>
+<sqlvar name="fact_table_fields">
+select '(''tid_stg'',''sem_rueck_beur_ein'',''geschlecht'', ''hzbart'',''hzbart_int'', ''hzbkfz'', ''hzbkfzkz'', ''ca12_staat'', ''fach_sem_zahl'',''hs'',''summe'')'
+from xdummy;
+</sqlvar>
+<sqlvar name="added_table_fields">
+select '(''fb'', ''abschluss_grp'', ''abschluss_grp_str'', ''fb_str'',''abschluss_astat_bund'')'
+from xdummy;
+</sqlvar>
+<sqlvar name="fields_target" type="hashsequence"><![CDATA[
+<#if fact_table_source?exists>
+select tid, table_name,
+       name,
+       name as targetname
+       from sx_fields where table_name ='${fact_table_source}'
+       and currentlyused=1
+       and name in ${fact_table_fields}
+       <#foreach added_table in added_tables>
+       union
+       select tid,table_name,
+       name,
+       '${added_table.prefix}' || name as targetname
+       from sx_fields where table_name ='${added_table.name}'
+       and currentlyused=1
+       and name in  ${added_table_fields}      
+       </#foreach>
+       order by 1
+</#if>
+]]>
+</sqlvar>
+</sqlvars>
+
+<#if sos_stg_aggr_exists==1 && fact_table_source?exists >
+
+<#assign  fact_table_target = {"name":"sos_stud_astat_dashboard", "caption":"Studierende (Fachsem., HS-Sem., Studiengang) Dashboard"}
+   />
+
+
+CREATE temp table tmp_tables(
+name CHAR(255) , 
+caption CHAR(255) , 
+description CHAR(255) , 
+table_type CHAR(255) , 
+systeminfo_id INTEGER  , 
+systeminfo_orig INTEGER  , 
+thema CHAR(255) , 
+sachgebiete_id CHAR(255) 
+);
+CREATE temp TABLE tmp_fields(
+tid serial NOT NULL,
+table_name VARCHAR(255)  not null, 
+name VARCHAR(255)  not null, 
+caption VARCHAR(255) , 
+description VARCHAR(255) , 
+field_type VARCHAR(255)  not null, 
+field_size VARCHAR(255)  , 
+field_not_null smallint,
+currentlyused SMALLINT , 
+is_primarykey SMALLINT  default 0 , 
+foreignkey_tab VARCHAR(255) , 
+foreignkey_col VARCHAR(255) , 
+foreignkey_int VARCHAR(255) , 
+foreignkey_cap VARCHAR(255) , 
+foreignkey_cond VARCHAR(255) , 
+foreignkey_func VARCHAR(255) , 
+check_integrity SMALLINT, 
+is_sum SMALLINT  default 1,
+foreignkey_uniquename VARCHAR(255)
+
+);
+
+
+--Vorbereitung:
+UPDATE sx_tables
+   SET caption = 'Standorte'
+WHERE name='sos_k_stort';
+UPDATE sx_tables
+   SET caption = 'Studienart'
+WHERE name = 'sos_k_stuart';
+UPDATE sx_tables
+   SET caption = 'Studiumstyp'
+WHERE name = 'sos_k_stutyp';
+UPDATE sx_tables
+   SET caption = 'Studienform'
+WHERE name = 'sos_k_stufrm';
+UPDATE sx_tables
+   SET caption = 'Hörerstatus'
+WHERE name = 'sos_k_hrst';
+
+
+
+--drop view if exists sos_stud_astat;
+
+
+drop VIEW sos_k_stutyp;
+
+CREATE VIEW sos_k_stutyp
+(
+  apnr,
+  druck,
+  astat
+)
+AS 
+ SELECT cifx.apnr,
+    cifx.druck,
+    astat
+   FROM cifx
+  WHERE cifx.key = 40;
+  
+
+update sx_fields set 
+       is_sum=0
+       where table_name='sos_stg_aggr'
+       and name!='summe';
+update sx_fields set 
+       is_sum=1
+       where table_name='sos_stg_aggr'
+       and name='summe';
+       
+  
+insert into tmp_tables (
+name,
+caption,
+description,
+table_type,
+systeminfo_id,
+thema,
+sachgebiete_id
+) 
+select 
+'${fact_table_target.name}',
+'${fact_table_target.caption}',
+description,
+table_type,
+systeminfo_id,
+thema,
+sachgebiete_id
+from sx_tables where name='${fact_table_source}'
+;
+
+
+insert into tmp_fields (table_name,
+       name,
+       caption,
+       description,
+       field_type,
+       field_size,
+       field_not_null,
+       currentlyused,
+       is_primarykey,
+       foreignkey_tab,
+       foreignkey_col,
+       foreignkey_int,
+       foreignkey_cap,
+       foreignkey_cond,
+       foreignkey_func,
+       check_integrity,
+       is_sum,
+       foreignkey_uniquename) 
+select  '${fact_table_target.name}' as table_name,
+       name,
+       caption,
+       description,
+       field_type,
+       field_size,
+       field_not_null,
+       currentlyused,
+       is_primarykey,
+       foreignkey_tab,
+       foreignkey_col,
+       foreignkey_int,
+       foreignkey_cap,
+       foreignkey_cond,
+       foreignkey_func,
+       check_integrity,
+       is_sum,
+       foreignkey_uniquename
+       from sx_fields where table_name ='${fact_table_source}'
+       and name in ${fact_table_fields}
+       and currentlyused=1;
+<#foreach added_table in added_tables>
+insert into tmp_fields (table_name,
+       name,
+       caption,
+       description,
+       field_type,
+       field_size,
+       field_not_null,
+       currentlyused,
+       is_primarykey,
+       foreignkey_tab,
+       foreignkey_col,
+       foreignkey_int,
+       foreignkey_cap,
+       foreignkey_cond,
+       foreignkey_func,
+       check_integrity,
+       is_sum,
+       foreignkey_uniquename) 
+select  '${fact_table_target.name}' as table_name,
+       '${added_table.prefix}' || name,
+       '${added_table.caption}: ' || caption,
+       description,
+       field_type,
+       field_size,
+       field_not_null,
+       currentlyused,
+       is_primarykey,
+       foreignkey_tab,
+       foreignkey_col,
+       foreignkey_int,
+       foreignkey_cap,
+       foreignkey_cond,
+       foreignkey_func,
+       check_integrity,
+       is_sum,
+       foreignkey_uniquename
+       from sx_fields where table_name ='${added_table.name}'
+       and name in ${added_table_fields}
+       and currentlyused=1;
+</#foreach>
+
+CREATE temp TABLE tmp_rpta_resultset
+(
+    caption        varchar(255),
+   uniquename     varchar(255),
+   fieldclause    text,
+   joinclause     text,
+   whereclause    text,
+   systeminfo_id  integer,
+   is_virtual smallint default 1
+);
+
+insert into tmp_rpta_resultset(caption,
+       uniquename,
+       systeminfo_id,
+       is_virtual)
+       select '${fact_table_target.caption}',
+       '${fact_table_target.name}',
+       7,
+       0
+;
+
+
+update tmp_rpta_resultset set fieldclause='
+<#foreach field_target in fields_target>
+${field_target.table_name}.${field_target.name} as ${field_target.targetname},
+</#foreach>
+null::varchar as dummy',
+joinclause='${fact_table_source}
+<#foreach added_table in added_tables>
+left outer join ${added_table.name} on (${added_table.joinclause})
+</#foreach>';
+
+--whereclause erstmal primitiv
+update tmp_rpta_resultset set whereclause = 'and stichtag in (select tid  from sos_stichtag where appl_key=''0'') and hrst in (select apnr from sos_k_hrst HRST where HRST.astat in (''1'',''2'')) and kz_rueck_beur_ein in (1,2,3)';
+select * into temp tmp_rs1 
+from rpta_resultset
+;
+
+update rpta_resultset set caption=T.caption,
+       fieldclause=T.fieldclause,
+       joinclause=T.joinclause,
+       whereclause=T.whereclause,
+       is_virtual=T.is_virtual
+       from tmp_rpta_resultset T
+       where T.systeminfo_id=rpta_resultset.systeminfo_id
+       and T.uniquename=rpta_resultset.uniquename
+       ;
+
+insert into rpta_resultset(caption,
+       uniquename,
+       fieldclause,
+       joinclause,
+       whereclause,
+       systeminfo_id,
+       is_virtual)
+select caption,
+       uniquename,
+       fieldclause,
+       joinclause,
+       whereclause,
+       systeminfo_id,
+       is_virtual
+       from tmp_rpta_resultset
+       where 0=(select count(*) 
+       from tmp_rs1 T
+       where T.systeminfo_id=tmp_rpta_resultset.systeminfo_id
+       and T.uniquename=tmp_rpta_resultset.uniquename)
+       ;
+drop table tmp_rpta_resultset;
+drop table tmp_rs1;
+
+delete from sx_tables where name
+in (select T.name from tmp_tables  T);
+
+insert into sx_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id)
+select name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id
+from tmp_tables;
+
+
+delete from sx_fields where table_name
+in (select T.table_name from tmp_fields T);
+
+insert into sx_fields (table_name,name,caption,description,field_type,
+field_size,
+field_not_null,
+currentlyUsed,
+foreignkey_tab,
+foreignkey_col,
+foreignkey_cap,
+foreignkey_int,
+foreignkey_cond,
+foreignkey_func,
+check_integrity,
+is_sum,
+foreignkey_uniquename
+)
+select 
+F.table_name,F.name,F.caption,F.description,F.field_type,
+F.field_size,
+F.field_not_null,
+F.currentlyUsed,
+F.foreignkey_tab,
+F.foreignkey_col,
+F.foreignkey_cap,
+F.foreignkey_int,
+F.foreignkey_cond,
+F.foreignkey_func,
+F.check_integrity,
+F.is_sum,
+F.foreignkey_uniquename
+
+from tmp_fields F;
+
+
+drop table tmp_fields;
+drop table tmp_tables;
+
+
+--rpta_column füllen:
+select * into temp tmp_rc1
+from rpta_column;
+
+
+create temp table tmp_rpta_column(
+ uniquename       varchar(255)   NOT NULL,
+   caption          varchar(255),
+   srcfieldname     varchar(255),
+   column_type      integer,
+   col_function     text,
+   is_aggregate     smallint,
+   resultset_id     integer,
+   description      text,
+   custom integer default 0
+   );
+
+insert into tmp_rpta_column(   uniquename,
+       caption,
+       srcfieldname,
+       column_type,
+       col_function,
+       is_aggregate,
+       resultset_id,
+       description)
+       select  F.name as  uniquename,
+       coalesce(T.caption,T.name) || ' - ' || F.caption,
+       F.name as srcfieldname,
+       1 as column_type,
+       (case when F.is_sum=1 then 'sum' else null::varchar end)  as col_function,
+       (case when F.is_sum=1 then 1 else 0 end) as is_aggregate,
+       R.tid as resultset_id,
+       F.description
+from rpta_resultset R, sx_fields F left outer join sx_tables T on (T.name=F.table_name) 
+where F.table_name='${fact_table_target.name}'
+and R.uniquename='${fact_table_target.name}'
+and F.currentlyused=1
+;
+
+update rpta_column set 
+       caption=T.caption,
+       srcfieldname=T.srcfieldname,
+       column_type=T.column_type,
+       col_function=T.col_function,
+       is_aggregate=T.is_aggregate,
+       resultset_id=R.tid,
+       description=T.description,
+       custom=T.custom
+       from tmp_rpta_column T, rpta_resultset R
+where T.uniquename=rpta_column.uniquename
+and rpta_column.resultset_id=R.tid
+and R.uniquename='${fact_table_target.name}'
+;
+insert into rpta_column(   uniquename,
+       caption,
+       srcfieldname,
+       column_type,
+       col_function,
+       is_aggregate,
+       resultset_id,
+       description,
+       custom)
+select T.uniquename,
+T.caption,
+T.srcfieldname,
+T.column_type,
+T.col_function,
+T.is_aggregate,
+R.tid as resultset_id,
+T.description,
+T.custom
+       from tmp_rpta_column T, rpta_resultset R
+       where R.uniquename='${fact_table_target.name}'
+       and 0=(select count(*) from tmp_rc1 C
+       where C.uniquename=T.uniquename
+       and C.resultset_id=R.tid)
+       ;
+
+drop table tmp_rpta_column;
+drop table tmp_rc1;
+
+</#if> --wenn sos_stg_aggr_exists=1
diff --git a/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_geschl_dashboard_fuellen.sql b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_geschl_dashboard_fuellen.sql
new file mode 100644
index 0000000..9d1ca55
--- /dev/null
+++ b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_geschl_dashboard_fuellen.sql
@@ -0,0 +1,83 @@
+--freemarker template
+<#include "RPTA-Makros"/>
+<sqlvars>
+<sqlvar name="rpta_installed">
+select count(*) from systeminfo where tid=330;
+</sqlvar>
+</sqlvars>
+<#assign rpta_column_layout = 
+{"uniquename":"sos_stud_geschl_dashboard",
+"caption":"Studierende nach Geschlecht",
+"rpta_resultset":"sos_stud_astat_dashboard",
+"whereclause":"",
+"description":"Studierende nach Geschlecht für Dashboard",
+"is_virtual":1
+}
+   />
+
+
+<#assign rpta_columns = [
+{"uniquename":"geschlecht",
+"caption":"Geschlecht (Schlüssel)",
+"srcfieldname":"geschlecht",
+"targetfieldname":"geschlecht",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"0",
+"format_code":"",
+"visible_size":"5",
+"is_aggregate":"0",
+"description":"Geschlecht"
+},
+{"uniquename":"geschlecht_str",
+"caption":"Geschlecht",
+"srcfieldname":"",
+"targetfieldname":"geschlecht_str",
+"column_type":"lookupColumn",
+"col_function":"select druck from sos_k_geschl GE where GE.apnr=geschlecht",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"is_aggregate":"0",
+"description":"Geschlecht"
+},
+{"uniquename":"sem_rueck_beur_ein",
+"caption":"Semester",
+"srcfieldname":"sem_rueck_beur_ein",
+"targetfieldname":"",
+"column_type":"physicalColumn",
+"col_function":"",
+"is_visible":"1",
+"format_code":"",
+"visible_size":"5",
+"is_aggregate":"0",
+"description":"Semester"
+},
+{"uniquename":"summe",
+"caption":"Anzahl der Studierenden",
+"srcfieldname":"summe",
+"targetfieldname":"summe",
+"column_type":"physicalColumn",
+"col_function":"sum",
+"is_visible":"1",
+"visible_size":"5",
+"is_aggregate":"1",
+"description":"Summe der Studierenden"
+},
+{"uniquename":"anteil",
+"caption":"Anteil der Studierenden (in %)",
+"srcfieldname":"",
+"targetfieldname":"anteil",
+"column_type":"computedColumn",
+"col_function":"select (summe::float/(select G.summe from tmp_gesamt G)*100)::integer",
+"is_visible":"1",
+"visible_size":"5",
+"is_aggregate":"0",
+"description":"Anteil in % der Studierenden"
+}
+]
+   />
+ 
+<#if rpta_installed==1>
+<@rpta_column_layout_fuellen />
+</#if>
diff --git a/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_geschl_fuellen.sql b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_geschl_fuellen.sql
index 9d1ca55..442fd8e 100644
--- a/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_geschl_fuellen.sql
+++ b/src-modules/module/viz/schluesseltabellen/rpta_column_layout_sos_stud_geschl_fuellen.sql
@@ -6,11 +6,11 @@ select count(*) from systeminfo where tid=330;
 </sqlvar>
 </sqlvars>
 <#assign rpta_column_layout = 
-{"uniquename":"sos_stud_geschl_dashboard",
+{"uniquename":"sos_stud_geschl",
 "caption":"Studierende nach Geschlecht",
-"rpta_resultset":"sos_stud_astat_dashboard",
+"rpta_resultset":"sos_stud_astat",
 "whereclause":"",
-"description":"Studierende nach Geschlecht für Dashboard",
+"description":"Studierende nach Geschlecht",
 "is_virtual":1
 }
    />