From vsalaun@users.chorem.org Wed Aug 10 15:27:34 2011
From: vsalaun@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r3258 - in trunk:
	lima-business/src/main/java/org/chorem/lima/business/ejb
	lima-swing/src/main/java/org/chorem/lima/ui/account
Date: Wed, 10 Aug 2011 15:27:34 +0200
Message-ID: <20110810132734.63D391595C@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0351778506673425462=="

--===============0351778506673425462==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: vsalaun
Date: 2011-08-10 15:27:34 +0200 (Wed, 10 Aug 2011)
New Revision: 3258

Url: http://chorem.org/repositories/revision/lima/3258

Log:
#426 add forms for updating accounts + uppercase ledger account number (when =
contains letters)

Added:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountFor=
m.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateSubLedgerF=
orm.jaxx
Modified:
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountServ=
iceImpl.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandl=
er.java

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/Acco=
untServiceImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountSer=
viceImpl.java	2011-08-10 11:38:02 UTC (rev 3257)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AccountSer=
viceImpl.java	2011-08-10 13:27:34 UTC (rev 3258)
@@ -83,6 +83,9 @@
     public void createAccountWithTransaction(Account masterAccount, Account =
account, TopiaContext topiaContext) throws LimaException {
        =20
         try {
+            // force upppercase account number
+            account.setAccountNumber(account.getAccountNumber().toUpperCase(=
));
+           =20
             // check if account number already exist
             AccountDAO accountDAO =3D
                 LimaCallaoDAOHelper.getAccountDAO(topiaContext);
@@ -150,6 +153,10 @@
     public void createSubLedgerWithTransaction(Account masterAccount, Accoun=
t account, TopiaContext topiaContext) throws LimaException {
=20
         try {
+           =20
+            // force upppercase account number
+            account.setAccountNumber(account.getAccountNumber().toUpperCase(=
));
+           =20
             // check if the accountnumber already exist
             AccountDAO accountDAO =3D
                 LimaCallaoDAOHelper.getAccountDAO(topiaContext);

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountFo=
rm.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jax=
x	2011-08-10 11:38:02 UTC (rev 3257)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jax=
x	2011-08-10 13:27:34 UTC (rev 3258)
@@ -31,42 +31,11 @@
=20
     <script>
     <![CDATA[
-    import org.chorem.lima.business.AccountServiceMonitorable;
-    import org.chorem.lima.service.LimaServiceFactory;
-    import org.chorem.lima.business.LimaException;
-    import org.chorem.lima.entity.AccountImpl;
-
     getRootPane().setDefaultButton(ok);
     protected void performCancel() {
         setAccount(null);
         dispose();
     }
-    protected void performOk() {
-        if (getMasterAccountTextField().getText().length() !=3D 0) {
-            AccountServiceMonitorable accountService =3D
-                LimaServiceFactory.getInstance().getService(
-                        AccountServiceMonitorable.class);
-            Account masterAccount =3D new AccountImpl();
-            try {
-                System.out.println("setMaster : "
-                    + getMasterAccountTextField().getText() + " to : "
-                    + getAccount().getAccountNumber());
-                masterAccount  =3D accountService
-                    .getAccountByNumber(getMasterAccountTextField().getText(=
));
-            } catch (LimaException eee) {
-                log.debug("Can't search account for update : "
-                    + getMasterAccountTextField().getText(), eee);
-            }
-            if (masterAccount !=3D null) {
-                getAccount().setMasterAccount(masterAccount);
-            } else {
-                getAccount().setMasterAccount(null);
-            }
-        } else {
-            setAccount(null);
-        }
-        dispose();
-    }
     ]]>
     </script>
=20
@@ -77,7 +46,10 @@
                 <JLabel text=3D"lima.charts.account.number"/>
             </cell>
             <cell fill=3D"horizontal">
-                <JTextField id=3D"numberTextField" editable=3D'{false}' text=
=3D"{getAccount().getAccountNumber()}"/>
+                <JTextField id=3D"numberTextField" text=3D"{getAccount().get=
AccountNumber()}"/>
+                <javax.swing.text.Document javaBean=3D"getNumberTextField().=
getDocument()"
+                    onInsertUpdate=3D'getAccount().setAccountNumber(getNumbe=
rTextField().getText())'
+                    onRemoveUpdate=3D'getAccount().setAccountNumber(getNumbe=
rTextField().getText())' />
             </cell>
         </row>
         <row>
@@ -92,19 +64,11 @@
             </cell>
         </row>
         <row>
-            <cell fill=3D"horizontal">
-                <JLabel text=3D"lima.common.masteraccount"/>
-            </cell>
-            <cell fill=3D"horizontal">
-                <JTextField id=3D"masterAccountTextField" text=3D"{getAccoun=
t().getMasterAccount().getAccountNumber()}"/>
-            </cell>
-        </row>
-        <row>
             <cell fill=3D"none">
                 <JButton text=3D"lima.common.cancel" onActionPerformed=3D"pe=
rformCancel()"/>
             </cell>
             <cell fill=3D"none">
