Exportbutton default unformatiert #9

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

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

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

@@ -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));
 			

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

@@ -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));
 			

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

@@ -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);
 

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

@@ -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);
 

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

@@ -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 {
             </tr>
             <tr>
                <td class="themenspalte">Script</td>
-               <td>
+               <td>$SUPERX_DIR/db/install/prozeduren/proc_decval_pg.sql</td>
-                  CREATE or replace FUNCTION decval(char(255)) RETURNS numeric(16,2) STABLE
-                  AS 'select $1::numeric  where trim($1) !='''' ' LANGUAGE sql;
-                  </td>
             </tr>
             <tr>
                <td class="themenspalte">Script</td>
-               <td>
+               <td>$SUPERX_DIR/db/install/prozeduren/proc_decval_ids.sql</td>
-                  create procedure decval(p_str char(255))
-                  returning decimal(16,2);
-                  
-                  return p_str::decimal(16,2);
-                  end procedure;
-                  </td>
             </tr>
             <tr>
                <td class="themenspalte">Rückgabe</td>

superx/WEB-INF/conf/edustore/db/install/conf/kern_mask_test_ant.xml

@@ -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>

superx/WEB-INF/conf/edustore/db/install/kern_drop_ids.sql

@@ -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);

superx/WEB-INF/conf/edustore/db/install/kern_drop_pg.sql

@@ -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));

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

@@ -4056,21 +4056,8 @@ end procedure;
 --Funktion / Prozedur val
 --Funktion / Prozedur val
 --Funktion / Prozedur decval
-
+! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_decval_ids.sql
- create procedure decval(p_str varchar(255))
+			--Funktion / Prozedur sp_filter_orga
-    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;
- --Funktion / Prozedur sp_filter_orga
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_filter_orga_ids.sql
 			--Funktion / Prozedur sp_update_sequence
 --Funktion / Prozedur sp_bool_to_smallint
@@ -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);
 

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

@@ -5098,18 +5098,8 @@ 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
-
+\! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_decval_pg.sql
-CREATE or replace FUNCTION decval(varchar(255)) RETURNS numeric(16,2) STABLE
+			--Funktion / Prozedur sp_filter_orga
-  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;
- --Funktion / Prozedur sp_filter_orga
 \! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_filter_orga_pg.sql
 			--Funktion / Prozedur sp_update_sequence
 \! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_update_sequence_pg.sql
@@ -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);
 

superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade.x

@@ -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

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

@@ -90,21 +90,8 @@ end procedure;
 --Funktion / Prozedur val
 --Funktion / Prozedur val
 --Funktion / Prozedur decval
-
+! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_decval_ids.sql
- create procedure decval(p_str varchar(255))
+			--Funktion / Prozedur sp_filter_orga
-    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;
- --Funktion / Prozedur sp_filter_orga
 ! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_filter_orga_ids.sql
 			--Funktion / Prozedur sp_update_sequence
 --Funktion / Prozedur sp_bool_to_smallint

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

@@ -158,18 +158,8 @@ 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
-
+\! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_decval_pg.sql
-CREATE or replace FUNCTION decval(varchar(255)) RETURNS numeric(16,2) STABLE
+			--Funktion / Prozedur sp_filter_orga
-  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;
- --Funktion / Prozedur sp_filter_orga
 \! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_filter_orga_pg.sql
 			--Funktion / Prozedur sp_update_sequence
 \! DOSQL $SUPERX_DIR/db/install/prozeduren/proc_sp_update_sequence_pg.sql

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

@@ -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'>

superx/xml/nd_templates.xsl

@@ -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">