Browse Source

Upgrade JR 6.21

RELEASE_kern5.3
Daniel Quathamer 3 days ago
parent
commit
5046b25764
  1. 22
      src/de/superx/common/Maske.java
  2. 159
      superx/WEB-INF/conf/edustore/db/conf/build.xml
  3. 2
      superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt
  4. 4
      superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/sch.eduetl/cifx_customize.tab
  5. 2
      superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_ids.sql
  6. 2
      superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_ids.xml
  7. 32063
      superx/WEB-INF/conf/edustore/db/install/conf/kern.html
  8. 2
      superx/WEB-INF/conf/edustore/db/install/conf/kern.rtf
  9. 4
      superx/WEB-INF/conf/edustore/db/install/conf/kern.xml
  10. 44
      superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_fuellen.sql
  11. 12
      superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_loeschen.sql
  12. 2
      superx/WEB-INF/conf/edustore/db/install/kern_backup.x
  13. 8
      superx/WEB-INF/conf/edustore/db/install/kern_install_ids.sql
  14. 2
      superx/WEB-INF/conf/edustore/db/install/kern_install_pg.sql
  15. 22
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_ids.sql
  16. 18
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_pg.sql
  17. 2
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_ids.sql
  18. 6
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_ids.sql
  19. 2
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_pg.sql
  20. 9
      superx/WEB-INF/conf/obsoletfiles.txt
  21. 28
      superx/WEB-INF/kern_dbforms-config_ids.xml
  22. 2
      superx/WEB-INF/kern_dbforms-config_pg.xml
  23. BIN
      superx/WEB-INF/lib/jasperreports-6.21.3.jar
  24. BIN
      superx/WEB-INF/lib/jasperreports-chart-customizers-6.20.0.jar
  25. BIN
      superx/WEB-INF/lib/jasperreports-custom-visualization-6.20.0.jar
  26. BIN
      superx/WEB-INF/lib/jasperreports-fonts-6.20.0.jar
  27. BIN
      superx/WEB-INF/lib/jasperreports-fonts-6.21.3.jar
  28. BIN
      superx/WEB-INF/lib/jasperreports-functions-6.20.0.jar
  29. BIN
      superx/WEB-INF/lib/jasperreports-functions-6.21.3.jar
  30. BIN
      superx/WEB-INF/lib/jasperreports-javaflow-6.20.0.jar
  31. BIN
      superx/WEB-INF/lib/jasperreports-metadata-6.20.0.jar
  32. BIN
      superx/WEB-INF/lib/openpdf-2.0.3.jar
  33. 13
      superx/WEB-INF/lib/openpdf-LICENSE.txt
  34. BIN
      superx/WEB-INF/lib/superx5.2.jar
  35. 15
      superx/edit/kern/webapp_manager.jsp
  36. 16
      superx/style/sx_common.css
  37. 8
      superx/xml/js/memtext/nd_functions.js

22
src/de/superx/common/Maske.java

