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

r636 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com 23 Sep '14

23 Sep '14

Author: kmorin Date: 2014-09-23 18:30:37 +0200 (Tue, 23 Sep 2014) New Revision: 636 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/636 Log: - Couleur orange dispara?\195?\174t quand on recharge le dossier - Ecart entre fct d?\195?\169placer par la liste ou par l'?\195?\169l?\195?\169ment (dans ?\195?\169l?\195?\169ment, tiens compte du groupage, pas dans la liste). 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/actions/LoadFolderEmailsAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.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-09-23 15:41:05 UTC (rev 635) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-23 16:30:37 UTC (rev 636) @@ -526,6 +526,10 @@ 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()) { + Hibernate.initialize(groupedEmail.getMailFolder()); + } } } return result; 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-23 15:41:05 UTC (rev 635) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-09-23 16:30:37 UTC (rev 636) @@ -120,7 +120,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, Email.PROPERTY_HISTORY)); + demand.fromEntityExcluding(email, Sets.newHashSet(Email.PROPERTY_MAIL_FOLDER, 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/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-09-23 15:41:05 UTC (rev 635) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-09-23 16:30:37 UTC (rev 636) @@ -410,8 +410,8 @@ } return Boolean.TRUE.equals(folder.getOpenAttachmentReportNoTaken()) - && row.getLastAttachmentOpeningInThisFolderUser() != null - && !row.getLastAttachmentOpeningInThisFolderUser().equals(row.getTakenBy()); + && row.getLastAttachmentOpener() != null + && !row.getLastAttachmentOpener().equals(row.getTakenBy()); } }; Color color = Color.ORANGE;

1 0

r635 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions 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 faxtomail-ui-web/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 23 Sep '14

23 Sep '14

