SuperX
/
kern
7
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

Compare commits

base: SuperX:5046b25764b26a28763f1b357ebda8c3b729b2a6
Branches Tags
SuperX:RELEASE_kern5.0
SuperX:RELEASE_kern5.1
SuperX:RELEASE_kern5.2
SuperX:RELEASE_kern5.3
SuperX:ak_tomcat10_test2
SuperX:freiburg_nutzungsstatistik
SuperX:kern5.0-HHU
SuperX:kern_tomcat10_test_his
SuperX:master
SuperX:userinfo_gueltigkeit
..
compare: SuperX:4ae72eacc9aeca3e7b8ab118db36e021e6cf735a
Branches Tags
SuperX:RELEASE_kern5.0
SuperX:RELEASE_kern5.1
SuperX:RELEASE_kern5.2
SuperX:RELEASE_kern5.3
SuperX:ak_tomcat10_test2
SuperX:freiburg_nutzungsstatistik
SuperX:kern5.0-HHU
SuperX:kern_tomcat10_test_his
SuperX:master
SuperX:userinfo_gueltigkeit

3 Commits
5046b25764 ... 4ae72eacc9

Author SHA1 Message Date
Daniel Quathamer 4ae72eacc9 Exportbutton default unformatiert #9
1 month ago
Imo John ed015fada1 Anpassung decval fuer Dezimaltrenner , und Auslagerung in .sql #352679
1 month ago
Daniel Quathamer e9e4729ec0 Vorbereitung 5.3
1 month ago
22 changed files with 173 additions and 271 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 4
      superx/WEB-INF/conf/edustore/db/conf/build.xml
  2. 2
      superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt
  3. 3
      superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_drop_ids.xml
  4. 6
      superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_drop_pg.xml
  5. 12
      superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_ids.sql
  6. 12
      superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql
  7. 111
      superx/WEB-INF/conf/edustore/db/install/conf/kern.html
  8. 2
      superx/WEB-INF/conf/edustore/db/install/conf/kern.rtf
  9. 93
      superx/WEB-INF/conf/edustore/db/install/conf/kern.xml
  10. 16
      superx/WEB-INF/conf/edustore/db/install/conf/kern_mask_test_ant.xml
  11. 1
      superx/WEB-INF/conf/edustore/db/install/kern_drop_ids.sql
  12. 2
      superx/WEB-INF/conf/edustore/db/install/kern_drop_pg.sql
  13. 27
      superx/WEB-INF/conf/edustore/db/install/kern_install_ids.sql
  14. 24
      superx/WEB-INF/conf/edustore/db/install/kern_install_pg.sql
  15. 14
      superx/WEB-INF/conf/edustore/db/install/prozeduren/proc_decval_ids.sql
  16. 11
      superx/WEB-INF/conf/edustore/db/install/prozeduren/proc_decval_pg.sql
  17. 1
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade.x
  18. 15
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_functions_ids.sql
  19. 12
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_functions_pg.sql
  20. 60
      superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_themenbaum.sql
  21. 4
      superx/WEB-INF/conf/edustore/db/install/upgrade/kernmodul_upgrade_man.sql
  22. 4
      superx/xml/nd_templates.xsl

4
superx/WEB-INF/conf/edustore/db/conf/build.xml
Unescape View File

@ -576,10 +576,10 @@ xmlns:HtmlUtils="de.superx.util.HtmlUtils"> @@ -576,10 +576,10 @@ xmlns:HtmlUtils="de.superx.util.HtmlUtils">
</target>
<target name="add_files_nd_his1" if="isNdModuleAndIsPlatformHIS1">
<!--rpta,etl,viz benötigt unter HIS1 ein paar Stylesheets von SuperX-KERN-Standalone 5.2-->
<!--rpta,etl,viz benötigt unter HIS1 ein paar Stylesheets von SuperX-KERN-Standalone 5.3-->
<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="KERN_DEPENDENT_URL" value="https://git.campussource.de/git/SuperX/kern/raw/branch/RELEASE_kern5.3/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." />

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