@ -2638,9 +2638,11 @@ public class Maske extends NamedIdObject implements Serializable { @@ -2638,9 +2638,11 @@ public class Maske extends NamedIdObject implements Serializable {
public StringBuffer getCSV(String mandantenID) throws IOException {
String fld_delim1 = "";
String fld_delim2 = "^";
boolean isCSV_Excel_ISO=false;
if (SxPools.get(mandantenID).getRepository().containsKey("K_CSV_Excel_ISO")&&SxPools.get(mandantenID).getRepository().get("K_CSV_Excel_ISO").toString().equals("1"))
{
fld_delim2 = ";";
isCSV_Excel_ISO=true;
}
String row_delim1 = "";
String row_delim2 = "\n";// we only user unix newline, even under DOS
@ -2675,23 +2677,15 @@ public class Maske extends NamedIdObject implements Serializable { @@ -2675,23 +2677,15 @@ public class Maske extends NamedIdObject implements Serializable {
// MB Spezifisch Ende
if (outFormat.equals("xml") && (f_wert.indexOf("&") > -1 || f_wert.indexOf("<") > -1 || f_wert.indexOf(">") > -1)) f_wert = "<![CDATA[" + f_wert + "]]>";
//wenn der Feldwert einen Zeilenumbruch enthält wird der Test in "" gesetzt -> für CSV Import
if (outFormat.equals("txt") && f_wert != null && (f_wert.indexOf("\n") > -1)) {
f_wert = "\""+f_wert+"\"";
//wenn der Feldwert einen Zeilenumbruch oder Trennzeichen enthält wird der Test in "" gesetzt -> für CSV Import
if (outFormat.equals("txt") && f_wert != null && !f_wert.trim().equals("") && (f_wert.indexOf("\n") > -1 || isCSV_Excel_ISO || f_wert.indexOf(fld_delim2) > -1)) {
//CSV-Mode, d.h. Text-Trennzeichen wird drum herum gesetzt, und " im Text verdoppelt:
f_wert = "\""+de.memtext.util.StringUtils.replace(f_wert,"\"","\"\"")+"\"";
}
// wenn der Feldwert zufällig das Zeichen
// "\" enthält, wird es mit "\" maskiert
if (outFormat.equals("txt") && f_wert != null && (f_wert.indexOf("\n") > -1)) {
f_wert = "\""+f_wert+"\"";
}
if (outFormat.equals("txt") && f_wert != null && (f_wert.indexOf("\\n") > -1)) {
if (outFormat.equals("txt") && f_wert != null && (f_wert.indexOf("\\n") > -1)) {
f_wert = de.memtext.util.StringUtils.replace(f_wert, "\\n", "\\\\n");
}
// wenn der Feldwert zufällig das Trennzeichen enthält, wird es
// mit "\" maskiert
if (outFormat.equals("txt") && f_wert != null && (f_wert.indexOf(fld_delim2) > -1))
f_wert = de.memtext.util.StringUtils.replace(f_wert, fld_delim2, "\\" + fld_delim2);
if (i < cols)
if (i < cols)
line.append(fld_delim1 + f_wert + fld_delim2);
else {
line.append(fld_delim1 + f_wert + fld_delim2);

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

@ -63,8 +63,17 @@ @@ -63,8 +63,17 @@
<condition property="isJoolap">
<equals arg1="${ISJOOLAP}" arg2="joolap" casesensitive="false" trim="true"/>
</condition>
<condition property="isJoolapKern">
<equals arg1="${MODULE}" arg2="joolap_kern" casesensitive="false" trim="true"/>
<condition property="isKenn">
<equals arg1="${MODULE}" arg2="kenn" casesensitive="false" trim="true"/>
</condition>
<condition property="isNdModuleAndIsPlatformHIS1">
<and>
<or>
<equals arg1="${MODULE}" arg2="rpta" casesensitive="false" trim="true"/>
<equals arg1="${MODULE}" arg2="etl" casesensitive="false" trim="true"/>
</or>
<equals arg1="${PLATFORM}" arg2="his1" casesensitive="false" trim="true"/>
</and>
</condition>
<condition property="isJoolapsKern">
<equals arg1="${MODULE}" arg2="joolap_kern_s" casesensitive="false" trim="true"/>
@ -244,17 +253,12 @@ @@ -244,17 +253,12 @@
oder für Joolap-KENN-S:
ant -f build.xml -DMODULE=joolap_kenn_s -DPFAD=/home/superx/fertige_module -DDATABASE=POSTGRES -DENCODING=ISO -DPLATFORM=superx -DROOT_DIR_WEBSERVER=/home/superx/devel_module/kernmodul4.0utf/webserver -DMODULE_DIR=/home/superx/svn/repos/devel_module/joolap_s/db/module/joolap_kenn_s -DROOT_DIR_WEBAPP=/home/superx/svn/repos/devel_module/joolap_s erzeuge_paket
oder für Joolap-Kern:
ant -f build.xml -DMODULE=joolap_kern -DISJOOLAP=joolap -DPFAD=/home/superx/fertige_module -DDATABASE=HSQLDB -DENCODING=ISO -DPLATFORM=superx -DROOT_DIR_WEBSERVER=/home/superx/devel_module/kernmodul4.0utf/webserver -DMODULE_DIR=/home/superx/svn/repos/devel_module/joolap/db/module/joolap_kern -DROOT_DIR_WEBAPP=/home/superx/svn/repos/devel_module/joolap erzeuge_paket
-->
<antcall target="erzeuge_paket_kern" />
<antcall target="erzeuge_paket_joolap_kern" />
<antcall target="erzeuge_paket_nicht_kern" />
<antcall target="add_files_nd_his1" />
</target>
@ -571,117 +575,38 @@ xmlns:HtmlUtils="de.superx.util.HtmlUtils"> @@ -571,117 +575,38 @@ xmlns:HtmlUtils="de.superx.util.HtmlUtils">
</antcall>
</target>
<target name="erzeuge_paket_joolap_kern" if="isJoolapKern">
<property name="MODULE_DIR" value="../module/${MODULE}" />
<target name="add_files_nd_his1" if="isNdModuleAndIsPlatformHIS1">
<!--rpta,etl,viz benötigt unter HIS1 ein paar Stylesheets von SuperX-KERN-Standalone 5.2-->
<property name="MODULE_DIR" value="../module/${MODULE}" />
<xmlproperty file="${MODULE_DIR}/conf/${MODULE}.xml"/>
<property name="KERN_DEPENDENT_URL" value="https://git.campussource.de/git/SuperX/kern/raw/branch/RELEASE_kern5.2/superx" />
<property name="ZIELPFAD" value="${PFAD}/${MODULE}${module(version)}_${PLATFORM}_${ENCODING}_${DATABASE}"/>
<echo message="Modul ${MODULE} Version ${module(version)} in Pfad ${ZIELPFAD} mit Encodierung ${ENCODING} erzeugen." />
<!-- <antcall target="clean_zielpfad">
<param name="ZIELPFAD" value="${ZIELPFAD}"/>
</antcall>-->
<antcall target="clean_zielpfad" />
<antcall target="sync_his1_paket">
<param name="ZIELPFAD" value="${ZIELPFAD}"/>
<param name="MODULE_DIR" value="${MODULE_DIR}"/>
</antcall>
<antcall target="sync_superx_paket">
<param name="ZIELPFAD" value="${ZIELPFAD}"/>
<param name="MODULE_DIR" value="${MODULE_DIR}"/>
</antcall>
<mkdir dir="${ZIELPFAD}/db/bin"/>
<mkdir dir="${ZIELPFAD}/db/server"/>
<mkdir dir="${ZIELPFAD}/joolap/lib"/>
<sync todir="${ZIELPFAD}/db/bin" overwrite="true" includeEmptyDirs="true">
<fileset dir="${ROOT_DIR_WEBAPP}/db/bin" casesensitive="yes" >
<exclude name="JOOLAP_ENV"/>
<exclude name="SUPERX_ENV"/>
<exclude name="*log*"/>
<exclude name="*tmp*"/>
<exclude name="*.alt"/>
<exclude name="*.out"/>
<exclude name="*.bak"/>
<exclude name="*.backup"/>
<exclude name="*.sichern"/>
</fileset>
</sync>
<copy todir="${ZIELPFAD}/joolap" overwrite="true" includeEmptyDirs="true">
<fileset dir="${ROOT_DIR_WEBAPP}" casesensitive="yes" >
<include name="*.x"/>
<include name="createJoolapMasterXml.xml"/>
<include name="createJoolapMasterXml.xsl"/>
</fileset>
</copy>
<echo message="from: ${ROOT_DIR_WEBAPP}/db/module" />
<echo message="to : ${ZIELPFAD}/joolap/db/module" />
<copy todir="${ZIELPFAD}/joolap/db/module" overwrite="true" includeEmptyDirs="true">
<fileset dir="${ROOT_DIR_WEBAPP}/db/module" casesensitive="yes" >
<include name="*.x.sam"/>
<include name="*.x"/>
</fileset>
</copy>
<sync todir="${ZIELPFAD}/db/server" overwrite="true" includeEmptyDirs="true">
<fileset dir="${ROOT_DIR_WEBAPP}/db/server" casesensitive="yes" >
<!-- <exclude name="*.log*, *.pid, *~, *#, *.tgz, *.tar*"/> -->
<exclude name="*.log*"/>
<exclude name="*.pid"/>
<exclude name="joolap.script*"/>
<exclude name="*.bak"/>
<exclude name="*.old"/>
<exclude name="*test*"/>
<exclude name="*tmp*"/>
<exclude name="*.tgz"/>
<exclude name="*.tar*"/>
<exclude name="*.properties"/>
</fileset>
</sync>
<sync todir="${ZIELPFAD}/joolap/lib" overwrite="true" includeEmptyDirs="true">
<fileset dir="${ROOT_DIR_WEBAPP}/lib" casesensitive="yes" />
</sync>
<sync todir="${ZIELPFAD}/joolap/db/dist" overwrite="true" includeEmptyDirs="true">
<fileset dir="${ROOT_DIR_WEBAPP}/db/dist" casesensitive="yes" />
</sync>
<!--<antcall target="purge_zielpfad_postgres">
<param name="ZIELPFAD" value="${ZIELPFAD}"/>
</antcall>
<antcall target="purge_zielpfad_informix">
<param name="ZIELPFAD" value="${ZIELPFAD}"/>
</antcall> -->
<antcall target="copy_lizenz_files_superx" >
<param name="VERSION" value="${module(version)}" />
</antcall>
<antcall target="copy_lizenz_files_his1" >
<param name="VERSION" value="${module(version)}" />
</antcall>
<antcall target="convertToIso" >
<param name="ZIELPFAD" value="${ZIELPFAD}"/>
</antcall>
<antcall target="Doku_Hinweis_superx" />
<antcall target="sync_doc_paket" >
<param name="ZIEL_DOC_PFAD" value="${ZIELPFAD}/webserver/tomcat/webapps/superx/doku"/>
</antcall>
<antcall target="rechte" >
<param name="ZIELPFAD" value="${ZIELPFAD}"/>
</antcall>
<chmod dir="${ZIELPFAD}" perm="u+rx" includes="**/*.sh,**/*.x,**/*.x.sam,**/*_mask,**/*_mask_xil,**/DOSQL,**/DOQUERY,**/joolapdbserver"/>
<!--klappt noch nicht, wg. Dateirechten:
<antcall target="tar_it">
<param name="ZIELPFAD" value="${ZIELPFAD}"/>
<param name="PAKET_FILENAME" value="${MODULE}${module(version)}_${PLATFORM}_${ENCODING}_${DATABASE}"/>
</antcall>-->
<antcall target="db_joolap_move" />
<mkdir dir="${ZIELPFAD}/superx/edit/kern"/>
<mkdir dir="${ZIELPFAD}/superx/images"/>
<mkdir dir="${ZIELPFAD}/superx/style"/>
<mkdir dir="${ZIELPFAD}/superx/xml/js"/>
<mkdir dir="${ZIELPFAD}/superx/xml/js/memtext"/>
<get src="${KERN_DEPENDENT_URL}/htmlhead_dialoge.inc" dest="${ZIELPFAD}/superx"/>
<get src="${KERN_DEPENDENT_URL}/edit/kern/maske_combo_laden.jsp" dest="${ZIELPFAD}/superx/edit/kern"/>
<get src="${KERN_DEPENDENT_URL}/edit/kern/maske_sicht_laden.jsp" dest="${ZIELPFAD}/superx/edit/kern"/>
<get src="${KERN_DEPENDENT_URL}/images/books.svg" dest="${ZIELPFAD}/superx/images"/>
<get src="${KERN_DEPENDENT_URL}/images/home.svg" dest="${ZIELPFAD}/superx/images"/>
<get src="${KERN_DEPENDENT_URL}/images/information_liberation.svg" dest="${ZIELPFAD}/superx/images"/>
<get src="${KERN_DEPENDENT_URL}/images/logout.svg" dest="${ZIELPFAD}/superx/images"/>
<get src="${KERN_DEPENDENT_URL}/images/user.svg" dest="${ZIELPFAD}/superx/images"/>
<get src="${KERN_DEPENDENT_URL}/images/wrenchblck.svg" dest="${ZIELPFAD}/superx/images"/>
<get src="${KERN_DEPENDENT_URL}/images/video.svg" dest="${ZIELPFAD}/superx/images"/>
<get src="${KERN_DEPENDENT_URL}/style/sx_common.css" dest="${ZIELPFAD}/superx/style"/>
<get src="${KERN_DEPENDENT_URL}/style/fontello-codes.css" dest="${ZIELPFAD}/superx/style"/>
<get src="${KERN_DEPENDENT_URL}/style/sx_field_dialogue.css" dest="${ZIELPFAD}/superx/style"/>
<get src="${KERN_DEPENDENT_URL}/style/sx_fontello.css" dest="${ZIELPFAD}/superx/style"/>
<get src="${KERN_DEPENDENT_URL}/style/sx_menue.css" dest="${ZIELPFAD}/superx/style"/>
<get src="${KERN_DEPENDENT_URL}/style/sx_tabelle.css" dest="${ZIELPFAD}/superx/style"/>
<get src="${KERN_DEPENDENT_URL}/xml/js/memtext/nd_functions.js" dest="${ZIELPFAD}/superx/xml/js/memtext"/>
<get src="${KERN_DEPENDENT_URL}/xml/nd_templates.xsl" dest="${ZIELPFAD}/superx/xml"/>
</target>

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

@ -1 +1 @@ @@ -1 +1 @@
06.03.2025
01.09.2025

4
superx/WEB-INF/conf/edustore/db/install/conf/his1/dbconv/sch.eduetl/cifx_customize.tab

@ -7,7 +7,9 @@ apnr CHAR(10) not null, @@ -7,7 +7,9 @@ apnr CHAR(10) not null,
kurz NVARCHAR(255) ,
druck NVARCHAR(255) default 'Drucktext' ,
lang_1 NVARCHAR(255) ,
uniquename NVARCHAR(255)
uniquename NVARCHAR(255) ,
sort1 INTEGER ,
struktur_c CHAR(50)
);
comment on column cifx_customize.tid is 'Laufnr.';

2
superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_ids.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_ids.xml

@ -253,7 +253,7 @@ @@ -253,7 +253,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="executeFile">

32063
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.rtf

File diff suppressed because one or more lines are too long

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

@ -1378,6 +1378,10 @@ @@ -1378,6 +1378,10 @@
notnull="false" description="Langtext"/>
<column name="uniquename" type="VARCHAR" size="255" default=""
notnull="false" description="Schlüssel (Anzeige)" currentlyUsed="false"/>
<column name="sort1" type="INTEGER" size="4" default=""
notnull="false" />
<column name="struktur_c" type="CHAR" size="50" default=""
notnull="false" />
</columns>
<indexes>
</indexes>

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

@ -1681,6 +1681,50 @@ values('cifx_customize', @@ -1681,6 +1681,50 @@ values('cifx_customize',
0,
1);
insert into tmp_fields (
table_name,
name,
caption,
description,
field_type,
field_size,
field_not_null,
currentlyUsed,
check_integrity,
is_sum)
values('cifx_customize',
'sort1',
'sort1',
'',
'INTEGER',
'4',
0,
1,
0,
1);
insert into tmp_fields (
table_name,
name,
caption,
description,
field_type,
field_size,
field_not_null,
currentlyUsed,
check_integrity,
is_sum)
values('cifx_customize',
'struktur_c',
'struktur_c',
'',
'CHAR',
'50',
0,
1,
0,
1);
insert into tmp_fields (
table_name,
name,

12
superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_loeschen.sql

@ -474,6 +474,18 @@ name) @@ -474,6 +474,18 @@ name)
values('cifx_customize',
'uniquename');
insert into tmp_fields (
table_name,
name)
values('cifx_customize',
'sort1');
insert into tmp_fields (
table_name,
name)
values('cifx_customize',
'struktur_c');
insert into tmp_fields (
table_name,
name)

2
superx/WEB-INF/conf/edustore/db/install/kern_backup.x

@ -59,7 +59,7 @@ DOQUERY "select tid, hs, key, apnr, d_akt_von, d_akt_bis, kurz, druck, lang_1, l @@ -59,7 +59,7 @@ DOQUERY "select tid, hs, key, apnr, d_akt_von, d_akt_bis, kurz, druck, lang_1, l
DOQUERY "select tid, hs, key, apnr, d_akt_von, d_akt_bis, kurz, druck, lang_1, lang_2, lang_3, parent, parent_int, filter, refapnr, astat, bund_apnr, land_apnr, hiskey_id, uniquename, sort1, sort2, sort3, sortc1, sortc2, sourcesystem, sourcesystem_id, intern_int, intern_c, sprache, struktur_int, struktur_c, ebene, lid, parent_lid from cifx;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/cifx.unl txt
DOQUERY "select tid, key, apnr, cifx_tid, sourcesystem, sourcesystem_id, systeminfo_id from trans_cifx;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/trans_cifx.unl txt
DOQUERY "select key, apnr, cif_tid, sourcesystem, sourcesystem_id, systeminfo_id from trans_cif;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/trans_cif.unl txt
DOQUERY "select tid, cifx_table, key, apnr, kurz, druck, lang_1, uniquename from cifx_customize;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/cifx_customize.unl txt
DOQUERY "select tid, cifx_table, key, apnr, kurz, druck, lang_1, uniquename, sort1, struktur_c from cifx_customize;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/cifx_customize.unl txt
DOQUERY "select tid, name, nummer, x, y, buttonbreite, feldbreite, zeilenanzahl, typ, laenge, obligatorisch, art, relation, attribut, defaultwert from felderinfo;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/felderinfo.unl txt
DOQUERY "select name, adresse, hs_nr, kapitel, superx_server, kennung, passwd from hochschulinfo;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/hochschulinfo.unl txt
DOQUERY "select maskeninfo_id, systeminfo_id from maske_system_bez;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/maske_system_bez.unl txt

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

@ -408,7 +408,7 @@ create table macro_masken_bez( @@ -408,7 +408,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) ,
@ -761,7 +761,9 @@ apnr CHAR(10) not null, @@ -761,7 +761,9 @@ apnr CHAR(10) not null,
kurz NVARCHAR(255) ,
druck NVARCHAR(255) default 'Drucktext' ,
lang_1 NVARCHAR(255) ,
uniquename NVARCHAR(255) ,
uniquename NVARCHAR(255) ,
sort1 INTEGER ,
struktur_c CHAR(50) ,
primary key (tid)
constraint c_cifx_customize
)
@ -4415,7 +4417,7 @@ end procedure; @@ -4415,7 +4417,7 @@ end procedure;
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/kern_install_pg.sql

@ -854,6 +854,8 @@ kurz VARCHAR(255) , @@ -854,6 +854,8 @@ kurz VARCHAR(255) ,
druck VARCHAR(255) default 'Drucktext' ,
lang_1 VARCHAR(255) ,
uniquename VARCHAR(255) ,
sort1 INTEGER ,
struktur_c CHAR(50) ,
constraint c_cifx_customize primary key (tid)
)

22
superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_ids.sql

@ -1037,7 +1037,7 @@ alter table macro_masken_bez add ( sortnr SMALLINT ); @@ -1037,7 +1037,7 @@ alter table macro_masken_bez add ( sortnr SMALLINT );
! echo "field macro_masken_bez.schleifenrelation will be added"
! echo `date`
alter table macro_masken_bez add ( schleifenrelation NCHAR(255) );
alter table macro_masken_bez add ( schleifenrelation TEXT );
</#if>
@ -2101,6 +2101,26 @@ alter table cifx_customize add ( uniquename NVARCHAR(255) ); @@ -2101,6 +2101,26 @@ alter table cifx_customize add ( uniquename NVARCHAR(255) );
</#if>
<#if !fields?seq_contains("cifx_customize.sort1") >
! echo "field cifx_customize.sort1 will be added"
! echo `date`
alter table cifx_customize add ( sort1 INTEGER );
</#if>
<#if !fields?seq_contains("cifx_customize.struktur_c") >
! echo "field cifx_customize.struktur_c will be added"
! echo `date`
alter table cifx_customize add ( struktur_c CHAR(50) );
</#if>
<#if !fields?seq_contains("felderinfo.tid") >

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

@ -2044,6 +2044,24 @@ alter table cifx_customize add column uniquename VARCHAR(255) ; @@ -2044,6 +2044,24 @@ alter table cifx_customize add column uniquename VARCHAR(255) ;
</#if>
<#if !fields?seq_contains("cifx_customize.sort1") >
select now(), 'field cifx_customize.sort1 will be added';
alter table cifx_customize add column sort1 INTEGER ;
</#if>
<#if !fields?seq_contains("cifx_customize.struktur_c") >
select now(), 'field cifx_customize.struktur_c will be added';
alter table cifx_customize add column struktur_c CHAR(50) ;
</#if>
<#if !fields?seq_contains("felderinfo.tid") >

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

@ -416,7 +416,7 @@ drop table tmp_cif_load; @@ -416,7 +416,7 @@ drop table tmp_cif_load;
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);

6
superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_ids.sql

@ -706,7 +706,7 @@ create table macro_masken_bez( @@ -706,7 +706,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) ,
@ -1155,7 +1155,9 @@ apnr CHAR(10) not null, @@ -1155,7 +1155,9 @@ apnr CHAR(10) not null,
kurz NVARCHAR(255) ,
druck NVARCHAR(255) default 'Drucktext' ,
lang_1 NVARCHAR(255) ,
uniquename NVARCHAR(255) ,
uniquename NVARCHAR(255) ,
sort1 INTEGER ,
struktur_c CHAR(50) ,
primary key (tid)
constraint c_cifx_customize
)

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

@ -1379,6 +1379,8 @@ kurz VARCHAR(255) , @@ -1379,6 +1379,8 @@ kurz VARCHAR(255) ,
druck VARCHAR(255) default 'Drucktext' ,
lang_1 VARCHAR(255) ,
uniquename VARCHAR(255) ,
sort1 INTEGER ,
struktur_c CHAR(50) ,
constraint c_cifx_customize primary key (tid)
)

9
superx/WEB-INF/conf/obsoletfiles.txt

@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
WEB-INF/conf/edustore/db/bin/ant
WEB-INF/classes/freemarker/version.properties
WEB-INF/lib/avalon-framework-cvs-20020806.jar
WEB-INF/lib/iText-2.1.7.jar
WEB-INF/lib/iText-LICENSE.txt
WEB-INF/lib/poi-2.5.1-final-20040804.jar
WEB-INF/lib/poi-3.5-FINAL-20090928.jar
WEB-INF/lib/poi-3.7.jar
@ -63,6 +65,13 @@ WEB-INF/lib/jasperreports-javaflow-6.4.1.jar @@ -63,6 +65,13 @@ WEB-INF/lib/jasperreports-javaflow-6.4.1.jar
WEB-INF/lib/jasperreports-chart-customizers-6.4.1.jar
WEB-INF/lib/jasperreports-chart-themes-6.4.1.jar
WEB-INF/lib/jasperreports-chart-themes-6.20.0.jar
WEB-INF/lib/jasperreports-javaflow-6.20.0.jar
WEB-INF/lib/jasperreports-functions-6.20.0.jar
WEB-INF/lib/jasperreports-fonts-6.20.0.jar
WEB-INF/lib/jasperreports-custom-visualization-6.20.0.jar
WEB-INF/lib/jasperreports-chart-customizers-6.20.0.jar
WEB-INF/lib/jasperreports-metadata-6.20.0.jar
WEB-INF/lib/jasperreports-6.20.0.jar
WEB-INF/lib/hsqldb-1.8.0.10.jar
#WEB-INF/lib/kettle-core-6.0.0.0-353.jar
#WEB-INF/lib/kettle-engine-6.0.0.0-353.jar

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

@ -102,6 +102,8 @@ @@ -102,6 +102,8 @@
<field name="druck" description="Drucktext" fieldType="varchar" size="255" isKey="" defaultValue="Drucktext" sortable=""/>
<field name="lang_1" description="Langtext" fieldType="varchar" size="255" isKey="" sortable=""/>
<field name="uniquename" description="Schlüssel (Anzeige)" fieldType="varchar" size="255" isKey="" sortable=""/>
<field name="sort1" description="" fieldType="int" size="6" isKey="" sortable=""/>
<field name="struktur_c" description="" fieldType="char" size="50" isKey="" sortable=""/>
<interceptor className="de.superx.servlet.DbformInterceptor"/>
</table>
<table name="colorscheme">
@ -672,15 +674,25 @@ @@ -672,15 +674,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 +823,7 @@ @@ -811,7 +823,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="blob" 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/WEB-INF/kern_dbforms-config_pg.xml

@ -102,6 +102,8 @@ @@ -102,6 +102,8 @@
<field name="druck" description="Drucktext" fieldType="varchar" size="255" isKey="" defaultValue="Drucktext" sortable=""/>
<field name="lang_1" description="Langtext" fieldType="varchar" size="255" isKey="" sortable=""/>
<field name="uniquename" description="Schlüssel (Anzeige)" fieldType="varchar" size="255" isKey="" sortable=""/>
<field name="sort1" description="" fieldType="int" size="6" isKey="" sortable=""/>
<field name="struktur_c" description="" fieldType="char" size="50" isKey="" sortable=""/>
<interceptor className="de.superx.servlet.DbformInterceptor"/>
</table>
<table name="colorscheme">

BIN
superx/WEB-INF/lib/jasperreports-6.20.0.jar → superx/WEB-INF/lib/jasperreports-6.21.3.jar

Binary file not shown.

BIN
superx/WEB-INF/lib/jasperreports-chart-customizers-6.20.0.jar

Binary file not shown.

BIN
superx/WEB-INF/lib/jasperreports-custom-visualization-6.20.0.jar

Binary file not shown.

BIN
superx/WEB-INF/lib/jasperreports-fonts-6.20.0.jar

Binary file not shown.

BIN
superx/WEB-INF/lib/jasperreports-fonts-6.21.3.jar

Binary file not shown.

BIN
superx/WEB-INF/lib/jasperreports-functions-6.20.0.jar

Binary file not shown.

BIN
superx/WEB-INF/lib/jasperreports-functions-6.21.3.jar

Binary file not shown.

BIN
superx/WEB-INF/lib/jasperreports-javaflow-6.20.0.jar

Binary file not shown.

BIN
superx/WEB-INF/lib/jasperreports-metadata-6.20.0.jar

Binary file not shown.

BIN
superx/WEB-INF/lib/openpdf-2.0.3.jar

Binary file not shown.

13
superx/WEB-INF/lib/openpdf-LICENSE.txt

@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
# Licenses
## Licenses of OpenPDF
### Mozilla Public License Version 2.0
Please see https://www.mozilla.org/en-US/MPL/2.0/ or the attached file
[MPL-2.0.txt](src/main/resources/META-INF/MPL-2.0.txt).
### GNU Lesser General Public License 2.1
Please see https://www.gnu.org/licenses/old-licenses/lgpl-2.1 or the attached file
[LGPL-2.1.md](src/main/resources/META-INF/LGPL-2.1.md).

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

Binary file not shown.

15
superx/edit/kern/webapp_manager.jsp

@ -9,6 +9,11 @@ @@ -9,6 +9,11 @@
<%@ page import ="java.io.File" %>
<%@ page import ="de.memtext.util.FileUtils" %>
<%
String platform=de.superx.servlet.SuperXManager.isHis1?"HISinOne":"SuperX";
String restApiPath="sxrest"; //klappt noch nicht: platform.equals("HISinOne")?"ds/api":"sxrest";
%>
<html>
<head>
@ -21,6 +26,7 @@ @@ -21,6 +26,7 @@
</head>
<script language="Javascript">
var restApiPath="<%=restApiPath %>";
function getVersion()
{
@ -30,12 +36,12 @@ var xhttp = new XMLHttpRequest(); @@ -30,12 +36,12 @@ var xhttp = new XMLHttpRequest();
document.getElementById("version").innerHTML = this.responseText;
}
};
xhttp.open("GET", "../../sxrest/version", true);
xhttp.open("GET", "../../"+restApiPath+"/version", true);
xhttp.send();
}
async function ManagerCacheRefresh()
{
const url="../../sxrest/managercache_refresh";
const url="../../"+restApiPath+"/managercache_refresh";
try {
const response = await fetch(url);
if (!response.ok) {
@ -58,7 +64,7 @@ var xhttp = new XMLHttpRequest(); @@ -58,7 +64,7 @@ var xhttp = new XMLHttpRequest();
document.getElementById("TransletCacheStatus").innerHTML = this.responseText;
}
};
xhttp.open("GET", "../../sxrest/transletcache_refresh", true);
xhttp.open("GET", "../../"+restApiPath+"/transletcache_refresh", true);
xhttp.send();
}
@ -73,7 +79,7 @@ var xhttp = new XMLHttpRequest(); @@ -73,7 +79,7 @@ var xhttp = new XMLHttpRequest();
document.getElementById("Inhalt").innerHTML = this.responseText;
}
};
xhttp.open("GET", "../../sxrest/logs/"+logtype+"?loglines="+loglines, true);
xhttp.open("GET", "../../"+restApiPath+"/logs/"+logtype+"?loglines="+loglines, true);
xhttp.send();
@ -142,7 +148,6 @@ String sxversion=de.superx.servlet.SuperXManager.sxversion; @@ -142,7 +148,6 @@ String sxversion=de.superx.servlet.SuperXManager.sxversion;
String builddatum=de.superx.servlet.SuperXManager.builddatum;
String finRechteInfos=SxPools.getPoolFinRechteInfos();
String platform=de.superx.servlet.SuperXManager.isHis1?"HISinOne":"SuperX";
String webinfpfad=de.superx.servlet.SuperXManager.getWEB_INFPfad();
String javaVersion=System.getProperties().get("java.version").toString();
//String jvmMemory=String.valueOf(Runtime.totalMemory()/(1024* 1024));

