Browse Source

Merge branch 'RELEASE_kern5.0'

userinfo_gueltigkeit
Daniel Quathamer 8 months ago
parent
commit
b18cbe7de0
  1. 1
      superx/WEB-INF/conf/edustore/db/conf/build.xml
  2. 1
      superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt
  3. 2
      superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_ids.sql
  4. 2
      superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql
  5. 7
      superx/WEB-INF/conf/edustore/db/install/conf/kern.xml
  6. 2
      superx/WEB-INF/conf/edustore/db/install/conf/module_metadata.sql
  7. 2
      superx/WEB-INF/conf/edustore/db/install/conf/sx_tables_fuellen.sql
  8. 2
      superx/WEB-INF/conf/edustore/db/install/kern_install_ids.sql
  9. 2
      superx/WEB-INF/conf/edustore/db/install/kern_install_pg.sql
  10. 2
      superx/WEB-INF/conf/edustore/db/install/upgrade/cif_fuellen_key_2.sql
  11. 2
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_ids.sql
  12. 2
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_pg.sql
  13. 2
      superx/WEB-INF/conf/edustore/db/install/upgrade/kernmodul_upgrade_man.sql
  14. 5
      superx/WEB-INF/kern_dbforms-config_ids.xml
  15. 5
      superx/WEB-INF/kern_dbforms-config_pg.xml
  16. BIN
      superx/WEB-INF/lib/superx5.0.jar
  17. 36
      superx/WEB-INF/patch/patch_archive/patch_2024-03-08_bash_var.sh
  18. 120
      superx/WEB-INF/patch/patch_archive/patch_2024-03-08_readme.htm
  19. 89
      superx/WEB-INF/patch/xml/patch_2024-03-08.xml
  20. 553
      superx/WEB-INF/web.xml
  21. 29
      superx/edit/kern/sichten_edit.jsp
  22. 22
      superx/edit/kern/sx_repository_edit_content.inc
  23. 16
      superx/edit/kern/webapp_manager.jsp
  24. 60
      superx/images/icons/arrow_refresh.svg
  25. 2
      superx/xml/js/memtext/sx_functions.js
  26. 1
      superx/xml/maskComponents_html.xsl
  27. 4
      superx/xml/maske_html.xsl
  28. 4
      superx/xml/maske_html_his1.xsl

1
superx/WEB-INF/conf/edustore/db/conf/build.xml

@ -400,6 +400,7 @@ @@ -400,6 +400,7 @@
<copy file="${ROOT_DIR_WEBAPP}/../src/edustore/edustore_kern.xml" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/classes/edustore/edustore_kern.xml"/>
<copy file="${ROOT_DIR_WEBAPP}/../src/edustore/edustore_kern.xml" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/classes/edustore/edustore.xml"/>
<copy file="${ROOT_DIR_WEBAPP}/../src/edustore/custom.xml.sam" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/classes/edustore/custom.xml.sam"/>
<copy file="${ROOT_DIR_WEBAPP}/WEB-INF/http_get_masken_blacklist.txt" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/http_get_masken_blacklist.txt"/>
<!-- <copy file="${ROOT_DIR_WEBAPP}/../src/edustore/mondrian.xsd" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/classes/edustore/mondrian.xsd"/> -->
<copy file="${ROOT_DIR_WEBAPP}/xml/font_activ/angle-circled-left.svg" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/images/icons/arrow_left_fat.svg"/>

1
superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt

@ -0,0 +1 @@ @@ -0,0 +1 @@
22.03.2024

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

@ -746,8 +746,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit. @@ -746,8 +746,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit.
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum'::varchar(200),'In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten'::varchar(200),'In diesem Formular können Sie Sichten verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete'::varchar(200),'In diesem Formular können Sie Masken zu Sachgebieten zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder'::varchar(200),'In diesem Formular können Sie Felder zu Masken zuordnen.'::varchar(255));

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

@ -754,8 +754,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit. @@ -754,8 +754,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit.
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum'::varchar(200),'In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten'::varchar(200),'In diesem Formular können Sie Sichten verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete'::varchar(200),'In diesem Formular können Sie Masken zu Sachgebieten zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder'::varchar(200),'In diesem Formular können Sie Felder zu Masken zuordnen.'::varchar(255));

7
superx/WEB-INF/conf/edustore/db/install/conf/kern.xml

@ -268,7 +268,7 @@ @@ -268,7 +268,7 @@
<table name="sichten" version="3.0" caption="Sichten" thema="Administration" typ="Schlüsseltabelle">
<description>Sichten</description>
<columns>
<column name="tid" type="SERIAL" size="4" default="" notnull="true" />
<column name="tid" type="SERIAL" size="4" default="" isKey="true" notnull="true" />
<column name="parent" type="CHAR" size="255" default=""
notnull="false" description="Übergeordnete Sicht" currentlyUsed="false">
<comment>Um zukünftig evtl. Hierarchien von Sichten abzubilden
@ -11115,14 +11115,13 @@ mode="navi"> @@ -11115,14 +11115,13 @@ mode="navi">
followUp=""
caption="Sichten"
orderBy="name"
gotoHt="tid"
gotoHt=""
helpfile=""
maxRows="1"
mode="full">
<description>In diesem Formular können Sie Sichten verwalten.</description>
<filters>
<filter mandatory="false" type="equal">art</filter>
<filter mandatory="false" type="contains">name</filter>
<filter mandatory="true" type="equal">tid</filter>
</filters>
<field-selection complete="false" />
<customfield name="tid" />

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

@ -40,8 +40,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit. @@ -40,8 +40,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit.
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum'::varchar(200),'In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten'::varchar(200),'In diesem Formular können Sie Sichten verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete'::varchar(200),'In diesem Formular können Sie Masken zu Sachgebieten zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder'::varchar(200),'In diesem Formular können Sie Felder zu Masken zuordnen.'::varchar(255));

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

@ -1195,8 +1195,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit. @@ -1195,8 +1195,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit.
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum'::varchar(200),'In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten'::varchar(200),'In diesem Formular können Sie Sichten verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete'::varchar(200),'In diesem Formular können Sie Masken zu Sachgebieten zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder'::varchar(200),'In diesem Formular können Sie Felder zu Masken zuordnen.'::varchar(255));

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

@ -4901,8 +4901,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit. @@ -4901,8 +4901,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit.
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum'::varchar(200),'In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten'::varchar(200),'In diesem Formular können Sie Sichten verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete'::varchar(200),'In diesem Formular können Sie Masken zu Sachgebieten zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder'::varchar(200),'In diesem Formular können Sie Felder zu Masken zuordnen.'::varchar(255));

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

