branch develop updated (86bc3394 -> a6487173)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 86bc3394 Fix ot showing search page problem new a6487173 fixes #10226 : Utilisation de Sujet à la place de Objet dans la recherche The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a6487173ae226a837530e7b81583fc948dc52bf9 Author: jcouteau <couteau@codelutin.com> Date: Mon Jan 28 11:56:28 2019 +0100 fixes #10226 : Utilisation de Sujet à la place de Objet dans la recherche Summary of changes: .../persistence/entities/EmailTopiaDao.java | 6 +++--- .../faxtomail/persistence/entities/SearchFilter.java | 20 +++++++++++++++++--- .../faxtomail/services/service/EmailServiceTest.java | 2 +- .../ui/swing/content/search/SearchToGroupUI.css | 8 ++++++++ .../ui/swing/content/search/SearchToGroupUI.jaxx | 6 +++--- .../faxtomail/ui/swing/content/search/SearchUI.css | 8 ++++++++ .../faxtomail/ui/swing/content/search/SearchUI.jaxx | 6 +++--- .../ui/swing/content/search/SearchUIModel.java | 12 +++++++++++- 8 files changed, 54 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit a6487173ae226a837530e7b81583fc948dc52bf9 Author: jcouteau <couteau@codelutin.com> Date: Mon Jan 28 11:56:28 2019 +0100 fixes #10226 : Utilisation de Sujet à la place de Objet dans la recherche --- .../persistence/entities/EmailTopiaDao.java | 6 +++--- .../faxtomail/persistence/entities/SearchFilter.java | 20 +++++++++++++++++--- .../faxtomail/services/service/EmailServiceTest.java | 2 +- .../ui/swing/content/search/SearchToGroupUI.css | 8 ++++++++ .../ui/swing/content/search/SearchToGroupUI.jaxx | 6 +++--- .../faxtomail/ui/swing/content/search/SearchUI.css | 8 ++++++++ .../faxtomail/ui/swing/content/search/SearchUI.jaxx | 6 +++--- .../ui/swing/content/search/SearchUIModel.java | 12 +++++++++++- 8 files changed, 54 insertions(+), 14 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java index 00dfbadb..8586f357 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java @@ -292,9 +292,9 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { } // email subject - if (StringUtils.isNotBlank(searchFilter.getDemandObject())) { - query.append(" AND lower(" + EMAIL_IDENTIFIER + "." + Email.PROPERTY_OBJECT + ") LIKE lower(:" + SearchFilter.PROPERTY_DEMAND_OBJECT + ")"); - args.put(SearchFilter.PROPERTY_DEMAND_OBJECT, "%" + searchFilter.getDemandObject() + "%"); + if (StringUtils.isNotBlank(searchFilter.getDemandSubject())) { + query.append(" AND lower(" + EMAIL_IDENTIFIER + "." + Email.PROPERTY_SUBJECT + ") LIKE lower(:" + SearchFilter.PROPERTY_DEMAND_SUBJECT + ")"); + args.put(SearchFilter.PROPERTY_DEMAND_SUBJECT, "%" + searchFilter.getDemandSubject() + "%"); } // email demand type diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java index de934e24..2ab2f4ba 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java @@ -36,6 +36,7 @@ public class SearchFilter extends AbstractSerializableBean { public static final String PROPERTY_SENDER = "sender"; public static final String PROPERTY_DEMAND_OBJECT = "demandObject"; + public static final String PROPERTY_DEMAND_SUBJECT = "demandSubject"; public static final String PROPERTY_MESSAGE = "message"; public static final String PROPERTY_BODY = "body"; public static final String PROPERTY_WAITING_STATES = "WaitingStates"; @@ -70,8 +71,10 @@ public class SearchFilter extends AbstractSerializableBean { protected String sender; - protected String demandObject; - + //protected String demandObject; + + protected String demandSubject; + protected String message; protected String body; @@ -144,7 +147,7 @@ public class SearchFilter extends AbstractSerializableBean { firePropertyChange(PROPERTY_SENDER, oldValue, sender); } - public String getDemandObject() { + /*public String getDemandObject() { return demandObject; } @@ -152,6 +155,17 @@ public class SearchFilter extends AbstractSerializableBean { String oldValue = this.demandObject; this.demandObject = demandObject; firePropertyChange(PROPERTY_DEMAND_OBJECT, oldValue, demandObject); + }*/ + + + public String getDemandSubject() { + return demandSubject; + } + + public void setDemandSubject(String demandSubject) { + String oldValue = this.demandSubject; + this.demandSubject = demandSubject; + firePropertyChange(PROPERTY_DEMAND_OBJECT, oldValue, demandSubject); } public List<WaitingState> getWaitingStates() { diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java index 4fa1a8e3..c3b597a4 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java @@ -113,7 +113,7 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { Assert.assertEquals(10, emails.getCount()); // client code filter + subject filter - filter.setDemandObject("A+"); + filter.setDemandSubject("A+"); emails = service.search(filter, getCurrentUser(), paginationParameter); Assert.assertEquals(0, emails.getCount()); 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 f43a60a0..f038eab2 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 @@ -184,6 +184,14 @@ JXDatePicker { text: {model.getDemandObject()}; } +#subjectLabel { + text: "faxtomail.demande.subject.label"; +} + +#subjectField { + text: {model.getDemandSubject()}; +} + #senderLabel { text: "faxtomail.demande.sender.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 6fc7bd1a..2c26c93e 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 @@ -135,11 +135,11 @@ </cell> <cell> - <JLabel id='objectLabel'/> + <JLabel id='subjectLabel'/> </cell> <cell columns='1' weightx='1'> - <JTextField id='objectField' - onKeyReleased='handler.setText(event, "demandObject")'/> + <JTextField id='subjectField' + onKeyReleased='handler.setText(event, "demandSubject")'/> </cell> </row> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css index d3d3ee32..5b3ca815 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css @@ -189,6 +189,14 @@ JXDatePicker { text: {model.getDemandObject()}; } +#subjectLabel { + text: "faxtomail.demande.subject.label"; +} + +#subjectField { + text: {model.getDemandSubject()}; +} + #senderLabel { text: "faxtomail.demande.sender.label"; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx index c90bfee9..badae95b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx @@ -146,11 +146,11 @@ </cell> <cell> - <JLabel id='objectLabel'/> + <JLabel id='subjectLabel'/> </cell> <cell columns='1' weightx='1'> - <JTextField id='objectField' - onKeyReleased='handler.setText(event, "demandObject")'/> + <JTextField id='subjectField' + onKeyReleased='handler.setText(event, "demandSubject")'/> </cell> </row> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java index e859dd6f..f6243710 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java @@ -89,7 +89,7 @@ public class SearchUIModel extends AbstractFaxToMailBeanUIModel<SearchFilter, Se return editObject.getSender(); } - public void setDemandObject(String demandObject) { + /* public void setDemandObject(String demandObject) { Object oldValue = getDemandObject(); editObject.setDemandObject(demandObject); firePropertyChanged(SearchFilter.PROPERTY_DEMAND_OBJECT, oldValue, demandObject); @@ -97,6 +97,16 @@ public class SearchUIModel extends AbstractFaxToMailBeanUIModel<SearchFilter, Se public String getDemandObject() { return editObject.getDemandObject(); + }*/ + + public void setDemandSubject(String demandSubject) { + Object oldValue = getDemandSubject(); + editObject.setDemandSubject(demandSubject); + firePropertyChanged(SearchFilter.PROPERTY_DEMAND_SUBJECT, oldValue, demandSubject); + } + + public String getDemandSubject() { + return editObject.getDemandSubject(); } public void setClient(Client client) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm