Author: echatellier Date: 2014-04-24 15:40:54 +0200 (Thu, 24 Apr 2014) New Revision: 44 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/44 Log: refs #4659: Ajout des champs manquants Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java trunk/faxtomail-service/src/main/resources/ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java 2014-04-24 12:44:23 UTC (rev 43) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java 2014-04-24 13:40:54 UTC (rev 44) @@ -17,20 +17,32 @@ public static final String PROPERTY_SENDER = "sender"; public static final String PROPERTY_RECIPIENT = "recipient"; public static final String PROPERTY_SUBJECT = "subject"; + public static final String PROPERTY_MESSAGE = "message"; + public static final String PROPERTY_BODY = "body"; public static final String PROPERTY_ETAT_ATTENTE = "etatAttente"; + public static final String PROPERTY_GAMME = "gamme"; public static final String PROPERTY_TAKEN_BY = "takenBy"; public static final String PROPERTY_PRIORITY = "priority"; public static final String PROPERTY_DEMAND_TYPE = "demandType"; public static final String PROPERTY_DEMAND_STATUS = "demandStatus"; public static final String PROPERTY_EDI_CODE_NUMBER = "ediCodeNumber"; public static final String PROPERTY_PROJECT_REFERENCE = "projectReference"; + public static final String PROPERTY_LOCAL_REFERENCE = "localReference"; + public static final String PROPERTY_COMMAND_NUMBER = "commandNumber"; public static final String PROPERTY_MODIFIED_BY = "modifiedBy"; + public static final String PROPERTY_PRINTING_BY = "printingBy"; + public static final String PROPERTY_ARCHIVED_BY = "archivedBy"; + public static final String PROPERTY_TRANSFER_BY = "transferBy"; public static final String PROPERTY_MIN_MODIFICATION_DATE = "minModificationDate"; public static final String PROPERTY_MAX_MODIFICATION_DATE = "maxModificationDate"; public static final String PROPERTY_MIN_RECEPTION_DATE = "minReceptionDate"; public static final String PROPERTY_MAX_RECEPTION_DATE = "maxReceptionDate"; public static final String PROPERTY_MIN_PRINTING_DATE = "minPrintingDate"; public static final String PROPERTY_MAX_PRINTING_DATE = "maxPrintingDate"; + public static final String PROPERTY_MIN_ARCHIVED_DATE = "minArchivedDate"; + public static final String PROPERTY_MAX_ARCHIVED_DATE = "maxArchivedDate"; + public static final String PROPERTY_MIN_TRANSFER_DATE = "minTransferDate"; + public static final String PROPERTY_MAX_TRANSFER_DATE = "maxTransferDate"; public static final String PROPERTY_CLIENT_CODE = "clientCode"; protected String sender; @@ -38,23 +50,39 @@ protected String recipient; protected String subject; + + protected String message; + + protected String body; protected EtatAttente etatAttente; - protected FaxToMailUser takenBy; - protected Priority priority; protected DemandType demandType; protected DemandStatus demandStatus; + protected Range gamme; + protected String ediCodeNumber; + + protected String commandNumber; protected String projectReference; + protected String localReference; + + protected FaxToMailUser takenBy; + protected FaxToMailUser modifiedBy; + protected FaxToMailUser printingBy; + + protected FaxToMailUser transferBy; + + protected FaxToMailUser archivedBy; + protected Date minModificationDate; protected Date maxModificationDate; @@ -67,6 +95,14 @@ protected Date maxPrintingDate; + protected Date minTransferDate; + + protected Date maxTransferDate; + + protected Date minArchivedDate; + + protected Date maxArchivedDate; + protected String clientCode; public String getSender() { @@ -248,4 +284,124 @@ this.clientCode = clientCode; firePropertyChange(PROPERTY_CLIENT_CODE, oldValue, clientCode); } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + String oldValue = this.message; + this.message = message; + firePropertyChange(PROPERTY_MESSAGE, oldValue, message); + } + + public String getBody() { + return body; + } + + public void setBody(String body) { + String oldValue = this.body; + this.body = body; + firePropertyChange(PROPERTY_BODY, oldValue, body); + } + + public Range getGamme() { + return gamme; + } + + public void setGamme(Range gamme) { + Range oldValue = this.gamme; + this.gamme = gamme; + firePropertyChange(PROPERTY_GAMME, oldValue, gamme); + } + + public String getCommandNumber() { + return commandNumber; + } + + public void setCommandNumber(String commandNumber) { + String oldValue = this.commandNumber; + this.commandNumber = commandNumber; + firePropertyChange(PROPERTY_COMMAND_NUMBER, oldValue, commandNumber); + } + + public String getLocalReference() { + return localReference; + } + + public void setLocalReference(String localReference) { + String oldValue = this.localReference; + this.localReference = localReference; + firePropertyChange(PROPERTY_LOCAL_REFERENCE, oldValue, localReference); + } + + public FaxToMailUser getPrintingBy() { + return printingBy; + } + + public void setPrintingBy(FaxToMailUser printingBy) { + FaxToMailUser oldValue = this.printingBy; + this.printingBy = printingBy; + firePropertyChange(PROPERTY_PRINTING_BY, oldValue, printingBy); + } + + public FaxToMailUser getTransferBy() { + return transferBy; + } + + public void setTransferBy(FaxToMailUser transferBy) { + FaxToMailUser oldValue = this.transferBy; + this.transferBy = transferBy; + firePropertyChange(PROPERTY_TRANSFER_BY, oldValue, transferBy); + } + + public FaxToMailUser getArchivedBy() { + return archivedBy; + } + + public void setArchivedBy(FaxToMailUser archivedBy) { + FaxToMailUser oldValue = this.archivedBy; + this.archivedBy = archivedBy; + firePropertyChange(PROPERTY_ARCHIVED_BY, oldValue, archivedBy); + } + + public Date getMinTransferDate() { + return minTransferDate; + } + + public void setMinTranferDate(Date minTransferDate) { + Date oldValue = this.minTransferDate; + this.minTransferDate = minTransferDate; + firePropertyChange(PROPERTY_MIN_TRANSFER_DATE, oldValue, minTransferDate); + } + + public Date getMaxTransferDate() { + return maxTransferDate; + } + + public void setMaxTransferDate(Date maxTransferDate) { + Date oldValue = this.maxTransferDate; + this.maxTransferDate = maxTransferDate; + firePropertyChange(PROPERTY_MAX_TRANSFER_DATE, oldValue, maxTransferDate); + } + + public Date getMinArchivedDate() { + return minArchivedDate; + } + + public void setMinArchivedDate(Date minArchivedDate) { + Date oldValue = this.minArchivedDate; + this.minArchivedDate = minArchivedDate; + firePropertyChange(PROPERTY_MIN_ARCHIVED_DATE, oldValue, minArchivedDate); + } + + public Date getMaxArchivedDate() { + return maxArchivedDate; + } + + public void setMaxArchiveDate(Date maxArchiveDate) { + Date oldValue = this.maxArchivedDate; + this.maxArchivedDate = maxArchivedDate; + firePropertyChange(PROPERTY_MAX_ARCHIVED_DATE, oldValue, maxArchivedDate); + } } Property changes on: trunk/faxtomail-service/src/main/resources ___________________________________________________________________ Added: svn:ignore + email_accounts.csv email_filters.csv fx_clients.csv smtp.properties Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css 2014-04-24 12:44:23 UTC (rev 43) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css 2014-04-24 13:40:54 UTC (rev 44) @@ -69,6 +69,27 @@ date: { model.getMaxModificationDate() }; } +#transferBetweenLabel { + text: "faxtomail.search.transferBetween.label"; +} + +#transferBetweenStartDatePicker { + date: { model.getMinTransferDate() }; +} + +#transferBetweenEndDatePicker { + date: { model.getMaxTransferDate() }; +} + +#transferByLabel { + text: "faxtomail.demande.transferBy.label"; +} + +#transferByComboBox { + property: transferBy; + selectedItem: { model.getTransferBy() }; +} + #receivedBetweenLabel { text: "faxtomail.search.receivedBetween.label"; } @@ -81,6 +102,27 @@ date: { model.getMaxReceptionDate() }; } +#archivedBetweenLabel { + text: "faxtomail.search.archivedBetween.label"; +} + +#archivedBetweenStartDatePicker { + date: { model.getMinArchivedDate() }; +} + +#archivedBetweenEndDatePicker { + date: { model.getMaxArchivedDate() }; +} + +#archivedByLabel { + text: "faxtomail.demande.archivedBy.label"; +} + +#archivedByComboBox { + property: archivedBy; + selectedItem: { model.getArchivedBy() }; +} + #printedBetweenLabel { text: "faxtomail.search.printedBetween.label"; } @@ -93,6 +135,15 @@ date: { model.getMaxPrintingDate() }; } +#printedByLabel { + text: "faxtomail.demande.printedBy.label"; +} + +#printedByComboBox { + property: printingBy; + selectedItem: { model.getPrintingBy() }; +} + #subjectLabel { text: "faxtomail.demande.subject.label"; } @@ -170,6 +221,47 @@ text: { model.getProjectReference() }; } +#localReferenceLabel { + text: "faxtomail.demande.localReference.label"; +} + +#localReferenceField { + text: { model.getLocalReference() }; +} + +#messageLabel { + text: "faxtomail.demande.comment.label"; +} + +#messageField { + text: { model.getMessage() }; +} + +#bodyLabel { + text: "faxtomail.demande.body.label"; +} + +#bodyField { + text: { model.getBody() }; +} + +#commandNumberLabel { + text: "faxtomail.demande.commandNumber.label"; +} + +#commandNumberField { + text: { model.getCommandNumber() }; +} + +#gammeLabel { + text: "faxtomail.demande.gamme.label"; +} + +#gammeComboBox { + property: gamme; + selectedItem: { model.getGamme() }; +} + #searchButton { text: "faxtomail.search.button.label"; _applicationAction: { com.franciaflex.faxtomail.ui.swing.actions.SearchToGroupAction.class }; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx 2014-04-24 12:44:23 UTC (rev 43) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx 2014-04-24 13:40:54 UTC (rev 44) @@ -79,7 +79,7 @@ <cell> <JLabel id='takenByLabel'/> </cell> - <cell weightx='2'> + <cell columns='3' weightx='2'> <BeanFilterableComboBox id='takenByComboBox' constructorParams='this' genericType="FaxToMailUser"/> @@ -103,7 +103,7 @@ <cell anchor='west'> <JLabel id='modifiedByLabel'/> </cell> - <cell weightx='2'> + <cell columns='3' weightx='2'> <BeanFilterableComboBox id='modifiedByComboBox' constructorParams='this' genericType="FaxToMailUser"/> @@ -112,6 +112,54 @@ <row> <cell anchor='west'> + <JLabel id='transferBetweenLabel'/> + </cell> + <cell weightx='1'> + <JXDatePicker id='transferBetweenStartDatePicker'/> + </cell> + <cell> + <JLabel styleClass='between2ndPartLabel'/> + </cell> + <cell weightx='1'> + <JXDatePicker id='transferBetweenEndDatePicker'/> + </cell> + + <cell anchor='west'> + <JLabel id='transferByLabel'/> + </cell> + <cell columns='3' weightx='2'> + <BeanFilterableComboBox id='transferByComboBox' + constructorParams='this' + genericType="FaxToMailUser"/> + </cell> + </row> + + <row> + <cell anchor='west'> + <JLabel id='archivedBetweenLabel'/> + </cell> + <cell weightx='1'> + <JXDatePicker id='archivedBetweenStartDatePicker'/> + </cell> + <cell> + <JLabel styleClass='between2ndPartLabel'/> + </cell> + <cell weightx='1'> + <JXDatePicker id='archivedBetweenEndDatePicker'/> + </cell> + + <cell anchor='west'> + <JLabel id='archivedByLabel'/> + </cell> + <cell columns='3' weightx='2'> + <BeanFilterableComboBox id='archivedByComboBox' + constructorParams='this' + genericType="FaxToMailUser"/> + </cell> + </row> + + <row> + <cell anchor='west'> <JLabel id='printedBetweenLabel'/> </cell> <cell weightx='1'> @@ -123,6 +171,15 @@ <cell weightx='1'> <JXDatePicker id='printedBetweenEndDatePicker'/> </cell> + + <cell anchor='west'> + <JLabel id='printedByLabel'/> + </cell> + <cell columns='3' weightx='2'> + <BeanFilterableComboBox id='printedByComboBox' + constructorParams='this' + genericType="FaxToMailUser"/> + </cell> </row> <row> @@ -137,7 +194,7 @@ <cell> <JLabel id='clientLabel'/> </cell> - <cell weightx='1'> + <cell columns='3' weightx='1'> <JTextField id='clientField' onKeyReleased='handler.setText(event, "clientCode")'/> </cell> @@ -145,17 +202,17 @@ <row> <cell> - <JLabel id='objectLabel'/> + <JLabel id='subjectLabel'/> </cell> <cell columns='3' weightx='1'> - <JTextField id='objectField' + <JTextField id='subjectField' onKeyReleased='handler.setText(event, "object")'/> </cell> <cell> <JLabel id='docTypeLabel'/> </cell> - <cell weightx='1'> + <cell columns='3' weightx='1'> <BeanFilterableComboBox id='docTypeComboBox' constructorParams='this' genericType="DemandType"/> @@ -176,6 +233,13 @@ <cell weightx='1'> <JTextField id='projectReferenceField'/> </cell> + + <cell> + <JLabel id='localReferenceLabel'/> + </cell> + <cell weightx='1'> + <JTextField id='localReferenceField'/> + </cell> </row> <row> @@ -200,24 +264,47 @@ <cell> <JLabel id='etatAttenteLabel'/> </cell> - <cell weightx='2'> + <cell columns='3' weightx='2'> <BeanFilterableComboBox id='etatAttenteComboBox' constructorParams='this' genericType="EtatAttente"/> </cell> </row> - <!--<row>--> - <!--<cell anchor='east'>--> - <!--<JLabel id='gammeLabel'/>--> - <!--</cell>--> - <!--<cell weightx='1' columns='6'>--> - <!--<BeanFilterableComboBox id='gammeComboBox'--> - <!--constructorParams='this'--> - <!--genericType="Range"/>--> - <!--</cell>--> - <!--</row>--> + <row> + <cell> + <JLabel id='messageLabel'/> + </cell> + <cell columns='3' weightx='1'> + <JTextField id='messageField'/> + </cell> + <cell> + <JLabel id='gammeLabel'/> + </cell> + <cell columns='3' weightx='1'> + <BeanFilterableComboBox id='gammeComboBox' + constructorParams='this' + genericType="Range"/> + </cell> + </row> + + <row> + <cell> + <JLabel id='bodyLabel'/> + </cell> + <cell columns='3' weightx='1'> + <JTextField id='bodyField'/> + </cell> + + <cell> + <JLabel id='commandNumberLabel'/> + </cell> + <cell columns='3' weightx='1'> + <JTextField id='commandNumberField'/> + </cell> + </row> + </Table> </JScrollPane> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-04-24 12:44:23 UTC (rev 43) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-04-24 13:40:54 UTC (rev 44) @@ -68,8 +68,8 @@ searchUIModel.setMinModificationDate(twoMonthsAgo); searchUIModel.setMaxReceptionDate(now); searchUIModel.setMinReceptionDate(twoMonthsAgo); - searchUIModel.setMaxPrintingDate(now); - searchUIModel.setMinPrintingDate(twoMonthsAgo); + //searchUIModel.setMaxPrintingDate(now); + //searchUIModel.setMinPrintingDate(twoMonthsAgo); } getUI().setContextValue(searchUIModel); @@ -93,6 +93,12 @@ initBeanFilterableComboBox(ui.getModifiedByComboBox(), getContext().getUserService().getAllUsers(), model.getModifiedBy()); + initBeanFilterableComboBox(ui.getArchivedByComboBox(), + getContext().getUserService().getAllUsers(), + model.getArchivedBy()); + initBeanFilterableComboBox(ui.getTransferByComboBox(), + getContext().getUserService().getAllUsers(), + model.getTransferBy()); initBeanFilterableComboBox(ui.getDocTypeComboBox(), referentielService.getAllDemandType(), model.getDemandType()); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css 2014-04-24 12:44:23 UTC (rev 43) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css 2014-04-24 13:40:54 UTC (rev 44) @@ -44,15 +44,6 @@ enabled: { model.isMenuEnabled() }; } -#modifiedByLabel { - text: "faxtomail.search.modifiedBy.label"; -} - -#modifiedByComboBox { - property: modifiedBy; - selectedItem: { model.getModifiedBy() }; -} - #takenByLabel { text: "faxtomail.demande.takenBy.label"; } @@ -74,6 +65,36 @@ date: { model.getMaxModificationDate() }; } +#modifiedByLabel { + text: "faxtomail.search.modifiedBy.label"; +} + +#modifiedByComboBox { + property: modifiedBy; + selectedItem: { model.getModifiedBy() }; +} + +#transferBetweenLabel { + text: "faxtomail.search.transferBetween.label"; +} + +#transferBetweenStartDatePicker { + date: { model.getMinTransferDate() }; +} + +#transferBetweenEndDatePicker { + date: { model.getMaxTransferDate() }; +} + +#transferByLabel { + text: "faxtomail.demande.transferBy.label"; +} + +#transferByComboBox { + property: transferBy; + selectedItem: { model.getTransferBy() }; +} + #receivedBetweenLabel { text: "faxtomail.search.receivedBetween.label"; } @@ -86,6 +107,27 @@ date: { model.getMaxReceptionDate() }; } +#archivedBetweenLabel { + text: "faxtomail.search.archivedBetween.label"; +} + +#archivedBetweenStartDatePicker { + date: { model.getMinArchivedDate() }; +} + +#archivedBetweenEndDatePicker { + date: { model.getMaxArchivedDate() }; +} + +#archivedByLabel { + text: "faxtomail.demande.archivedBy.label"; +} + +#archivedByComboBox { + property: archivedBy; + selectedItem: { model.getArchivedBy() }; +} + #printedBetweenLabel { text: "faxtomail.search.printedBetween.label"; } @@ -98,6 +140,15 @@ date: { model.getMaxPrintingDate() }; } +#printedByLabel { + text: "faxtomail.demande.printedBy.label"; +} + +#printedByComboBox { + property: printingBy; + selectedItem: { model.getPrintingBy() }; +} + #subjectLabel { text: "faxtomail.demande.subject.label"; } @@ -175,6 +226,47 @@ text: { model.getProjectReference() }; } +#localReferenceLabel { + text: "faxtomail.demande.localReference.label"; +} + +#localReferenceField { + text: { model.getLocalReference() }; +} + +#messageLabel { + text: "faxtomail.demande.comment.label"; +} + +#messageField { + text: { model.getMessage() }; +} + +#bodyLabel { + text: "faxtomail.demande.body.label"; +} + +#bodyField { + text: { model.getBody() }; +} + +#commandNumberLabel { + text: "faxtomail.demande.commandNumber.label"; +} + +#commandNumberField { + text: { model.getCommandNumber() }; +} + +#gammeLabel { + text: "faxtomail.demande.gamme.label"; +} + +#gammeComboBox { + property: gamme; + selectedItem: { model.getGamme() }; +} + #searchButton { text: "faxtomail.search.button.label"; _applicationAction: { com.franciaflex.faxtomail.ui.swing.actions.SearchAction.class }; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 2014-04-24 12:44:23 UTC (rev 43) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 2014-04-24 13:40:54 UTC (rev 44) @@ -90,7 +90,7 @@ <cell> <JLabel id='takenByLabel'/> </cell> - <cell weightx='2'> + <cell columns='3' weightx='2'> <BeanFilterableComboBox id='takenByComboBox' constructorParams='this' genericType="FaxToMailUser"/> @@ -114,7 +114,7 @@ <cell anchor='west'> <JLabel id='modifiedByLabel'/> </cell> - <cell weightx='2'> + <cell columns='3' weightx='2'> <BeanFilterableComboBox id='modifiedByComboBox' constructorParams='this' genericType="FaxToMailUser"/> @@ -123,6 +123,54 @@ <row> <cell anchor='west'> + <JLabel id='transferBetweenLabel'/> + </cell> + <cell weightx='1'> + <JXDatePicker id='transferBetweenStartDatePicker'/> + </cell> + <cell> + <JLabel styleClass='between2ndPartLabel'/> + </cell> + <cell weightx='1'> + <JXDatePicker id='transferBetweenEndDatePicker'/> + </cell> + + <cell anchor='west'> + <JLabel id='transferByLabel'/> + </cell> + <cell columns='3' weightx='2'> + <BeanFilterableComboBox id='transferByComboBox' + constructorParams='this' + genericType="FaxToMailUser"/> + </cell> + </row> + + <row> + <cell anchor='west'> + <JLabel id='archivedBetweenLabel'/> + </cell> + <cell weightx='1'> + <JXDatePicker id='archivedBetweenStartDatePicker'/> + </cell> + <cell> + <JLabel styleClass='between2ndPartLabel'/> + </cell> + <cell weightx='1'> + <JXDatePicker id='archivedBetweenEndDatePicker'/> + </cell> + + <cell anchor='west'> + <JLabel id='archivedByLabel'/> + </cell> + <cell columns='3' weightx='2'> + <BeanFilterableComboBox id='archivedByComboBox' + constructorParams='this' + genericType="FaxToMailUser"/> + </cell> + </row> + + <row> + <cell anchor='west'> <JLabel id='printedBetweenLabel'/> </cell> <cell weightx='1'> @@ -134,6 +182,15 @@ <cell weightx='1'> <JXDatePicker id='printedBetweenEndDatePicker'/> </cell> + + <cell anchor='west'> + <JLabel id='printedByLabel'/> + </cell> + <cell columns='3' weightx='2'> + <BeanFilterableComboBox id='printedByComboBox' + constructorParams='this' + genericType="FaxToMailUser"/> + </cell> </row> <row> @@ -148,7 +205,7 @@ <cell> <JLabel id='clientLabel'/> </cell> - <cell weightx='1'> + <cell columns='3' weightx='1'> <JTextField id='clientField' onKeyReleased='handler.setText(event, "clientCode")'/> </cell> @@ -166,7 +223,7 @@ <cell> <JLabel id='docTypeLabel'/> </cell> - <cell weightx='1'> + <cell columns='3' weightx='1'> <BeanFilterableComboBox id='docTypeComboBox' constructorParams='this' genericType="DemandType"/> @@ -187,6 +244,13 @@ <cell weightx='1'> <JTextField id='projectReferenceField'/> </cell> + + <cell> + <JLabel id='localReferenceLabel'/> + </cell> + <cell weightx='1'> + <JTextField id='localReferenceField'/> + </cell> </row> <row> @@ -211,24 +275,47 @@ <cell> <JLabel id='etatAttenteLabel'/> </cell> - <cell weightx='2'> + <cell columns='3' weightx='2'> <BeanFilterableComboBox id='etatAttenteComboBox' constructorParams='this' genericType="EtatAttente"/> </cell> </row> - <!--<row>--> - <!--<cell anchor='east'>--> - <!--<JLabel id='gammeLabel'/>--> - <!--</cell>--> - <!--<cell weightx='1' columns='6'>--> - <!--<BeanFilterableComboBox id='gammeComboBox'--> - <!--constructorParams='this'--> - <!--genericType="Range"/>--> - <!--</cell>--> - <!--</row>--> + <row> + <cell> + <JLabel id='messageLabel'/> + </cell> + <cell columns='3' weightx='1'> + <JTextField id='messageField'/> + </cell> + <cell> + <JLabel id='gammeLabel'/> + </cell> + <cell columns='3' weightx='1'> + <BeanFilterableComboBox id='gammeComboBox' + constructorParams='this' + genericType="Range"/> + </cell> + </row> + + <row> + <cell> + <JLabel id='bodyLabel'/> + </cell> + <cell columns='3' weightx='1'> + <JTextField id='bodyField'/> + </cell> + + <cell> + <JLabel id='commandNumberLabel'/> + </cell> + <cell columns='3' weightx='1'> + <JTextField id='commandNumberField'/> + </cell> + </row> + </Table> </JScrollPane> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-04-24 12:44:23 UTC (rev 43) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-04-24 13:40:54 UTC (rev 44) @@ -98,6 +98,12 @@ initBeanFilterableComboBox(ui.getModifiedByComboBox(), getContext().getUserService().getAllUsers(), model.getModifiedBy()); + initBeanFilterableComboBox(ui.getArchivedByComboBox(), + getContext().getUserService().getAllUsers(), + model.getArchivedBy()); + initBeanFilterableComboBox(ui.getTransferByComboBox(), + getContext().getUserService().getAllUsers(), + model.getTransferBy()); initBeanFilterableComboBox(ui.getDocTypeComboBox(), referentielService.getAllDemandType(), model.getDemandType()); @@ -110,6 +116,9 @@ initBeanFilterableComboBox(ui.getStatusComboBox(), Arrays.asList(DemandStatus.values()), model.getDemandStatus()); + initBeanFilterableComboBox(ui.getGammeComboBox(), + referentielService.getAllRange(), + model.getGamme()); final JXTable dataTable = getUI().getDataTable(); dataTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-04-24 12:44:23 UTC (rev 43) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-04-24 13:40:54 UTC (rev 44) @@ -22,23 +22,24 @@ * #L% */ +import java.util.Date; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.Priority; +import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; - -import java.util.Date; -import java.util.List; - /** * @author kmorin <kmorin@codelutin.com> * @since x.x @@ -110,6 +111,36 @@ return editObject.getClientCode(); } + public void setMessage(String message) { + Object oldValue = getMessage(); + editObject.setMessage(message); + firePropertyChanged(EmailFilter.PROPERTY_MESSAGE, oldValue, message); + } + + public String getMessage() { + return editObject.getMessage(); + } + + public void setBody(String body) { + Object oldValue = getBody(); + editObject.setBody(body); + firePropertyChanged(EmailFilter.PROPERTY_BODY, oldValue, body); + } + + public String getBody() { + return editObject.getBody(); + } + + public void setCommandNumber(String commandNumber) { + Object oldValue = getCommandNumber(); + editObject.setCommandNumber(commandNumber); + firePropertyChanged(EmailFilter.PROPERTY_COMMAND_NUMBER, oldValue, commandNumber); + } + + public String getCommandNumber() { + return editObject.getCommandNumber(); + } + public void setEtatAttente(EtatAttente etatAttente) { Object oldValue = getEtatAttente(); editObject.setEtatAttente(etatAttente); @@ -129,6 +160,26 @@ public FaxToMailUser getTakenBy() { return editObject.getTakenBy(); } + + public FaxToMailUser getPrintingBy() { + return editObject.getPrintingBy(); + } + + public void setPrintingBy(FaxToMailUser faxToMailUser) { + Object oldValue = getPrintingBy(); + editObject.setPrintingBy(faxToMailUser); + firePropertyChanged(EmailFilter.PROPERTY_PRINTING_BY, oldValue, faxToMailUser); + } + + public FaxToMailUser getArchivedBy() { + return editObject.getArchivedBy(); + } + + public void setArchivedBy(FaxToMailUser faxToMailUser) { + Object oldValue = getArchivedBy(); + editObject.setArchivedBy(faxToMailUser); + firePropertyChanged(EmailFilter.PROPERTY_ARCHIVED_BY, oldValue, faxToMailUser); + } public Priority getPriority() { return editObject.getPriority(); @@ -180,6 +231,16 @@ return editObject.getProjectReference(); } + public String getLocalReference() { + return editObject.getLocalReference(); + } + + public void setLocalReference(String localReference) { + Object oldValue = getLocalReference(); + editObject.setLocalReference(localReference); + firePropertyChanged(EmailFilter.PROPERTY_LOCAL_REFERENCE, oldValue, localReference); + } + public FaxToMailUser getModifiedBy() { return editObject.getModifiedBy(); } @@ -190,6 +251,16 @@ firePropertyChanged(EmailFilter.PROPERTY_MODIFIED_BY, oldValue, modifiedBy); } + public FaxToMailUser getTransferBy() { + return editObject.getTransferBy(); + } + + public void setTransferBy(FaxToMailUser transferBy) { + Object oldValue = getTransferBy(); + editObject.setTransferBy(transferBy); + firePropertyChanged(EmailFilter.PROPERTY_TRANSFER_BY, oldValue, transferBy); + } + public Date getMinModificationDate() { return editObject.getMinModificationDate(); } @@ -249,7 +320,57 @@ editObject.setMaxPrintingDate(maxPrintingDate); firePropertyChanged(EmailFilter.PROPERTY_MAX_PRINTING_DATE, oldValue, maxPrintingDate); } + + public Date getMinArchivedDate() { + return editObject.getMinArchivedDate(); + } + public void setMinArchivedDate(Date minArchivedDate) { + Object oldValue = getMinArchivedDate(); + editObject.setMinArchivedDate(minArchivedDate); + firePropertyChanged(EmailFilter.PROPERTY_MIN_ARCHIVED_DATE, oldValue, minArchivedDate); + } + + public Date getMaxArchivedDate() { + return editObject.getMaxArchivedDate(); + } + + public void setMaxArchivedDate(Date maxArchivedDate) { + Object oldValue = getMaxArchivedDate(); + editObject.setMaxArchiveDate(maxArchivedDate); + firePropertyChanged(EmailFilter.PROPERTY_MAX_ARCHIVED_DATE, oldValue, maxArchivedDate); + } + + public Date getMinTransferDate() { + return editObject.getMinTransferDate(); + } + + public void setMinTransferDate(Date minTransferDate) { + Object oldValue = getMinTransferDate(); + editObject.setMinArchivedDate(minTransferDate); + firePropertyChanged(EmailFilter.PROPERTY_MIN_TRANSFER_DATE, oldValue, minTransferDate); + } + + public Date getMaxTransferDate() { + return editObject.getMaxTransferDate(); + } + + public void setMaxTransferDate(Date maxTransferDate) { + Object oldValue = getMaxTransferDate(); + editObject.setMaxTransferDate(maxTransferDate); + firePropertyChanged(EmailFilter.PROPERTY_MAX_TRANSFER_DATE, oldValue, maxTransferDate); + } + + public Range getGamme() { + return editObject.getGamme(); + } + + public void setGamme(Range gamme) { + Object oldValue = getGamme(); + editObject.setGamme(gamme); + firePropertyChanged(EmailFilter.PROPERTY_GAMME, oldValue, gamme); + } + public List<DemandeUIModel> getResults() { return results; } Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-04-24 12:44:23 UTC (rev 43) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-04-24 13:40:54 UTC (rev 44) @@ -59,13 +59,16 @@ faxtomail.demandReplies.text=Réponses (%s) faxtomail.demandReplies.title=Réponses envoyées faxtomail.demande.archive.button.label=Archiver +faxtomail.demande.archivedBy.label=Archivé par faxtomail.demande.askCancelEditBeforeLeaving.cancelSave=L'élément n'est pas valide et ne peut être sauvé. faxtomail.demande.askSaveBeforeLeaving.save=Vous avez modifié l'élément mais vous n'avez pas enregistré ces modifications. faxtomail.demande.attachment.label=Pièces-jointes faxtomail.demande.back.button.label=Quitter +faxtomail.demande.body.label=Corps du mail faxtomail.demande.client.label=Code client faxtomail.demande.clientBrand.label=Marque faxtomail.demande.clientCode.label=Client +faxtomail.demande.commandNumber.label=Numéro de commande faxtomail.demande.comment.label=Message faxtomail.demande.companyReference.label=Notre référence faxtomail.demande.demandStatus.label=Statut @@ -75,13 +78,16 @@ faxtomail.demande.etatAttente.label=État attente faxtomail.demande.fax.label=Fax faxtomail.demande.firstOpened.label=Première ouverture +faxtomail.demande.gamme.label=Gamme faxtomail.demande.group.button.label=Grouper faxtomail.demande.group.successful=Groupement réussi avec l'élément %s faxtomail.demande.lastAttachmentOpening.label=Dernière ouverture de pièce-jointe faxtomail.demande.lastModified.label=Dernière modification +faxtomail.demande.localReference.label=Notre référence faxtomail.demande.mailBody.label=Corps du mail faxtomail.demande.mailFolder.label=Dossier faxtomail.demande.print.button.label=Imprimer +faxtomail.demande.printedBy.label=Imprimé par faxtomail.demande.priority.label=Priorité faxtomail.demande.projectReference.label=Référence chantier faxtomail.demande.rangeRow.label=Gammes @@ -95,6 +101,7 @@ faxtomail.demande.status.label=Statut faxtomail.demande.subject.label=Objet faxtomail.demande.takenBy.label=Pris par +faxtomail.demande.transferBy.label=Transmit par faxtomail.demande.transmit.button.label=Transmettre faxtomail.demandeList.action.archive=Archiver faxtomail.demandeList.action.archive.tip=Archiver l'élément @@ -207,6 +214,7 @@ faxtomail.reply.title=Réponse à \: %s faxtomail.search.action.gotoFolder=Aller au dossier faxtomail.search.action.gotoFolder.tip=Aller au dossier +faxtomail.search.archivedBetween.label=Archivé entre le faxtomail.search.between2ndPart.label=et le faxtomail.search.button.label=Rechercher faxtomail.search.chantier.label=Chantier @@ -223,6 +231,7 @@ faxtomail.search.status.label=Statut faxtomail.search.subject.label=Objet faxtomail.search.title=Recherche +faxtomail.search.transferBetween.label=Transmit entre le faxtomail.searchToGroup.action.cancel=Annuler faxtomail.searchToGroup.action.cancel.tip=Fermer la fenêtre sans grouper l'élément faxtomail.searchToGroup.action.group=Grouper