@ -1 +1 @@ @@ -1 +1 @@
01.09.2025
11.09.2025

3
superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_drop_ids.xml
Unescape View File

@ -28,9 +28,6 @@ @@ -28,9 +28,6 @@
</dbi:dbaction>
<dbi:dbaction dbi:action="sqlexec">eduetl:drop procedure val(char(255));
</dbi:dbaction>
<dbi:dbaction dbi:action="sqlexec">eduetl:drop procedure decval(varchar(255));
</dbi:dbaction>
<dbi:dbaction dbi:action="sqlexec">eduetl:drop procedure decval(char(255));

6
superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_drop_pg.xml
Unescape View File

@ -130,12 +130,6 @@ @@ -130,12 +130,6 @@
</dbi:dbaction>
<dbi:dbaction dbi:action="sqlexec">eduetl:drop function val(smallint);
</dbi:dbaction>
<dbi:dbaction dbi:action="sqlexec">eduetl:drop function decval(varchar(255));
</dbi:dbaction>
<dbi:dbaction dbi:action="sqlexec">eduetl:drop function decval(text);
</dbi:dbaction>
<dbi:dbaction dbi:action="sqlexec">eduetl:drop function decval(char(255));

12
superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_ids.sql
Unescape View File

@ -705,6 +705,18 @@ insert into tmp_themenbaum @@ -705,6 +705,18 @@ insert into tmp_themenbaum
gueltig_bis)
values('Gastzugang einrichten','71770','Administration','01.01.1900','01.01.3000');
insert into tmp_themenbaum
( name ,maskeninfo_id, parentname,
gueltig_seit ,
gueltig_bis)
values('Datenblatt archivieren','71840','Datenmanagement','01.01.1900','01.01.3000');
insert into tmp_themenbaum
( name ,maskeninfo_id, parentname,
gueltig_seit ,
gueltig_bis)
values('Übersicht Datenblatt-Archiv','71860','Datenmanagement','01.01.1900','01.01.3000');
--gibt es die Maske schon?
delete from tmp_themenbaum where maskeninfo_id in (select T.maskeninfo_id from themenbaum T);

12
superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql
Unescape View File

@ -707,6 +707,18 @@ insert into tmp_themenbaum @@ -707,6 +707,18 @@ insert into tmp_themenbaum
gueltig_bis)
values('Gastzugang einrichten','71770','Administration',date_val('01.01.1900'),date_val('01.01.3000'));
insert into tmp_themenbaum
( name ,maskeninfo_id, parentname,
gueltig_seit ,
gueltig_bis)
values('Datenblatt archivieren','71840','Datenmanagement',date_val('01.01.1900'),date_val('01.01.3000'));
insert into tmp_themenbaum
( name ,maskeninfo_id, parentname,
gueltig_seit ,
gueltig_bis)
values('Übersicht Datenblatt-Archiv','71860','Datenmanagement',date_val('01.01.1900'),date_val('01.01.3000'));
--gibt es die Maske schon?
delete from tmp_themenbaum where maskeninfo_id in (select T.maskeninfo_id from themenbaum T);

111
superx/WEB-INF/conf/edustore/db/install/conf/kern.html
Unescape View File

