Author: echatellier Date: 2014-09-03 16:24:11 +0200 (Wed, 03 Sep 2014) New Revision: 600 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/600 Log: Retrait du chargement de l'historique pour la liste. Utilisation du champ lastAttachmentOpener pour afficher le nom dans le tableau. 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/LoadFolderEmailsAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 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/util/DemandeTableModel.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-09-03 14:02:15 UTC (rev 599) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-03 14:24:11 UTC (rev 600) @@ -637,8 +637,8 @@ Email.PROPERTY_WAITING_STATE, Email.PROPERTY_TAKEN_BY, Email.PROPERTY_REPLIES, - Email.PROPERTY_ATTACHMENT, - Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER + Email.PROPERTY_ATTACHMENT + //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER ).findPage(page); } else { result = dao.forMailFolderEquals(folder) @@ -652,7 +652,7 @@ Email.PROPERTY_TAKEN_BY //Email.PROPERTY_REPLIES, //Email.PROPERTY_ATTACHMENT, - //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER*/ + //Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER ).findPage(page); @@ -671,12 +671,12 @@ //Hibernate.initialize(email.getTakenBy()); Hibernate.initialize(email.getReplies()); Hibernate.initialize(email.getAttachment()); - List<History> histories = email.getHistory(); + /*List<History> histories = email.getHistory(); if (histories != null) { for (History history : histories) { Hibernate.initialize(history.getFaxToMailUser()); } - } + }*/ } } @@ -737,6 +737,12 @@ email.addHistory(history); + // pour eviter de charger tout l'historique dans la liste, on duplique l'information de + // dernier ouvreur de PJ directement dans l'email + if (type == HistoryType.ATTACHMENT_OPENING) { + email.setLastAttachmentOpener(user); + } + email = emailDao.update(email); getPersistenceContext().commit(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-09-03 14:02:15 UTC (rev 599) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-09-03 14:24:11 UTC (rev 600) @@ -117,7 +117,7 @@ List<DemandeUIModel> demands = new ArrayList<DemandeUIModel>(); for (Email email : emails) { DemandeUIModel demand = new DemandeUIModel(); - demand.fromEntityExcluding(email, Sets.newHashSet(Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_EMAIL_GROUP)); + demand.fromEntityExcluding(email, Sets.newHashSet(Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_EMAIL_GROUP, Email.PROPERTY_HISTORY)); // on ajoute toutes les lignes de rangeRow, // qui sont toutes valides puisqu'on les récupère de la base et qu'on ne sauvegarde que les lignes valides Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-09-03 14:02:15 UTC (rev 599) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentCellEditor.java 2014-09-03 14:24:11 UTC (rev 600) @@ -122,7 +122,7 @@ context.getCurrentUser(), new Date(), filename); - model.fromEntityIncluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY)); + model.fromEntity(email); } } @@ -135,7 +135,7 @@ context.getCurrentUser(), new Date(), FaxToMailUIUtil.getEditedFileName(attachment.getOriginalFileName())); - model.fromEntityIncluding(email, Sets.newHashSet(Email.PROPERTY_HISTORY)); + model.fromEntity(email); } }; 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-09-03 14:02:15 UTC (rev 599) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-09-03 14:24:11 UTC (rev 600) @@ -636,6 +636,22 @@ return lastAttachmentOpeningInThisFolderHistory; } + /** + * Utilisé depuis la liste des mails seulement pour des raisons de performances sans charger + * l'historique. + * + * Contient la même information que {@code #lastAttachmentOpeningInThisFolderHistory} normalement. + * + * @return lastAttachmentOpener + */ + public FaxToMailUser getLastAttachmentOpener() { + return editObject.getLastAttachmentOpener(); + } + + public void setLastAttachmentOpener(FaxToMailUser lastAttachmentOpener) { + editObject.setLastAttachmentOpener(lastAttachmentOpener); + } + public FaxToMailUser getLastAttachmentOpeningInThisFolderUser() { History history = getLastAttachmentOpeningInThisFolderHistory(); return history != null ? history.getFaxToMailUser() : null; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-09-03 14:02:15 UTC (rev 599) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-09-03 14:24:11 UTC (rev 600) @@ -169,7 +169,7 @@ put(MailField.LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER, ColumnIdentifier.<Email>newId( - DemandeUIModel.PROPERTY_LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER, + Email.PROPERTY_LAST_ATTACHMENT_OPENER, n("faxtomail.demandeList.table.header.lastAttachmentOpeningUser"), n("faxtomail.demandeList.table.header.lastAttachmentOpeningUser.tip")));