- Faxtomail-commits - mailman.cloud.codelutin.com

r724 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing
by kmorin＠users.forge.codelutin.com 08 Dec '14

08 Dec '14

Author: kmorin Date: 2014-12-08 11:53:29 +0000 (Mon, 08 Dec 2014) New Revision: 724 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/724 Log: fix mauvaise requete de recherche Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 15:37:03 UTC (rev 723) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-08 11:53:29 UTC (rev 724) @@ -390,12 +390,12 @@ + "WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN ("; if (searchFilter.isAddGroupDemands()) { - hqlForFetchStep1 += "SELECT CASE WHEN E." + Email.PROPERTY_EMAIL_GROUP + " IS NULL " + + hqlForFetchStep1 += "SELECT CASE WHEN G IS NULL " + "THEN E." + TopiaEntity.PROPERTY_TOPIA_ID + " ELSE E2." + TopiaEntity.PROPERTY_TOPIA_ID + " END " + "FROM " + Email.class.getName() + " E " + - "INNER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + - "INNER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 "; + "LEFT OUTER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + + "LEFT OUTER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 "; } else { hqlForFetchStep1 += "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E "; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-12-05 15:37:03 UTC (rev 723) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-12-08 11:53:29 UTC (rev 724) @@ -414,12 +414,14 @@ UserService userService = serviceContext.getUserService(); setFaxtomailUserCache(userService.getAllActiveUsers()); - try { - setContactCache(serviceContext.getLdapService().getUserAndEmails()); + if (!config.isLdapMock()) { + try { + setContactCache(serviceContext.getLdapService().getUserAndEmails()); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Error while getting contact from ldap", e); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Error while getting contact from ldap", e); + } } } }

1 0

r723 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 05 Dec '14

05 Dec '14

Author: kmorin Date: 2014-12-05 15:37:03 +0000 (Fri, 05 Dec 2014) New Revision: 723 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/723 Log: amelioration des perf de recherche Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 14:02:48 UTC (rev 722) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 15:37:03 UTC (rev 723) @@ -386,18 +386,20 @@ } // add same fecth liste as emailService#getEmailForFolder() - String hqlForFetchStep1 = "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " - + "WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN (" - + "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " - + query.toString() + ") "; + String hqlForFetchStep1 = "SELECT E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + + "WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN ("; if (searchFilter.isAddGroupDemands()) { - hqlForFetchStep1 += "OR E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN (" - + "select E2." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " - + "LEFT OUTER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " - + "LEFT OUTER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 " - + query.toString() + ")"; + hqlForFetchStep1 += "SELECT CASE WHEN E." + Email.PROPERTY_EMAIL_GROUP + " IS NULL " + + "THEN E." + TopiaEntity.PROPERTY_TOPIA_ID + + " ELSE E2." + TopiaEntity.PROPERTY_TOPIA_ID + " END " + + "FROM " + Email.class.getName() + " E " + + "INNER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + + "INNER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 "; + } else { + hqlForFetchStep1 += "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E "; } + hqlForFetchStep1 += query.toString() + ")"; String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( Email.PROPERTY_PRIORITY, @@ -471,6 +473,7 @@ // initialize folder of the grouped demand to transmit the grouped emails of the same folder for (Email groupedEmail : emailGroup.getEmail()) { Hibernate.initialize(groupedEmail.getMailFolder()); + Hibernate.initialize(groupedEmail.getAttachment()); } } } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-12-05 14:02:48 UTC (rev 722) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-12-05 15:37:03 UTC (rev 723) @@ -549,4 +549,10 @@ } } + public static void main(String[] args) { + String recipient = "- ftm_mailfx03 - <adv29(a)franciaflex.com>"; + recipient = recipient.replaceFirst("^.*<(.*)>$", "$1"); + recipient = recipient.toLowerCase(); + System.out.println(recipient); + } }

1 0

r722 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com 05 Dec '14

05 Dec '14