@ -18219,104 +18219,6 @@ a:active { @@ -18219,104 +18219,6 @@ a:active {
</tbody>
</table>
<table class="table is-bordered is-striped is-narrow is-hoverable">
<thead>
<tr>
<td class="column-title"><strong>Funktion/Prozedur</strong></td>
<td><strong>decval</strong></td>
</tr>
</thead>
<tbody>
<tr>
<td class="themenspalte">Beschreibung</td>
<td>Liefert einen String als decimal (analog Basic-Funktion
val). </td>
</tr>
<tr>
<td class="themenspalte">Parameter</td>
<td>
<ol>
<li>wert varchar(255) (Eine String-Repräsentation einer Dezimalzahl
)</li>
</ol>
</td>
</tr>
<tr>
<td class="themenspalte">Script</td>
<td>
CREATE or replace FUNCTION decval(varchar(255)) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
</td>
</tr>
<tr>
<td class="themenspalte">Script</td>
<td>
create procedure decval(p_str varchar(255))
returning decimal(16,2);
return p_str::decimal(16,2);
end procedure;
</td>
</tr>
<tr>
<td class="themenspalte">Rückgabe</td>
<td>
<ol>
<li>wert Typ: numeric</li>
</ol>
</td>
</tr>
<tr>
<td class="themenspalte">Kommentar</td>
<td>Die Zahl<br></td>
</tr>
</tbody>
</table>
<table class="table is-bordered is-striped is-narrow is-hoverable">
<thead>
<tr>
<td class="column-title"><strong>Funktion/Prozedur</strong></td>
<td><strong>decval</strong></td>
</tr>
</thead>
<tbody>
<tr>
<td class="themenspalte">Beschreibung</td>
<td>Liefert einen String als decimal (analog Basic-Funktion
val). </td>
</tr>
<tr>
<td class="themenspalte">Parameter</td>
<td>
<ol>
<li>wert text (Eine String-Repräsentation einer Dezimalzahl
)</li>
</ol>
</td>
</tr>
<tr>
<td class="themenspalte">Script</td>
<td>
CREATE or replace FUNCTION decval(text) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
</td>
</tr>
<tr>
<td class="themenspalte">Rückgabe</td>
<td>
<ol>
<li>wert Typ: numeric</li>
</ol>
</td>
</tr>
<tr>
<td class="themenspalte">Kommentar</td>
<td>Die Zahl<br></td>
</tr>
</tbody>
</table>
<table class="table is-bordered is-striped is-narrow is-hoverable">
<thead>
<tr>
@ -18341,20 +18243,11 @@ a:active { @@ -18341,20 +18243,11 @@ a:active {
</tr>
<tr>
<td class="themenspalte">Script</td>
<td>
CREATE or replace FUNCTION decval(char(255)) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
</td>
<td>$SUPERX_DIR/db/install/prozeduren/proc_decval_pg.sql</td>
</tr>
<tr>
<td class="themenspalte">Script</td>
<td>
create procedure decval(p_str char(255))
returning decimal(16,2);
return p_str::decimal(16,2);
end procedure;
</td>
<td>$SUPERX_DIR/db/install/prozeduren/proc_decval_ids.sql</td>
</tr>
<tr>
<td class="themenspalte">Rückgabe</td>

2
superx/WEB-INF/conf/edustore/db/install/conf/kern.rtf
View File

File diff suppressed because one or more lines are too long

93
superx/WEB-INF/conf/edustore/db/install/conf/kern.xml
Unescape View File

@ -7159,82 +7159,6 @@ CREATE or replace FUNCTION val(smallint) RETURNS integer STABLE @@ -7159,82 +7159,6 @@ CREATE or replace FUNCTION val(smallint) RETURNS integer STABLE
</returns>
</function>
<function version="3.0">
<name>decval</name>
<description>Liefert einen String als decimal (analog Basic-Funktion
val). </description>
<parameters>
<param>
<name>wert</name>
<type>varchar(255)</type>
<description>Eine String-Repräsentation einer Dezimalzahl
</description>
</param>
</parameters>
<src>
<body><![CDATA[
CREATE or replace FUNCTION decval(varchar(255)) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
]]></body>
<author>D.Quathamer</author>
<lastupdated>9.1.2004</lastupdated>
<dbsystem>POSTGRES</dbsystem>
<type>function</type>
</src>
<src>
<body><![CDATA[
create procedure decval(p_str varchar(255))
returning decimal(16,2);
return p_str::decimal(16,2);
end procedure;
]]></body>
<author>D.Quathamer</author>
<lastupdated>9.1.2004</lastupdated>
<dbsystem>INFORMIX</dbsystem>
<type>procedure</type>
</src>
<returns>
<param>
<name>wert</name>
<type>numeric</type>
<description />
</param>
<comment>Die Zahl</comment>
</returns>
</function>
<function version="3.0">
<name>decval</name>
<description>Liefert einen String als decimal (analog Basic-Funktion
val). </description>
<parameters>
<param>
<name>wert</name>
<type>text</type>
<description>Eine String-Repräsentation einer Dezimalzahl
</description>
</param>
</parameters>
<src>
<body><![CDATA[
CREATE or replace FUNCTION decval(text) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
]]></body>
<author>D.Quathamer</author>
<lastupdated>9.1.2004</lastupdated>
<dbsystem>POSTGRES</dbsystem>
<type>function</type>
</src>
<returns>
<param>
<name>wert</name>
<type>numeric</type>
<description />
</param>
<comment>Die Zahl</comment>
</returns>
</function>
<function version="3.0">
<name>decval</name>
@ -7249,23 +7173,14 @@ CREATE or replace FUNCTION decval(text) RETURNS numeric(16,2) STABLE @@ -7249,23 +7173,14 @@ CREATE or replace FUNCTION decval(text) RETURNS numeric(16,2) STABLE
</param>
</parameters>
<src>
<body><![CDATA[
CREATE or replace FUNCTION decval(char(255)) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
]]></body>
<file>$SUPERX_DIR/db/install/prozeduren/proc_decval_pg.sql</file>
<author>D.Quathamer</author>
<lastupdated>9.1.2004</lastupdated>
<dbsystem>POSTGRES</dbsystem>
<type>function</type>
</src>
<src>
<body><![CDATA[
create procedure decval(p_str char(255))
returning decimal(16,2);
return p_str::decimal(16,2);
end procedure;
]]></body>
<file>$SUPERX_DIR/db/install/prozeduren/proc_decval_ids.sql</file>
<author>D.Quathamer</author>
<lastupdated>9.1.2004</lastupdated>
<dbsystem>INFORMIX</dbsystem>
@ -9976,7 +9891,7 @@ where dimension_bp_id=(select D.tid from dimension_bp D where D.apnr='bluep_absc @@ -9976,7 +9891,7 @@ where dimension_bp_id=(select D.tid from dimension_bp D where D.apnr='bluep_absc
<dbsystem>INFORMIX</dbsystem>
</src>
</maske>
<maske tid="71840" name="Datenblatt archivieren" thema="">
<maske tid="71840" name="Datenblatt archivieren" thema="Datenmanagement">
<src>
<path>$SUPERX_DIR/db/install/masken</path>
<author>D. Quathamer</author>
@ -9990,7 +9905,7 @@ where dimension_bp_id=(select D.tid from dimension_bp D where D.apnr='bluep_absc @@ -9990,7 +9905,7 @@ where dimension_bp_id=(select D.tid from dimension_bp D where D.apnr='bluep_absc
<dbsystem>INFORMIX</dbsystem>
</src>
</maske>
<maske tid="71860" name="Übersicht Datenblatt-Archiv" thema="">
<maske tid="71860" name="Übersicht Datenblatt-Archiv" thema="Datenmanagement">
<src>
<path>$SUPERX_DIR/db/install/masken</path>
<author>I. John</author>

16
superx/WEB-INF/conf/edustore/db/install/conf/kern_mask_test_ant.xml
Unescape View File

@ -382,5 +382,21 @@ @@ -382,5 +382,21 @@
<arg value="-logger:conf/edustore/db/conf/logging.properties"/>
<classpath refid="classpath"/>
</java>
<!--Test Maske - tid: 71840 - Maskenname: Datenblatt archivieren-->
<java classname="de.superx.bin.ExecuteMask" fork="true" failonerror="true" classpathref="classpath" dir="${WEBAPP_DIR}/WEB-INF">
<arg value="-tid:71840"/>
<arg value="-out:71840.htm"/>
<arg value="-user:admin"/>
<arg value="-logger:conf/edustore/db/conf/logging.properties"/>
<classpath refid="classpath"/>
</java>
<!--Test Maske - tid: 71860 - Maskenname: Übersicht Datenblatt-Archiv-->
<java classname="de.superx.bin.ExecuteMask" fork="true" failonerror="true" classpathref="classpath" dir="${WEBAPP_DIR}/WEB-INF">
<arg value="-tid:71860"/>
<arg value="-out:71860.htm"/>
<arg value="-user:admin"/>
<arg value="-logger:conf/edustore/db/conf/logging.properties"/>
<classpath refid="classpath"/>
</java>
</target>
</project>

1
superx/WEB-INF/conf/edustore/db/install/kern_drop_ids.sql
Unescape View File

@ -19,7 +19,6 @@ drop procedure sp_user_themen(integer, date, smallint); @@ -19,7 +19,6 @@ drop procedure sp_user_themen(integer, date, smallint);
drop procedure string_not_null(char);
drop function date_str(date);
drop procedure val(char(255));
drop procedure decval(varchar(255));
drop procedure decval(char(255));
drop function sp_filter_orga(integer);
drop procedure sp_get_subquery_str(varchar, varchar, varchar, varchar, varchar, varchar);

2
superx/WEB-INF/conf/edustore/db/install/kern_drop_pg.sql
Unescape View File

@ -51,8 +51,6 @@ drop function sp_user_themen(integer, date, smallint); @@ -51,8 +51,6 @@ drop function sp_user_themen(integer, date, smallint);
drop function val(varchar(255));
drop function val(integer);
drop function val(smallint);
drop function decval(varchar(255));
drop function decval(text);
drop function decval(char(255));
drop function sp_filter_orga(integer);
drop function sp_update_sequence(varchar(255));

27
superx/WEB-INF/conf/edustore/db/install/kern_install_ids.sql
Unescape View File

@ -4056,20 +4056,7 @@ end procedure; @@ -4056,20 +4056,7 @@ end procedure;
--Funktion / Prozedur val
--Funktion / Prozedur val
--Funktion / Prozedur decval
create procedure decval(p_str varchar(255))
returning decimal(16,2);
return p_str::decimal(16,2);
end procedure;
--Funktion / Prozedur decval
--Funktion / Prozedur decval
create procedure decval(p_str char(255))
returning decimal(16,2);
return p_str::decimal(16,2);
end procedure;
! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_decval_ids.sql
--Funktion / Prozedur sp_filter_orga
! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_filter_orga_ids.sql
--Funktion / Prozedur sp_update_sequence
@ -5125,6 +5112,18 @@ insert into tmp_themenbaum @@ -5125,6 +5112,18 @@ insert into tmp_themenbaum
gueltig_bis)
values('Gastzugang einrichten','71770','Administration','01.01.1900','01.01.3000');
insert into tmp_themenbaum
( name ,maskeninfo_id, parentname,
gueltig_seit ,
gueltig_bis)
values('Datenblatt archivieren','71840','Datenmanagement','01.01.1900','01.01.3000');
insert into tmp_themenbaum
( name ,maskeninfo_id, parentname,
gueltig_seit ,
gueltig_bis)
values('Übersicht Datenblatt-Archiv','71860','Datenmanagement','01.01.1900','01.01.3000');
--gibt es die Maske schon?
delete from tmp_themenbaum where maskeninfo_id in (select T.maskeninfo_id from themenbaum T);

24
superx/WEB-INF/conf/edustore/db/install/kern_install_pg.sql
Unescape View File

@ -5098,17 +5098,7 @@ CREATE or replace FUNCTION val(integer) RETURNS integer STABLE @@ -5098,17 +5098,7 @@ CREATE or replace FUNCTION val(integer) RETURNS integer STABLE
CREATE or replace FUNCTION val(smallint) RETURNS integer STABLE
AS 'select $1::integer ' LANGUAGE sql;
--Funktion / Prozedur decval
CREATE or replace FUNCTION decval(varchar(255)) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
--Funktion / Prozedur decval
CREATE or replace FUNCTION decval(text) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
--Funktion / Prozedur decval
CREATE or replace FUNCTION decval(char(255)) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
\! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_decval_pg.sql
--Funktion / Prozedur sp_filter_orga
\! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_filter_orga_pg.sql
--Funktion / Prozedur sp_update_sequence
@ -6124,6 +6114,18 @@ insert into tmp_themenbaum @@ -6124,6 +6114,18 @@ insert into tmp_themenbaum
gueltig_bis)
values('Gastzugang einrichten','71770','Administration',date_val('01.01.1900'),date_val('01.01.3000'));
insert into tmp_themenbaum
( name ,maskeninfo_id, parentname,
gueltig_seit ,
gueltig_bis)
values('Datenblatt archivieren','71840','Datenmanagement',date_val('01.01.1900'),date_val('01.01.3000'));
insert into tmp_themenbaum
( name ,maskeninfo_id, parentname,
gueltig_seit ,
gueltig_bis)
values('Übersicht Datenblatt-Archiv','71860','Datenmanagement',date_val('01.01.1900'),date_val('01.01.3000'));
--gibt es die Maske schon?
delete from tmp_themenbaum where maskeninfo_id in (select T.maskeninfo_id from themenbaum T);

14
superx/WEB-INF/conf/edustore/db/install/prozeduren/proc_decval_ids.sql
Unescape View File

@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
-- Function: decval
-- Wandelt String Datentypen zu numeric um
create procedure decval(p_str varchar(255))
returning decimal(16,2);
return p_str::decimal(16,2);
end procedure;
create procedure decval(p_str char(255))
returning decimal(16,2);
return p_str::decimal(16,2);
end procedure;

11
superx/WEB-INF/conf/edustore/db/install/prozeduren/proc_decval_pg.sql
Unescape View File

@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
-- Function: decval
-- Wandelt String Datentypen zu numeric um
CREATE or replace FUNCTION decval(varchar(255)) RETURNS numeric(16,2) STABLE
AS 'select replace($1,'','',''.'')::numeric where trim($1) !='''' ' LANGUAGE sql;
CREATE or replace FUNCTION decval(text) RETURNS numeric(16,2) STABLE
AS 'select replace($1,'','',''.'')::numeric where trim($1) !='''' ' LANGUAGE sql;
CREATE or replace FUNCTION decval(char(255)) RETURNS numeric(16,2) STABLE
AS 'select replace($1,'','',''.'')::numeric where trim($1) !='''' ' LANGUAGE sql;

1
superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade.x
Unescape View File

@ -61,7 +61,6 @@ DOQUERY "drop procedure now();" >/dev/null 2>&1 @@ -61,7 +61,6 @@ DOQUERY "drop procedure now();" >/dev/null 2>&1
DOQUERY "drop procedure string_not_null(char);" >/dev/null 2>&1
DOQUERY "drop function date_str(date);" >/dev/null 2>&1
DOQUERY "drop procedure val(char(255));" >/dev/null 2>&1
DOQUERY "drop procedure decval(varchar(255));" >/dev/null 2>&1
DOQUERY "drop procedure decval(char(255));" >/dev/null 2>&1
DOQUERY "drop function sp_filter_orga(integer);" >/dev/null 2>&1
DOQUERY "drop procedure sp_get_subquery_str(varchar, varchar, varchar, varchar, varchar, varchar);" >/dev/null 2>&1

15
superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_functions_ids.sql
Unescape View File

@ -90,20 +90,7 @@ end procedure; @@ -90,20 +90,7 @@ end procedure;
--Funktion / Prozedur val
--Funktion / Prozedur val
--Funktion / Prozedur decval
create procedure decval(p_str varchar(255))
returning decimal(16,2);
return p_str::decimal(16,2);
end procedure;
--Funktion / Prozedur decval
--Funktion / Prozedur decval
create procedure decval(p_str char(255))
returning decimal(16,2);
return p_str::decimal(16,2);
end procedure;
! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_decval_ids.sql
--Funktion / Prozedur sp_filter_orga
! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_filter_orga_ids.sql
--Funktion / Prozedur sp_update_sequence

12
superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_functions_pg.sql
Unescape View File

@ -158,17 +158,7 @@ CREATE or replace FUNCTION val(integer) RETURNS integer STABLE @@ -158,17 +158,7 @@ CREATE or replace FUNCTION val(integer) RETURNS integer STABLE
CREATE or replace FUNCTION val(smallint) RETURNS integer STABLE
AS 'select $1::integer ' LANGUAGE sql;
--Funktion / Prozedur decval
CREATE or replace FUNCTION decval(varchar(255)) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
--Funktion / Prozedur decval
CREATE or replace FUNCTION decval(text) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
--Funktion / Prozedur decval
CREATE or replace FUNCTION decval(char(255)) RETURNS numeric(16,2) STABLE
AS 'select $1::numeric where trim($1) !='''' ' LANGUAGE sql;
\! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_decval_pg.sql
--Funktion / Prozedur sp_filter_orga
\! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_filter_orga_pg.sql
--Funktion / Prozedur sp_update_sequence

60
superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_themenbaum.sql
Unescape View File

@ -1739,6 +1739,66 @@ select @@ -1739,6 +1739,66 @@ select
delete from tmp_themenbaum;
insert into tmp_themenbaum(
name,
maskeninfo_id,
gueltig_seit,
gueltig_bis)
select 'Datenblatt archivieren'::char(255),71840,
date_val('01.01.1900'),date_val('30.09.2999')
from xdummy;
delete from tmp_themenbaum where 0 <
(select count(*) from themenbaum where maskeninfo_id=71840);
update tmp_themenbaum set parent=(select max(tid) from themenbaum where name='Datenmanagement');
insert into themenbaum(
name,
maskeninfo_id,
parent,
gueltig_seit,
gueltig_bis,
erlaeuterung)
select
name,
maskeninfo_id,
parent,
gueltig_seit,
gueltig_bis,
erlaeuterung
from tmp_themenbaum;
delete from tmp_themenbaum;
insert into tmp_themenbaum(
name,
maskeninfo_id,
gueltig_seit,
gueltig_bis)
select 'Übersicht Datenblatt-Archiv'::char(255),71860,
date_val('01.01.1900'),date_val('30.09.2999')
from xdummy;
delete from tmp_themenbaum where 0 <
(select count(*) from themenbaum where maskeninfo_id=71860);
update tmp_themenbaum set parent=(select max(tid) from themenbaum where name='Datenmanagement');
insert into themenbaum(
name,
maskeninfo_id,
parent,
gueltig_seit,
gueltig_bis,
erlaeuterung)
select
name,
maskeninfo_id,
parent,
gueltig_seit,
gueltig_bis,
erlaeuterung
from tmp_themenbaum;
delete from tmp_themenbaum;
drop table tmp_themenbaum;
<#if SQLdialect='Postgres'>

4
superx/WEB-INF/conf/edustore/db/install/upgrade/kernmodul_upgrade_man.sql
Unescape View File

@ -190,3 +190,7 @@ where T.tid !=T.richtig); @@ -190,3 +190,7 @@ where T.tid !=T.richtig);
drop table tmp_dummy;
--obsolete Zeilen weg:
delete from sachgeb_maske_bez where maskeninfo_id is null;

4
superx/xml/nd_templates.xsl
Unescape View File

@ -4034,10 +4034,10 @@ function exportTreeContents(what) { @@ -4034,10 +4034,10 @@ function exportTreeContents(what) {
<input type="button" id="treealldata" class="clsButtonStyle" onclick="exportandhideRptaDlg('all rows')" value="Alle Daten"></input>&#160;-->
</xsl:if>
<tr><td width="30%">Exportformat</td>
<td width="30%"><input type="radio" class="maskinput" name="dlg_exportformat" id="dlg_exportformat1" value="classic" title="Unformatiert" />
<td width="30%"><input type="radio" class="maskinput" name="dlg_exportformat" checked="true" id="dlg_exportformat1" value="classic" title="Unformatiert" />
&#160;<label for="dlg_exportformat1">Unformatiert</label></td>
<td width="30%">
<input type="radio" class="maskinput" name="dlg_exportformat" id="dlg_exportformat2" value="rpta" checked="true" title="Formatiert" />
<input type="radio" class="maskinput" name="dlg_exportformat" id="dlg_exportformat2" value="rpta" title="Formatiert" />
&#160;<label for="dlg_exportformat2">Formatiert</label>
<br />
<select name="RPTPageFormat" id="RPTPageFormat">

Write Preview
Loading…
Cancel
Save