diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt b/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt index 748c379..b9616ac 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt +++ b/superx/WEB-INF/conf/edustore/db/install/conf/builddatum.txt @@ -1 +1 @@ -22.03.2024 +01.05.2024 diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml b/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml index afc2732..b7783c8 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml +++ b/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml @@ -9152,7 +9152,7 @@ where dimension_bp_id=(select D.tid from dimension_bp D where D.apnr='bluep_absc 70550 70560 --> - + $SUPERX_DIR/db/install/masken D. Quathamer diff --git a/superx/WEB-INF/patch/xml/patch_2024-04-24.xml b/superx/WEB-INF/patch/xml/patch_2024-04-24.xml new file mode 100644 index 0000000..e68aa1d --- /dev/null +++ b/superx/WEB-INF/patch/xml/patch_2024-04-24.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + +
    +
  • Bugfix Datenschutz und Impressum überlagern Buttons
    • +
  • Layoutverbesserung Manager
    • +
+ + + + + + + + + + +Bugfix Datenschutz und Impressum überlagern Buttons + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/superx/edit/kern/organigramm_dialog.jsp b/superx/edit/kern/organigramm_dialog.jsp new file mode 100644 index 0000000..d5e0f02 --- /dev/null +++ b/superx/edit/kern/organigramm_dialog.jsp @@ -0,0 +1,127 @@ +<%@ taglib uri="/WEB-INF/dbforms.tld" prefix="db" %> +<%@page pageEncoding="utf-8" contentType="text/html; charset=UTF-8" %> + + + + + + + + + + + + +Formular Organigramm + + + +<%@ page import ="java.util.Hashtable" %> +<% +//HttpSession session=request.getSession(true); +if (request.getCharacterEncoding() == null) + request.setCharacterEncoding("UTF-8"); +Object userobject=request.getSession().getAttribute("UserID"); +String userid; +String filter=""; +String sql=""; +if(userobject == null) +{ +%> + + +<% +} +else + userid=userobject.toString(); +Object mandantobject=request.getSession().getAttribute("MandantenID"); +String mandantenid=""; +if(mandantobject != null) + mandantenid=mandantobject.toString(); +//der superx-Default-Mandant ist bei dbforms ein Leerstring +if(mandantenid.equals("default")) + mandantenid=""; +String db_form_name="organigramm"; +String erlaubt="0"; +%> +<%@ include file="/edit/check_authentication.inc" %> +<% +if(erlaubt.equals("0")) +{ +%> + + +<% +} + +String keyfieldsused="false"; +Object kf=request.getParameter("keyfieldsused"); +if(kf != null) +keyfieldsused=kf.toString(); + +%> + + + +

+Logo +
<% if(!mandantenid.equals("default") && !mandantenid.equals("")) +out.println("Mandant: " + mandantenid +""); +%>

+ + + + + + + + + + + + + + + + + + + + +
Filtern
+ +Übernehmen
0Alle Institutionen  +
+ + " class="icon icon-left-big" style="color:blue;cursor: pointer;" title="Zuweisen und schließen">  +
+ + diff --git a/superx/xml/graphtools.xsl b/superx/xml/graphtools.xsl index 0be74a1..108976c 100644 --- a/superx/xml/graphtools.xsl +++ b/superx/xml/graphtools.xsl @@ -2,6 +2,24 @@ + + +steelblue + + +#cccccc + + +0,0,139 + + +173,216,230 + + +10 + + + @@ -27,6 +45,15 @@ xmlns:svg="http://www.w3.org/2000/svg"> + + + + + + + + + @@ -54,11 +81,20 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + + + + + + + - + + + + @@ -101,7 +137,10 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + + + + @@ -113,13 +152,18 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + - + + + + + + @@ -127,7 +171,10 @@ xmlns:svg="http://www.w3.org/2000/svg"> - + + + + @@ -144,29 +191,83 @@ xmlns:svg="http://www.w3.org/2000/svg"> + + + + - - + + + + + + - + - + - + - -blue + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -white + + + + + + + + + + + + + + + + + diff --git a/superx/xml/maskComponents_html.xsl b/superx/xml/maskComponents_html.xsl index b483180..c00d680 100644 --- a/superx/xml/maskComponents_html.xsl +++ b/superx/xml/maskComponents_html.xsl @@ -1525,9 +1525,9 @@ dojo.addOnLoad(initMaske); { url=location.protocol+'//'+location.host+"/superx/servlet/SuperXmlMaske"; - -
+ @@ -296,7 +296,16 @@ form { margin-bottom : 0;} px;-->

- + + + + ok=(document.forms[0],'superx');if (ok==true) document.getElementById('progressbar').style.display='';return ok; + + + ok=validateForm(document.forms[0],'superx');if (ok==true) document.getElementById('progressbar').style.display='';return ok; + + +       diff --git a/superx/xml/menue_html.css b/superx/xml/menue_html.css index b9c49cd..9145f3d 100644 --- a/superx/xml/menue_html.css +++ b/superx/xml/menue_html.css @@ -352,7 +352,7 @@ a:link { left: 3px; margin: 0; overflow: hidden; - padding: 75px 0 0; + padding: 75px 0 50px; position: absolute; top: 0; transition: width 0.3s ease 0s; @@ -399,6 +399,7 @@ a:link { width: 98%; float: left; display: block; + padding-bottom: 50px; } .columnTwoThirdLeft_1024, .columnOneThirdRight_1024