Merge pull request #2746 from jlawyerorg/master

3.1.0.1

.github/ISSUE_TEMPLATE/bug-report---fehler.md

@@ -1,35 +1,32 @@
 ---
-name: Bug report / Fehler
-about: Submit a bug report / Fehler melden
+name: Fehler
+about: Fehler melden
 title: "[BUG] "
 labels: bug
 assignees: ''
 
 ---
 
-**NOTE: Please search existing tickets to avoid duplicates **
 **HINWEIS: Bitte vorab die Ticketsuche verwenden, um Doppeleinträge zu vermeiden **
 
 
-**Describe the bug / Fehlerbeschreibung**
-(todo: a description of the bug / eine Beschreibung des Fehlers)
+**Fehlerbeschreibung**
+(todo: eine Beschreibung des Fehlers)
 
-**To Reproduce / Schritte zum Nachvollziehen**
+**Schritte zum Nachvollziehen**
 
-1. Go to / Gehe zu '...'
-2. Klicke auf / Click on '....'
-4. Error message / Fehlermeldung: '...'
+1. Gehe zu '...'
+2. Klicke auf '....'
+4. Fehlermeldung: '...'
 
-**Expected behavior / Erwartetes Verhalten**
-A clear and concise description of what you expected to happen.
+**Erwartetes Verhalten**
 Eine Beschreibung des erwarteten Verhaltens.
 
 **Screenshots**
-If applicable, add screenshots to help explain your problem.
 Falls relevant, Screenshot beifügen.
 
-**Environment / verwendete Umgebung:**
- - OS / Betriebssystem:
+**verwendete Umgebung:**
+ - Betriebssystem:
  - j-lawyer.org Version:
 
-**Additional context / Sonstiges**
+**Sonstiges**

.github/ISSUE_TEMPLATE/feature-request---erweiterungswunsch.md

@@ -1,23 +1,21 @@
 ---
-name: Feature request / Erweiterungswunsch
-about: Submit an idea / Eine Verbesserung vorschlagen
+name: Erweiterungswunsch
+about: Eine Verbesserung vorschlagen
 title: "[FEATURE]"
 labels: enhancement
 assignees: ''
 
 ---
 
-**NOTE: Please search existing tickets to avoid duplicates **
 **HINWEIS: Bitte vorab die Ticketsuche verwenden, um Doppeleinträge zu vermeiden **
 
 
 
-**Is your feature request related to a problem? Please describe. / Welches Problem soll durch die Erweiterung / Verbesserung gelöst werden?**
-Description / Beschreibung
+**Welches Problem soll durch die Erweiterung / Verbesserung gelöst werden?**
+Beschreibung
 
-**Describe the solution you'd like / Beschreibe die gewünschte Lösung**
-Description / Beschreibung
+**Beschreibe die gewünschte Lösung**
+Beschreibung
 
-**Additional context / Sonstiges **
-Add any other context or screenshots about the feature request here.
+**Sonstiges **
 Sonstige Informationen / Screenshots / ...

.github/ISSUE_TEMPLATE/task-request---aufgabe.md

@@ -1,21 +1,19 @@
 ---
-name: Task request / Aufgabe
-about: Submit a task / Aufgabe erstellen, die weder Erweiterung noch Fehler ist
+name: Aufgabe
+about: Aufgabe erstellen, die weder Erweiterung noch Fehler ist
 title: "[TASK] "
 labels: task
 assignees: ''
 
 ---
 
-**NOTE: Please search existing tickets to avoid duplicates **
 **HINWEIS: Bitte vorab die Ticketsuche verwenden, um Doppeleinträge zu vermeiden **
 
 
-**Describe the tasks / Aufgabenbeschreibung**
-(todo: a description of the task / eine Beschreibung der Aufgabe)
+**Aufgabenbeschreibung**
+(todo: eine Beschreibung der Aufgabe)
 
 **Screenshots**
-If applicable, add screenshots to help explain your problem.
 Falls relevant, Screenshot beifügen.
 
-**Additional context / Sonstiges**
+**Sonstiges**

.github/workflows/main.yml

@@ -111,7 +111,7 @@ jobs:
             -Dsonar.organization=jlawyerorg
             -Dsonar.projectKey=jlawyerorg_j-lawyer-org
             -Dsonar.projectName=j-lawyer-org
