Skip to content

Commit

Permalink
added entities for messaging
Browse files Browse the repository at this point in the history
added migration scripts for messaging
added callout UI component
added messaging service layer / business logic
added REST endpoint for messaging services
added parsing of messages to extract mentions
added web hook for message creation
added test cases

issue #2018
  • Loading branch information
j-dimension committed Sep 14, 2023
1 parent 289941c commit b70610d
Show file tree
Hide file tree
Showing 39 changed files with 16,208 additions and 14 deletions.
2 changes: 1 addition & 1 deletion docker/getversion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jlversion=`echo "$jlversion" | tr _ .`

# tadaaa!
# echo $jlversion
echo 2.4.0.12
echo 2.4.0.13

Binary file modified j-lawyer-client/lib/j-lawyer-cloud/j-lawyer-cloud.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,6 @@ You should also get your employer (if you work as a programmer) or school,
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -990,9 +989,7 @@ public final void setEntry(Invoice invoice) {

this.pnlInvoicePositions.add(posPanel);
this.pnlInvoicePositions.doLayout();
int dl = this.splitMain.getDividerLocation();
this.splitMain.setDividerLocation(dl + 1);
this.splitMain.setDividerLocation(dl);
this.bumpSplitPane();

posPanel.setEntry(this.currentEntry.getId(), pos);
posPanel.updateEntryTotal();
Expand All @@ -1009,6 +1006,12 @@ public final void setEntry(Invoice invoice) {
this.cmbStatus.setEnabled(invoice!=null);

}

public void bumpSplitPane() {
int dl = this.splitMain.getDividerLocation();
this.splitMain.setDividerLocation(dl + 1);
this.splitMain.setDividerLocation(dl);
}

/**
* This method is called from within the constructor to initialize the form.
Expand Down Expand Up @@ -1982,9 +1985,7 @@ private void addPosition(InvoicePosition pos) {
posPanel.updateEntryTotal();
this.pnlInvoicePositions.add(posPanel);
this.pnlInvoicePositions.doLayout();
int dl = this.splitMain.getDividerLocation();
this.splitMain.setDividerLocation(dl + 1);
this.splitMain.setDividerLocation(dl);
this.bumpSplitPane();
this.updateTotals(posPanel);

} catch (Exception ex) {
Expand Down Expand Up @@ -2033,9 +2034,7 @@ private void cmdRemoveAllPositionsActionPerformed(java.awt.event.ActionEvent evt
private void clearPositionsPanel() {
this.pnlInvoicePositions.removeAll();
this.pnlInvoicePositions.doLayout();
int dl = this.splitMain.getDividerLocation();
this.splitMain.setDividerLocation(dl + 1);
this.splitMain.setDividerLocation(dl);
this.bumpSplitPane();
}

private void cmdSearchRecipientMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_cmdSearchRecipientMousePressed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,7 @@ private void cmdRemovePositionActionPerformed(java.awt.event.ActionEvent evt) {/
} catch (Exception ex) {
log.warn("unable to layout invoice dialog", ex);
}
this.parent.bumpSplitPane();
} catch (Exception ex) {
log.error("Error updating invoice position", ex);
JOptionPane.showMessageDialog(this, "Fehler beim Speichern der Rechnungsposition: " + ex.getMessage(), com.jdimension.jlawyer.client.utils.DesktopUtils.POPUP_TITLE_ERROR, JOptionPane.ERROR_MESSAGE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,7 @@ public class OAuthUserConsentDialog extends javax.swing.JDialog {
*
* @param parent
* @param modal
* @param tenantId
* @param clientId
*/
public OAuthUserConsentDialog(JDialog parent, boolean modal, String tenantId, String clientId) {
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
</AuxValues>

<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane1" pref="376" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane1" pref="276" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="jScrollPane1">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>

<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Component class="javax.swing.JTextArea" name="taMessage">
<Properties>
<Property name="editable" type="boolean" value="false"/>
<Property name="columns" type="int" value="20"/>
<Property name="lineWrap" type="boolean" value="true"/>
<Property name="rows" type="int" value="5"/>
<Property name="text" type="java.lang.String" value="&#xf6;alksjd&#xf6; flkasd&#xf6; falksdj&#xf6; falksjd&#xf6; falksjd &#xf6;flkajsd&#xf6; lkfaj&#xf6; dskfja&#xf6;lkdsjf&#xf6; alksd&#xf6; falksdj&#xf6; falksdj&#xf6; falksjd&#xf6; lkfajsd&#xf6;lkfaj s&#xf6;dkjfa &#xf6;slkfja&#xf6;slkdj fa&#xf6;lkdsj f&#xf6;alkds "/>
<Property name="wrapStyleWord" type="boolean" value="true"/>
<Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
</Form>
Loading

0 comments on commit b70610d

Please sign in to comment.