From 7f22a7d186c5221d0cfdab4c52cf95d2106dedc8 Mon Sep 17 00:00:00 2001 From: j-dimension Date: Thu, 24 Oct 2024 21:00:51 +0200 Subject: [PATCH 1/4] fixed issue with attachments file extensions being stripped off --- .../java/com/jdimension/jlawyer/timer/MailboxScannerTask.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/MailboxScannerTask.java b/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/MailboxScannerTask.java index 0f5e9f5d..855fb717 100644 --- a/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/MailboxScannerTask.java +++ b/j-lawyer-server/j-lawyer-server-war/src/java/com/jdimension/jlawyer/timer/MailboxScannerTask.java @@ -1312,6 +1312,9 @@ private boolean saveToCase(Message msg, Date received, ArchiveFileBean toCase, A // remove any extension, because of the template it might be somewhere in the middle of the new name docName = docName.replace("." + extension, ""); + + // add back extension + docName = ServerFileUtils.preserveExtension(newName, docName); if (caseSvc.doesDocumentExistUnrestricted(toCase.getId(), docName)) { log.error("There is already a document '" + docName + "' in case " + toCase.getFileNumber() + " - skipping this attachment"); From 0327431547babbd6bc43d54fd50cb2e1d669b340 Mon Sep 17 00:00:00 2001 From: j-dimension Date: Sat, 26 Oct 2024 22:53:09 +0200 Subject: [PATCH 2/4] improved error message in case of missing data during invoice creation --- .../com/jdimension/jlawyer/services/InvoiceService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/InvoiceService.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/InvoiceService.java index 360b59c1..b0430f1c 100644 --- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/InvoiceService.java +++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/InvoiceService.java @@ -1062,18 +1062,18 @@ public byte[] getGiroCode(String senderPrincipalId, float amount, String purpose } if (ServerStringUtils.isEmpty(sender.getCompany())) { - throw new Exception("Girocode kann nicht erstellt werden - Unternehmensname des Absenders leer"); + throw new Exception("Girocode kann nicht erstellt werden - Unternehmensname des Absenders leer. Korrektur unter 'Administration' - 'Nutzer'."); } String name=sender.getCompany().trim(); if (ServerStringUtils.isEmpty(sender.getBankBic())) { - throw new Exception("Girocode kann nicht erstellt werden - BIC des Absenders ist leer"); + throw new Exception("Girocode kann nicht erstellt werden - BIC des Absenders ist leer. Korrektur unter 'Administration' - 'Nutzer'."); } String bic=sender.getBankBic().trim(); bic=bic.replace(" ", ""); if (ServerStringUtils.isEmpty(sender.getBankIban())) { - throw new Exception("Girocode kann nicht erstellt werden - IBAN des Absenders ist leer"); + throw new Exception("Girocode kann nicht erstellt werden - IBAN des Absenders ist leer. Korrektur unter 'Administration' - 'Nutzer'."); } String iban=sender.getBankIban().trim(); iban=iban.replace(" ", ""); From da5dd1e710e9d63b4f66de766de27edd8420b856 Mon Sep 17 00:00:00 2001 From: j-dimension Date: Sat, 26 Oct 2024 22:56:25 +0200 Subject: [PATCH 3/4] fixed NPE when creation of invoice document was cancelled by user --- .../jdimension/jlawyer/client/editors/files/InvoiceDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.java index 5a980611..4959f960 100644 --- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.java +++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceDialog.java @@ -2551,7 +2551,7 @@ private void cmdCreateInvoiceDocumentActionPerformed(java.awt.event.ActionEvent } ArchiveFileDocumentsBean invoiceDoc = this.caseView.newDocumentDialog(null, currentEntry, senderUser, this.getInvoicePositionsAsTable(this.cmbTableHeadersLanguage.getSelectedItem().toString()), timesheetPosTable, giroCode, null); - if (this.currentEntry != null) { + if (invoiceDoc!=null && this.currentEntry != null) { this.save(); try { JLawyerServiceLocator locator = JLawyerServiceLocator.getInstance(ClientSettings.getInstance().getLookupProperties()); From 191b640464c7899013f5497a555cb7bfc53f3f75 Mon Sep 17 00:00:00 2001 From: j-dimension Date: Sat, 26 Oct 2024 23:35:33 +0200 Subject: [PATCH 4/4] added placeholder hint to tooltip --- .../client/editors/documents/viewer/SoundplayerPanel.form | 1 + .../client/editors/documents/viewer/SoundplayerPanel.java | 1 + 2 files changed, 2 insertions(+) diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.form b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.form index 6c8368f5..74620229 100644 --- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.form +++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.form @@ -176,6 +176,7 @@ + diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.java index 9c5b877b..407bcfe8 100644 --- a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.java +++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/documents/viewer/SoundplayerPanel.java @@ -794,6 +794,7 @@ public void mouseReleased(java.awt.event.MouseEvent evt) { cmdNewDocument.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/edit.png"))); // NOI18N cmdNewDocument.setText("neues Dokument"); + cmdNewDocument.setToolTipText("Neues Dokument aus Vorlage erstellen und das Ergebnis dieses Dialogs übergeben. \nDie Vorlage benötigt den Platzhalter {{INGO_TEXT}}."); cmdNewDocument.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { cmdNewDocumentActionPerformed(evt);