-            -Dsonar.projectVersion=2.6.0
+            -Dsonar.projectVersion=3.1-dev
             -Dsonar.java.binaries=.
             -Dsonar.java.source=11
             

docker/getversion.sh

@@ -21,5 +21,5 @@ jlversion=`echo "$jlversion" | tr _ .`
 
 # tadaaa! 
 # echo $jlversion
-echo 3.0.0.1
+echo 3.1.0.1
 

j-lawyer-client/nbproject/project.properties

@@ -3,6 +3,7 @@ file.reference.algorithm_catalog-5.3.0_6.0.0.jar=lib/bea/algorithm_catalog-5.3.0
 file.reference.algorithm_identifier-1.0.0.10.jar=lib/bea/algorithm_identifier-1.0.0.10.jar
 file.reference.ASN1_signature-3.26.0.1.jar=lib/bea/ASN1_signature-3.26.0.1.jar
 file.reference.autent-common-3.72.6.jar=lib/bea/autent-common-3.72.6.jar
+file.reference.barcodes-9.0.0.jar=lib/itext/barcodes-9.0.0.jar
 file.reference.base64-1.2.2.3.jar=lib/bea/base64-1.2.2.3.jar
 file.reference.bcpkix-jdk18on-1.74.jar=lib/bea/bcpkix-jdk18on-1.74.jar
 file.reference.bcprov-jdk18on-1.74.jar=lib/bea/bcprov-jdk18on-1.74.jar
@@ -12,16 +13,22 @@ file.reference.bea-osci-1.14.0.jar=lib/bea/bea-osci-1.14.0.jar
 file.reference.bea-xjustiz-1.13.0.jar=lib/bea/bea-xjustiz-1.13.0.jar
 file.reference.BeaPayload-3.26.0.1.jar=lib/bea/BeaPayload-3.26.0.1.jar
 file.reference.BeaToolkit-3.26.0.1.jar=lib/bea/BeaToolkit-3.26.0.1.jar
+file.reference.bouncy-castle-adapter-9.0.0.jar=lib/itext/bouncy-castle-adapter-9.0.0.jar
+file.reference.bouncy-castle-connector-9.0.0.jar=lib/itext/bouncy-castle-connector-9.0.0.jar
+file.reference.bouncy-castle-fips-adapter-9.0.0.jar=lib/itext/bouncy-castle-fips-adapter-9.0.0.jar
 file.reference.cadestoolbox-1.5.7.jar=lib/bea/cadestoolbox-1.5.7.jar
 file.reference.challenge-response-common-3.72.5.jar=lib/bea/challenge-response-common-3.72.5.jar
 file.reference.checker-qual-3.33.0.jar=lib/bea/checker-qual-3.33.0.jar
 file.reference.ci-1.15.0.jar=lib/bea/ci-1.15.0.jar
+file.reference.cleanup-5.0.0.jar=lib/itext/cleanup-5.0.0.jar
 file.reference.client_ca_certs-79dgn.jar=lib/bea/client_ca_certs-79dgn.jar
 file.reference.commonmark-0.23.0.jar=lib/commonmark-0.23.0.jar
 file.reference.commonmark-ext-gfm-tables-0.23.0.jar=lib/commonmark-ext-gfm-tables-0.23.0.jar
+file.reference.commons-9.0.0.jar=lib/itext/commons-9.0.0.jar
 file.reference.commons-codec-1.15.jar=lib/bea/commons-codec-1.15.jar
 file.reference.commons-collections4-4.4.jar=lib/bea/commons-collections4-4.4.jar
 file.reference.commons-compress-1.21.jar=lib/bea/commons-compress-1.21.jar
+file.reference.commons-imaging-1.0-alpha2.jar=lib/itext/commons-imaging-1.0-alpha2.jar
 file.reference.commons-io-2.15.1.jar=lib/bea/commons-io-2.15.1.jar
 file.reference.commons-lang3-3.12.0.jar=lib/bea/commons-lang3-3.12.0.jar
 file.reference.commons-logging-1.2.jar=lib/bea/commons-logging-1.2.jar
@@ -34,9 +41,12 @@ file.reference.ehcache-3.10.8.jar=lib/ehcache-3.10.8.jar
 file.reference.error_prone_annotations-2.18.0.jar=lib/bea/error_prone_annotations-2.18.0.jar
 file.reference.failureaccess-1.0.1.jar=lib/bea/failureaccess-1.0.1.jar
 file.reference.flatlaf-3.5.jar=lib/flatlaf-3.5.jar