Author: kmorin Date: 2014-12-05 14:02:48 +0000 (Fri, 05 Dec 2014) New Revision: 722 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/722 Log: fixes #6250 Les pj ne sont pas dans la liste d?\195?\169roulante dans la r?\195?\169ponse quand l'?\195?\169l?\195?\169ment est group?\195?\169 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 09:53:15 UTC (rev 721) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 14:02:48 UTC (rev 722) @@ -581,9 +581,11 @@ EmailGroup emailGroup = email.getEmailGroup(); if (emailGroup != null) { Hibernate.initialize(emailGroup.getEmail()); - // initialize folder of the grouped demand to transmit the grouped emails of the same folder for (Email groupedEmail : emailGroup.getEmail()) { + // initialize folder of the grouped demand to transmit the grouped emails of the same folder Hibernate.initialize(groupedEmail.getMailFolder()); + // initialize the attachments for the attachments in the replies + Hibernate.initialize(groupedEmail.getAttachment()); } } } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-05 09:53:15 UTC (rev 721) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-05 14:02:48 UTC (rev 722) @@ -198,6 +198,7 @@ Collection<Email> emails = emailGroup.getEmail(); for (Email email2 : emails) { Hibernate.initialize(email2.getMailFolder()); + Hibernate.initialize(email2.getAttachment()); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-12-05 09:53:15 UTC (rev 721) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-12-05 14:02:48 UTC (rev 722) @@ -729,6 +729,7 @@ demandeUIModel.setTopiaId(email.getTopiaId()); demandeUIModel.setMailFolder(email.getMailFolder()); demandeUIModel.setDemandStatus(email.getDemandStatus()); + demandeUIModel.loadAttachments(email); groupedDemandes.add(demandeUIModel); } }

1 0

r721 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by kmorin＠users.forge.codelutin.com 05 Dec '14

05 Dec '14

Author: kmorin Date: 2014-12-05 09:53:15 +0000 (Fri, 05 Dec 2014) New Revision: 721 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/721 Log: fixes #6248 Erreur quand on veut d?\195?\169placer un ?\195?\169l?\195?\169ment Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-12-04 18:36:57 UTC (rev 720) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-12-05 09:53:15 UTC (rev 721) @@ -202,9 +202,8 @@ if (folder.isChildrenNotEmpty()) { for (MailFolder child : folder.getChildren()) { // if the child is in the moveable roots, remove it to merge the branches - if (!readableRoots.remove(child)) { - browseMoveableFolders(child, readableRoots, inheritedAllowMoveDemandIntoFolder); - } + readableRoots.remove(child); + browseMoveableFolders(child, readableRoots, inheritedAllowMoveDemandIntoFolder); } }

1 0

r720 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search
by kmorin＠users.forge.codelutin.com 04 Dec '14

04 Dec '14

Author: kmorin Date: 2014-12-04 18:36:57 +0000 (Thu, 04 Dec 2014) New Revision: 720 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/720 Log: improve perfs Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-03 15:57:45 UTC (rev 719) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-04 18:36:57 UTC (rev 720) @@ -394,8 +394,8 @@ if (searchFilter.isAddGroupDemands()) { hqlForFetchStep1 += "OR E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN (" + "select E2." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " - + "INNER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " - + "INNER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 " + + "LEFT OUTER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + + "LEFT OUTER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 " + query.toString() + ")"; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-12-03 15:57:45 UTC (rev 719) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-12-04 18:36:57 UTC (rev 720) @@ -65,7 +65,7 @@ protected int resultPerPage = 50; - protected PaginationParameter paginationParameter = PaginationParameter.of(0, resultPerPage, Email.PROPERTY_RECEPTION_DATE, false); + protected PaginationParameter paginationParameter = PaginationParameter.of(0, resultPerPage, Email.PROPERTY_TOPIA_CREATE_DATE, false); protected PaginationResult<Email> paginationResult = PaginationResult.of(null, 0, paginationParameter); 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-12-03 15:57:45 UTC (rev 719) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-12-04 18:36:57 UTC (rev 720) @@ -421,7 +421,7 @@ } public void resetPaginationParameter() { - setPaginationParameter(PaginationParameter.of(0, resultPerPage, Email.PROPERTY_RECEPTION_DATE, false)); + setPaginationParameter(PaginationParameter.of(0, resultPerPage, Email.PROPERTY_TOPIA_CREATE_DATE, false)); } public void setPaginationResult(PaginationResult<Email> paginationResult) {

1 0

r719 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by kmorin＠users.forge.codelutin.com 03 Dec '14

03 Dec '14

Author: kmorin Date: 2014-12-03 15:57:45 +0000 (Wed, 03 Dec 2014) New Revision: 719 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/719 Log: forgot to remove comments Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 15:45:21 UTC (rev 718) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 15:57:45 UTC (rev 719) @@ -535,7 +535,7 @@ loopFolder = loopFolder.getParent(); } while (ediTranfer == null && loopFolder != null); -// if (BooleanUtils.isTrue(ediTranfer)) { + if (BooleanUtils.isTrue(ediTranfer)) { // ajout d'un historique transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, History.PROPERTY_MODIFICATION_DATE, new Date(), @@ -546,19 +546,19 @@ email.setDemandStatus(DemandStatus.TRANSMISSION_TO_EDI); fieldSet.add(Email.PROPERTY_DEMAND_STATUS); -// } else { -// // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira -//// transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, -//// History.PROPERTY_MODIFICATION_DATE, new Date(), -//// History.PROPERTY_EMAIL, email); -//// email.addHistory(transmissionToEdi); -// -// // passage en status -// if (email.getDemandStatus() == DemandStatus.UNTREATED) { -// email.setDemandStatus(DemandStatus.IN_PROGRESS); -// } -// fieldSet.add(Email.PROPERTY_DEMAND_STATUS); -// } + } else { + // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira +// transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, +// History.PROPERTY_MODIFICATION_DATE, new Date(), +// History.PROPERTY_EMAIL, email); +// email.addHistory(transmissionToEdi); + + // passage en status + if (email.getDemandStatus() == DemandStatus.UNTREATED) { + email.setDemandStatus(DemandStatus.IN_PROGRESS); + } + fieldSet.add(Email.PROPERTY_DEMAND_STATUS); + } } } else {

