Browse Source

Layoutanpassung Masken #7

master
Daniel Quathamer 8 hours ago
parent
commit
4eaf0d6a48
  1. 2
      superx/WEB-INF/conf/edustore/db/install/MODULINFO
  2. 2
      superx/WEB-INF/conf/edustore/db/install/VERSION
  3. 14
      superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/sch.eduetl/k_astat_studienfach_land.tab
  4. 2
      superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/sch.eduetl/macro_masken_bez.tab
  5. 2
      superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql
  6. 2
      superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_pg.xml
  7. 32032
      superx/WEB-INF/conf/edustore/db/install/conf/kern.html
  8. 2
      superx/WEB-INF/conf/edustore/db/install/conf/kern_load.html
  9. 2
      superx/WEB-INF/conf/edustore/db/install/conf/module_metadata.sql
  10. 26
      superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_fuellen.sql
  11. 18
      superx/WEB-INF/conf/edustore/db/install/kern_install_pg.sql
  12. 16
      superx/WEB-INF/conf/edustore/db/install/masken/71620_maskeninfo.unl
  13. 2
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_pg.sql
  14. 2
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_pg.sql
  15. 16
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_pg.sql
  16. 26
      superx/WEB-INF/kern_dbforms-config_pg.xml
  17. 2
      superx/edit/kern/macro_masken_bez_edit.jsp
  18. 2
      superx/edit/kern/macro_masken_bez_list.jsp
  19. 6
      superx/edit/kern/maske_combo_laden.jsp
  20. 5
      superx/edit/kern/maske_sicht_laden.jsp
  21. 9
      superx/style/sx_common.css
  22. 6
      superx/style/sx_tabelle.css
  23. 33
      superx/xml/nd_templates.xsl

2
superx/WEB-INF/conf/edustore/db/install/MODULINFO

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
#!/bin/bash
export MODUL_VERSION=5.2
export MODUL_VERSION=5.3b
export MODULNAME=kern
export SACHGEBIETID=0
export SACHGEBIET=Administration

2
superx/WEB-INF/conf/edustore/db/install/VERSION

@ -1 +1 @@ @@ -1 +1 @@
5.2
5.3b

14
superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/sch.eduetl/k_astat_studienfach_land.tab

@ -10,4 +10,18 @@ name NVARCHAR(255) , @@ -10,4 +10,18 @@ name NVARCHAR(255) ,
isced NVARCHAR(255) ,
keybund NVARCHAR(255)
);
comment on column k_astat_studienfach_land.schluessel is 'Landesschlüssel';
comment on column k_astat_studienfach_land.gueltig_ab is 'Gültigkeitsbeginn';
comment on column k_astat_studienfach_land.land is 'Bundesland';
comment on column k_astat_studienfach_land.gueltig_bis is 'Gültigkeitsende';
comment on column k_astat_studienfach_land.name is 'Drucktext des Schlüssels';
comment on column k_astat_studienfach_land.isced is 'ISCED-Code';
comment on column k_astat_studienfach_land.keybund is 'Bundesschlüssel des Studienfaches';

2
superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/sch.eduetl/macro_masken_bez.tab

@ -4,7 +4,7 @@ create table macro_masken_bez( @@ -4,7 +4,7 @@ create table macro_masken_bez(
maskeninfo_id2 INTEGER not null,
active INTEGER default 1 not null,
sortnr SMALLINT ,
schleifenrelation NCHAR(255) ,
schleifenrelation TEXT ,
schleifenfeldname NCHAR(255) ,
alias NCHAR(255) ,
schleifenfstand NCHAR(255) ,

2
superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
-- Fülle db_version
delete from db_version where his_system='kern';
insert into db_version (his_system,version,systeminfo_id) values('kern','5.2',9);
insert into db_version (his_system,version,systeminfo_id) values('kern','5.3b',9);

2
superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_pg.xml

@ -263,7 +263,7 @@ @@ -263,7 +263,7 @@
<dbi:dbaction dbi:action="executeFile">
<dbi:file database="eduetl" encoding="UTF-8" withNativeClient="n" structure="SQL" filename="$SUPERX_DIR/db/install/schluesseltabellen/themenbaum_update_logo_css.sql"/>
</dbi:dbaction>
<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.2'
<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.3b'
WHERE his_system = 'kern';
</dbi:dbaction>
<dbi:dbaction dbi:action="sqlquery">eduetl:select setval('themenbaum_tid_seq',(select max(tid)+1 from themenbaum));

32032
superx/WEB-INF/conf/edustore/db/install/conf/kern.html

File diff suppressed because one or more lines are too long

2
superx/WEB-INF/conf/edustore/db/install/conf/kern_load.html

@ -92,7 +92,7 @@ font-style:italic: @@ -92,7 +92,7 @@ font-style:italic:
<td class="themenspalte">SuperX-Version</td><td>2</td>
</tr>
<tr>
<td class="themenspalte">Modulversion</td><td>5.2</td>
<td class="themenspalte">Modulversion</td><td>5.3b</td>
</tr>
<tr>
<td class="themenspalte">Sachgebiet</td><td>Administration id 0</td>

2
superx/WEB-INF/conf/edustore/db/install/conf/module_metadata.sql

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
--SQL Script automatisch generiert von SuperX module_upgrade.xsl
delete from db_version where his_system='kern';
insert into db_version (his_system,version,systeminfo_id) values('kern','5.2',9);
insert into db_version (his_system,version,systeminfo_id) values('kern','5.3b',9);
CREATE temp TABLE tmp_db_forms (

26
superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_fuellen.sql

@ -8211,7 +8211,7 @@ check_integrity, @@ -8211,7 +8211,7 @@ check_integrity,
is_sum)
values('k_astat_studienfach_land',
'schluessel',
'schluessel',
'Landesschlüssel',
'',
'VARCHAR',
'255',
@ -8233,8 +8233,8 @@ check_integrity, @@ -8233,8 +8233,8 @@ check_integrity,
is_sum)
values('k_astat_studienfach_land',
'gueltig_ab',
'gueltig_ab',
'',
'Gültigkeitsbeginn',
' (Bsp: 20181 für SoSe2018)',
'INTEGER',
'10',
0,
@ -8255,8 +8255,8 @@ check_integrity, @@ -8255,8 +8255,8 @@ check_integrity,
is_sum)
values('k_astat_studienfach_land',
'land',
'land',
'',
'Bundesland',
' (Bsp: 1 für Schleswig-Holstein)',
'INTEGER',
'10',
0,
@ -8321,8 +8321,8 @@ check_integrity, @@ -8321,8 +8321,8 @@ check_integrity,
is_sum)
values('k_astat_studienfach_land',
'gueltig_bis',
'gueltig_bis',
'',
'Gültigkeitsende',
' (Bsp: 20251 für SoSe2025)',
'INTEGER',
'10',
0,
@ -8343,7 +8343,7 @@ check_integrity, @@ -8343,7 +8343,7 @@ check_integrity,
is_sum)
values('k_astat_studienfach_land',
'name',
'name',
'Drucktext des Schlüssels',
'',
'VARCHAR',
'255',
@ -8365,8 +8365,8 @@ check_integrity, @@ -8365,8 +8365,8 @@ check_integrity,
is_sum)
values('k_astat_studienfach_land',
'isced',
'isced',
'',
'ISCED-Code',
'Code des Studienfaches nach International Standard Classification of Education',
'VARCHAR',
'255',
0,
@ -8387,8 +8387,8 @@ check_integrity, @@ -8387,8 +8387,8 @@ check_integrity,
is_sum)
values('k_astat_studienfach_land',
'keybund',
'keybund',
'',
'Bundesschlüssel des Studienfaches',
' oder des zugeordneten Studienfaches',
'VARCHAR',
'255',
0,
@ -10335,7 +10335,7 @@ values('macro_masken_bez', @@ -10335,7 +10335,7 @@ values('macro_masken_bez',
'schleifenrelation',
'schleifenrelation',
'',
'CHAR',
'TEXT',
'255',
0,
1,

18
superx/WEB-INF/conf/edustore/db/install/kern_install_pg.sql

@ -459,7 +459,7 @@ create table macro_masken_bez( @@ -459,7 +459,7 @@ create table macro_masken_bez(
maskeninfo_id2 INTEGER not null,
active INTEGER default 1 not null,
sortnr SMALLINT ,
schleifenrelation CHAR(255) ,
schleifenrelation TEXT ,
schleifenfeldname CHAR(255) ,
alias CHAR(255) ,
schleifenfstand CHAR(255) ,
@ -4049,6 +4049,20 @@ keybund VARCHAR(255) @@ -4049,6 +4049,20 @@ keybund VARCHAR(255)
comment on column k_astat_studienfach_land.schluessel is 'Landesschlüssel';
comment on column k_astat_studienfach_land.gueltig_ab is 'Gültigkeitsbeginn';
comment on column k_astat_studienfach_land.land is 'Bundesland';
comment on column k_astat_studienfach_land.gueltig_bis is 'Gültigkeitsende';
comment on column k_astat_studienfach_land.name is 'Drucktext des Schlüssels';
comment on column k_astat_studienfach_land.isced is 'ISCED-Code';
comment on column k_astat_studienfach_land.keybund is 'Bundesschlüssel des Studienfaches';
select now(), 'Tabelle k_astat_studienfach_land erzeugt';
@ -5403,7 +5417,7 @@ select now(), 'Fülle db_version'; @@ -5403,7 +5417,7 @@ select now(), 'Fülle db_version';
delete from db_version where his_system='kern';
insert into db_version (his_system,version,systeminfo_id) values('kern','5.2',9);
insert into db_version (his_system,version,systeminfo_id) values('kern','5.3b',9);

16
superx/WEB-INF/conf/edustore/db/install/masken/71620_maskeninfo.unl

@ -58,7 +58,11 @@ d_akt_bis,\ @@ -58,7 +58,11 @@ d_akt_bis,\
sourcesystem_str ,\
sourcesystem_id ,\
systeminfo_str,\
systeminfo_datum\
systeminfo_datum, --,\
(case when sourcesystem=6 then '71800&key='||key||'&apnr='||apnr||'' else '' end) as nextmask, --,\
(case when exists(select C.apnr from cifx_customize C where C.key=tmp_ergebnis.key and C.apnr=tmp_ergebnis.apnr) \
then '../edit/kern/cifx_customize_edit.jsp|key='||key||'&apnr='||apnr||''\
else '' end ) as nextedit\
from tmp_ergebnis\
order by 1,2,3,4,5,6,7,8,9\
;^XIL List\
@ -86,7 +90,7 @@ Column CID=1 heading_text=" Gültig bis " center_heading\ @@ -86,7 +90,7 @@ Column CID=1 heading_text=" Gültig bis " center_heading\
Column CID=1 heading_text="Quellsystem" center_heading\
row_selectable col_selectable heading_platform readonly\
width=20 text_size=200\
Column CID=1 heading_text="Quellsystem \\nSchlüssel" center_heading\
Column CID=1 heading_text="ID im \\nQuellsystem" center_heading\
row_selectable col_selectable heading_platform readonly\
width=10 text_size=200\
Column CID=1 heading_text="Komponente" center_heading\
@ -95,4 +99,10 @@ Column CID=1 heading_text="Komponente" center_heading\ @@ -95,4 +99,10 @@ Column CID=1 heading_text="Komponente" center_heading\
Column CID=1 heading_text="Komponente\\nLetzter Update" center_heading\
row_selectable col_selectable heading_platform readonly\
width=20 text_size=200\
@@@^ ^ ^Schlüsselverwaltung BI und Bezug zur jew. Komponente / zum jew. Vorsystem^drop table tmp_ergebnis;^^1^440^360^^1^^
Column CID=1 heading_text="Umschlüsseln" center_heading\
row_selectable col_selectable heading_platform readonly\
width=2 text_size=200\
Column CID=1 heading_text="Anpassen Texte" center_heading\
row_selectable col_selectable heading_platform readonly\
width=2 text_size=200\
@@@^ ^ ^Schlüsselverwaltung BI und Bezug zur jew. Komponente / zum jew. Vorsystem^drop table tmp_ergebnis;^ ^1^440^360^^1^ ^

2
superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_pg.sql

@ -1086,7 +1086,7 @@ alter table macro_masken_bez add column sortnr SMALLINT ; @@ -1086,7 +1086,7 @@ alter table macro_masken_bez add column sortnr SMALLINT ;
select now(), 'field macro_masken_bez.schleifenrelation will be added';
alter table macro_masken_bez add column schleifenrelation CHAR(255) ;
alter table macro_masken_bez add column schleifenrelation TEXT ;
</#if>

2
superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_pg.sql

@ -376,7 +376,7 @@ select now(), 'Fülle db_version'; @@ -376,7 +376,7 @@ select now(), 'Fülle db_version';
delete from db_version where his_system='kern';
insert into db_version (his_system,version,systeminfo_id) values('kern','5.2',9);
insert into db_version (his_system,version,systeminfo_id) values('kern','5.3b',9);

16
superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_pg.sql

@ -888,7 +888,7 @@ create table macro_masken_bez( @@ -888,7 +888,7 @@ create table macro_masken_bez(
maskeninfo_id2 INTEGER not null,
active INTEGER default 1 not null,
sortnr SMALLINT ,
schleifenrelation CHAR(255) ,
schleifenrelation TEXT ,
schleifenfeldname CHAR(255) ,
alias CHAR(255) ,
schleifenfstand CHAR(255) ,
@ -5294,6 +5294,20 @@ keybund VARCHAR(255) @@ -5294,6 +5294,20 @@ keybund VARCHAR(255)
comment on column k_astat_studienfach_land.schluessel is 'Landesschlüssel';
comment on column k_astat_studienfach_land.gueltig_ab is 'Gültigkeitsbeginn';
comment on column k_astat_studienfach_land.land is 'Bundesland';
comment on column k_astat_studienfach_land.gueltig_bis is 'Gültigkeitsende';
comment on column k_astat_studienfach_land.name is 'Drucktext des Schlüssels';
comment on column k_astat_studienfach_land.isced is 'ISCED-Code';
comment on column k_astat_studienfach_land.keybund is 'Bundesschlüssel des Studienfaches';
</#if>
delete from db_tabellen where name='k_astat_studienfach_land';
insert into db_tabellen (name,protokollierung) values('k_astat_studienfach_land',0);

26
superx/WEB-INF/kern_dbforms-config_pg.xml

@ -672,15 +672,25 @@ @@ -672,15 +672,25 @@
<interceptor className="de.superx.servlet.DbformInterceptor"/>
</table>
<table name="k_astat_studienfach_land">
<field name="schluessel" description="" fieldType="varchar" size="255" isKey="" sortable=""/>
<field name="gueltig_ab" description="" fieldType="int" size="6" isKey="" sortable=""/>
<field name="land" description="" fieldType="int" size="6" isKey="" sortable=""/>
<field name="schluessel" description="Landesschlüssel" fieldType="varchar" size="255" isKey="" sortable=""/>
<field name="gueltig_ab" description="Gültigkeitsbeginn" fieldType="int" size="6" isKey="" sortable="">
<comment> (Bsp: 20181 für SoSe2018)</comment>
</field>
<field name="land" description="Bundesland" fieldType="int" size="6" isKey="" sortable="">
<comment> (Bsp: 1 für Schleswig-Holstein)</comment>
</field>
<field name="version" description="" fieldType="int" size="6" isKey="" sortable=""/>
<field name="sortkey" description="" fieldType="int" size="6" isKey="" sortable=""/>
<field name="gueltig_bis" description="" fieldType="int" size="6" isKey="" sortable=""/>
<field name="name" description="" fieldType="varchar" size="255" isKey="" sortable=""/>
<field name="isced" description="" fieldType="varchar" size="255" isKey="" sortable=""/>
<field name="keybund" description="" fieldType="varchar" size="255" isKey="" sortable=""/>
<field name="gueltig_bis" description="Gültigkeitsende" fieldType="int" size="6" isKey="" sortable="">
<comment> (Bsp: 20251 für SoSe2025)</comment>
</field>
<field name="name" description="Drucktext des Schlüssels" fieldType="varchar" size="255" isKey="" sortable=""/>
<field name="isced" description="ISCED-Code" fieldType="varchar" size="255" isKey="" sortable="">
<comment>Code des Studienfaches nach International Standard Classification of Education</comment>
</field>
<field name="keybund" description="Bundesschlüssel des Studienfaches" fieldType="varchar" size="255" isKey="" sortable="">
<comment> oder des zugeordneten Studienfaches</comment>
</field>
<interceptor className="de.superx.servlet.DbformInterceptor"/>
</table>
<table name="k_prio_param">
@ -811,7 +821,7 @@ @@ -811,7 +821,7 @@
<field name="maskeninfo_id2" description="Untermaske" fieldType="int" size="6" isKey="true" sortable=""/>
<field name="active" description="" fieldType="int" size="6" isKey="true" defaultValue="1" sortable=""/>
<field name="sortnr" description="Sortiernr." fieldType="int" size="6" isKey="true" sortable=""/>
<field name="schleifenrelation" description="" fieldType="char" size="255" isKey="" sortable=""/>
<field name="schleifenrelation" description="" fieldType="long varchar" size="32000" isKey="" sortable=""/>
<field name="schleifenfeldname" description="" fieldType="char" size="255" isKey="" sortable=""/>
<field name="alias" description="" fieldType="char" size="255" isKey="" sortable=""/>
<field name="schleifenfstand" description="" fieldType="char" size="255" isKey="" sortable=""/>

2
superx/edit/kern/macro_masken_bez_edit.jsp

@ -156,7 +156,7 @@ dbConnectionName="<%= mandantenid %>" ><input type="hidden" name="${_csrf.parame @@ -156,7 +156,7 @@ dbConnectionName="<%= mandantenid %>" ><input type="hidden" name="${_csrf.parame
<td class="db_label">
<db:message key="Schleifenrelation"/></td><td align="left">
<div id="fld_schleifenrelation">
<db:textField nullFieldValue="" styleClass="clsInputStyle" onBlur="" maxlength="255" size="40" id="inp_macro_masken_bezschleifenrelation" fieldName="schleifenrelation"/>
<db:textArea nullFieldValue="" onBlur="" styleClass="editform" wrap="virtual" rows="6" cols="80" fieldName="schleifenrelation"/>
</div>
</td>
</tr>

2
superx/edit/kern/macro_masken_bez_list.jsp

@ -107,7 +107,7 @@ dbConnectionName="<%= mandantenid %>" ><input type="hidden" name="${_csrf.parame @@ -107,7 +107,7 @@ dbConnectionName="<%= mandantenid %>" ><input type="hidden" name="${_csrf.parame
</td><td align="left"> <db:select fieldName="maskeninfo_id1" customEntry=",,true"><% sql = "select tid, name from maskeninfo order by name;"; %><db:queryData name="macro_masken_bez_maskeninfo31" query="<%= sql %>" dbConnectionName="<%= mandantenid %>" /></db:select></td><td align="left"> <db:select fieldName="maskeninfo_id2" customEntry=",,true"><% sql = "select tid, name from maskeninfo order by name;"; %><db:queryData name="macro_masken_bez_maskeninfo32" query="<%= sql %>" dbConnectionName="<%= mandantenid %>" /></db:select></td><td align="left">
<db:textField nullFieldValue="" styleClass="clsInputStyle" size="6" fieldName="active"/></td><td align="left">
<db:textField nullFieldValue="" styleClass="clsInputStyle" size="6" fieldName="sortnr"/></td><td align="left">
<db:textField nullFieldValue="" styleClass="clsInputStyle" maxlength="255" size="20" fieldName="schleifenrelation"/></td><td align="left">
<db:textArea nullFieldValue="" styleClass="clsInputStyle" wrap="virtual" rows="10" cols="80" fieldName="schleifenrelation"/></td><td align="left">
<db:textField nullFieldValue="" styleClass="clsInputStyle" maxlength="255" size="10" fieldName="schleifenfeldname"/></td><td><%
if(currentRow_macro_masken_bez != null)
{

6
superx/edit/kern/maske_combo_laden.jsp

@ -29,7 +29,9 @@ String tid = request.getParameter("tid"); @@ -29,7 +29,9 @@ String tid = request.getParameter("tid");
String fname = request.getParameter("Feldname");
String previousValue = request.getParameter("previousValue");
String zeilenanzahl = request.getParameter("zeilenanzahl");
String referrerForm = request.getParameter("referrerForm");
if(referrerForm==null || referrerForm.equals(""))
referrerForm="0";
String params = request.getParameter("params");
String callurl="../../servlet/SuperXmlMaske?tid="+tid+"&getJSON_"+fname+"=xxxxxx-xxxxxx@";
@ -79,7 +81,7 @@ var zeilenanzahl="<%= zeilenanzahl %>"; @@ -79,7 +81,7 @@ var zeilenanzahl="<%= zeilenanzahl %>";
var referrerWindow=window.opener;
var referrerDocument=referrerWindow.document;
var referrerForm=referrerDocument.forms[0];
var referrerForm=referrerDocument.forms["<%= referrerForm %>"];
var previousValue=referrerForm.elements[fname].value;
var previousValuesArray=ndMaskDialogPreviousValueToArray(previousValue);
var previousValuesCount=0;

5
superx/edit/kern/maske_sicht_laden.jsp

@ -29,6 +29,9 @@ String tid = request.getParameter("tid"); @@ -29,6 +29,9 @@ String tid = request.getParameter("tid");
String fname = request.getParameter("Feldname");
String previousValue = request.getParameter("previousValue");
String zeilenanzahl = request.getParameter("zeilenanzahl");
String referrerForm = request.getParameter("referrerForm");
if(referrerForm==null || referrerForm.equals(""))
referrerForm="0";
String params = request.getParameter("params");
@ -52,7 +55,7 @@ var previousValue="<%= previousValue %>"; @@ -52,7 +55,7 @@ var previousValue="<%= previousValue %>";
var zeilenanzahl="<%= zeilenanzahl %>";
var referrerWindow=window.opener;
var referrerDocument=referrerWindow.document;
var referrerForm=referrerDocument.forms[0];
var referrerForm=referrerDocument.forms["<%= referrerForm %>"];
previousValue=referrerForm.elements[fname].value;
var referrerFormInputSichtid=referrerForm.elements[fname+"-Sicht"];
var referrerFormInputSichtstand=referrerForm.elements[fname+"-Stand"];

9
superx/style/sx_common.css

@ -87,7 +87,7 @@ body.dark-theme img { /*filter für theme dark*/ @@ -87,7 +87,7 @@ body.dark-theme img { /*filter für theme dark*/
.title, .subtitle, .label, .labelNormal, .labelPflicht, .subdir-button, .stb-button, .supplement, .menu-list a,
.navbar-item, .navbar-dropdown, .bottom-nav, .button, .breadcrumb, p.legende, .dontprint, .panel-block, .panel-tabs, .resultcount {
color: hsl(0, 0%, 21%); /*für Schrift in diversen Elementen*/
/*color: hsl(0, 0%, 21%);*/ /*für Schrift in diversen Elementen*/
font-family: sans-serif;
font-weight: normal;
font-size: 12px; }
@ -784,7 +784,14 @@ li.submenu_listelem { @@ -784,7 +784,14 @@ li.submenu_listelem {
span.feldname {font-weight:medium; }
span.feldwert {font-weight:bolder; }
/*Logobuttons und Icons*/
img.svg_icon{
height:20px;
}
.icon_themenbaum_admin_small{content:url(../images/logobutton_kern.svg);height:20px;width:20px;display:inline;}
.icon_themenbaum_admin_normal{content:url(../images/logobutton_kern.svg);height:100px;width:100px;display:inline;}
.icon_themenbaum_neutral_small{content:url(../images/icon_neutral_mini.svg);height:21px;width:20px;padding-top:5px;display:inline;}

6
superx/style/sx_tabelle.css

@ -349,12 +349,12 @@ table.ergtabelle th, table.ergtabelle td { @@ -349,12 +349,12 @@ table.ergtabelle th, table.ergtabelle td {
p.teiltabelle_titel {
clear: left;
line-height: 115%;
line-height: 2em;
border-bottom: 2px solid black;
color: black;
display: block;
font-size: 115%;
font-weight: bold;
font-size: 2em;
font-weight: bolder;
margin: 5px 0 20px 5px;
padding: 0px 0px 0px 5px;
}

33
superx/xml/nd_templates.xsl

@ -1420,10 +1420,12 @@ menue.push(entry); @@ -1420,10 +1420,12 @@ menue.push(entry);
</xsl:when>
<xsl:otherwise>
<!--Legende nicht im modalen Dialog, sondern inline:-->
<div class="container">
<xsl:call-template name="nd_legendeContent">
<xsl:with-param name="ergebniselement_ordnr" select="$ergebniselement_ordnr" />
<xsl:with-param name="isDisplayedInModal" select="'false'" />
</xsl:call-template>
</div>
</xsl:otherwise>
</xsl:choose>
@ -4331,13 +4333,17 @@ document.forms[0].target = '_blank'; @@ -4331,13 +4333,17 @@ document.forms[0].target = '_blank';
<xsl:param name="ergebniselement_ordnr" select="0" />
<xsl:param name="isDisplayedInModal" select="'true'" />
<div class="container"> <!--20240911NEU-->
<p class="legende">
<xsl:for-each select="../felder/feld">
<xsl:if test="(value !='' or sicht/@isFirstInGroup='false' or @isstandtoday='false') and @varname != 'sort' and @varname != 'maxoffset' and value_caption != ''">
<xsl:if test="(value !='' or sicht/@isFirstInGroup='false' or @isstandtoday='false') and value_caption != ''">
<xsl:variable name="showFieldValueInLegend">
<xsl:call-template name="showFieldValueInLegend">
<xsl:with-param name="ergebniselementOrdnr" select="$ergebniselement_ordnr" />
<xsl:with-param name="feldname" select="@varname"/>
</xsl:call-template>
</xsl:variable>
<xsl:if test="$showFieldValueInLegend='true'" >
<span class="feldname">
<xsl:choose>
<xsl:when test="string-length(caption_short) &gt; 0 and caption_short != 'null'" >
@ -4364,6 +4370,7 @@ document.forms[0].target = '_blank'; @@ -4364,6 +4370,7 @@ document.forms[0].target = '_blank';
<br />
</xsl:if>
</xsl:if>
</xsl:if>
</xsl:for-each>
@ -4394,11 +4401,13 @@ document.forms[0].target = '_blank'; @@ -4394,11 +4401,13 @@ document.forms[0].target = '_blank';
</span>
</p>
<xsl:if test="../hinweis != ''">
<p>
<xsl:call-template name="newline_to_br">
<xsl:with-param name="string" select="../hinweis" />
</xsl:call-template>
</p>
</xsl:if>
</div>
</xsl:template>
<xsl:template name="nd_legende_modal">
<xsl:param name="ergebniselement_ordnr" select="0" />
@ -4535,7 +4544,21 @@ document.forms[0].target = '_blank'; @@ -4535,7 +4544,21 @@ document.forms[0].target = '_blank';
</xsl:template>
<xsl:template name="showFieldValueInLegend">
<xsl:param name="ergebniselement_ordnr" select="0" />
<xsl:param name="feldname" />
<xsl:variable name="isHidden"><xsl:value-of select="/ergebnisse/ergebnis[@ordnr=$ergebniselement_ordnr]/completefields/feld[@varname=$feldname]/@hidden"/>
</xsl:variable>
<xsl:choose>
<xsl:when test="$isHidden='true' or $feldname = 'sort' or $feldname = 'maxoffset' or $feldname ='##line##'">
<xsl:text>false</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>true</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

Loading…
Cancel
Save