+file.reference.flatlaf-extras-3.5.2.jar=lib/flatlaf-extras-3.5.2.jar
 file.reference.flatlaf-fonts-inter-3.19.jar=lib/flatlaf-fonts-inter-3.19.jar
 file.reference.flatlaf-fonts-roboto-2.137.jar=lib/flatlaf-fonts-roboto-2.137.jar
+file.reference.font-asian-9.0.0.jar=lib/itext/font-asian-9.0.0.jar
 file.reference.fontbox-2.0.24.jar=lib/bea/fontbox-2.0.24.jar
+file.reference.forms-9.0.0.jar=lib/itext/forms-9.0.0.jar
 file.reference.freemarker-2.3.32.jar=lib/bea/freemarker-2.3.32.jar
 file.reference.gcf-businesscard-3.7.5.5.jar=lib/bea/gcf-businesscard-3.7.5.5.jar
 file.reference.gcf-justiz-3.7.5.5.jar=lib/bea/gcf-justiz-3.7.5.5.jar
@@ -49,6 +59,8 @@ file.reference.guava-32.1.1-jre.jar=lib/bea/guava-32.1.1-jre.jar
 file.reference.ha-api-3.1.12.jar=lib/bea/ha-api-3.1.12.jar
 file.reference.hibernate-core-5.3.28.Final.jar=lib/hibernate-core-5.3.28.Final.jar
 file.reference.http-core-2.4.0.19.jar=lib/bea/http-core-2.4.0.19.jar
+file.reference.hyph-9.0.0.jar=lib/itext/hyph-9.0.0.jar
+file.reference.io-9.0.0.jar=lib/itext/io-9.0.0.jar
 file.reference.ISOCountryCodeType-V2006-1.0.7-Streaming.jar=lib/bea/ISOCountryCodeType-V2006-1.0.7-Streaming.jar
 file.reference.istack-commons-runtime-3.0.11.jar=lib/bea/istack-commons-runtime-3.0.11.jar
 file.reference.j-lawyer-invoicing.jar=lib/j-lawyer-invoicing/j-lawyer-invoicing.jar
@@ -68,7 +80,9 @@ file.reference.jaxb-impl-2.3.3.jar=lib/bea/jaxb-impl-2.3.3.jar
 file.reference.jaxb-runtime-2.3.3.jar=lib/bea/jaxb-runtime-2.3.3.jar
 file.reference.jboss-servlet-api_3.1_spec-1.0.0.Final-redhat-1.jar=lib/bea/jboss-servlet-api_3.1_spec-1.0.0.Final-redhat-1.jar
 file.reference.jsr305-3.0.2.jar=lib/bea/jsr305-3.0.2.jar
+file.reference.kernel-9.0.0.jar=lib/itext/kernel-9.0.0.jar
 file.reference.KSWToolkit-3.20.0.1.jar=lib/bea/KSWToolkit-3.20.0.1.jar
+file.reference.layout-9.0.0.jar=lib/itext/layout-9.0.0.jar
 file.reference.log4j-1.2-api-2.17.2.jar=lib/bea/log4j-1.2-api-2.17.2.jar
 file.reference.log4j-api-2.17.2.jar=lib/bea/log4j-api-2.17.2.jar
 file.reference.log4j-core-2.17.2.jar=lib/bea/log4j-core-2.17.2.jar
@@ -86,7 +100,10 @@ file.reference.osci-bibliothek-2.4.0.jar=lib/bea/osci-bibliothek-2.4.0.jar
 file.reference.outlook-message-parser-1.9.6.jar=lib/outlook-message-parser-1.9.6.jar
 file.reference.padestoolbox-1.5.22.jar=lib/bea/padestoolbox-1.5.22.jar
 file.reference.PCard-3.26.0.1.jar=lib/bea/PCard-3.26.0.1.jar
+file.reference.pdfa-9.0.0.jar=lib/itext/pdfa-9.0.0.jar
 file.reference.pdfbox-2.0.24.jar=lib/bea/pdfbox-2.0.24.jar
+file.reference.pdftest-9.0.0.jar=lib/itext/pdftest-9.0.0.jar
+file.reference.pdfua-9.0.0.jar=lib/itext/pdfua-9.0.0.jar
 file.reference.pfl-basic-4.1.0.jar=lib/bea/pfl-basic-4.1.0.jar
 file.reference.pfl-tf-4.1.0.jar=lib/bea/pfl-tf-4.1.0.jar
 file.reference.poi-5.2.3.jar=lib/poi-5.2.3.jar