1 0

r718 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 03 Dec '14

03 Dec '14

Author: kmorin Date: 2014-12-03 15:45:21 +0000 (Wed, 03 Dec 2014) New Revision: 718 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/718 Log: fix status lors du d?\195?\169placement fix erreur r?\195?\169ception d'email quand une pj est vide Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 12:42:49 UTC (rev 717) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 15:45:21 UTC (rev 718) @@ -535,7 +535,7 @@ loopFolder = loopFolder.getParent(); } while (ediTranfer == null && loopFolder != null); - if (BooleanUtils.isTrue(ediTranfer)) { +// if (BooleanUtils.isTrue(ediTranfer)) { // ajout d'un historique transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, History.PROPERTY_MODIFICATION_DATE, new Date(), @@ -546,19 +546,19 @@ email.setDemandStatus(DemandStatus.TRANSMISSION_TO_EDI); fieldSet.add(Email.PROPERTY_DEMAND_STATUS); - } else { - // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira -// transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, -// History.PROPERTY_MODIFICATION_DATE, new Date(), -// History.PROPERTY_EMAIL, email); -// email.addHistory(transmissionToEdi); - - // passage en status - if (email.getDemandStatus() == DemandStatus.UNTREATED) { - email.setDemandStatus(DemandStatus.IN_PROGRESS); - } - fieldSet.add(Email.PROPERTY_DEMAND_STATUS); - } +// } else { +// // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira +//// transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, +//// History.PROPERTY_MODIFICATION_DATE, new Date(), +//// History.PROPERTY_EMAIL, email); +//// email.addHistory(transmissionToEdi); +// +// // passage en status +// if (email.getDemandStatus() == DemandStatus.UNTREATED) { +// email.setDemandStatus(DemandStatus.IN_PROGRESS); +// } +// fieldSet.add(Email.PROPERTY_DEMAND_STATUS); +// } } } else { @@ -1252,7 +1252,7 @@ List<Email> emails = dao.forTopiaIdIn(emailIds).findAll(); for (Email email : emails) { if (email.getDemandStatus() != DemandStatus.TRANSMISSION_TO_EDI - || email.getDemandStatus() != DemandStatus.TRANSMITTED_TO_EDI) { + && email.getDemandStatus() != DemandStatus.TRANSMITTED_TO_EDI) { email.setDemandStatus(DemandStatus.QUALIFIED); } email.setMailFolder(newFolder); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-12-03 12:42:49 UTC (rev 717) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-12-03 15:45:21 UTC (rev 718) @@ -497,8 +497,10 @@ } else { // convertit le contenu texte en PDF String content = IOUtils.toString(message.getInputStream(), charset); - Attachment attachment = emailService.convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); - attachments.add(0, attachment); + if (StringUtils.isNotBlank(content)) { + Attachment attachment = emailService.convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); + attachments.add(0, attachment); + } } emailService.saveEmail(email,

1 0

r717 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search
by kmorin＠users.forge.codelutin.com 03 Dec '14

03 Dec '14

Author: kmorin Date: 2014-12-03 12:42:49 +0000 (Wed, 03 Dec 2014) New Revision: 717 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/717 Log: fixes #6238 Erreur quand on ouvre un ?\195?\169l?\195?\169ment group?\195?\169 refs #6237 La recherche pour grouper se lance parfois toute seule ?\195?\160 l'ouverture de l'?\195?\169cran Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 09:10:22 UTC (rev 716) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 12:42:49 UTC (rev 717) @@ -1076,7 +1076,7 @@ EmailGroupTopiaDao groupDao = getPersistenceContext().getEmailGroupDao(); Email email1 = getFullEmailById(email1Id, user); - Email email2 = getEmailById(email2Id); + Email email2 = getFullEmailById(email2Id, user); EmailGroup group1 = email1.getEmailGroup(); EmailGroup group2 = email2.getEmailGroup(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-12-03 09:10:22 UTC (rev 716) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-12-03 12:42:49 UTC (rev 717) @@ -64,7 +64,6 @@ @Override public void doAction() throws Exception { SearchUIModel model = getModel(); - getContext().setSearch(model); SearchFilter searchFilter = model.toEntity(); FaxToMailServiceContext serviceContext = getContext().newServiceContext(); 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-12-03 09:10:22 UTC (rev 716) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-12-03 12:42:49 UTC (rev 717) @@ -90,25 +90,14 @@ public void beforeInit(SearchToGroupUI ui) { super.beforeInit(ui); - SearchUIModel searchUIModel = getContext().getSearch(); - if (searchUIModel == null) { - searchUIModel = new SearchUIModel(); -// searchUIModel.setTakenBy(getContext().getCurrentUser()); -// searchUIModel.setModifiedBy(getContext().getCurrentUser()); + SearchUIModel searchUIModel = new SearchUIModel(); + Date now = new Date(); + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.MONTH, -2); + Date twoMonthsAgo = cal.getTime(); + searchUIModel.setMaxReceptionDate(now); + searchUIModel.setMinReceptionDate(twoMonthsAgo); - Date now = new Date(); - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.MONTH, -2); - Date twoMonthsAgo = cal.getTime(); - -// searchUIModel.setMaxModificationDate(now); -// searchUIModel.setMinModificationDate(twoMonthsAgo); - searchUIModel.setMaxReceptionDate(now); - searchUIModel.setMinReceptionDate(twoMonthsAgo); - //searchUIModel.setMaxPrintingDate(now); - //searchUIModel.setMinPrintingDate(twoMonthsAgo); - } - getUI().setContextValue(searchUIModel); }

1 0

r716 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing
by kmorin＠users.forge.codelutin.com 03 Dec '14

03 Dec '14

Author: kmorin Date: 2014-12-03 09:10:22 +0000 (Wed, 03 Dec 2014) New Revision: 716 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/716 Log: fix compilation Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-12-03 08:39:37 UTC (rev 715) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-12-03 09:10:22 UTC (rev 716) @@ -840,7 +840,7 @@ } public void setDemands(List<DemandeUIModel> demands) { - this.demands = new ArrayList<>(demands); + this.demands = new ArrayList<DemandeUIModel>(demands); } public void removeDemand(DemandeUIModel demand) {

1 0

r715 - in trunk/faxtomail-service: . src/main/java/com/franciaflex/faxtomail/services/service/ldap
by kmorin＠users.forge.codelutin.com 03 Dec '14

03 Dec '14

Author: kmorin Date: 2014-12-03 08:39:37 +0000 (Wed, 03 Dec 2014) New Revision: 715 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/715 Log: fix dependency Modified: trunk/faxtomail-service/pom.xml trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/Contact.java Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-12-03 08:32:52 UTC (rev 714) +++ trunk/faxtomail-service/pom.xml 2014-12-03 08:39:37 UTC (rev 715) @@ -212,6 +212,11 @@ <artifactId>itextpdf</artifactId> </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-common</artifactId> + </dependency> + </dependencies> <build> Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/Contact.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/Contact.java 2014-12-03 08:32:52 UTC (rev 714) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ldap/Contact.java 2014-12-03 08:39:37 UTC (rev 715) @@ -1,12 +1,36 @@ package com.franciaflex.faxtomail.services.service.ldap; -import org.jdesktop.beans.AbstractBean; +/* + * #%L + * FaxToMail :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +import org.jdesktop.beans.AbstractSerializableBean; + /** * @author Kevin Morin (Code Lutin) * @since x.x */ -public class Contact extends AbstractBean { +public class Contact extends AbstractSerializableBean { public static final String PROPERTY_NAME = "name"; public static final String PROPERTY_EMAIL = "email"; @@ -36,6 +60,6 @@ public void setEmail(String email) { Object oldValue = getEmail(); this.email = email; - firePropertyChange(PROPERTY_NAME, oldValue, email); + firePropertyChange(PROPERTY_EMAIL, oldValue, email); } }

1 0