@ -5899,8 +5899,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit. @@ -5899,8 +5899,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit.
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum'::varchar(200),'In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten'::varchar(200),'In diesem Formular können Sie Sichten verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete'::varchar(200),'In diesem Formular können Sie Masken zu Sachgebieten zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder'::varchar(200),'In diesem Formular können Sie Felder zu Masken zuordnen.'::varchar(255));

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

@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
<#assign cifx_keys_list = [
{"name":"Befristungsgrund", "key":"635"},
{"name":"Quellsystem", "key":"1"}
{"name":"Quellsystem", "key":"1"},
{"name":"Art des Studienbeginns", "key":"690"},
{"name":"Art des Studienende", "key":"691"},
{"name":"Flächenart", "key":"800"},

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

@ -437,8 +437,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit. @@ -437,8 +437,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit.
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum'::varchar(200),'In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten'::varchar(200),'In diesem Formular können Sie Sichten verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete'::varchar(200),'In diesem Formular können Sie Masken zu Sachgebieten zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder'::varchar(200),'In diesem Formular können Sie Felder zu Masken zuordnen.'::varchar(255));

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

@ -410,8 +410,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit. @@ -410,8 +410,6 @@ values ('user_institution','user_institution','/edit/kern/user_institution_edit.
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('themenbaum_edit','themenbaum','/edit/kern/themenbaum_edit.jsp','Themenbaum'::varchar(200),'In diesem Formular können Sie den Themenbaum bearbeiten. Bitte beachten Sie: bei Änderungen muss der Themenbaum neu geladen werden (SuperXManager)'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sichten','sichten','/edit/kern/sichten_edit.jsp','Sichten'::varchar(200),'In diesem Formular können Sie Sichten verwalten.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('sachgeb_maske_bez','sachgeb_maske_bez','/edit/kern/sachgeb_maske_bez_edit.jsp','Masken und Sachgebiete'::varchar(200),'In diesem Formular können Sie Masken zu Sachgebieten zuordnen.'::varchar(255));
insert into tmp_db_forms (name, tablename,form_path,caption,description)
values ('masken_felder_bez','masken_felder_bez','/edit/kern/masken_felder_bez_edit.jsp','Masken und Felder'::varchar(200),'In diesem Formular können Sie Felder zu Masken zuordnen.'::varchar(255));

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

@ -171,7 +171,7 @@ where id='REPORT_DOCUMENTATION_URL' @@ -171,7 +171,7 @@ where id='REPORT_DOCUMENTATION_URL'
and 2=(select apnr from konstanten where beschreibung='PLATTFORM');
--kern 5.0 Duplikate 'Benutzer verwalten' bei Themenbaum entfernen:
<@selectintotmp source="themenbaum T" target="tmp_dummy" select="T.tid,T.parent,null::integer as richtig"/>
<@selectintotmp source="themenbaum T" target="tmp_dummy" select="T.tid,T.parent,null::integer as richtig">
where name='Benutzer verwalten'
</@selectintotmp> <@informixnolog/>;

5
superx/WEB-INF/kern_dbforms-config_ids.xml

@ -2399,11 +2399,10 @@ mode="full"> @@ -2399,11 +2399,10 @@ mode="full">
</customfield>
</form>
<form name="sichten" table="sichten" path="/edit/kern/sichten_edit.jsp" followUp="" caption="Sichten" orderBy="name" gotoHt="tid" helpfile="" maxRows="1" mode="full">
<form name="sichten" table="sichten" path="/edit/kern/sichten_edit.jsp" followUp="" caption="Sichten" orderBy="name" gotoHt="" helpfile="" maxRows="1" mode="full">
<description>In diesem Formular können Sie Sichten verwalten.</description>
<filters>
<filter mandatory="false" type="equal">art</filter>
<filter mandatory="false" type="contains">name</filter>
<filter mandatory="true" type="equal">tid</filter>
</filters>
<field-selection complete="false"/>
<customfield name="tid"/>

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

@ -2413,11 +2413,10 @@ mode="full"> @@ -2413,11 +2413,10 @@ mode="full">
</customfield>
</form>
<form name="sichten" table="sichten" path="/edit/kern/sichten_edit.jsp" followUp="" caption="Sichten" orderBy="name" gotoHt="tid" helpfile="" maxRows="1" mode="full">
<form name="sichten" table="sichten" path="/edit/kern/sichten_edit.jsp" followUp="" caption="Sichten" orderBy="name" gotoHt="" helpfile="" maxRows="1" mode="full">
<description>In diesem Formular können Sie Sichten verwalten.</description>
<filters>
<filter mandatory="false" type="equal">art</filter>
<filter mandatory="false" type="contains">name</filter>
<filter mandatory="true" type="equal">tid</filter>
</filters>
<field-selection complete="false"/>
<customfield name="tid"/>

BIN
superx/WEB-INF/lib/superx5.0.jar

Binary file not shown.

36
superx/WEB-INF/patch/patch_archive/patch_2024-03-08_bash_var.sh

@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
export ANLEITUNG="Modul: KERN
PATCH 2024-03-08 Erweiterung https://hiszilla.his.de/hiszilla/show_bug.cgi?id=307740 :
Kernmodul 5.0 Bugfixes
Bugfix Freemarker Makro Konstanten
Bugfix Masken-Lesezeichen erzeugen
Neues Datenblatt-Makro mit Left outer join
Bugfix PDF Generation in Macros
Achtung:Dieser Patch ist für SuperX 5.0 geeignet, nicht für HISinOne-BI. In HISinOne-BI ist dies in Version 2023.12 enthalten.
Dateien:
Datei:
WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/fm_templates.unlLeft Outer Join bei Datenblättern
Datei:
xml/maskComponents_html.xslBugfix Lesezeichen + Vorlagen
Datei:
xml/tabelle_fo_pdf.xsl Erweiterung https://hiszilla.his.de/hiszilla/show_bug.cgi?id=314899 : Bugfix PDF Generation in Macros
Datei:
WEB-INF/lib/superx5.0.jar Erweiterung https://hiszilla.his.de/hiszilla/show_bug.cgi?id=314899 : Bugfix PDF Generation in Macros
Datei:
WEB-INF/http_get_masken_blacklist.txtHTTP-GET blacklist
Datei:
edit/kern/sx_repository_edit_content.incBugfix Repository Bearbeitung
Datei:
WEB-INF/conf/edustore/db/install/upgrade/cif_fuellen_key_2.sqlBugfix Repository Bearbeitung
Änderungen:
Erweiterung https://hiszilla.his.de/hiszilla/show_bug.cgi?id=307740 : FM-Templates einfügen
Scriptfile: $SUPERX_DIR/db/install/schluesseltabellen/fm_templates_fuellen.sql
"
export MODULE_LIST="kern "

120
superx/WEB-INF/patch/patch_archive/patch_2024-03-08_readme.htm

@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Patch </title>
<META NAME="author" content="Daniel Quathamer">
<META NAME="copyright" content="(c)2024 Daniel Quathamer">
<META NAME="date" content="22.03.2024 12:20:31">
<meta name="viewport" content="width=device-width, initial-scale=1"><style type="text/css">
@page { }
table { border-collapse:collapse; border-spacing:0; empty-cells:show }
td, th { vertical-align:top; font-size:12pt;}
h1, h2, h3, h4, h5, h6 { clear:both }
span.footnodeNumber { padding-right:1em; }
span.annotation_style_by_filter { font-size:95%; font-family:Arial; background-color:#fff000; margin:0; border:0; padding:0; }
</style><LINK REL="stylesheet" type="text/css" href="https://super-ics.de/superx/style/bulma.css">
<base target="_parent">
</head>
<body>
<div class="container has-text-left">
<div class="columns is-mobile is-left">
<div class="column is-14">
<div class="card has-background">
<div class="card">
<header class="card-header">
<div class="media-content">
<div class="media-left">
<figure class="image is-96x96"><a href="http://www.superx-projekt.de"><img src="https://super-ics.de/superx/images/superx_logo_pur.png"></a></figure>
</div>
<div class="media-right">
<p class="title is-1"></p>
<p class="title is-3">Patchnotes mit Administrationshilfe</p>
<p class="subtitle is-5">made by MEMTEXT</p>
<p class="subtitle is-5"></p>
</div>
</div>
</header>
<div class="card-content">
<div class="media">
<div class="media-left">
<figure class="image is-48x48"><img src="https://super-ics.de/superx/images/context_add.svg"></figure>
</div>
<div class="media-content">
<p class="title is-5">Modul: KERN</p>
<p class="subtitle is-5">PATCH 2024-03-08</p>
</div>
</div>
<div class="content">
<p><strong>Achtung: Der Patch ist nur für aktuelle Modulversionen geeignet!</strong></p>
<p><strong> Erweiterung <a href="https://hiszilla.his.de/hiszilla/show_bug.cgi?id=307740">307740</a></strong>:
</p>
<patch-description feature_id="307740">
<ul><strong>Kernmodul 5.0 Bugfixes</strong>
<li>Bugfix Freemarker Makro Konstanten</li>
<li>Bugfix Masken-Lesezeichen erzeugen</li>
<li>Neues Datenblatt-Makro mit Left outer join</li>
<li>Bugfix PDF Generation in Macros</li>
</ul>
<p>
<strong>Achtung:</strong>Dieser Patch ist für SuperX 5.0 geeignet, nicht für HISinOne-BI. In HISinOne-BI ist dies in Version 2023.12 enthalten.<br>
</p>
</patch-description>
<p>Dateien:</p>
<ul type="circle">
<li>Datei: WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/fm_templates.unl<br>Left Outer Join bei Datenblättern
</li>
<li>Datei: xml/maskComponents_html.xsl<br>Bugfix Lesezeichen + Vorlagen
</li>
<li>Datei: xml/tabelle_fo_pdf.xsl<br><strong> Erweiterung <a href="https://hiszilla.his.de/hiszilla/show_bug.cgi?id=314899">314899</a></strong>: Bugfix PDF Generation in Macros
</li>
<li>Datei: WEB-INF/lib/superx5.0.jar<br><strong> Erweiterung <a href="https://hiszilla.his.de/hiszilla/show_bug.cgi?id=314899">314899</a></strong>: Bugfix PDF Generation in Macros
</li>
<li>Datei: WEB-INF/http_get_masken_blacklist.txt<br>HTTP-GET blacklist
</li>
<li>Datei: edit/kern/sx_repository_edit_content.inc<br>Bugfix Repository Bearbeitung
</li>
<li>Datei: WEB-INF/conf/edustore/db/install/upgrade/cif_fuellen_key_2.sql<br>Bugfix Repository Bearbeitung
</li>
</ul>
<p>Änderungen:</p>
<ul type="circle">
<li><strong> Erweiterung <a href="https://hiszilla.his.de/hiszilla/show_bug.cgi?id=307740">307740</a></strong>: FM-Templates einfügen<br>Scriptfile: $SUPERX_DIR/db/install/schluesseltabellen/fm_templates_fuellen.sql
</li>
</ul>
<hr>
</div>
<div class="content">
<h3>Download</h3>
<ul>
<li><strong>Patch SuperX <a href="http://www.superx-projekt.de/dist/patch/patch_2024-03-08_superx_utf8.zip">klassisch in UTF8</a></strong></li>
<li><strong>Patch <a href="http://www.superx-projekt.de/dist/patch/patch_2024-03-08_superx_iso.zip">klassisch in ISO</a></strong></li>
</ul>
<p><small>In der klassischen SuperX-Variante liegt das db und webserver Verzeichnis auf einer Ebene meistens unterhalb von /home/superx.
Bei der "webapps"-Variante liegt alles unterhalb von webapps/superx. Dies ist der Standard in HISinOne-BI.</small></p>
</div>
<footer class="card-footer"><a href="http://download.superx-projekt.de/" class="card-footer-item"> Link zur Downloadseite
<figure class="image is-48x48"><img src="https://super-ics.de/superx/images/downloadblck.svg"></figure></a><a href="http://www.superx-projekt.de/doku/kern_modul/install/f_Patcheinspielen.htm" class="card-footer-item"> Hinweise zur Patchinstallation
<figure class="image is-48x48"><img src="https://super-ics.de/superx/images/bookblck.svg"></figure></a><a href="https://super-ics.de/impressum.htm" class="card-footer-item"> Impressum </a><a href="https://super-ics.de/datenschutz_public.htm" class="card-footer-item"> Datenschutz </a></footer>
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

89
superx/WEB-INF/patch/xml/patch_2024-03-08.xml

@ -0,0 +1,89 @@ @@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
<patch patch_id="2024-03-08">
<systeme>
<!--<system name="his1" codierung="utf8"/>-->
<system name="superx" codierung="utf8"/>
<system name="superx" codierung="iso"/>
</systeme>
<module name="kern" systeminfo_id="xxx" inst_from="xx">
<patch-description feature_id="307740">
<ul><strong>Kernmodul 5.0 Bugfixes</strong>
<li>Bugfix Freemarker Makro Konstanten</li>
<li>Bugfix Masken-Lesezeichen erzeugen</li>
<li>Neues Datenblatt-Makro mit Left outer join</li>
<li>Bugfix PDF Generation in Macros</li>
</ul>
<p>
<strong>Achtung:</strong>Dieser Patch ist für SuperX 5.0 geeignet, nicht für HISinOne-BI. In HISinOne-BI ist dies in Version 2023.12 enthalten.<br />
</p>
</patch-description>
<patch-test>
<!-- Bisher nur sql erlaubt. Ergebniss muss 0 sein, um zu erlauben, dass der Patch eingespielt wird! -->
<nativeaction sql="select 0 from xdummy where (select count(*) from db_version where his_system='kern') > 0 " scriptfile="" database=""/>
</patch-test>
<patch-data>
<files>
<file path="WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/fm_templates.unl"><patch-description feature_id="317536">Left Outer Join bei Datenblättern</patch-description></file>
<file path="xml/maskComponents_html.xsl"><patch-description feature_id="294250">Bugfix Lesezeichen + Vorlagen</patch-description></file>
<file path="xml/tabelle_fo_pdf.xsl"><patch-description feature_id="314899">Bugfix PDF Generation in Macros</patch-description></file>
<file path="WEB-INF/lib/superx5.0.jar"><patch-description feature_id="314899">Bugfix PDF Generation in Macros</patch-description></file>
<file path="WEB-INF/http_get_masken_blacklist.txt"><patch-description feature_id="283628">HTTP-GET blacklist Upgrade</patch-description></file>
<file path="edit/kern/sx_repository_edit_content.inc"><patch-description feature_id="283628">Bugfix Repository Bearbeitung</patch-description></file>
<file path="WEB-INF/conf/edustore/db/install/upgrade/cif_fuellen_key_2.sql"><patch-description feature_id="307740">Bugfix Metadaten Stammdaten-Verwaltung</patch-description></file>
</files>
<database name="superx">
<!-- TODO: hier können beliebige Elemente der normalen Modul-XML stehen-->
<masken>
</masken>
</database>
<upgrade>
<upgrade-step>
<action>
<nativeaction sql="create table tmp_templates(tid integer,
id char(200) not null,
content text not null,
description char(200) ,
comment char(200) ,
version integer default 1
)
;" scriptfile="" database=""><patch-description feature_id=""></patch-description></nativeaction>
</action>
<action>
<loadtable refresh="true" delimiter="^" header="false"
tabname="tmp_templates">
<file
path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/fm_templates.unl" />
</loadtable>
</action>
<action>
<nativeaction sql="" scriptfile="$SUPERX_DIR/db/install/schluesseltabellen/fm_templates_fuellen.sql" database="POSTGRES"><patch-description feature_id="307740">FM-Templates einfügen</patch-description></nativeaction>
</action>
<action>
<nativeaction sql="drop table tmp_templates;" scriptfile="" database=""><patch-description feature_id=""></patch-description></nativeaction>
</action>
</upgrade-step>
</upgrade>
</patch-data>
</module>
</patch>

553
superx/WEB-INF/web.xml

@ -0,0 +1,553 @@ @@ -0,0 +1,553 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
<display-name>SuperX</display-name>
<description>SuperX</description>
<!-- Define servlet-mapped and path-mapped example filters -->
<!--<filter>
<filter-name>Servlet Mapped Filter</filter-name>
<filter-class>filters.ExampleFilter</filter-class>
<init-param>
<param-name>attribute</param-name>
<param-value>filters.ExampleFilter.SERVLET_MAPPED</param-value>
</init-param>
</filter>
<filter>
<filter-name>Path Mapped Filter</filter-name>
<filter-class>filters.ExampleFilter</filter-class>
<init-param>
<param-name>attribute</param-name>
<param-value>filters.ExampleFilter.PATH_MAPPED</param-value>
</init-param>
</filter>
<filter>
<filter-name>Request Dumper Filter</filter-name>
<filter-class>filters.RequestDumperFilter</filter-class>
</filter>-->
<!-- Example filter to set character encoding on each request -->
<!--<filter>
<filter-name>Set Character Encoding</filter-name>
<filter-class>filters.SetCharacterEncodingFilter</filter-class>
<init-param>
<param-name>encoding</param-name>
<param-value>EUC_JP</param-value>
</init-param>
</filter>
<filter>
<filter-name>Compression Filter</filter-name>
<filter-class>compressionFilters.CompressionFilter</filter-class>
<init-param>
<param-name>compressionThreshold</param-name>
<param-value>10</param-value>
</init-param>
<init-param>
<param-name>debug</param-name>
<param-value>0</param-value>
</init-param>
</filter>
-->
<!-- Example filter mapping to apply the "Set Character Encoding" filter
to *all* requests processed by this web application -->
<!--
<filter-mapping>
<filter-name>Set Character Encoding</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-->
<!--
<filter-mapping>
<filter-name>Compression Filter</filter-name>
<url-pattern>/CompressionTest</url-pattern>
</filter-mapping>
-->
<!--
<filter-mapping>
<filter-name>Request Dumper Filter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-->
<!-- Define example application events listeners -->
<!--<listener>
<listener-class>listeners.ContextListener</listener-class>
</listener>
<listener>
<listener-class>listeners.SessionListener</listener-class>
</listener>-->
<!-- MONDRIAN -->
<listener>
<listener-class>mondrian.web.taglib.Listener</listener-class>
</listener>
<!-- END MONDRIAN -->
<!-- Encoding fuer DBFORMS setzen -->
<filter>
<filter-name>Set Character Encoding</filter-name>
<filter-class>org.dbforms.util.external.SetCharacterEncodingFilter</filter-class>
<init-param>
<param-name>encoding</param-name>
<param-value>UTF-8</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>Set Character Encoding</filter-name>
<url-pattern>/servlet/control</url-pattern>
</filter-mapping>
<!-- Define servlets that are included in the example application -->
<!--=========== DbForms Configuration Servlet ===========-->
<servlet>
<servlet-name>org.dbforms.ConfigServlet</servlet-name>
<!-- servlet-class>org.dbforms.servlets.ConfigServlet</servlet-class -->
<servlet-class>de.superx.servlet.SxDbformsConfigServlet</servlet-class>
<init-param>
<param-name>log4j.configuration</param-name>
<param-value>/WEB-INF/log4j.properties</param-value>
</init-param>
<init-param>
<param-name>digesterDebugLevel</param-name>
<param-value>0</param-value>
</init-param>
<init-param>
<param-name>localeKey</param-name>
<param-value>de_DE</param-value>
</init-param>
<init-param>
<param-name>resourceBundle</param-name>
<param-value>ApplicationResources</param-value>
</init-param>
<!--
<init-param>
<param-name>validation</param-name>
<param-value>/WEB-INF/validation.xml</param-value>
</init-param>
<init-param>
<param-name>validator-rules</param-name>
<param-value>/WEB-INF/validator-rules.xml</param-value>
</init-param>
-->
<load-on-startup>1</load-on-startup>
</servlet>
<!--=========== DbForms Controller Servlet ==============-->
<servlet>
<servlet-name>control</servlet-name>
<servlet-class>org.dbforms.servlets.Controller</servlet-class>
<init-param>
<param-name>maxUploadSize</param-name>
<param-value>800000</param-value>
</init-param>
</servlet>
<!--=========== DbForms FileServlet =====================-->
<servlet>
<servlet-name>file</servlet-name>
<servlet-class>org.dbforms.servlets.FileServlet</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>
<!--SuperX-Servlets -->
<!-- Das SuperXManager-Servlet initialisiert den ConnectionPool
und gecachte Object automatisch beim Tomcat-Start-->
<servlet>
<servlet-name>SuperXManager</servlet-name>
<servlet-class>de.superx.servlet.SuperXManager</servlet-class>
<load-on-startup>50</load-on-startup>
<init-param>
<param-name>sharedSecret</param-name>
<param-value>sYyOvWDtISVNG6Xgh7MBk4hC9uLuyPQ3i</param-value>
</init-param>
<init-param>
<param-name>xml_return_link</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>xsl_processor</param-name>
<param-value>net.sf.saxon.TransformerFactoryImpl</param-value>
<!--<param-value>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</param-value> deprecated macht Probleme bei UT8-->
</init-param>
<init-param>
<!-- deaktiviert da manueller Datenupdate moeglich -->
<param-name>sichtenCaching</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<!-- statische Felder (Art=1) in Masken cachen? -->
<param-name>field1Cache</param-name>
<param-value>1=0</param-value>
<!-- (hier sql moegliche, z.B. bestimmte felder ausschließen-->
</init-param>
<init-param>
<param-name>defaultMaskXsl</param-name>
<param-value>maske_html.xsl</param-value>
</init-param>
<init-param>
<param-name>maxRows</param-name>
<param-value>30000</param-value>
</init-param>
<!--<init-param>
<param-name>defaultTableHtmlXsl</param-name>
<param-value>tabelle_html_his1.xsl</param-value>
</init-param>
<init-param>
<param-name>defaultTableXlsXsl</param-name>
<param-value>tabelle_xls_his1.xsl</param-value>
</init-param>
<init-param>
<param-name>defaultTablePdfXsl</param-name>
<param-value>tabelle_fo_pdf_his1.xsl</param-value>
</init-param>-->
</servlet>
<servlet>
<servlet-name>SuperXUpload</servlet-name>
<servlet-class>de.superx.servlet.SuperXUpload</servlet-class>
<init-param>
<!--MandantenID-->
<param-name>default</param-name>
<!--Filter * vorlage.xls,*.xsl-->
<param-value>vorlage.xls,*.gif,*.png,*.htm</param-value>
</init-param>
<!--ggfs weitere Einträge für weitere Mandanten hinzufuegen-->
</servlet>
<servlet>
<servlet-name>de.superx.servlet.Entwicklung</servlet-name>
<servlet-class>de.superx.servlet.Entwicklung</servlet-class>
</servlet>
<servlet>
<servlet-name>SuperXhtmlAnmeldung</servlet-name>
<servlet-class>de.superx.servlet.SuperXhtmlAnmeldung</servlet-class>
</servlet>
<!-- ************************* SUPERXDBSERVLET ************************************ -->
<servlet>
<servlet-name>SuperXDBServlet</servlet-name>
<servlet-class>de.superx.servlet.SuperXDBServlet</servlet-class>
<init-param>
<!--Dieser Parameter legt fest, wie viele Zeilen das Servlet maximal zurueckgeben soll.
Achtung: Diese Zahl muss groesser als die Zahl der Eintraege im Organigramm sein,
sonst funktioniert das AdminTool nicht.-->
<param-name>maxRows</param-name>
<param-value>17000</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>SuperXmlAnmeldung</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlAnmeldung</servlet-class>
<init-param>
<param-name>maxRows</param-name>
<param-value>17000</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>SuperXmlAbmeldung</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlAbmeldung</servlet-class>
<init-param>
<param-name>alt_redirect_url</param-name>
<param-value>/superx/xml</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>SuperXmlMaske</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlMaske</servlet-class>
<init-param>
<param-name>maxRows</param-name>
<param-value>17000</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>SuperXmlTabelle</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlTabelle</servlet-class>
<init-param>
<param-name>maxRows</param-name>
<param-value>17000</param-value>
</init-param>
<init-param>
<param-name>maxOffset</param-name>
<param-value>30</param-value>
</init-param>
</servlet>
<servlet>
<servlet-name>SuperXmlPwChanger</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlPwChanger</servlet-class>
</servlet>
<servlet>
<servlet-name>de.superx.servlet.SuperXmlMenu</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlMenu</servlet-class>
</servlet>
<servlet>
<servlet-name>SuperXmlMenu</servlet-name>
<servlet-class>de.superx.servlet.SuperXmlMenu</servlet-class>
</servlet>
<servlet>
<servlet-name>ImageServlet</servlet-name>
<servlet-class>net.sf.jasperreports.j2ee.servlets.ImageServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ImageServlet</servlet-name>
<url-pattern>/servlet/image</url-pattern>
</servlet-mapping>
<!--==== Controller Servlet and FileServlet Mappings========-->
<servlet-mapping>
<servlet-name>control</servlet-name>
<url-pattern>/servlet/control</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>file</servlet-name>
<url-pattern>/servlet/file</url-pattern>
</servlet-mapping>
<!-- SuperX Mappings-->
<servlet-mapping>
<servlet-name>SuperXmlAnmeldung</servlet-name>
<url-pattern>/servlet/SuperXmlAnmeldung</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlAnmeldung</servlet-name>
<url-pattern>/servlet/de.superx.servlet.SuperXmlAnmeldung</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXDBServlet</servlet-name>
<url-pattern>/servlet/SuperXDBServlet</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlAbmeldung</servlet-name>
<url-pattern>/servlet/SuperXmlAbmeldung</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlMaske</servlet-name>
<url-pattern>/servlet/SuperXmlMaske</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlTabelle</servlet-name>
<url-pattern>/servlet/SuperXmlTabelle</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlPwChanger</servlet-name>
<url-pattern>/servlet/de.superx.servlet.SuperXmlPwChanger</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlPwChanger</servlet-name>
<url-pattern>/servlet/SuperXmlPwChanger</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXManager</servlet-name>
<url-pattern>/servlet/SuperXManager</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXUpload</servlet-name>
<url-pattern>/servlet/SuperXUpload</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>SuperXmlMenu</servlet-name>
<url-pattern>/servlet/SuperXmlMenu</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>de.superx.servlet.Entwicklung</servlet-name>
<url-pattern>/servlet/de.superx.servlet.Entwicklung</url-pattern>
</servlet-mapping>
<jsp-config>
<taglib>
<taglib-uri>/WEB-INF/dbforms.tld</taglib-uri>
<taglib-location>/WEB-INF/dbforms.tld</taglib-location>
</taglib>
</jsp-config>
<!--
<taglib>
<taglib-uri>
http://jakarta.apache.org/tomcat/debug-taglib
</taglib-uri>
<taglib-location>
/WEB-INF/jsp/debug-taglib.tld
</taglib-location>
</taglib>
<taglib>
<taglib-uri>
http://jakarta.apache.org/tomcat/examples-taglib
</taglib-uri>
<taglib-location>
/WEB-INF/jsp/example-taglib.tld
</taglib-location>
</taglib>
<taglib>
<taglib-uri>
http://jakarta.apache.org/tomcat/jsp2-example-taglib
</taglib-uri>
<taglib-location>
/WEB-INF/jsp2/jsp2-example-taglib.tld
</taglib-location>
</taglib>
<jsp-property-group>
<description>
Special property group for JSP Configuration JSP example.
</description>
<display-name>JSPConfiguration</display-name>
<url-pattern>/jsp2/misc/config.jsp</url-pattern>
<el-ignored>true</el-ignored>
<page-encoding>ISO-8859-1</page-encoding>
<scripting-invalid>true</scripting-invalid>
<include-prelude>/jsp2/misc/prelude.jspf</include-prelude>
<include-coda>/jsp2/misc/coda.jspf</include-coda>
</jsp-property-group>
</jsp-config>
-->
<security-constraint>
<display-name>Example Security Constraint</display-name>
<web-resource-collection>
<web-resource-name>Protected Area</web-resource-name>
<!-- Define the context-relative URL(s) to be protected -->
<url-pattern>/security/protected/*</url-pattern>
<!-- If you list http methods, only those methods are protected -->
<http-method>DELETE</http-method>
<http-method>GET</http-method>
<http-method>POST</http-method>
<http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
<!-- Anyone with one of the listed roles may access this area -->
<role-name>tomcat</role-name>
<role-name>role1</role-name>
</auth-constraint>
</security-constraint>
<!-- Default login configuration uses form-based authentication -->
<login-config>
<auth-method>FORM</auth-method>
<realm-name>Example Form-Based Authentication Area</realm-name>
<form-login-config>
<form-login-page>/security/protected/login.jsp</form-login-page>
<form-error-page>/security/protected/error.jsp</form-error-page>
</form-login-config>
</login-config>
<!-- Security roles referenced by this web application -->
<security-role>
<role-name>role1</role-name>
</security-role>
<security-role>
<role-name>tomcat</role-name>
</security-role>
<resource-ref>
<description>SuperX Datasource</description>
<res-ref-name>jdbc/superx</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
<!--<resource-env-ref>
<description>
SuperX Datasource
</description>
<resource-env-ref-name>
jdbc/superx
</resource-env-ref-name>
<resource-env-ref-type>
javax.sql.DataSource
</resource-env-ref-type>
</resource-env-ref>-->
<!--How long (in minutes) will a session be maintained in spite of inactivity?
A negative value means forever -->
<session-config>
<session-timeout>180</session-timeout>
</session-config>
<!--REST DQ-->
<servlet>
<servlet-name>Jersey REST Service</servlet-name>
<servlet-class>
com.sun.jersey.spi.container.servlet.ServletContainer
</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
<param-value>de.superx.sxrest</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>Jersey REST Service</servlet-name>
<url-pattern>/sxrest/*</url-pattern>
</servlet-mapping>
<!--Ende REST DQ-->
<!-- SAIKU -->
<!--
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/saiku/applicationContext.xml</param-value>
</context-param>
<filter>
<filter-name>org.springframework.security.filterChainProxy</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
</filter>
<filter>
<filter-name>http-request-context</filter-name>
<filter-class>org.codehaus.enunciate.webapp.HTTPRequestContextFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>org.springframework.security.filterChainProxy</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>http-request-context</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
</listener>
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<listener>
<listener-class>org.codehaus.enunciate.modules.spring_app.SpringComponentPostProcessor</listener-class>
</listener>
<servlet>
<servlet-name>spring</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>jersey</servlet-name>
<servlet-class>org.codehaus.enunciate.modules.jersey.EnunciateJerseyServletContainer</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
<param-value>org.saiku.web</param-value>
</init-param>
<init-param>
<param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
<param-value>com.sun.jersey.api.container.filter.PostReplaceFilter</param-value>
</init-param>
<init-param>
<param-name>org.codehaus.enunciate.modules.jersey.config.ServletPath</param-name>
<param-value>/rest</param-value>
</init-param>
</servlet>
<servlet-mapping>
<servlet-name>spring</servlet-name>
<url-pattern>/oauth/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/json/saiku/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/json/saiku/session</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/rest/saiku/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/rest/saiku/session</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/xml/saiku/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>jersey</servlet-name>
<url-pattern>/xml/saiku/session</url-pattern>
</servlet-mapping>
<mime-mapping>
<extension>wsdl</extension>
<mime-type>text/xml</mime-type>
</mime-mapping>
<mime-mapping>
<extension>xsd</extension>
<mime-type>text/xml</mime-type>
</mime-mapping>-->
</web-app>

29
superx/edit/kern/sichten_edit.jsp

@ -76,29 +76,14 @@ keyfieldsused=kf.toString(); @@ -76,29 +76,14 @@ keyfieldsused=kf.toString();
<div style="margin: 0px; padding: 0px; overflow: hidden; width: 100%;" id="menuCaption">
<span class="menuCaptionTitle" id="menuCaptionTitle">Sichten. </span><img border="0" height="18px" alt="Erl&auml;uterung" src="/superx/images/information.svg"><span style="display:none" connectId="menuCaption" dojoType="tooltip">In diesem Formular k&ouml;nnen Sie Sichten verwalten.</span>
</div><%
String tid = request.getParameter("tid");
Hashtable gotoMyHash = null;
if(tid !=null) {
gotoMyHash= new Hashtable();
gotoMyHash.put("tid",tid);
}
%>
<%
String art = request.getParameter("art");
if(art != null && !art.equals("null")){
filter +="art="+art;
}
%>
</div>
<%
String name = request.getParameter("name");
if(name != null && !name.equals("null")){
filter +=",name~'"+name+"'";
String tid = request.getParameter("tid");
if(tid != null && !tid.equals("null")){
filter +="tid="+tid;
}
%>
<db:dbform tableName="sichten" maxRows="1" autoUpdate="false" captionResource="true" multipart="false" followUp="/edit/kern/sichten_edit.jsp" gotoHt="<%= gotoMyHash %>" filter="<%= filter %>" orderBy="name"
<db:dbform tableName="sichten" maxRows="1" autoUpdate="false" captionResource="true" multipart="false" followUp="/edit/kern/sichten_edit.jsp" filter="<%= filter %>" orderBy="name"
dbConnectionName="<%= mandantenid %>" ><input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/><db:header/>
<db:errors/>
<db:body allowNew="true">
@ -119,9 +104,7 @@ dbConnectionName="<%= mandantenid %>" ><input type="hidden" name="${_csrf.parame @@ -119,9 +104,7 @@ dbConnectionName="<%= mandantenid %>" ><input type="hidden" name="${_csrf.parame
<p>&nbsp;</p>
<hr>
<p>
<input type="hidden" name="art" value="<%= art %>" />
<input type="hidden" name="name" value="<%= name %>" />
<input type="hidden" name="tid" value="<%= tid %>" />
</p>
<table class="db_form_table" cellspacing="0" cellpadding="0" width="100%" border="0">
<td>

22
superx/edit/kern/sx_repository_edit_content.inc

@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
<script src="/superx/xml/js/ckeditor/ckeditor.js"></script>
<tr>
<td class="db_label">
<db:message key="Inhalt der Variable"/></td><td align="left">
<div id="fld_content">
<db:textArea nullFieldValue="" onBlur="" id="editor1" styleClass="clsInputStyle" wrap="virtual" rows="6" cols="80" fieldName="content"/>
<%
if(currentRow_sx_repository !=null && currentRow_sx_repository.get("art") !=null && currentRow_sx_repository.get("art").toString().trim().equals("HTML_CONTENT"))
{
%>
<script language="Javascript">
CKEDITOR.replace( 'editor1' );
</script>
<%
}
%>
</div>
</td>
</tr>

16
superx/edit/kern/webapp_manager.jsp

@ -63,6 +63,10 @@ function getLogs(logtype,caption,loglines) @@ -63,6 +63,10 @@ function getLogs(logtype,caption,loglines)
document.getElementById("MaskHeader").innerHTML=(logtype.startsWith("server")?"Server-Logdateien":"Maskenprotokolle");
document.getElementById("MaskSubHeader").innerHTML=caption;
if(document.forms['log'] && document.forms['log'].elements['logtype'])
{
document.forms['log'].elements['logtype'].value=logtype;
}
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
@ -173,11 +177,7 @@ if(tab == null) @@ -173,11 +177,7 @@ if(tab == null)
<a class="navbar-item" href="webapp_manager.jsp">Webanwendung Manager</a>
<div class="navbar-burger burger" data-target="navMenu">
<span>dd</span>
<span>dd</span>
<span>dd</span>
</div>
</div>
<!-- <div id="navMenu" class="navbar-menu">
<div class="navbar-start">
@ -302,7 +302,7 @@ if(tab.equals("")) @@ -302,7 +302,7 @@ if(tab.equals(""))
<p class="subtitle">der Webanwendung</p>
<p align="left">Version: <%= sxversion %><br />
Builddatum: <%= builddatum %><br />
Platform: <%= platform %><br />
Plattform: <%= platform %><br />
Aktueller Mandant: <%= mandantenid %><br />
Installierte Mandanten: <br />
<%= finRechteInfos %>
@ -418,10 +418,10 @@ if(tab.equals("log")) @@ -418,10 +418,10 @@ if(tab.equals("log"))
</div>
</section>
<section class="section">
<form name="log" >
<form name="log" onsubmit="getLogs(document.forms['log'].elements['logtype'].value,document.getElementById('MaskSubHeader').innerHTML,document.forms['log'].elements['loglines'].value);return false;" >
<div class="container" id="loadMask" >
<div> (max. letzte <input type="text" size="5" maxlength="5" name="loglines" value="100" /> Zeilen)
<div> (max. letzte <input type="hidden" name="logtype" value="" /> <input type="text" size="5" maxlength="5" name="loglines" value="100" /> 100 Zeilen)
<textarea id="Inhalt" name="Inhalt" class="textarea" placeholder="Inhalt..." rows="20"></textarea>

60
superx/images/icons/arrow_refresh.svg

@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="25"
version="1.1"
id="svg4"
sodipodi:docname="arrows-cw.svg"
height="25"
inkscape:version="0.92.2 5c3e80d, 2017-08-06">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs8" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1051"
id="namedview6"
showgrid="false"
inkscape:zoom="1.8433992"
inkscape:cx="224.82479"
inkscape:cy="50"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg4" />
<path
d="m 24.562937,851.19324 q 0,0.0874 0,0.11655 -1.048951,4.37063 -4.370629,7.08042 -3.321679,2.70979 -7.779721,2.70979 -2.360139,0 -4.5745917,-0.90326 -2.2144522,-0.90327 -3.9627039,-2.56411 l -2.0979021,2.09791 q -0.3205128,0.32051 -0.7284383,0.32051 -0.40792536,0 -0.72843818,-0.32051 Q 0,859.41002 0,859.0021 v -7.28438 q 0,-0.40793 0.32051282,-0.72844 0.32051282,-0.32052 0.72843818,-0.32052 h 7.2843823 q 0.4079254,0 0.7284383,0.32052 0.3205128,0.32051 0.2913753,0.72844 -0.029138,0.40792 -0.2913753,0.72843 l -2.2435898,2.24359 q 1.1655012,1.07809 2.6223776,1.66084 1.4568766,0.58275 3.0594406,0.58275 2.156177,0 4.050117,-1.07809 1.893939,-1.07808 3.030303,-2.88461 0.174825,-0.29138 0.844988,-1.92308 0.145688,-0.37879 0.495338,-0.37879 h 3.117716 q 0.2331,0 0.378787,0.17483 0.145688,0.17482 0.145688,0.34965 z m 0.407925,-12.99534 v 7.28438 q 0,0.40793 -0.291375,0.72844 -0.291375,0.32052 -0.757576,0.32052 h -7.284382 q -0.407925,0 -0.728438,-0.32052 -0.320513,-0.32051 -0.291375,-0.72844 0.02914,-0.40792 0.291375,-0.72843 l 2.24359,-2.24359 Q 15.763403,840.26667 12.5,840.26667 q -2.185315,0 -4.0792541,1.07809 -1.8939394,1.07808 -3.030303,2.88461 -0.1748252,0.29138 -0.8449884,1.92308 -0.1456876,0.37879 -0.4953379,0.37879 H 0.81585082 q -0.20396271,0 -0.37878788,-0.17483 -0.17482518,-0.17482 -0.14568765,-0.34965 v -0.11655 Q 1.3403263,841.51958 4.6911422,838.80979 8.041958,836.1 12.5,836.1 q 2.36014,0 4.60373,0.90326 2.243589,0.90327 3.991841,2.56411 l 2.097902,-2.09791 q 0.320513,-0.32051 0.728438,-0.32051 0.407926,0 0.757576,0.32051 0.349651,0.32052 0.291375,0.72844 z"
id="path2"
inkscape:connector-curvature="0"
style="stroke-width:0.02913753" />
<path
style="stroke-width:0.02913753"
inkscape:connector-curvature="0"
id="path817"
d="m 24.573343,15.09324 q 0,0.0874 0,0.11655 -1.048951,4.37063 -4.370629,7.08042 Q 16.881035,25 12.422993,25 10.062854,25 7.8484017,24.09674 5.6339495,23.19347 3.8856978,21.53263 l -2.0979021,2.09791 q -0.3205128,0.32051 -0.7284383,0.32051 -0.40792538,0 -0.7284382,-0.32051 Q 0.01040638,23.31002 0.01040638,22.9021 v -7.28438 q 0,-0.40793 0.32051282,-0.72844 0.32051282,-0.32052 0.7284382,-0.32052 h 7.2843823 q 0.4079254,0 0.7284383,0.32052 0.3205128,0.32051 0.2913753,0.72844 -0.029138,0.40792 -0.2913753,0.72843 l -2.2435898,2.24359 q 1.1655012,1.07809 2.6223776,1.66084 1.4568762,0.58275 3.0594402,0.58275 2.156177,0 4.050117,-1.07809 1.893939,-1.07808 3.030303,-2.88461 0.174825,-0.29138 0.844988,-1.92308 0.145688,-0.37879 0.495338,-0.37879 h 3.117716 q 0.2331,0 0.378787,0.17483 0.145688,0.17482 0.145688,0.34965 z M 24.981268,2.0979 v 7.28438 q 0,0.40793 -0.291375,0.72844 -0.291375,0.32052 -0.757576,0.32052 h -7.284382 q -0.407925,0 -0.728438,-0.32052 -0.320513,-0.32051 -0.291375,-0.72844 0.02914,-0.40792 0.291375,-0.72843 l 2.24359,-2.24359 q -2.389278,-2.24359 -5.652681,-2.24359 -2.185315,0 -4.0792537,1.07809 Q 6.5372129,6.32284 5.4008493,8.12937 5.2260241,8.42075 4.5558609,10.05245 4.4101733,10.43124 4.060523,10.43124 H 0.8262572 q -0.20396271,0 -0.37878788,-0.17483 Q 0.27264414,10.08159 0.30178167,9.90676 V 9.79021 Q 1.3507327,5.41958 4.7015486,2.70979 8.0523644,0 12.510406,0 q 2.36014,0 4.60373,0.90326 2.243589,0.90327 3.991841,2.56411 l 2.097902,-2.09791 q 0.320513,-0.32051 0.728438,-0.32051 0.407926,0 0.757576,0.32051 0.349651,0.32052 0.291375,0.72844 z" />
</svg>

After

Width:  |  Height:  |  Size: 4.7 KiB

2
superx/xml/js/memtext/sx_functions.js

@ -872,7 +872,7 @@ function prepareLesezeichenLink2() { @@ -872,7 +872,7 @@ function prepareLesezeichenLink2() {
}
} else {
servlet = '/superx/servlet/SuperXmlMaske';
title = 'Maske ' + maskenname;
title = 'Maske '+maskenname;
var lis = document.getElementById('lesezeichen_checkboxen').getElementsByTagName(
"input");
params = '';

1
superx/xml/maskComponents_html.xsl

@ -1478,6 +1478,7 @@ jQuery.ajaxPrefilter( function( s ) { @@ -1478,6 +1478,7 @@ jQuery.ajaxPrefilter( function( s ) {
var caption;
var jsessionid=']]></xsl:text><xsl:value-of select="/maske/@jsessionid"/><xsl:text>';
var maskentid=</xsl:text><xsl:value-of select="/maske/@tid"/><xsl:text>;
var maskenname='</xsl:text><xsl:value-of select="substring(/maske/@name,0,40)" /><xsl:text>';
var mandantenID='</xsl:text><xsl:value-of select="/maske/@MandantenID"/><xsl:text>';
var felder = new Array();
</xsl:text>

4
superx/xml/maske_html.xsl

@ -408,9 +408,7 @@ Dabei werden die auf einer Maske ausgewählten Merkmale (z.B. Haushaltsjahr=2007 @@ -408,9 +408,7 @@ Dabei werden die auf einer Maske ausgewählten Merkmale (z.B. Haushaltsjahr=2007
Sie können nun bei der gleichen oder auch anderen Masken diese Vorlage aufrufen und die Merkmale werden als Auswahl eingestellt.<br/><br/>
Weiterhin können Sie sogar bei einer Ergebnistabelle die Vorlage aufrufen und die Ergebnisse werden für die enthaltenen Merkmale neu berechnet.<br/><br/>
(Zu beachten ist allerdings, dass die Feldbezeichnungen passen müssen, z.B. wirkt sich das Merkmal Kostenstelle=1 nicht auf das Feld Institution aus).
<br/><br/>
Bitte beachten Sie auch: diese Funktion ist im Internet Explorer 6.x nicht verfügbar, bitte aktualisieren Sie auf einen aktuellen Browser.
</SPAN>
<br/></SPAN>
<br/>
<p align="center"><input type="button" class="clsButtonStyle" id="merkmalsvorlage_abbrechen" onclick="dojo.widget.byId('merkmalsvorlageinfo').hide()" value="OK"></input></p>

4
superx/xml/maske_html_his1.xsl

@ -348,9 +348,7 @@ Dabei werden die auf einer Maske ausgewählten Merkmale (z.B. Haushaltsjahr=2007 @@ -348,9 +348,7 @@ Dabei werden die auf einer Maske ausgewählten Merkmale (z.B. Haushaltsjahr=2007
Sie können nun bei der gleichen oder auch anderen Masken diese Vorlage aufrufen und die Merkmale werden als Auswahl eingestellt.<br/><br/>
Weiterhin können Sie sogar bei einer Ergebnistabelle die Vorlage aufrufen und die Ergebnisse werden für die enthaltenen Merkmale neu berechnet.<br/><br/>
(Zu beachten ist allerdings, dass die Feldbezeichnungen passen müssen, z.B. wirkt sich das Merkmal Kostenstelle=1 nicht auf das Feld Institution aus).
<br/><br/>
Bitte beachten Sie auch: diese Funktion ist im Internet Explorer 6.x nicht verfügbar, bitte aktualisieren Sie auf einen aktuellen Browser.
</SPAN>
<br/></SPAN>
<br/>
<p align="center"><input type="button" class="clsButtonStyle" id="merkmalsvorlage_abbrechen" onclick="dojo.widget.byId('merkmalsvorlageinfo').hide()" value="OK"></input></p>

Loading…
Cancel
Save