-                <JButton id=3D"ok" text=3D"lima.common.ok" onActionPerformed=
=3D"performOk()"/>
+                <JButton id=3D"ok" text=3D"lima.common.ok" onActionPerformed=
=3D"dispose()"/>
             </cell>
         </row>
     </Table>

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountVi=
ewHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHand=
ler.java	2011-08-10 11:38:02 UTC (rev 3257)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHand=
ler.java	2011-08-10 13:27:34 UTC (rev 3258)
@@ -44,6 +44,8 @@
 import org.chorem.lima.ui.account.AccountForm;
 import org.chorem.lima.ui.account.AccountView;
 import org.chorem.lima.ui.account.SubLedgerForm;
+import org.chorem.lima.ui.account.UpdateAccountForm;
+import org.chorem.lima.ui.account.UpdateSubLedgerForm;
 import org.chorem.lima.ui.importexport.ImportExport;
 import org.chorem.lima.util.DialogHelper;
 import org.chorem.lima.util.ErrorHelper;
@@ -224,7 +226,7 @@
                 }
                 //test if selectedrow is account or ledger     =20
                 if (selectedObject.getGeneralLedger()=3D=3Dnull) {
-                    AccountForm accountForm =3D new AccountForm(view);
+                    UpdateAccountForm accountForm =3D new UpdateAccountForm(=
view);
                     accountForm.setAccount(selectedObject);
                     // jaxx constructor don't call super() ?
                     accountForm.setLocationRelativeTo(view);
@@ -234,7 +236,7 @@
                 }
                 // else is a subledger
                 else {
-                    SubLedgerForm subLedgerForm =3D new SubLedgerForm(view);
+                    UpdateSubLedgerForm subLedgerForm =3D new UpdateSubLedge=
rForm(view);
                     subLedgerForm.setAccount(selectedObject);
                     // jaxx constructor don't call super() ?
                     subLedgerForm.setLocationRelativeTo(view);

Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccoun=
tForm.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountFo=
rm.jaxx	                        (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountFo=
rm.jaxx	2011-08-10 13:27:34 UTC (rev 3258)
@@ -0,0 +1,86 @@
+<JDialog modal=3D"true"
+         defaultCloseOperation=3D"{JDialog.DO_NOTHING_ON_CLOSE}"
+         onWindowClosing=3D"performCancel();">
+
+    <org.chorem.lima.entity.Account id=3D"account" javaBean=3D'null'/>
+
+    <script>
+    <![CDATA[
+    import org.chorem.lima.business.AccountServiceMonitorable;
+    import org.chorem.lima.service.LimaServiceFactory;
+    import org.chorem.lima.business.LimaException;
+    import org.chorem.lima.entity.AccountImpl;
+
+    getRootPane().setDefaultButton(ok);
+    protected void performCancel() {
+        setAccount(null);
+        dispose();
+    }
+    protected void performOk() {
+        if (getMasterAccountTextField().getText().length() !=3D 0) {
+            AccountServiceMonitorable accountService =3D
+                LimaServiceFactory.getInstance().getService(
+                        AccountServiceMonitorable.class);
+            Account masterAccount =3D new AccountImpl();
+            try {
+                System.out.println("setMaster : "
+                    + getMasterAccountTextField().getText() + " to : "
+                    + getAccount().getAccountNumber());
+                masterAccount  =3D accountService
+                    .getAccountByNumber(getMasterAccountTextField().getText(=
));
+            } catch (LimaException eee) {
+                log.debug("Can't search account for update : "
+                    + getMasterAccountTextField().getText(), eee);
+            }
+            if (masterAccount !=3D null) {
+                getAccount().setMasterAccount(masterAccount);
+            } else {
+                getAccount().setMasterAccount(null);
+            }
+        } else {
+            setAccount(null);
+        }
+        dispose();
+    }
+    ]]>
+    </script>
+
+    <Table>
+   =20
+        <row>
+            <cell fill=3D"horizontal">
+                <JLabel text=3D"lima.charts.account.number"/>
+            </cell>
+            <cell fill=3D"horizontal">
+                <JTextField id=3D"numberTextField" editable=3D'{false}' text=
=3D"{getAccount().getAccountNumber()}"/>
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D"horizontal">
+                <JLabel text=3D"lima.common.label"/>
+            </cell>
+            <cell fill=3D"horizontal">
+                <JTextField id=3D"descriptionTextField" text=3D"{getAccount(=
).getLabel()}"/>
+                <javax.swing.text.Document javaBean=3D"getDescriptionTextFie=
ld().getDocument()"
+                    onInsertUpdate=3D'getAccount().setLabel(getDescriptionTe=
xtField().getText())'
+                    onRemoveUpdate=3D'getAccount().setLabel(getDescriptionTe=
xtField().getText())' />
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D"horizontal">
+                <JLabel text=3D"lima.common.masteraccount"/>
+            </cell>
+            <cell fill=3D"horizontal">
+                <JTextField id=3D"masterAccountTextField" text=3D"{getAccoun=
t().getMasterAccount().getAccountNumber()}"/>
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D"none">
+                <JButton text=3D"lima.common.cancel" onActionPerformed=3D"pe=
rformCancel()"/>
+            </cell>
+            <cell fill=3D"none">
+                <JButton id=3D"ok" text=3D"lima.common.ok" onActionPerformed=
=3D"performOk()"/>
+            </cell>
+        </row>
+    </Table>
+</JDialog>
\ No newline at end of file

Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateSubLed=
gerForm.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateSubLedger=
Form.jaxx	                        (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateSubLedger=
Form.jaxx	2011-08-10 13:27:34 UTC (rev 3258)
@@ -0,0 +1,101 @@
+<JDialog modal=3D"true"
+         defaultCloseOperation=3D"{JDialog.DO_NOTHING_ON_CLOSE}"
+         onWindowClosing=3D"performCancel();">
+
+    <org.chorem.lima.entity.Account id=3D"account" javaBean=3D'null'/>
+
+    <script>
+    <![CDATA[
+    import org.chorem.lima.business.AccountServiceMonitorable;
+    import org.chorem.lima.service.LimaServiceFactory;
+    import org.chorem.lima.business.LimaException;
+    import org.chorem.lima.entity.AccountImpl;
+   =20
+    getRootPane().setDefaultButton(ok);
+    protected void performCancel() {
+        setAccount(null);
+        dispose();
+    }
+        protected void performOk() {
+        if (getMasterAccountTextField().getText().length() !=3D 0) {
+            AccountServiceMonitorable accountService =3D
+                LimaServiceFactory.getInstance().getService(
+                        AccountServiceMonitorable.class);
+            Account masterAccount =3D new AccountImpl();
+            try {
+                System.out.println("setMaster : "
+                    + getMasterAccountTextField().getText() + " to : "
+                    + getAccount().getAccountNumber());
+                masterAccount  =3D accountService
+                    .getAccountByNumber(getMasterAccountTextField().getText(=
));
+            } catch (LimaException eee) {
+                log.debug("Can't search account for update : "
+                    + getMasterAccountTextField().getText(), eee);
+            }
+            if (masterAccount !=3D null) {
+                getAccount().setMasterAccount(masterAccount);
+            } else {
+                getAccount().setMasterAccount(null);
+            }
+        } else {
+            setAccount(null);
+        }
+        dispose();
+    }
+    ]]>
+    </script>
+
+    <Table>
+        <row>
+            <cell fill=3D"horizontal">
+                <JLabel text=3D"lima.common.code"/>
+            </cell>
+            <cell fill=3D"horizontal">
+                <JTextField id=3D"numberTextField"
+                text=3D"{getAccount().getAccountNumber()}"/>
+                <javax.swing.text.Document javaBean=3D"getNumberTextField().=
getDocument()"
+                    onInsertUpdate=3D'getAccount().setAccountNumber(getNumbe=
rTextField().getText())'
+                    onRemoveUpdate=3D'getAccount().setAccountNumber(getNumbe=
rTextField().getText())' />
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D"horizontal">
+                <JLabel text=3D"lima.common.label"/>
+            </cell>
+            <cell fill=3D"horizontal">
+                <JTextField id=3D"descriptionTextField" text=3D"{getAccount(=
).getLabel()}"/>
+                <javax.swing.text.Document javaBean=3D"getDescriptionTextFie=
ld().getDocument()"
+                onInsertUpdate=3D'getAccount().setLabel(getDescriptionTextFi=
eld().getText())'
+                onRemoveUpdate=3D'getAccount().setLabel(getDescriptionTextFi=
eld().getText())' />
+            </cell>
+        </row>
+        <!-- Lien Fiche contact-->
+        <row>
+            <cell fill=3D"horizontal">
+                <JLabel text=3D"lima.identity.contact"/>
+            </cell>
+            <cell fill=3D"horizontal">
+                <JTextField id=3D"thirdPartyTextField" text=3D"{getAccount()=
.getThirdParty()}"/>
+                <javax.swing.text.Document javaBean=3D"getThirdPartyTextFiel=
d().getDocument()"
+                onInsertUpdate=3D'getAccount().setThirdParty(getThirdPartyTe=
xtField().getText())'
+                onRemoveUpdate=3D'getAccount().setThirdParty(getThirdPartyTe=
xtField().getText())' />
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D"horizontal">
+                <JLabel text=3D"lima.common.masteraccount"/>
+            </cell>
+            <cell fill=3D"horizontal">
+                <JTextField id=3D"masterAccountTextField" text=3D"{getAccoun=
t().getMasterAccount().getAccountNumber()}"/>
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D"none">
+                <JButton text=3D"lima.common.cancel" onActionPerformed=3D"pe=
rformCancel()"/>
+            </cell>
+            <cell fill=3D"none">
+                <JButton id=3D"ok" text=3D"lima.common.ok" onActionPerformed=
=3D"performOk()"/>
+            </cell>
+        </row>
+    </Table>
+</JDialog>
\ No newline at end of file


--===============0351778506673425462==--