@@ -97,11 +114,14 @@ file.reference.rtf-to-html-1.0.1.jar=lib/rtf-to-html-1.0.1.jar
 file.reference.saaj-impl-1.5.2.jar=lib/bea/saaj-impl-1.5.2.jar
 file.reference.security_utils-1.0.0.jar=lib/bea/security_utils-1.0.0.jar
 file.reference.SHEF.jar=lib/SHEF.jar
+file.reference.sign-9.0.0.jar=lib/itext/sign-9.0.0.jar
 file.reference.SignerToolBox-3.26.0.1.jar=lib/bea/SignerToolBox-3.26.0.1.jar
 file.reference.slf4j-api-1.7.36.jar=lib/bea/slf4j-api-1.7.36.jar
 file.reference.stax-ex-1.8.3.jar=lib/bea/stax-ex-1.8.3.jar
 file.reference.stax2-api-4.1.jar=lib/bea/stax2-api-4.1.jar
 file.reference.streambuffer-1.5.9.jar=lib/bea/streambuffer-1.5.9.jar
+file.reference.styled-xml-parser-9.0.0.jar=lib/itext/styled-xml-parser-9.0.0.jar
+file.reference.svg-9.0.0.jar=lib/itext/svg-9.0.0.jar
 file.reference.ts_102231v020000_xsd-1.0.7-Streaming.jar=lib/bea/ts_102231v020000_xsd-1.0.7-Streaming.jar
 file.reference.ts_102231v030102_xsd-1.0.6-Streaming.jar=lib/bea/ts_102231v030102_xsd-1.0.6-Streaming.jar
 file.reference.txw2-2.3.3.jar=lib/bea/txw2-2.3.3.jar
@@ -456,7 +476,27 @@ javac.classpath=\
     ${file.reference.jackson-core-2.16.1.jar}:\
     ${file.reference.j-lawyer-invoicing.jar}:\
     ${file.reference.commonmark-0.23.0.jar}:\
-    ${file.reference.commonmark-ext-gfm-tables-0.23.0.jar}
+    ${file.reference.commonmark-ext-gfm-tables-0.23.0.jar}:\
+    ${file.reference.flatlaf-extras-3.5.2.jar}:\
+    ${file.reference.cleanup-5.0.0.jar}:\
+    ${file.reference.commons-imaging-1.0-alpha2.jar}:\
+    ${file.reference.kernel-9.0.0.jar}:\
+    ${file.reference.io-9.0.0.jar}:\
+    ${file.reference.commons-9.0.0.jar}:\
+    ${file.reference.layout-9.0.0.jar}:\
+    ${file.reference.barcodes-9.0.0.jar}:\
+    ${file.reference.bouncy-castle-adapter-9.0.0.jar}:\
+    ${file.reference.bouncy-castle-connector-9.0.0.jar}:\
+    ${file.reference.bouncy-castle-fips-adapter-9.0.0.jar}:\
+    ${file.reference.font-asian-9.0.0.jar}:\
+    ${file.reference.forms-9.0.0.jar}:\
+    ${file.reference.hyph-9.0.0.jar}:\
+    ${file.reference.pdfa-9.0.0.jar}:\
+    ${file.reference.pdftest-9.0.0.jar}:\
+    ${file.reference.pdfua-9.0.0.jar}:\
+    ${file.reference.sign-9.0.0.jar}:\
+    ${file.reference.styled-xml-parser-9.0.0.jar}:\
+    ${file.reference.svg-9.0.0.jar}
 file.reference.j-lawyer-server-entities.jar=../j-lawyer-server-entities/dist/j-lawyer-server-entities.jar
 file.reference.novaworx-syntax-0.0.7.jar=lib/novaworx-syntax-0.0.7.jar
 file.reference.ical4j-0.9.18.jar=lib/bizcal/ical4j-0.9.18.jar

j-lawyer-client/src/com/jdimension/jlawyer/client/assistant/AssistantChatDialog.java

@@ -673,6 +673,7 @@ You should also get your employer (if you work as a programmer) or school,
 import com.jdimension.jlawyer.ai.ParameterData;
 import com.jdimension.jlawyer.client.editors.files.ArchiveFilePanel;
 import com.jdimension.jlawyer.client.settings.ClientSettings;
