diff --git a/src/de/superx/common/Maske.java b/src/de/superx/common/Maske.java index afbf0da..3287d38 100644 --- a/src/de/superx/common/Maske.java +++ b/src/de/superx/common/Maske.java @@ -2576,16 +2576,23 @@ public class Maske extends NamedIdObject implements Serializable { } /** - * Normalerweise Maskenname nur bei JasperReports der Stylesheetname - * - * @return - */ - public String getExportName() { - String result = getName(); - if (selectedTableStylesheet != null && selectedTableStylesheet.getFilename().indexOf(".jrxml") > -1) - result = selectedTableStylesheet.getCaption(); - return result; - } + * Normalerweise Maskenname nur bei JasperReports der Stylesheetname + * + * @return + */ + public String getExportName() { + String result = getName(); + if (selectedTableStylesheet != null && selectedTableStylesheet.getFilename().indexOf(".jrxml") > -1) result = selectedTableStylesheet.getCaption(); + if (map.containsKey("exportfilename")) + { + if (map.get("exportfilename")==null||map.get("exportfilename").toString().trim().equals("")) + { + throw new IllegalStateException("Die Maske definiert exportfilename, dieser ist aber leer. Masken-SQL prüfen"); + } + result=map.get("exportfilename").toString(); + } + return result; + } public String getFullTableXml(String mandantenId, SxUser sxuser, HttpServletRequest request, Locale locale) throws TransformerConfigurationException, TemplateException, IOException, SQLException, diff --git a/src/de/superx/servlet/SuperXmlTabelle.java b/src/de/superx/servlet/SuperXmlTabelle.java index 83eddd6..e436732 100644 --- a/src/de/superx/servlet/SuperXmlTabelle.java +++ b/src/de/superx/servlet/SuperXmlTabelle.java @@ -511,7 +511,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet { response.reset(); //response.setContentType("application/vnd.ms-excel"); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getName()) + ".xlsx"); + response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + ".xlsx"); response.setHeader("Cache-Control", "expires=0"); response.setContentLength(outStream.size()); ServletOutputStream sos; @@ -716,7 +716,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet { SuperXManager.setLastXmlMandantid(request.getSession().getAttribute("MandantenID").toString()); XmlTransformer xmlTransformer = new XmlTransformer(getServletConfig(), request, response, getMandantenID(), getBrowser()); xmlTransformer.setMaske(maske); - xmlTransformer.transform(maske.getName(), maske.getTmpFiles(), currentXml, desiredLocale, maske.getSelectedTableStylesheetFilename(), "text/html", + xmlTransformer.transform(maske.getExportName(), maske.getTmpFiles(), currentXml, desiredLocale, maske.getSelectedTableStylesheetFilename(), "text/html", ServletHelper.getParameter(request, "encrypt")); @@ -931,7 +931,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet { // neu MB if (maske.getSelectedTableStylesheetFilename() != null && maske.getSelectedTableStylesheetFilename().equals("tabelle_xml.xsl")) { response.setContentType("application/x-xml; charset=" + SqlStringUtils.getEncoding()); - response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getName()) + ".xml"); + response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + ".xml"); response.setHeader("Cache-Control", "expires=0"); // hier wird für xml-output localiziert für andere // formate in xmlTransformer könnte @@ -1021,7 +1021,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet { // open browser download dialogue response.setContentType("application/x-xml; charset=" + SqlStringUtils.getEncoding()); - response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getName()) + filename_extension); + response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + filename_extension); response.setHeader("Cache-Control", "expires=0"); } } @@ -1029,7 +1029,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet { getServletConfig(), request, response, getMandantenID(), getBrowser()); xmlTransformer.setMaske(maske); - xmlTransformer.transform(maske.getName(), + xmlTransformer.transform(maske.getExportName(), maske.getTmpFiles(), currentXml, desiredLocale, maske.getSelectedTableStylesheetFilename(), maske.getSelectedTableStylesheetContenttype(contenttype), @@ -1075,7 +1075,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet { if (SxPools.get(getMandantenID()).getRepository().containsKey("K_CSV_Excel_ISO")&&SxPools.get(getMandantenID()).getRepository().get("K_CSV_Excel_ISO").toString().equals("1")) { outp = new String(csv.toString().getBytes("iso-8859-1")); - response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getName()) + ".csv"); + response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + ".csv"); response.setHeader("Cache-Control", "expires=0"); response.setHeader("ContentType", "text/plain"); //; charset=ISO-8859-1 sendBackIso(csv.toString(), "text/csv; charset=ISO-8859-1"); @@ -1084,7 +1084,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet { { //Format bis 2024.06: - response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getName()) + ".csv"); + response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + ".csv"); response.setHeader("Cache-Control", "expires=0"); sendBack(csv.toString(), "text/csv"); @@ -1936,7 +1936,7 @@ public class SuperXmlTabelle extends AbstractSuperXServlet { String filename_extension=".jrxml"; OutputStream out = response.getOutputStream(); // open browser download dialogue - response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getName()) + filename_extension); + response.setHeader("Content-disposition", "attachment; filename=" + FileUtils.removeProblemChars(maske.getExportName()) + filename_extension); response.setHeader("Cache-Control", "expires=0"); String jrxmlFileContent = de.memtext.util.FileUtils.getFileContentsWithEncoding(jrxmlFilePath, SqlStringUtils.getEncoding()); diff --git a/superx/index.jsp b/superx/index.jsp index a3822b8..639c0b5 100644 --- a/superx/index.jsp +++ b/superx/index.jsp @@ -16,6 +16,10 @@ if(mandantparam !=null && !mandantenid.equals("")) String username=""; String loginPortlet=""; +String login_param=request.getParameter("login"); +if(login_param ==null) + login_param=""; + StringBuffer defaultReport=new StringBuffer(); String defaultReportParam=request.getParameter("report_id"); String defaultMandantenIDParam=request.getParameter("MandantID"); @@ -245,12 +249,12 @@ username=request.getRemoteUser(); { %> -<%@ include file="sx_login.inc" %> +<%@ include file="sx_login.jsp" %> <% } -else -{ +//else +//{ %>
@@ -280,7 +284,7 @@ rs.close(); st.close(); conmm.close(); -} +//} %> diff --git a/superx/style/sx_common.css b/superx/style/sx_common.css index 993109c..78b1d72 100644 --- a/superx/style/sx_common.css +++ b/superx/style/sx_common.css @@ -319,6 +319,11 @@ body.dark-theme img { /*filter für theme dark*/ overflow: initial; } /*Bottom-Navi*/ +#nd_navi_bottom { /*20250130BF ergänzt*/ + position: fixed; /*nd_navi_bottom ist immer sichtbar, auch beim Scrollen*/ + bottom: 0; + width: 100%;} + .bottom-nav { /*für Bottomnavi-Zeile*/ display: flex; flex-flow: row nowrap; @@ -664,11 +669,10 @@ input.schluesselfeld { } input.ndSchluesselfeld { - border-color: hsl(var(--bulma-input-focus-h),var(--bulma-input-focus-s),var(--bulma-input-focus-l)); - --bulma-input-border-width: 1px; + border-color: hsl(var(--bulma-input-focus-h),var(--bulma-input-focus-s),var(--bulma-input-focus-l)); + --bulma-input-border-width: 1px; --bulma-input-border-l: var(--bulma-border-l); - box-shadow: inset 0 0.0625em 0.125em hsla(var(--bulma-scheme-h), var(--bulma-scheme-s), var(--bulma-scheme-invert-l), 0.05); - + box-shadow: inset 0 0.0625em 0.125em hsla(var(--bulma-scheme-h), var(--bulma-scheme-s), var(--bulma-scheme-invert-l), 0.05); background-color:#FFFAF0; font-size: var(--bulma-size-small); padding-left: 5px; diff --git a/superx/sx_login.jsp b/superx/sx_login.jsp new file mode 100644 index 0000000..075bb51 --- /dev/null +++ b/superx/sx_login.jsp @@ -0,0 +1,76 @@ +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+   +

Willkommen bei SuperX.

+

Bitte melden Sie sich an.

+
+
+ +
+
+
+
+
+ +
+
+ +
+
+ +
+
+ + + + + + + + +
+
+
+ + +
+ + +   + + + +   + + +
+ + +
+
+
+
+
+
diff --git a/superx/xml/nd_templates.xsl b/superx/xml/nd_templates.xsl index 44385dd..6c1ab42 100644 --- a/superx/xml/nd_templates.xsl +++ b/superx/xml/nd_templates.xsl @@ -2275,6 +2275,7 @@ Seite 1 von 1
+
@@ -2583,7 +2584,7 @@ Seite 1 von 1
-