Author: kmorin Date: 2014-09-23 17:41:05 +0200 (Tue, 23 Sep 2014) New Revision: 635 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/635 Log: - prendre l'?\195?\169l?\195?\169ment quand on enregsitre m?\195?\170me s'il n'y a pas eu de modifications - correction du bug des colonnes (toutes les colonnes etaient affich?\195?\169es quand on quittait un ?\195?\169l?\195?\169ment) - les gammes ne s'affichaient plus quand on venait de la recherche - correction du message d'erreur quand on ne pouvait d?\195?\169placer un ?\195?\169l?\195?\169ment depuis la liste - fermeture de la fenetre des pieces jointes dans la liste quand on change de dossier 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/SearchFilter.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.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/demande/DemandeListTableFilter.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.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/SearchUIModel.java trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 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-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-23 15:41:05 UTC (rev 635) @@ -438,10 +438,6 @@ Hibernate.initialize(history.getFields()); } } - EmailGroup emailGroup = email.getEmailGroup(); - if (emailGroup != null) { - Hibernate.initialize(emailGroup.getEmail()); - } } return result; } Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java 2014-09-23 15:41:05 UTC (rev 635) @@ -65,6 +65,7 @@ public static final String PROPERTY_MIN_REPLY_DATE = "minReplyDate"; public static final String PROPERTY_MAX_REPLY_DATE = "maxReplyDate"; public static final String PROPERTY_CLIENT_CODE = "clientCode"; + public static final String PROPERTY_ADD_GROUP_DEMANDS = "addGroupDemands"; protected String sender; @@ -128,6 +129,8 @@ protected String clientCode; + protected boolean addGroupDemands; + public String getSender() { return sender; } @@ -432,4 +435,14 @@ this.maxReplyDate = maxReplyDate; firePropertyChange(PROPERTY_MAX_REPLY_DATE, oldValue, maxReplyDate); } + + public boolean isAddGroupDemands() { + return addGroupDemands; + } + + public void setAddGroupDemands(boolean addGroupDemands) { + Object oldValue = this.addGroupDemands; + this.addGroupDemands = addGroupDemands; + firePropertyChange(PROPERTY_ADD_GROUP_DEMANDS, oldValue, addGroupDemands); + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -91,7 +91,9 @@ @Override protected void releaseAction() { super.releaseAction(); - frame.toFront(); - frame = null; + if (frame != null) { + frame.toFront(); + frame = null; + } } } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -101,7 +101,9 @@ @Override protected void releaseAction() { super.releaseAction(); - frame.toFront(); - frame = null; + if (frame != null) { + frame.toFront(); + frame = null; + } } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -58,7 +58,9 @@ @Override protected void releaseAction() { super.releaseAction(); - frame.toFront(); - frame = null; + if (frame != null) { + frame.toFront(); + frame = null; + } } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -37,8 +37,8 @@ } @Override - public void postSuccessAction() { - super.postSuccessAction(); + public void doAction() throws Exception { + super.doAction(); getActionEngine().runInternalAction(getContext().getMainUI().getHandler(), GoToPreviousScreenAction.class); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -27,10 +27,19 @@ import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; +import java.util.Collection; import java.util.List; +import java.util.Map; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; +import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.pagination.PaginationResult; import com.franciaflex.faxtomail.persistence.entities.Email; @@ -60,19 +69,41 @@ FaxToMailServiceContext serviceContext = getContext().newServiceContext(); PaginationResult<Email> paginationResult = serviceContext.getEmailService().search(searchFilter, getContext().getCurrentUser(), getModel().getPaginationParameter()); + List<Email> emails = paginationResult.getElements(); List<DemandeUIModel> result = new ArrayList<>(); + + Map<String, WaitingState> waitingStateById = Maps.uniqueIndex(getContext().getWaitingStateCache(), TopiaEntities.getTopiaIdFunction()); + for (Email email : emails) { DemandeUIModel demand = new DemandeUIModel(); - demand.fromEntity(email); - demand.setMailFolder(email.getMailFolder()); + 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 + Collection<RangeRow> rangeRows = demand.getRangeRow(); + if (rangeRows != null) { + for (RangeRow rangeRow : rangeRows) { + if (rangeRow != null) { + RangeRowModel rangeRowModel = new RangeRowModel(); + rangeRowModel.fromEntity(rangeRow); + if (rangeRowModel.isValid()) { + demand.addValidRangeRow(rangeRowModel); + } + } + } + } + + MailFolder mailFolder = email.getMailFolder(); demand.setValid(handler.isDemandeValid(demand)); + demand.setMailFolder(mailFolder); + demand.setEditable(mailFolder.isFolderWritable()); + WaitingState waitingState = email.getWaitingState(); + if (waitingState != null) { + demand.setWaitingState(waitingStateById.get(waitingState.getTopiaId())); + } + result.add(demand); - - if (model.isShowGroupesDemandsInResults()) { - demand.setGroupedDemandes(email.getEmailGroup()); - result.addAll(demand.getGroupedDemandes()); - } } model.setResults(result); model.setPaginationParameter(paginationResult.getCurrentPage()); 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-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -25,16 +25,25 @@ */ import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; +import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUIHandler; import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIModel; import java.util.ArrayList; +import java.util.Collection; import java.util.List; +import java.util.Map; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.pagination.PaginationResult; import static org.nuiton.i18n.I18n.t; @@ -59,13 +68,39 @@ FaxToMailServiceContext serviceContext = getContext().newServiceContext(); PaginationResult<Email> paginationResult = serviceContext.getEmailService().search(searchFilter, getContext().getCurrentUser(), getModel().getPaginationParameter()); + List<Email> emails = paginationResult.getElements(); + List<DemandeUIModel> result = new ArrayList<>(); - List<DemandeUIModel> result = new ArrayList<>(); - for (Email mail : emails) { + Map<String, WaitingState> waitingStateById = Maps.uniqueIndex(getContext().getWaitingStateCache(), TopiaEntities.getTopiaIdFunction()); + + for (Email email : emails) { DemandeUIModel demand = new DemandeUIModel(); - demand.fromEntity(mail); + 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 + Collection<RangeRow> rangeRows = demand.getRangeRow(); + if (rangeRows != null) { + for (RangeRow rangeRow : rangeRows) { + if (rangeRow != null) { + RangeRowModel rangeRowModel = new RangeRowModel(); + rangeRowModel.fromEntity(rangeRow); + if (rangeRowModel.isValid()) { + demand.addValidRangeRow(rangeRowModel); + } + } + } + } + + MailFolder mailFolder = email.getMailFolder(); demand.setValid(handler.isDemandeValid(demand)); + demand.setMailFolder(mailFolder); + demand.setEditable(mailFolder.isFolderWritable()); + WaitingState waitingState = email.getWaitingState(); + if (waitingState != null) { + demand.setWaitingState(waitingStateById.get(waitingState.getTopiaId())); + } result.add(demand); } model.setResults(result); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-23 15:41:05 UTC (rev 635) @@ -280,7 +280,7 @@ context.getActionFactory().createLogicAction(handler, LoadFolderEmailsAction.class); if (context.isActionInProgress(null)) { - context.getActionEngine().runInternalAction(loadFolderEmailsAction); + context.getActionEngine().runFullInternalAction(loadFolderEmailsAction); } else { context.getActionEngine().runAction(loadFolderEmailsAction); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-09-23 15:41:05 UTC (rev 635) @@ -49,6 +49,7 @@ import javax.swing.event.ListSelectionListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; +import javax.swing.table.TableCellEditor; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; @@ -253,12 +254,17 @@ navigationTree.addTreeSelectionListener(new TreeSelectionListener() { @Override public void valueChanged(TreeSelectionEvent e) { + TableCellEditor cellEditor = dataTable.getCellEditor(); + if (cellEditor != null) { + cellEditor.stopCellEditing(); + } + FolderTreeNode folderNode = (FolderTreeNode) e.getPath().getLastPathComponent(); if (folderNode.isCanSelect()) { MailFolder folder = folderNode.getMailFolder(); + getContext().setCurrentMailFolder(folder); getModel().setSelectedFolder(folder); - getContext().setCurrentMailFolder(folder); DemandeUIModel currentEmail = getContext().getCurrentEmail(); if (currentEmail != null) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-09-23 15:41:05 UTC (rev 635) @@ -303,6 +303,7 @@ closeButtonPopups(); DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent(); SaveDemandeAndExitAction action = new SaveDemandeAndExitAction(demandeUI.getHandler()); + action.setTakeIfNotTaken(true); getContext().getActionEngine().runAction(action); } 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-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css 2014-09-23 15:41:05 UTC (rev 635) @@ -267,6 +267,7 @@ #addGroupedElementCheckbox { text: "faxtomail.search.addGroupedElement.label"; + selected: { model.isAddGroupDemands() }; } #searchButton { 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-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 2014-09-23 15:41:05 UTC (rev 635) @@ -345,7 +345,7 @@ <row> <cell columns="6"> <JCheckBox id="addGroupedElementCheckbox" - onItemStateChanged='handler.setBoolean(event, "showGroupesDemandsInResults")'/> + onItemStateChanged='handler.setBoolean(event, "addGroupDemands")'/> </cell> </row> 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-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-09-23 15:41:05 UTC (rev 635) @@ -63,7 +63,6 @@ protected boolean menuEnabled; protected boolean groupEnabled; - protected boolean showGroupesDemandsInResults; protected static Binder<SearchUIModel, SearchFilter> toBeanBinder = BinderFactory.newBinder(SearchUIModel.class, @@ -445,12 +444,14 @@ firePropertyChanged(PROPERTY_GROUP_ENABLED, oldValue, groupEnabled); } - public boolean isShowGroupesDemandsInResults() { - return showGroupesDemandsInResults; + public boolean isAddGroupDemands() { + return editObject.isAddGroupDemands(); } - public void setShowGroupesDemandsInResults(boolean showGroupesDemandsInResults) { - this.showGroupesDemandsInResults = showGroupesDemandsInResults; + public void setAddGroupDemands(boolean addGroupDemands) { + Object oldValue = isAddGroupDemands(); + editObject.setAddGroupDemands(addGroupDemands); + firePropertyChange(SearchFilter.PROPERTY_ADD_GROUP_DEMANDS, oldValue, addGroupDemands); } @Override Modified: trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-09-23 15:41:05 UTC (rev 635) @@ -16,7 +16,6 @@ com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_STATUS=Statut de demande com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_TYPE=Type de demande com.franciaflex.faxtomail.persistence.entities.MailField.EDI_RETURN=Retour EDI -com.franciaflex.faxtomail.persistence.entities.MailField.WAITING_STATE=État d'attente com.franciaflex.faxtomail.persistence.entities.MailField.FAX=Fax com.franciaflex.faxtomail.persistence.entities.MailField.LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER=Dernier à ouvrir une PJ com.franciaflex.faxtomail.persistence.entities.MailField.MAIL_FOLDER=Dossier @@ -34,6 +33,7 @@ com.franciaflex.faxtomail.persistence.entities.MailField.SAV_NB=Quantité de SAV com.franciaflex.faxtomail.persistence.entities.MailField.SENDER=Émetteur com.franciaflex.faxtomail.persistence.entities.MailField.TAKEN_BY=Pris par +com.franciaflex.faxtomail.persistence.entities.MailField.WAITING_STATE=État d'attente faxtomail.email.content.attachment.htmlfileName=contenu html du mail faxtomail.email.content.attachment.plainfileName=contenu texte du mail faxtomail.email.object.noClient=Client non trouvé