+import com.jdimension.jlawyer.client.settings.UserSettings;
 import com.jdimension.jlawyer.client.utils.ComponentUtils;
 import com.jdimension.jlawyer.client.utils.FrameUtils;
 import com.jdimension.jlawyer.client.utils.TemplatesUtil;
@@ -1147,7 +1148,7 @@ protected Void doInBackground() throws Exception {
                 ClientSettings settings = ClientSettings.getInstance();
 
                 Message incomingMsg = new Message();
-                incomingMsg.setRole("assistant");
+                incomingMsg.setRole(Message.ROLE_ASSISTANT);
                 incomingMsg.setContent("...");
                 AiChatMessagePanel incomingMsgPanel = new AiChatMessagePanel(incomingMsg, owner);
                 try {
@@ -1244,6 +1245,7 @@ protected void done() {
                         }
                         AiChatMessagePanel msgPanel = incomingMessageRef.get();
                         msgPanel.getMessage().setContent(resultString.toString());
+                        messages.add(msgPanel.getMessage());
                         msgPanel.setMessage(msgPanel.getMessage(), owner);
                         msgPanel.repaint();
                         msgPanel.updateUI();
@@ -1287,7 +1289,28 @@ private void cmdCopyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST
     private void cmdProcessOutputActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cmdProcessOutputActionPerformed
         if (this.inputAdapter instanceof AssistantFlowAdapter && this.result != null) {
             // caller is capable of handling results
+            //((AssistantFlowAdapter) this.inputAdapter).processOutput(capability, this.result);
+
+            if(result.getResponse()!=null && result.getResponse().getOutputData()!=null) {
+                OutputData intro=new OutputData();
+                intro.setType(OutputData.TYPE_STRING);
+                intro.setStringData("Chat-Verlauf: " + System.lineSeparator()+System.lineSeparator());
+                result.getResponse().getOutputData().add(intro);
+                for(Message msg: this.messages) {
+                    OutputData od=new OutputData();
+                    od.setType(OutputData.TYPE_STRING);
+                    String role=msg.getRole();
+                    if("user".equalsIgnoreCase(role))
+                        role=UserSettings.getInstance().getCurrentUser().getPrincipalId();
+                    else
+                        role="Assistent Ingo";
+                    od.setStringData(role + ": " + msg.getContent() + System.lineSeparator()+System.lineSeparator());
+                    result.getResponse().getOutputData().add(od);
+                }
+            }
+
             ((AssistantFlowAdapter) this.inputAdapter).processOutput(capability, this.result);
+
         }
         this.setVisible(false);
         this.dispose();
@@ -1309,7 +1332,7 @@ private void cmdNewDocumentActionPerformed(java.awt.event.ActionEvent evt) {//GE
         if (this.caseView != null) {
             if (this.pnlMessages.getComponentCount() > 0) {
                 AiChatMessagePanel p = (AiChatMessagePanel) this.pnlMessages.getComponent(this.pnlMessages.getComponentCount() - 1);
-                this.caseView.newDocumentDialog(null, null, null, null, null, null, p.getMessage().getContent());
+                this.caseView.newDocumentDialog(null, null, null, null, null, null, null, p.getMessage().getContent());
             }
         }
     }//GEN-LAST:event_cmdNewDocumentActionPerformed

j-lawyer-client/src/com/jdimension/jlawyer/client/assistant/AssistantGenerateDialog.java

@@ -1353,7 +1353,7 @@ private void cmdInterruptActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
 
     private void cmdNewDocumentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cmdNewDocumentActionPerformed
         if(this.caseView!=null)
-            this.caseView.newDocumentDialog(null, null, null, null, null, null, this.taResult.getText());
+            this.caseView.newDocumentDialog(null, null, null, null, null, null, null, this.taResult.getText());
     }//GEN-LAST:event_cmdNewDocumentActionPerformed
 
     /**

j-lawyer-client/src/com/jdimension/jlawyer/client/assistant/AssistantGenericDialog.java

@@ -1314,9 +1314,13 @@ private void cmdCopyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST
     private void cmdProcessOutputActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cmdProcessOutputActionPerformed
         if(this.inputAdapter instanceof AssistantFlowAdapter && this.result!=null) {
 
+            String resultText=this.taResult.getText();
+            if(taResult.getSelectedText()!=null)
+                resultText=taResult.getSelectedText();
+
             for (OutputData o : this.result.getResponse().getOutputData()) {
                 if (o.getType().equalsIgnoreCase(OutputData.TYPE_STRING)) {
-                    o.setStringData(this.taResult.getText());
+                    o.setStringData(resultText);
                 }
             }
 

j-lawyer-client/src/com/jdimension/jlawyer/client/bea/BeaInboxPanel.java

@@ -2359,6 +2359,7 @@ public void reset() {
     public void reset(boolean force) {
 
         boolean needsBeaReset = !BeaAccess.hasInstance();
+        log.info("beA has instance: " + !needsBeaReset);
         if (!needsBeaReset) {
             try {
                 needsBeaReset = !BeaAccess.getInstance().isLoggedIn();
@@ -2367,8 +2368,16 @@ public void reset(boolean force) {
                 needsBeaReset = true;
             }
         }
+        log.info("beA reset needed: " + needsBeaReset);
 
         if (needsBeaReset) {
+            try {
+                log.info("beA logout");
+                this.logout();
+                log.info("beA logout succeeded");
+            } catch (Exception ex) {
+                log.error("beA logout failed", ex);
+            }
             BeaLoginDialog loginPanel = new BeaLoginDialog(EditorsRegistry.getInstance().getMainWindow(), true, this);
             loginPanel.setVisible(true);
             if (!BeaAccess.hasInstance()) {

j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageDialog.java

@@ -2086,7 +2086,7 @@ private void cmbTemplatesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
                     PartiesTriplet triplet=new PartiesTriplet(pe.getAddress(), pe.getReferenceType(), pe.getInvolvement());
                     partiesTriplets.add(triplet);
                 }
-                HashMap<String, Object> htValues = locator.lookupSystemManagementRemote().getPlaceHolderValues(ht, this.contextArchiveFile, partiesTriplets, this.contextDictateSign, null, new HashMap<>(), caseLawyer, caseAssistant, author, null, null, null, null, null, null);
+                HashMap<String, Object> htValues = locator.lookupSystemManagementRemote().getPlaceHolderValues(ht, this.contextArchiveFile, partiesTriplets, this.contextDictateSign, null, new HashMap<>(), caseLawyer, caseAssistant, author, null, null, null, null, null, null, null);
                 this.txtSubject.setText(TemplatesUtil.replacePlaceHolders(tpl.getSubject(), htValues));
 
                 placeHolderNames = TemplatesUtil.getPlaceHoldersInTemplate(tpl.getBody(), allPartyTypesPlaceholders,new ArrayList<>());
@@ -2095,7 +2095,7 @@ private void cmbTemplatesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
                     ht.put(ph, "");
                 }
 
-                htValues = locator.lookupSystemManagementRemote().getPlaceHolderValues(ht, this.contextArchiveFile, partiesTriplets, this.contextDictateSign, null, new HashMap<>(), caseLawyer, caseAssistant, author, null, null, null, null, null, null);
+                htValues = locator.lookupSystemManagementRemote().getPlaceHolderValues(ht, this.contextArchiveFile, partiesTriplets, this.contextDictateSign, null, new HashMap<>(), caseLawyer, caseAssistant, author, null, null, null, null, null, null, null);
 
                 String t = TemplatesUtil.replacePlaceHolders(tpl.getBody(), htValues) + System.getProperty("line.separator");
                 int cursorIndex = t.indexOf(PLACEHOLDER_CURSOR);

j-lawyer-client/src/com/jdimension/jlawyer/client/calendar/CalendarUtils.java

@@ -925,7 +925,7 @@ public ArchiveFileReviewsBean storeCalendarEntry(ArchiveFileReviewsBean entry, A
                 relatedEventDlg.setTitle("weiterer Eintrag mit " + template.getRelatedOffsetDays() + " Tagen Versatz");
                 relatedEventDlg.setEventType(entry.getEventType());
                 relatedEventDlg.setSummary(template.getRelatedName());
-                relatedEventDlg.setDescription(template.getRelatedDescription());
+                relatedEventDlg.setDescription((entry.getDescription() + System.lineSeparator() + template.getRelatedDescription()).trim());
                 relatedEventDlg.setReviewAssignee(entry.getAssignee());
 
                 Calendar c = Calendar.getInstance();