branch faxtomail-2.3.x created (now a21a77e)
This is an automated email from the git hooks/post-receive script. New change to branch faxtomail-2.3.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git at a21a77e fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste This branch includes the following new commits: new e83eb03 fix lazy loading new 2950458 suppression code mort new f1cf122 fix filter new a21a77e fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste The 4 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 a21a77e9e4deee58039b64c4419744095882b52b Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:20:06 2017 +0100 fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste commit f1cf12245362a4127c0e13f7f74373f6fa71d0b6 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:19:02 2017 +0100 fix filter commit 2950458f5b8c21d1dad32f79df014321d9165233 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:18:47 2017 +0100 suppression code mort commit e83eb03efd9f39da2ba8d02074c5f6c61b607c8e Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:18:17 2017 +0100 fix lazy loading -- 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 faxtomail-2.3.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit e83eb03efd9f39da2ba8d02074c5f6c61b607c8e Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:18:17 2017 +0100 fix lazy loading --- .../faxtomail/persistence/entities/EmailTopiaDao.java | 18 ++++-------------- .../faxtomail/services/service/EmailServiceImpl.java | 1 + 2 files changed, 5 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 02ac8ce..90900be 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 @@ -407,15 +407,10 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { Email.PROPERTY_PRIORITY, Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_CLIENT, - //Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, Email.PROPERTY_WAITING_STATE, Email.PROPERTY_TAKEN_BY, - Email.PROPERTY_LAST_ATTACHMENT_OPENER - //Email.PROPERTY_REPLIES, - //Email.PROPERTY_ATTACHMENT, - //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, - //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, - //Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL + Email.PROPERTY_LAST_ATTACHMENT_OPENER, + Email.PROPERTY_LAST_PRINTING_USER ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; // code copied from topia to perform search @@ -546,15 +541,10 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { Email.PROPERTY_PRIORITY, Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_CLIENT, - //Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, Email.PROPERTY_WAITING_STATE, Email.PROPERTY_TAKEN_BY, - Email.PROPERTY_LAST_ATTACHMENT_OPENER - //Email.PROPERTY_REPLIES, - //Email.PROPERTY_ATTACHMENT, - //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, - //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, - //Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL + Email.PROPERTY_LAST_ATTACHMENT_OPENER, + Email.PROPERTY_LAST_PRINTING_USER ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; if (log.isTraceEnabled()) { diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index b2caa31..f5fcfd6 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -208,6 +208,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe .addAllFetches(Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_TAKEN_BY, Email.PROPERTY_LAST_ATTACHMENT_OPENER, + Email.PROPERTY_LAST_PRINTING_USER, Email.PROPERTY_CLIENT, Email.PROPERTY_WAITING_STATE, Email.PROPERTY_ORIGINAL_EMAIL, -- 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 faxtomail-2.3.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 2950458f5b8c21d1dad32f79df014321d9165233 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:18:47 2017 +0100 suppression code mort --- .../java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index 978295c..055e9e6 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java @@ -531,10 +531,6 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { result = defaultPrinter || printJob.printDialog(attributes); if (result) { -// pdDocument = PDDocument.loadLegacy(fis); -// if (pdDocument.isEncrypted()) { -// pdDocument.decrypt(""); -// } pdDocument = PDDocument.load(fis); final PDFRenderer renderer = new PDFRenderer(pdDocument); final int numOfPages = pdDocument.getNumberOfPages(); -- 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 faxtomail-2.3.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit f1cf12245362a4127c0e13f7f74373f6fa71d0b6 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:19:02 2017 +0100 fix filter --- .../ui/swing/content/demande/DemandeListTableFilter.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java index 4dcc368..26f2c7b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java @@ -167,6 +167,14 @@ public class DemandeListTableFilter extends AbstractTableFilter<JXTable> { case Email.PROPERTY_SUBJECT: emailFilter.setSubjects(!filtered ? null : new HashSet<String>((Collection) items)); break; + + case Email.PROPERTY_LAST_PRINTING_DATE: + emailFilter.setLastPrintingDates(!filtered ? null : new HashSet<Date>((Collection) items)); + break; + + case Email.PROPERTY_LAST_PRINTING_USER: + emailFilter.setLastPrintingUsers(!filtered ? null : new HashSet<FaxToMailUser>((Collection) items)); + break; } executeFilter(); -- 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 faxtomail-2.3.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit a21a77e9e4deee58039b64c4419744095882b52b Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:20:06 2017 +0100 fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste --- .../ui/swing/actions/PrintOnDefaultPrinterAction.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java index 5b5a16a..94b4fd5 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java @@ -25,7 +25,6 @@ package com.franciaflex.faxtomail.ui.swing.actions; */ import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; -import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.HistoryType; @@ -79,11 +78,10 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { public void doAction() throws Exception { FaxToMailUser currentUser = getContext().getCurrentUser(); AbstractFaxToMailUIHandler handler = (AbstractFaxToMailUIHandler) getHandler(); - Configuration config = getContext().newServiceContext().getConfigurationService().getConfiguration(); int printedFileNb = 0; Multimap<DemandeUIModel, AttachmentFile> nonPrintedAttachment = HashMultimap.create(); - notPrintableDemands = new ArrayList<DemandeUIModel>(); + notPrintableDemands = new ArrayList<>(); List<DemandeUIModel> orderedDemands = new ArrayList<>(attachmentsToPrintByDemand.keySet()); // order the demands by reception date @@ -94,6 +92,10 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { return o1.getReceptionDate().compareTo(o2.getReceptionDate()); } }); + + FaxToMailServiceContext serviceContext = getContext().newServiceContext(); + EmailService emailService = serviceContext.getEmailService(); + for (DemandeUIModel demandeUIModel : orderedDemands) { if(!handler.isActionEnabled(demandeUIModel, MailAction.PRINT)) { @@ -102,14 +104,15 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { } else { if (take && (demandeUIModel.getTakenBy() == null || !takeOnlyIfNotTaken)) { demandeUIModel.setTakenBy(currentUser); + Email persistedEmail = emailService.getFullEmailById(demandeUIModel.getTopiaId()); + Email email = demandeUIModel.toEntity(persistedEmail); + emailService.saveEmail(email, currentUser); } List<String> printedFiles = new ArrayList<String>(); - FaxToMailServiceContext serviceContext = getContext().newServiceContext(); if (printDemandDetails) { // generate details as pdf - EmailService emailService = serviceContext.getEmailService(); Email email = demandeUIModel.toEntity(); final AttachmentFile demandDetailAttachment = emailService.getEmailDetailAsAttachment(email); // print details @@ -133,7 +136,7 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { } } - Email email = serviceContext.getEmailService().addToHistory(demandeUIModel.getTopiaId(), + Email email = emailService.addToHistory(demandeUIModel.getTopiaId(), HistoryType.PRINTING, getContext().getCurrentUser(), new Date(), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm