Skip to content

Commit

Permalink
enhanced UI to provide message priorities to user when sending beA me…
Browse files Browse the repository at this point in the history 
…ssages. issue #1796
  • Loading branch information
@j-dimension
j-dimension committed Dec 11, 2023
1 parent 29750c4 commit 22c6050
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 113 deletions.
4 changes: 2 additions & 2 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/bea/BeaAccess.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1236,9 +1236,9 @@ public static void addSignatureVerification(BeaAccess bea, Message msg) {
}
}

public Message sendAndRetrieveMessage(Message msg, String senderSafeId, String recipientSafeId, BeaListItem authority) throws BeaWrapperException {
public Message sendAndRetrieveMessage(Message msg, String senderSafeId, String recipientSafeId, BeaListItem authority, BeaListItem priority) throws BeaWrapperException {
this.checkValidBeaClient();
Message sentMessage=this.wrapper.sendAndRetrieveMessage(msg, senderSafeId, recipientSafeId, authority);
Message sentMessage=this.wrapper.sendAndRetrieveMessage(msg, senderSafeId, recipientSafeId, authority, priority);
if (!this.messageCache.containsKey(sentMessage.getId())) {
this.messageCache.put(sentMessage.getId(), sentMessage);
}
Expand Down
10 changes: 6 additions & 4 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@ public class SendBeaMessageAction extends ProgressableAction {
List<BeaAttachmentMetadata> attachments = null;
private boolean readReceipt = false;
private BeaListItem authority = null;
private BeaListItem priority = null;
private List<Identity> recipients = null;
private String subject = "";
private String body = "";
Expand All @@ -717,13 +718,14 @@ public class SendBeaMessageAction extends ProgressableAction {

private String msgType = Message.MESSAGETYPE_ALLGEMEINE_NACHRICHT;

public SendBeaMessageAction(ProgressIndicator i, JDialog cleanAfter, String messageType, String fromSafeId, List<BeaAttachmentMetadata> attachmentMetadata, AppUserBean cu, boolean readReceipt, BeaListItem authority, List<Identity> to, String subject, String body, String documentTag, String azSender, String azRecipient) {
public SendBeaMessageAction(ProgressIndicator i, JDialog cleanAfter, String messageType, String fromSafeId, List<BeaAttachmentMetadata> attachmentMetadata, AppUserBean cu, boolean readReceipt, BeaListItem authority, List<Identity> to, String subject, String body, BeaListItem priority, String documentTag, String azSender, String azRecipient) {
super(i, false, cleanAfter);
this.attachments = attachmentMetadata;
this.readReceipt = readReceipt;
this.recipients = to;
this.subject = subject;
this.body = body;
this.priority=priority;
this.fromSafeId = fromSafeId;
this.documentTag = documentTag;
this.readReceipt = readReceipt;
Expand All @@ -733,8 +735,8 @@ public SendBeaMessageAction(ProgressIndicator i, JDialog cleanAfter, String mess
this.msgType = messageType;
}

public SendBeaMessageAction(ProgressIndicator i, JDialog cleanAfter, String messageType, String fromSafeId, List<BeaAttachmentMetadata> attachmentMetadata, AppUserBean cu, boolean readReceipt, BeaListItem authority, List<Identity> to, String subject, String body, ArchiveFileBean af, String documentTag, String azSender, String azRecipient, CaseFolder folder) {
this(i, cleanAfter, messageType, fromSafeId, attachmentMetadata, cu, readReceipt, authority, to, subject, body, documentTag, azSender, azRecipient);
public SendBeaMessageAction(ProgressIndicator i, JDialog cleanAfter, String messageType, String fromSafeId, List<BeaAttachmentMetadata> attachmentMetadata, AppUserBean cu, boolean readReceipt, BeaListItem authority, List<Identity> to, String subject, String body, BeaListItem priority, ArchiveFileBean af, String documentTag, String azSender, String azRecipient, CaseFolder folder) {
this(i, cleanAfter, messageType, fromSafeId, attachmentMetadata, cu, readReceipt, authority, to, subject, body, priority, documentTag, azSender, azRecipient);
this.archiveFile = af;
this.folder = folder;
}
Expand Down Expand Up @@ -803,7 +805,7 @@ public boolean execute() throws Exception {

this.progress("Sende an " + to.toString() + "...");
String toSafeId = to.getSafeId();
sentMessage = bea.sendAndRetrieveMessage(msg, senderSafeId, toSafeId, this.authority);
sentMessage = bea.sendAndRetrieveMessage(msg, senderSafeId, toSafeId, this.authority, this.priority);

} catch (BeaWrapperException ex) {
log.error(ex);
Expand Down
98 changes: 53 additions & 45 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/bea/SendBeaMessageDialog.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
</Component>
</SubComponents>
</Container>
<Component class="javax.swing.ButtonGroup" name="buttonGroupTextHtml">
</Component>
<Component class="javax.swing.ButtonGroup" name="btGroupReviews">
</Component>
<Container class="javax.swing.JPopupMenu" name="popAttachments">
Expand Down Expand Up @@ -595,7 +593,7 @@
<Component id="cmdShowReviewSelector" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<EmptySpace min="0" pref="49" max="32767" attributes="0"/>
</Group>
</Group>
</Group>
Expand Down Expand Up @@ -763,21 +761,23 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel6" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="cmbMessageType" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="rdXjustiz" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="rdXjustizEeb" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="chkEeb" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Component id="cmbMessageType" alignment="0" max="32767" attributes="0"/>
<Component id="cmbPriorities" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
Expand All @@ -786,43 +786,23 @@
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="rdXjustiz" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="rdXjustizEeb" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="cmbMessageType" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="103" groupAlignment="3" attributes="0">
<Component id="cmbPriorities" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel6" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmbMessageType" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="chkEeb" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="12" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JRadioButton" name="rdXjustiz">
<Properties>
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
<ComponentRef name="buttonGroupTextHtml"/>
</Property>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Strukturdatensatz erzeugen"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rdXjustizActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JRadioButton" name="rdXjustizEeb">
<Properties>
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
<ComponentRef name="buttonGroupTextHtml"/>
</Property>
<Property name="text" type="java.lang.String" value="Zustellung gegen Empfangsbekenntnis"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rdXjustizEebActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JComboBox" name="cmbMessageType">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
Expand All @@ -846,6 +826,34 @@
<Property name="enabled" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JComboBox" name="cmbPriorities">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
<StringArray count="4">
<StringItem index="0" value="Item 1"/>
<StringItem index="1" value="Item 2"/>
<StringItem index="2" value="Item 3"/>
<StringItem index="3" value="Item 4"/>
</StringArray>
</Property>
</Properties>
<AuxValues>
<AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;Object&gt;"/>
</AuxValues>
</Component>
<Component class="javax.swing.JLabel" name="jLabel6">
<Properties>
<Property name="text" type="java.lang.String" value="Priorit&#xe4;t:"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="chkEeb">
<Properties>
<Property name="text" type="java.lang.String" value="Zust. g. Empfangsb."/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkEebActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel1">
Expand All @@ -869,7 +877,7 @@
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Component id="pnlParties" pref="471" max="32767" attributes="0"/>
<Component id="pnlParties" max="32767" attributes="0"/>
<Component id="cmbTemplates" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
Expand All @@ -886,7 +894,7 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="cmbTemplates" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="pnlParties" pref="135" max="32767" attributes="0"/>
<Component id="pnlParties" pref="49" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
Expand Down
Loading

0 comments on commit 22c6050

Please sign in to comment.