This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 97d630d59619b83b336301c314db5f5e02b25a57 Author: Kevin Morin <morin@codelutin.com> Date: Thu Aug 27 11:34:54 2015 +0200 remplacement du champ code client par une combo avec les clients dans la recherche pour grouper (fixes #7422) --- .../demande/actions/SaveAndOpenSearchToGroupAction.java | 10 ++++++++++ .../faxtomail/ui/swing/content/search/SearchToGroupUI.css | 7 ++++--- .../faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx | 6 ++++-- .../ui/swing/content/search/SearchToGroupUIHandler.java | 7 +++++++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenSearchToGroupAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenSearchToGroupAction.java index c92bf49..1b48b8e 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenSearchToGroupAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/SaveAndOpenSearchToGroupAction.java @@ -24,10 +24,15 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.actions; * #L% */ +import com.franciaflex.faxtomail.persistence.entities.Client; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUIHandler; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI; +import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIModel; import java.awt.*; +import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -54,6 +59,11 @@ public class SaveAndOpenSearchToGroupAction extends SaveAndOpenModalFrameAction< public void doAction() throws Exception { super.doAction(); + FaxToMailUIContext context = getContext(); + FaxToMailUser currentUser = context.getCurrentUser(); + List<Client> allowedClients = context.newServiceContext().getClientService().getAllClientsForUser(currentUser); + getUI().setContextValue(allowedClients, SearchUIModel.PROPERTY_ALLOWED_CLIENTS); + frameContent = new SearchToGroupUI(getUI()); } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css index ca145cc..f43a60a 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css @@ -196,9 +196,10 @@ JXDatePicker { text: "faxtomail.demande.client.label"; } -/*#clientField { - text: {model.getClientCode()}; -}*/ +#clientComboBox { + property: client; + selectedItem: { model.getClient() }; +} #docTypeLabel { text: "faxtomail.demande.docType.label"; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx index d30b5f4..6fc7bd1 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx @@ -28,6 +28,7 @@ com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil com.franciaflex.faxtomail.persistence.entities.HasLabel + com.franciaflex.faxtomail.persistence.entities.Client com.franciaflex.faxtomail.persistence.entities.Email com.franciaflex.faxtomail.persistence.entities.DemandType com.franciaflex.faxtomail.persistence.entities.DemandStatus @@ -164,8 +165,9 @@ <JLabel id='clientLabel'/> </cell> <cell columns='3' weightx='1'> - <JTextField id='clientField' - onKeyReleased='handler.setText(event, "clientCode")'/> + <BeanFilterableComboBox id='clientComboBox' + constructorParams='this' + genericType="Client"/> </cell> <cell> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java index 02515ea..f28ecf8 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java @@ -24,6 +24,7 @@ package com.franciaflex.faxtomail.ui.swing.content.search; * #L% */ +import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.HasLabel; @@ -94,6 +95,9 @@ public class SearchToGroupUIHandler extends AbstractFaxToMailDemandListHandler<S searchUIModel.setMaxReceptionDate(now); searchUIModel.setMinReceptionDate(twoMonthsAgo); + List<Client> allowedClients = ui.getContextValue(List.class, SearchUIModel.PROPERTY_ALLOWED_CLIENTS); + searchUIModel.setAllowedClients(allowedClients); + getUI().setContextValue(searchUIModel); } @@ -126,6 +130,9 @@ public class SearchToGroupUIHandler extends AbstractFaxToMailDemandListHandler<S initBeanFilterableComboBox(ui.getRepliedByComboBox(), users, model.getReplyBy()); + initBeanFilterableComboBox(ui.getClientComboBox(), + model.getAllowedClients(), + model.getClient()); initCheckBoxComboBox(ui.getDocTypeComboBox(), getContext().getDemandTypeCache(), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.