8 changed files with 312 additions and 22 deletions
@ -1 +1 @@
@@ -1 +1 @@
|
||||
22.03.2024 |
||||
01.05.2024 |
||||
|
||||
@ -0,0 +1,52 @@
@@ -0,0 +1,52 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<patch patch_id="2024-04-24"> |
||||
<systeme> |
||||
<!--<system name="his1" codierung="utf8"/>--> |
||||
<system name="superx" codierung="utf8"/> |
||||
<system name="superx" codierung="iso"/> |
||||
</systeme> |
||||
|
||||
|
||||
<module name="kern" systeminfo_id="xxx" inst_from="xx"> |
||||
<patch-description feature_id="322854"> |
||||
<ul> |
||||
<li>Bugfix Datenschutz und Impressum überlagern Buttons</li> |
||||
<li>Layoutverbesserung Manager</li> |
||||
</ul> |
||||
</patch-description> |
||||
|
||||
<patch-test> |
||||
<!-- Bisher nur sql erlaubt. Ergebniss muss 0 sein, um zu erlauben, dass der Patch eingespielt wird! --> |
||||
<nativeaction sql="select 0 from xdummy where (select count(*) from db_version where his_system='kern') > 0 " scriptfile="" database=""/> |
||||
</patch-test> |
||||
|
||||
<patch-data> |
||||
|
||||
<files> |
||||
<file path="xml/menue_html.css"><patch-description feature_id="322854">Bugfix Datenschutz und Impressum überlagern Buttons</patch-description></file> |
||||
<file path="edit/kern/webapp_manager.jsp"></file> |
||||
|
||||
|
||||
|
||||
</files> |
||||
|
||||
<database name="superx"> |
||||
<!-- TODO: hier können beliebige Elemente der normalen Modul-XML stehen--> |
||||
<masken> |
||||
|
||||
</masken> |
||||
</database> |
||||
|
||||
<upgrade> |
||||
<upgrade-step> |
||||
|
||||
</upgrade-step> |
||||
</upgrade> |
||||
|
||||
</patch-data> |
||||
|
||||
</module> |
||||
|
||||
|
||||
|
||||
</patch> |
||||
@ -0,0 +1,127 @@
@@ -0,0 +1,127 @@
|
||||
<%@ taglib uri="/WEB-INF/dbforms.tld" prefix="db" %> |
||||
<%@page pageEncoding="utf-8" contentType="text/html; charset=UTF-8" %> |
||||
<html> |
||||
<!--Automatically generated by module_scripts_create.x (SuperX)--> |
||||
<head> |
||||
<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> |
||||
<meta content="text/html; charset=utf-8" http-equiv="Content-Type"> |
||||
<meta content="0" http-equiv="expires"> |
||||
<LINK href="/superx/style/superx.css" type="text/css" REL="stylesheet"> |
||||
<LINK href="/superx/xml/superxml_html.css" type="text/css" REL="stylesheet"> |
||||
<LINK href="/superx/xml/maske_html.css" type="text/css" REL="stylesheet"> |
||||
<LINK href="/superx/style/dbforms_40.css" type="text/css" REL="stylesheet"> |
||||
<link rel="stylesheet" type="text/css" href="/superx/xml/css/start_portlet.css"/> |
||||
<link rel="stylesheet" type="text/css" href="/superx/xml/css/fontello-codes.css"/> |
||||
<title>Formular Organigramm</title> |
||||
<script type="text/javascript"> |
||||
var djConfig = {isDebug: false }; |
||||
//djConfig.debugAtAllCosts = true; |
||||
</script><script src="/superx/xml/js/dojo/dojo.js" type="text/javascript"> </script><script type="text/javascript"> |
||||
dojo.require("dojo.widget.Dialog"); |
||||
dojo.require("dojo.widget.Button"); |
||||
dojo.require("dojo.widget.Tooltip"); |
||||
dojo.require("dojo.string.common"); |
||||
|
||||
dojo.hostenv.writeIncludes(); |
||||
function inst_uebernehmen(inst_nr,inst_name) |
||||
{ |
||||
var myWindow=window.opener; |
||||
var myForm=myWindow.document.forms[0]; |
||||
if(myWindow.getDbFormFieldName) |
||||
{ |
||||
var inputElem=myForm.elements[myWindow.getDbFormFieldName('ch110_institut')]; |
||||
if(inputElem) |
||||
inputElem.value=inst_nr; |
||||
var inputLabel=myForm.elements["instLabel"]; |
||||
if(inputLabel) |
||||
inputLabel.value=inst_name; |
||||
} |
||||
window.close(); |
||||
} |
||||
</script><script src="/superx/xml/js/memtext/dbforms.js" type="text/javascript"> </script> |
||||
<db:base/> |
||||
</head> |
||||
<body class="clsPageBody"><%@ 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) |
||||
{ |
||||
%> |
||||
|
||||
<jsp:forward page="/edit/not_authenticated.htm"/> |
||||
<% |
||||
} |
||||
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")) |
||||
{ |
||||
%> |
||||
|
||||
<jsp:forward page="/edit/not_authorized.htm"/> |
||||
<% |
||||
} |
||||
|
||||
String keyfieldsused="false"; |
||||
Object kf=request.getParameter("keyfieldsused"); |
||||
if(kf != null) |
||||
keyfieldsused=kf.toString(); |
||||
|
||||
%> |
||||
|
||||
|
||||
|
||||
<p align="right"> |
||||
<a target="_parent" href="http://www.superx-projekt.de"><img border="0" alt="Logo" src="../../images/logo.gif"></a> |
||||
<br><% if(!mandantenid.equals("default") && !mandantenid.equals("")) |
||||
out.println("<strong>Mandant: " + mandantenid +"</strong>"); |
||||
%></p> |
||||
<div style="margin: 0px; padding: 0px; overflow: hidden; width: 100%;" id="menuCaption"> |
||||
<span class="menuCaptionTitle" id="menuCaptionTitle">Bitte wählen Sie eine Institution aus:</span><img border="0" alt="Erläuterung" src="/superx/images/info.png"><span style="display:none" connectId="menuCaption" dojoType="tooltip">In diesem Formular können Sie das Organigramm aufrufen</span> |
||||
</div><db:dbform tableName="organigramm" maxRows="*" autoUpdate="false" captionResource="true" multipart="false" followUp="/edit/kern/organigramm_list.jsp" orderBy="key_apnr" |
||||
dbConnectionName="<%= mandantenid %>" > |
||||
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/> |
||||
<db:header> |
||||
<table class="dbform_tab" border="1" > |
||||
<tr><td /><td>Filtern</td><td><db:search fieldName="drucktext" searchAlgo="weakEnd"/></td><td /> </tr> |
||||
|
||||
<tr> |
||||
<th></th><th align="left"> |
||||
<db:message key="Schlüssel"/></th><th align="left"> |
||||
<db:message key="Drucktext"/></th> |
||||
<th>Übernehmen</th> |
||||
</tr> |
||||
<tr><td /><td>0</td><td>Alle Institutionen</td><td><a onclick="inst_uebernehmen('0','Alle Institutionen');" class="icon icon-left-big" style="color:blue;cursor: pointer;" title="Zuweisen und schließen"> </a> |
||||
</td> </tr> |
||||
</db:header> |
||||
<db:errors/> |
||||
<db:body allowNew="false"> |
||||
<tr> |
||||
<td></td><td><db:label nullFieldValue="" fieldName="key_apnr" /> |
||||
</td><td><db:label nullFieldValue="" fieldName="drucktext" /> |
||||
</td> |
||||
<td><a onclick="<%= "inst_uebernehmen('"+currentRow_organigramm.get("key_apnr").toString()+"','"+currentRow_organigramm.get("drucktext").toString()+"');" %>" class="icon icon-left-big" style="color:blue;cursor: pointer;" title="Zuweisen und schließen"> </a> |
||||
</td> |
||||
</tr> |
||||
</db:body> |
||||
<db:footer><tr></tr> |
||||
</table> |
||||
</db:footer></db:dbform></body> |
||||
</html> |
||||
Loading…
Reference in new issue