1 0

r634 - trunk/faxtomail-ui-web/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 19 Sep '14

19 Sep '14

Author: echatellier Date: 2014-09-19 15:11:03 +0200 (Fri, 19 Sep 2014) New Revision: 634 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/634 Log: Fix waiting state enum Modified: trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties Modified: trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-09-19 07:44:44 UTC (rev 633) +++ trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-09-19 13:11:03 UTC (rev 634) @@ -16,7 +16,7 @@ com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_STATUS=Statut de demande com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_TYPE=Type de demande com.franciaflex.faxtomail.persistence.entities.MailField.EDI_RETURN=Retour EDI -com.franciaflex.faxtomail.persistence.entities.MailField.ETAT_ATTENTE=État d'attente +com.franciaflex.faxtomail.persistence.entities.MailField.WAITING_STATE=État d'attente com.franciaflex.faxtomail.persistence.entities.MailField.FAX=Fax com.franciaflex.faxtomail.persistence.entities.MailField.LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER=Dernier à ouvrir une PJ com.franciaflex.faxtomail.persistence.entities.MailField.MAIL_FOLDER=Dossier

1 0

r633 - in trunk: . faxtomail-ui-swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by echatellier＠users.forge.codelutin.com 19 Sep '14

19 Sep '14

Author: echatellier Date: 2014-09-19 09:44:44 +0200 (Fri, 19 Sep 2014) New Revision: 633 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/633 Log: Fix build Modified: trunk/faxtomail-ui-swing/pom.xml trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java trunk/pom.xml Modified: trunk/faxtomail-ui-swing/pom.xml =================================================================== --- trunk/faxtomail-ui-swing/pom.xml 2014-09-18 14:39:45 UTC (rev 632) +++ trunk/faxtomail-ui-swing/pom.xml 2014-09-19 07:44:44 UTC (rev 633) @@ -182,11 +182,6 @@ <artifactId>swingx-common</artifactId> </dependency> - <dependency> - <groupId>com.ezware.oxbow</groupId> - <artifactId>swing-bits</artifactId> - </dependency> -  <dependency> <groupId>org.apache.logging.log4j</groupId> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-18 14:39:45 UTC (rev 632) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-19 07:44:44 UTC (rev 633) @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing.content.demande; +/* + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Franciaflex, 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 com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.DemandType; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-18 14:39:45 UTC (rev 632) +++ trunk/pom.xml 2014-09-19 07:44:44 UTC (rev 633) @@ -350,12 +350,6 @@ </dependency> <dependency> - <groupId>com.ezware.oxbow</groupId> - <artifactId>swing-bits</artifactId> - <version>0.5.0</version> - </dependency> - - <dependency> <groupId>org.swinglabs</groupId> <artifactId>pdf-renderer</artifactId> <version>1.0.5</version>

1 0

r632 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: echatellier Date: 2014-09-18 16:39:45 +0200 (Thu, 18 Sep 2014) New Revision: 632 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/632 Log: Add usefull log Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java 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/ClientServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java 2014-09-18 14:23:20 UTC (rev 631) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java 2014-09-18 14:39:45 UTC (rev 632) @@ -133,6 +133,8 @@ @Override public void execute(Connection connection) throws SQLException { + int importedCount = 0; + // attention, le sql à pour cible postgresql, mssql, h2, il doit rester simple String query = String.format("SELECT %s, %s, %s, %s, %s, %s, %s, %s, %s, %s FROM %s", NewClient.PROPERTY_NAME, @@ -247,12 +249,18 @@ client.setFaxNumbers(faxNumbers); client = clientDao.update(client); } + + importedCount++; } // delete all rows stat = connection.createStatement(); stat.execute("DELETE FROM " + NewClient.class.getSimpleName()); + // usefull log info (do not remove) + if (importedCount > 0 && log.isInfoEnabled()) { + log.info(String.format("Imported %d new client rows", importedCount)); + } } }); 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-18 14:23:20 UTC (rev 631) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-18 14:39:45 UTC (rev 632) @@ -1231,6 +1231,8 @@ @Override public void execute(Connection connection) throws SQLException { + int importedCount = 0; + // attention, le sql à pour cible postgresql, mssql, h2, il doit rester simple String query = String.format("SELECT %s, %s, %s FROM %s", EdiReturn.PROPERTY_RANGE_ROW_TOPIA_ID, @@ -1273,11 +1275,18 @@ email.setDemandStatus(DemandStatus.IN_PROGRESS); emailsToUpdate.add(email); + + importedCount++; } // delete all rows stat = connection.createStatement(); stat.execute("DELETE FROM " + EdiReturn.class.getSimpleName()); + + // usefull log info (do not remove) + if (importedCount > 0 && log.isInfoEnabled()) { + log.info(String.format("Imported %d ediReturn rows", importedCount)); + } } });

1 0

r631 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: kmorin Date: 2014-09-18 16:23:20 +0200 (Thu, 18 Sep 2014) New Revision: 631 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/631 Log: fixes #5818 L'application reste bloqu?\195?\169e Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-18 14:17:26 UTC (rev 630) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-18 14:23:20 UTC (rev 631) @@ -368,7 +368,11 @@ // ok save //saveAction.actionPerformed(null); //XXX echatellier 2010731 : action bloquante - getContext().getActionEngine().runActionAndWait(saveAction); + if (getContext().isActionInProgress(null)) { + getContext().getActionEngine().runInternalAction(saveAction); + } else { + getContext().getActionEngine().runActionAndWait(saveAction); + } result = true; break; case JOptionPane.NO_OPTION:

1 0

r630 - trunk/faxtomail-ui-swing/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: echatellier Date: 2014-09-18 16:17:26 +0200 (Thu, 18 Sep 2014) New Revision: 630 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/630 Log: Fix i18n encoding Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 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-09-18 14:10:56 UTC (rev 629) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-09-18 14:17:26 UTC (rev 630) @@ -307,8 +307,8 @@ jaxx.application.error.cannot.mail=Erreur lors de l'ouverture du client mail jaxx.application.error.cannot.open=Erreur lors de l'ouverture de la pièce jointe jaxx.application.error.cannot.print=Erreur lors de l'impression -jaxx.application.error.desktop.edit.not.supported=L'action d'edition des fichiers par le syst�me n'est pas support� -jaxx.application.error.desktop.not.supported=L'ouverture des fichiers par le syst�me n'est pas support� +jaxx.application.error.desktop.edit.not.supported=L'action d'edition des fichiers par le système n'est pas supporté +jaxx.application.error.desktop.not.supported=L'ouverture des fichiers par le système n'est pas supporté jaxx.application.error.desktop.print.not.supported=Erreur lors de l'impression jaxx.application.error.noPrinter=Erreur lors de l'impression swing.error.cannot.copy.file=Erreur lors de la copie des fichiers

1 0

r629 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search
by kmorin＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: kmorin Date: 2014-09-18 16:10:56 +0200 (Thu, 18 Sep 2014) New Revision: 629 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/629 Log: fixes #5817 [Recherche pour grouper] la position du s?\195?\169parateur n'est pas conserv?\195?\169e quand on quitte et retourne sur la recherche Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 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-09-18 13:43:09 UTC (rev 628) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-09-18 14:10:56 UTC (rev 629) @@ -225,6 +225,8 @@ updateResultPerPage(e); } }); + + getContext().getSwingSession().add(ui, true); } public void searchDemandes() { @@ -307,6 +309,7 @@ @Override public void cancel() { + getContext().getSwingSession().updateState(); closeFrame(); }

1 0

r628 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: content/pdfeditor util
by kmorin＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: kmorin Date: 2014-09-18 15:43:09 +0200 (Thu, 18 Sep 2014) New Revision: 628 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/628 Log: - fix potential npe - set the topest ui for the quit dialog to have the pdf editor has parent Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-09-18 13:34:55 UTC (rev 627) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/pdfeditor/PDFEditorUIHandler.java 2014-09-18 13:43:09 UTC (rev 628) @@ -268,8 +268,13 @@ ); return result; } - + @Override + public Component getTopestUI() { + return getUI(); + } + + @Override public void onCloseUI() { } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-18 13:34:55 UTC (rev 627) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-18 13:43:09 UTC (rev 628) @@ -395,13 +395,15 @@ } protected void closeFrame(JFrame frame, AbstractApplicationUIHandler handler) { - boolean canClose = true; - if (handler instanceof CloseableUI) { - canClose = ((CloseableUI) handler).quitUI(); + if (frame != null) { + boolean canClose = true; + if (handler instanceof CloseableUI) { + canClose = ((CloseableUI) handler).quitUI(); + } + if (canClose) { + frame.dispose(); + } } - if (canClose) { - frame.dispose(); - } } protected <HL extends HasLabel> void initCheckBoxComboBox(final JComboBox<HL> comboBox,

1 0

r627 - 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
by echatellier＠users.forge.codelutin.com 18 Sep '14

18 Sep '14

Author: echatellier Date: 2014-09-18 15:34:55 +0200 (Thu, 18 Sep 2014) New Revision: 627 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/627 Log: Modification de performance pour les requette contenant ou pas des 'null' 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/DemandeListTableFilter.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-09-18 13:06:47 UTC (rev 626) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-18 13:34:55 UTC (rev 627) @@ -936,7 +936,7 @@ Set<Object> result = new HashSet<>(queryResults); // check if the property is sometimes null - if (property.startsWith("rangeRow.")) { + /*if (property.startsWith("rangeRow.")) { query = "FROM " + Email.class.getName() + " AS email" + " LEFT OUTER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow" + folderAndStatusCondition + " AND rangeRow IS NULL"; @@ -964,7 +964,12 @@ if (!queryResults.isEmpty()) { result.add(null); } - } + }*/ + + // TODO echatellier 20140918 : on ajoute null dans tous les cas car les requetes precendente + // sont trop lente juste pour savoir si on a vraiment besoin de savoir si l'on doit vraiment + // avoir des valeurs nulles + result.add(null); return result; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-18 13:06:47 UTC (rev 626) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-18 13:34:55 UTC (rev 627) @@ -210,12 +210,17 @@ log.debug("result size " + result.size() + " " + result); } for (Object o : result) { - Date date = (Date) o; - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MILLISECOND, 0); - filteredDates.add(cal.getTime()); + + // le dao revoie toujours null, meme si le cas est impossible en theorie pour + // PROPERTY_RECEPTION_DATE, donc dans ce cas, on ignore le cas null + if (o != null) { + Date date = (Date) o; + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND, 0); + filteredDates.add(cal.getTime()); + } } result = new HashSet<Object>(filteredDates); }

1 0