Bulma 1.0, Themenbaum isAufklappbarerThemenbaum richtig auswerten #7

src/de/superx/servlet/Themenbaum.java

@@ -113,6 +113,7 @@ public class Themenbaum implements ThemenbaumI, Serializable {
 		{
 			result.append(" aufklappbarer_themenbaum=\"true\"");
 		}
+		
 		result.append(">");
 		result.append(Maske.addGeneralInfo());
 		String welcomedPerson = login_name;
@@ -338,10 +339,14 @@ public class Themenbaum implements ThemenbaumI, Serializable {
 		public String getSubmenuXml(String tid,String  navigationElement) {
 		    boolean showNavigation = !navigationElement.isEmpty();
 			StringBuffer result = new StringBuffer( "<?xml version=\"1.0\" encoding=\""+SqlStringUtils.getEncoding()+"\"?>\n<menue hisinone_active=\""
-						+ (SuperXManager.isHis1 ? "true" : "false") + "\" "
+					+ (SuperXManager.isHis1 ? "true" : "false") + "\" "
-						+ "aufklappbarer_themenbaum=\""+(isAufklappbarerThemenbaum()?"true":"false")+"\""
+					+ " hisinone_refapp=\"" + SuperXManager.his1_refapp+"\""
-						+ " hisinone_refapp=\"" + SuperXManager.his1_refapp+"\""
+					+ " showNavigation=\""+showNavigation+"\"");
-						+ " showNavigation=\""+showNavigation+"\">\n");
+			if (SxPools.get(mandantenID).getRepository().containsKey("K_aufklappbarer Themenbaum")&&SxPools.get(mandantenID).getRepository().get("K_aufklappbarer Themenbaum").toString().equals("1"))
+			{
+				result.append(" aufklappbarer_themenbaum=\"true\"");
+			}
+			result.append(">\n");
 			result.append(Maske.addGeneralInfo());
 	        result.append("<user id=\"" + Themenbaum.this.userid + "\" admin=\""
 	                        + (Themenbaum.this.isAdmin ? "true" : "false") + "\"><![CDATA["

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

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

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

@@ -1 +1 @@
-5.1b
+5.1

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

@@ -1 +1 @@
-01.05.2024
+05.09.2024

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

@@ -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.1b',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.1',9);
 
 
 

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

@@ -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.1b',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.1',9);
 
 
 

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

@@ -250,7 +250,7 @@
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggre_bland.unl"/>
 </dbi:data>
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.1b'
+<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.1'
   WHERE his_system = 'kern';
 </dbi:dbaction>
 <dbi:dbaction dbi:action="executeFile">

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

@@ -260,7 +260,7 @@
 <dbi:file encoding="UTF-8" separator="^" trailingSeparator="y" withNativeClient="n" firstLinedescription="n" structure="CSV" filename="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/aggre_bland.unl"/>
 </dbi:data>
 </dbi:dbaction>
-<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.1b'
+<dbi:dbaction dbi:action="sqlexec">eduetl:UPDATE db_version SET version = '5.1'
   WHERE his_system = 'kern';
 </dbi:dbaction>
 <dbi:dbaction dbi:action="sqlquery">eduetl:select setval('themenbaum_tid_seq',(select max(tid)+1 from themenbaum));

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--<!DOCTYPE module SYSTEM "../../conf/superx-module.dtd"> -->
-<module name="kern" version="5.1b" sachgebiet_id="0" sachgebiet="Administration"
+<module name="kern" version="5.1" sachgebiet_id="0" sachgebiet="Administration"
 	systeminfo_id="9" system="Administration" thema="Administration"
 	thema_parent="Abfragen">
 	<database name="superx" version="2" system="superx">

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

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

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

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

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

@@ -4379,7 +4379,7 @@ end procedure;
  
 
 delete from db_version  where his_system='kern';
-insert into db_version (his_system,version,systeminfo_id) values('kern','5.1b',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.1',9);
 
 
 

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

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

superx/WEB-INF/conf/edustore/db/install/masken/71860_maske_system_bez.unl

@@ -1 +1 @@
-71860^7^
+71860^9^

superx/WEB-INF/conf/edustore/db/install/masken/71860_sachgeb_maske_bez.unl

@@ -1 +1 @@
-16^71860^
+0^71860^

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

@@ -409,7 +409,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.1b',9);
+insert into db_version (his_system,version,systeminfo_id) values('kern','5.1',9);
 
 
 

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

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

superx/WEB-INF/kern_dbforms-config_ids.xml

@@ -849,8 +849,8 @@
 </table>
 <table name="masken_protokoll">
 <field name="tid" description="ID" fieldType="int" size="8" isKey="" autoInc="true" sortable=""/>
-<field name="maskeninfo_id" description="ID der Maske" fieldType="int" size="6" isKey="" sortable=""/>
+<field name="maskeninfo_id" description="Maske" fieldType="int" size="6" isKey="" sortable=""/>
-<field name="user_id" description="ID des Users, welcher die Maske ausgeführt hat" fieldType="int" size="6" isKey="" sortable=""/>
+<field name="user_id" description="User" fieldType="int" size="6" isKey="" sortable=""/>
 <field name="zeitpunkt" description="Ausführungs Zeitpunkt" fieldType="timestamp" size="20" isKey="" sortable=""/>
 <field name="kommentar" description="Kommentar" fieldType="varchar" size="255" isKey="" sortable=""/>
 <foreign-key foreignTable="maskeninfo" name="masken_protokoll_maskeninfo67" displayType="select" visibleFields="name" format="%s">
@@ -928,8 +928,12 @@
 <field name="orgstruktur" description="Strukturmerkmal" fieldType="int" size="6" isKey="" sortable="">
 <comment>gem. COB-GX:30=Lehreinheit,20=Fakultät</comment>
 </field>
-<field name="lid" description="Langlebige ID" fieldType="varchar" size="255" isKey="" sortable=""/>
+<field name="lid" description="Langlebige ID" fieldType="varchar" size="255" isKey="" sortable="">
-<field name="parent_lid" description="Übergeordnete langlebige ID" fieldType="varchar" size="255" isKey="" sortable=""/>
+<comment>Bei historisierten Sichten ist das Feld gefüllt, bei anderen mit hier ein [NULL] stehen.</comment>
+</field>
+<field name="parent_lid" description="Übergeordnete langlebige ID" fieldType="varchar" size="255" isKey="" sortable="">
+<comment>Bei historisierten Sichten ist das Feld gefüllt, bei anderen mit hier ein [NULL] stehen.</comment>
+</field>
 <field name="uniquename" description="Eindeutiger Name/Schlüssel bei GX" fieldType="varchar" size="255" isKey="" sortable=""/>
 <field name="sourcesystem" description="Quellsystem" fieldType="int" size="6" isKey="" sortable="">
 <comment>(referenziert BI-Tabelle cifx mit key=1) </comment>
@@ -2246,8 +2250,8 @@ Außerdem können Sie hier dem Benutzer Berechtigungen über Gruppen, Sachgebiet
 <customfield name="gueltig_seit" nullFieldValue="" visibleSize="10"/>
 <customfield name="gueltig_bis" nullFieldValue="" visibleSize="10"/>
 <customfield name="orgstruktur" nullFieldValue="" visibleSize="10"/>
-<customfield name="lid" nullFieldValue="" visibleSize="40"/>
+<customfield name="lid" nullFieldValue="[NULL]" visibleSize="40"/>
-<customfield name="parent_lid" nullFieldValue="" visibleSize="40"/>
+<customfield name="parent_lid" nullFieldValue="[NULL]" visibleSize="40"/>
 <customfield name="uniquename" nullFieldValue="" visibleSize="40"/>
 <customfield name="sourcesystem" type="label" nullFieldValue="" visibleSize="15"/>
 <customfield name="sourcesystem_id" type="label" nullFieldValue="" visibleSize="50"/>