Skip to content

Commit

Permalink
finished import capability for specific configurations. issue #2561
Browse files Browse the repository at this point in the history
  • Loading branch information
j-dimension committed Sep 10, 2024
1 parent 3385eaf commit 0a96f3b
Show file tree
Hide file tree
Showing 19 changed files with 1,571 additions and 48 deletions.
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 @@ -22,6 +22,8 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="mnuDocumentsBinActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JPopupMenu$Separator" name="jSeparator1">
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="mnuBankImport">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
Expand Down Expand Up @@ -61,12 +63,23 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="mnuAddressImportActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="mnuImportFromSheet">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons/package_system.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Import: Einstellungen"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="mnuImportFromSheetActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="mnuBeaCourtAddressImport">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons16/bea16.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Import Gerichtsadressen"/>
<Property name="text" type="java.lang.String" value="Import: Gerichtsadressen"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="mnuBeaCourtAddressImportActionPerformed"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1088,9 +1088,11 @@ private void initComponents() {
jMenuBar1 = new javax.swing.JMenuBar();
mnuFile = new javax.swing.JMenu();
mnuDocumentsBin = new javax.swing.JMenuItem();
jSeparator1 = new javax.swing.JPopupMenu.Separator();
mnuBankImport = new javax.swing.JMenuItem();
mnuZipCodeImport = new javax.swing.JMenuItem();
mnuAddressImport = new javax.swing.JMenuItem();
mnuImportFromSheet = new javax.swing.JMenuItem();
mnuBeaCourtAddressImport = new javax.swing.JMenuItem();
jSeparator3 = new javax.swing.JSeparator();
mnuExit = new javax.swing.JMenuItem();
Expand Down Expand Up @@ -1299,6 +1301,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
}
});
mnuFile.add(mnuDocumentsBin);
mnuFile.add(jSeparator1);

mnuBankImport.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/fileimport.png"))); // NOI18N
mnuBankImport.setText(bundle.getString("menu.file.import.banks")); // NOI18N
Expand Down Expand Up @@ -1327,8 +1330,17 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
});
mnuFile.add(mnuAddressImport);

mnuImportFromSheet.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/package_system.png"))); // NOI18N
mnuImportFromSheet.setText("Import: Einstellungen");
mnuImportFromSheet.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
mnuImportFromSheetActionPerformed(evt);
}
});
mnuFile.add(mnuImportFromSheet);

mnuBeaCourtAddressImport.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons16/bea16.png"))); // NOI18N
mnuBeaCourtAddressImport.setText("Import Gerichtsadressen");
mnuBeaCourtAddressImport.setText("Import: Gerichtsadressen");
mnuBeaCourtAddressImport.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
mnuBeaCourtAddressImportActionPerformed(evt);
Expand Down Expand Up @@ -2820,6 +2832,14 @@ private void mnuDocumentNameTemplatesActionPerformed(java.awt.event.ActionEvent
}
}//GEN-LAST:event_mnuDocumentNameTemplatesActionPerformed

private void mnuImportFromSheetActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_mnuImportFromSheetActionPerformed
if (checkAdmin()) {
ImportFromSheetsDialog dlg = new ImportFromSheetsDialog(this, true);
FrameUtils.centerDialog(dlg, this);
dlg.setVisible(true);
}
}//GEN-LAST:event_mnuImportFromSheetActionPerformed

/**
* @param args the command line arguments
*/
Expand All @@ -2829,6 +2849,7 @@ public static void main(String args[]) {
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JMenuBar jMenuBar1;
private javax.swing.JPanel jPanel1;
private javax.swing.JPopupMenu.Separator jSeparator1;
private javax.swing.JSeparator jSeparator2;
private javax.swing.JSeparator jSeparator3;
private javax.swing.JPopupMenu.Separator jSeparator4;
Expand Down Expand Up @@ -2899,6 +2920,7 @@ public static void main(String args[]) {
private javax.swing.JMenuItem mnuForum;
private javax.swing.JMenuItem mnuGroups;
private javax.swing.JMenu mnuHelp;
private javax.swing.JMenuItem mnuImportFromSheet;
private javax.swing.JMenuItem mnuInvoiceCurrencies;
private javax.swing.JMenuItem mnuInvoicePools;
private javax.swing.JMenuItem mnuInvoicePositionTemplates;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ menu.settings.addresses.salutations=Begr\u00fc\u00dfung
menu.settings.addresses=Modul 'Adressen'
menu.settings=Einstellungen
menu.file.exit=Beenden
menu.file.import.addresses=Import Adressen
menu.file.import.zipcodes=Import Postleitzahlenverzeichnis
menu.file.import.banks=Import Bankenverzeichnis
menu.file.import.addresses=Import: Adressen
menu.file.import.zipcodes=Import: Postleitzahlenverzeichnis
menu.file.import.banks=Import: Bankenverzeichnis
menu.file=Datei
status.ready=bereit
title=j-lawyer.org Client
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
textarea.description=Die aktuellen Daten werden von https://www.j-lawyer.org heruntergeladen und importiert.
textarea.description=
button.import=Importieren
button.close=Schliessen
label.import\:=Bankenimport aus Datei:
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties>
<Property name="defaultCloseOperation" type="int" value="2"/>
<Property name="title" type="java.lang.String" value="Einstellungen importieren"/>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
<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="2"/>
<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" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jScrollPane1" alignment="0" pref="688" max="32767" attributes="0"/>
<Component id="progBar" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<Component id="cmdDryRun" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdImport" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdClose" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="cmdDownloadTemplate" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdUploadSheet" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
<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"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="cmdDownloadTemplate" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cmdUploadSheet" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane1" pref="480" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="progBar" min="-2" pref="22" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="cmdClose" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cmdImport" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cmdDryRun" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<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="taLog">
<Properties>
<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" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jdimension/jlawyer/client/configuration/ImportBanksDialog.properties" key="textarea.description" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
<Property name="wrapStyleWord" type="boolean" value="true"/>
<Property name="enabled" type="boolean" value="false"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Component class="javax.swing.JButton" name="cmdClose">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons/cancel.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jdimension/jlawyer/client/configuration/ImportBanksDialog.properties" key="button.close" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdCloseActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="cmdImport">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons/agt_action_success.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jdimension/jlawyer/client/configuration/ImportBanksDialog.properties" key="button.import" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
<Property name="enabled" type="boolean" value="false"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdImportActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JProgressBar" name="progBar">
<Properties>
<Property name="string" type="java.lang.String" value=""/>
<Property name="stringPainted" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="cmdDownloadTemplate">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons16/material/file_download_20dp_0E72B5.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Vorlage"/>
<Property name="toolTipText" type="java.lang.String" value="Vorlage herunterladen"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdDownloadTemplateActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="cmdUploadSheet">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons16/material/baseline_file_upload_black_48dp.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Datei laden"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdUploadSheetActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="cmdDryRun">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons/help.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Testlauf durchf&#xfc;hren"/>
<Property name="enabled" type="boolean" value="false"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdDryRunActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Form>
Loading

0 comments on commit 0a96f3b

Please sign in to comment.