This is an automated email from the git hooks/post-receive script. New commit to branch feature/1241-account-report in repository lima. See http://git.chorem.org/lima.git commit 797522fb4be6b4621d5e239c17e4a937dab1ebce Author: dcosse <cosse@codelutin.com> Date: Mon Jul 27 11:24:55 2015 +0200 refs #1241 pas de changement dans l'interface de configuration du premier lancement --- .../chorem/lima/ui/opening/CreateIdentityPanel.css | 95 ++----------------- .../lima/ui/opening/CreateIdentityPanel.jaxx | 105 ++------------------- .../ui/opening/CreateIdentityPanelHandler.java | 16 +--- 3 files changed, 20 insertions(+), 196 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.css b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.css index ab1c561..7d8da6b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.css @@ -75,6 +75,14 @@ text : {handler.getIdentity().getBusinessNumber()}; } +#vatNumberLabel { + text : "lima.identity.vatNumber"; +} + +#vatNumberTextField { + text : {handler.getIdentity().getVatNumber()}; +} + #classificationCodeLabel { text : "lima.identity.classificationCode"; } @@ -98,90 +106,3 @@ #emailTextField { text : {handler.getIdentity().getEmail()}; } - -#vatNumberLabel { - text : "lima.identity.vatNumber"; -} - -#vatNumberTextField { - text : {handler.getIdentity().getVatNumber()}; -} - -#treasuryAddressLabel { - text : "lima.treasury.address"; -} - -#treasuryAddressTextField { - text : {handler.getTreasury().getAddress()}; -} - -#treasuryAddress2Label { - text : "lima.treasury.address2"; -} - -#treasuryAddress2TextField { - text : {handler.getTreasury().getAddress2()}; -} - -#treasuryCdiLabel { - text : "lima.treasury.cdi"; -} - -#treasuryCdiTextField { - text : {handler.getTreasury().getCdi()}; -} - -#treasuryCityLabel { - text : "lima.treasury.city"; -} -#treasuryCityTextField { - text : {handler.getTreasury().getCity()}; -} - -#treasuryKeyLabel { - text : "lima.treasury.key"; -} - -#treasuryKeyTextField { - text : {handler.getTreasury().getKey()}; -} - -#treasuryServiceCodeLabel { - text : "lima.treasury.serviceCode"; -} - -#treasuryServiceCodeTextField { - text : {handler.getTreasury().getServiceCode()}; -} - -#treasurySieLabel { - text : "lima.treasury.sie"; -} - -#treasurySieTextField { - text : {handler.getTreasury().getSie()}; -} - -#treasuryDossierNumberLabel { - text : "lima.treasury.dossierNumber"; -} - -#treasuryDossierNumberTextField { - text : {handler.getTreasury().getDossierNumber()}; -} - -#treasuryZipCodeLabel { - text : "lima.treasury.zipCode"; -} - -#treasuryZipCodeTextField { - text : {handler.getTreasury().getZipCode()}; -} - -#treasurySystemTypeLabel { - text : "lima.treasury.systemType"; -} - -#treasurySystemTypeTextField { - text : {handler.getTreasury().getSystemType()}; -} diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx index 50235f8..d99f7f9 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanel.jaxx @@ -85,124 +85,35 @@ </row> <row> <cell fill="horizontal"> - <JLabel id="classificationCodeLabel"/> + <JLabel id="vatNumberLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="classificationCodeTextField"/> + <JTextField id="vatNumberTextField"/> </cell> </row> <row> <cell fill="horizontal"> - <JLabel id="phoneNumberLabel"/> - </cell> - <cell fill="horizontal"> - <JTextField id="phoneNumberTextField"/> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel id="emailLabel"/> - </cell> - <cell fill="horizontal"> - <JTextField id="emailTextField" /> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel id="vatNumber"/> - </cell> - <cell fill="horizontal"> - <JTextField id="vatNumberTextField" /> - </cell> - </row> - - <row> - <cell fill="horizontal"> - <JLabel id="treasuryAddressLabel"/> - </cell> - <cell fill="horizontal"> - <JTextField id="treasuryAddressTextField"/> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel id="treasuryAddress2Label"/> - </cell> - <cell fill="horizontal"> - <JTextField id="treasuryAddress2TextField"/> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel id="treasuryZipCodeLabel"/> - </cell> - <cell fill="horizontal"> - <JTextField id="treasuryZipCodeTextField"/> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel id="treasuryCityLabel"/> - </cell> - <cell fill="horizontal"> - <JTextField id="treasuryCityTextField"/> - </cell> - </row> - - <row> - <cell fill="horizontal"> - <JLabel id="treasurySieLabel"/> - </cell> - <cell fill="horizontal"> - <JTextField id="treasurySieTextField"/> - </cell> - </row> - - <row> - <cell fill="horizontal"> - <JLabel id="treasuryVatNumberLabel"/> - </cell> - <cell fill="horizontal"> - <JTextField id="treasuryDossierNumberTextField"/> - </cell> - </row> - - <row> - <cell fill="horizontal"> - <JLabel id="treasuryKeyLabel"/> - </cell> - <cell fill="horizontal"> - <JTextField id="treasuryKeyTextField"/> - </cell> - </row> - - <row> - <cell fill="horizontal"> - <JLabel id="treasuryCdiLabel"/> + <JLabel id="classificationCodeLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="treasuryCdiTextField"/> + <JTextField id="classificationCodeTextField"/> </cell> </row> - - <row> <cell fill="horizontal"> - <JLabel id="treasuryServiceCodeLabel"/> + <JLabel id="phoneNumberLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="treasuryServiceCodeTextField"/> + <JTextField id="phoneNumberTextField"/> </cell> </row> - <row> <cell fill="horizontal"> - <JLabel id="treasurySystemTypeLabel"/> + <JLabel id="emailLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="treasurySystemTypeTextField"/> + <JTextField id="emailTextField" /> </cell> </row> - </Table> </JPanel> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanelHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanelHandler.java index 830d8f9..97a5f0d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanelHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateIdentityPanelHandler.java @@ -24,10 +24,8 @@ package org.chorem.lima.ui.opening; import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.business.api.IdentityService; -import org.chorem.lima.business.api.TreasuryService; import org.chorem.lima.entity.Identity; import org.chorem.lima.entity.IdentityImpl; -import org.chorem.lima.entity.Treasury; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -36,15 +34,14 @@ public class CreateIdentityPanelHandler { protected IdentityService identityService; - protected TreasuryService treasuryService; - protected CreateIdentityPanel view; public CreateIdentityPanelHandler(CreateIdentityPanel view) { this.view = view; - identityService = LimaServiceFactory.getService(IdentityService.class); - treasuryService = LimaServiceFactory.getService(TreasuryService.class); + identityService = + LimaServiceFactory.getService( + IdentityService.class); } public Identity getIdentity() { @@ -55,11 +52,6 @@ public class CreateIdentityPanelHandler { return identity; } - public Treasury getTreasury() { - Treasury treasury = treasuryService.getTreasury(); - return treasury; - } - public void updateIdentity(){ Identity identity = getIdentity(); @@ -70,7 +62,7 @@ public class CreateIdentityPanelHandler { identity.setZipCode(view.getZipCodeTextField().getText()); identity.setCity(view.getCityTextField().getText()); identity.setBusinessNumber(view.getBusinessNumberTextField().getText()); - //identity.setVatNumber(view.getVatNumberTextField().getText()); + identity.setVatNumber(view.getVatNumberTextField().getText()); identity.setClassificationCode(view.getClassificationCodeTextField().getText()); identity.setPhoneNumber(view.getPhoneNumberTextField().getText()); identity.setEmail(view.getEmailTextField().getText()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.