16
superx/style/sx_common.css

@ -589,11 +589,12 @@ input.ndSchluesselfeld { @@ -589,11 +589,12 @@ input.ndSchluesselfeld {
/*Listen*/
ul {
margin: 0px;
padding: 0px;
list-style-type: none;
list-style-position: inside;
list-style-image: none; }
/*margin: 0px;
padding: 0px;*/
list-style-type: disc;
/*list-style-position: inside;
list-style-image: none;
*/ }
ol {
margin:0px;
@ -601,7 +602,10 @@ padding:0px; @@ -601,7 +602,10 @@ padding:0px;
list-style-type: decimal;
list-style-position:inside; }
.menu-list { padding-left: 0.6rem !important;}
.menu-list {
padding-left: 0.6rem !important;
list-style-type: none;
}
li.submenu_listelem {
list-style:none;

8
superx/xml/js/memtext/nd_functions.js

@ -222,7 +222,7 @@ var label = ""; @@ -222,7 +222,7 @@ var label = "";
if(referrerFrm.elements[fname] && val !="")
{
referrerFrm.elements[fname].value=val;
referrerFrm.elements["label_" + createVarname(fname)].value =label;
referrerFrm.elements["label_" + createVarname(fname)].value =removeHtmlEntities(label);
} else {
referrerFrm.elements[fname].value = '';
@ -233,6 +233,12 @@ window.close(); @@ -233,6 +233,12 @@ window.close();
return false;
}
function removeHtmlEntities(html) {
var txt = document.createElement("textarea");
txt.innerHTML = html;
return txt.value;
}
function dateGermanToDateUS(date_str)
{
var yyyy=date_str.substring(6,10);

Loading…
Cancel
Save