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

r275 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: echatellier Date: 2014-06-26 23:26:35 +0200 (Thu, 26 Jun 2014) New Revision: 275 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/275 Log: Rename fullpath to completename (reserved keyword) Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-26 21:26:35 UTC (rev 275) @@ -454,7 +454,7 @@ public List<FaxToMailUserGroup> getAllGroups() { FaxToMailUserGroupTopiaDao faxToMailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); - return faxToMailUserGroupDao.forAll().setOrderByArguments(FaxToMailUserGroup.PROPERTY_FULL_PATH).findAll(); + return faxToMailUserGroupDao.forAll().setOrderByArguments(FaxToMailUserGroup.PROPERTY_COMPLETE_NAME).findAll(); } /** Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-26 21:26:35 UTC (rev 275) @@ -160,13 +160,13 @@ // user groups FaxToMailUserGroupTopiaDao userGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Chargés de clientèle", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Chargés de clientèle"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/Chargés de clientèle"); FaxToMailUserGroup commerciauxGroup = userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Commerciaux", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Commerciaux"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/Commerciaux"); FaxToMailUserGroup savGroup = userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "SAV", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/SAV"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/SAV"); userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Administrateurs", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Administrateurs"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/Administrateurs"); FaxToMailUserTopiaDao userDao = getPersistenceContext().getFaxToMailUserDao(); FaxToMailUser marc = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Lefèbvre", Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-26 21:26:35 UTC (rev 275) @@ -108,7 +108,7 @@ * @param groupCN * @return */ - protected String getGroupFullPath(String groupCN) { + protected String getGroupCompleteName(String groupCN) { String[] parts = groupCN.split(","); ArrayUtils.reverse(parts); @@ -307,13 +307,13 @@ String[] groups = searchEntry.getAttributeValues("memberOf"); if (ArrayUtils.isNotEmpty(groups)) { for (String group : groups) { - String groupPath = getGroupFullPath(group); + String groupPath = getGroupCompleteName(group); String groupName = StringUtils.substringAfterLast(groupPath, "/"); FaxToMailUserGroup userGroup = faxtomailUserGroupDao.forNameEquals(groupName).findUniqueOrNull(); if (userGroup == null) { userGroup = faxtomailUserGroupDao.create( FaxToMailUserGroup.PROPERTY_NAME, groupName, - FaxToMailUserGroup.PROPERTY_FULL_PATH, groupPath); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, groupPath); } user.addUserGroups(userGroup); } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-26 21:26:35 UTC (rev 275) @@ -687,7 +687,7 @@ <tbody> <tr ng-repeat="group in parentScopeValues.rightGroups" class="parentInfos"> <td> - <span class="fa fa-users"></span> {{group.fullPath}} + <span class="fa fa-users"></span> {{group.completeName}} </td> <td> <label><input type="checkbox" ng-checked="parentScopeValues.readRightGroups.containsByTopiaId(group)" disabled> Lecture</label> @@ -709,7 +709,7 @@ <tbody> <tr ng-repeat="group in selectedMailFolder.rightGroups"> <td> - <span class="fa fa-users"></span> {{group.fullPath}} + <span class="fa fa-users"></span> {{group.completeName}} <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeRightGroup($index, group)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -775,7 +775,7 @@ <div class="form-group"> <label for="newRightGroupField" class="control-label">Nouveau groupe :</label> <select id="newRightGroupField" class="form-control" - ng-model="newRightGroup" ng-options="group as group.fullPath for group in groups"> + ng-model="newRightGroup" ng-options="group as group.completeName for group in groups"> </select> <a class="btn btn-success btn-xs" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> <span class="glyphicon glyphicon-plus"></span> @@ -809,7 +809,7 @@ <tbody> <tr ng-repeat="group in selectedMailFolder.rightGroups"> <td> - <span class="fa fa-users"></span> {{group.fullPath}} + <span class="fa fa-users"></span> {{group.completeName}} <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeRightGroup($index, group)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -855,7 +855,7 @@ <div class="form-group"> <label for="newRightGroupField" class="control-label">Nouveau groupe :</label> <select id="newRightGroupField" class="form-control" - ng-model="newRightGroup" ng-options="group as group.fullPath for group in groups"> + ng-model="newRightGroup" ng-options="group as group.completeName for group in groups"> </select> <a class="btn btn-success btn-xs" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> <span class="glyphicon glyphicon-plus"></span> @@ -1031,7 +1031,7 @@ <tr ng-repeat="groupChef in configuration.chefs" ng-class="{'info' : groupChef == selectedGroupChef}" ng-click="editGroupChef(groupChef)"> - <td>{{groupChef.userGroup ? groupChef.userGroup.fullPath : '(aucun groupe)'}} + <td>{{groupChef.userGroup ? groupChef.userGroup.completeName : '(aucun groupe)'}} <a class="btn btn-danger btn-xs pull-right" ng-click="removeGroupChef(groupChef, $index)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -1052,7 +1052,7 @@ <label for="groupChefUserGroupField" class="control-label">Chef du groupe : </label> <select id="groupChefUserGroupField" class="form-control" ng-required="selectedGroupChef" ng-model="selectedGroupChef.userGroup" - ng-options="group as group.fullPath for group in groups"> + ng-options="group as group.completeName for group in groups"> <option value="" ng-if="!selectedGroupChef.userGroup"></option> </select> </div> @@ -1069,7 +1069,7 @@ <tr ng-repeat="group in selectedGroupChef.managedGroups"> <td> <span class="fa fa-users"></span> - {{group.fullPath}} + {{group.completeName}} <a class="btn btn-danger btn-xs pull-right" ng-click="removeManagedGroup($index)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -1084,7 +1084,7 @@ <div class="form-group"> <label for="newManagedGroupField" class="control-label">Nouveau groupe :</label> <select id="newManagedGroupField" class="form-control" - ng-model="newManagedGroup" ng-options="group as group.fullPath for group in groups" width="'100%'" searchContains="true"> + ng-model="newManagedGroup" ng-options="group as group.completeName for group in groups" width="'100%'" searchContains="true"> </select> <a class="btn btn-success btn-xs" ng-click="addManagedGroup()" ng-disabled="!newManagedGroup"> <span class="glyphicon glyphicon-plus"></span> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-26 21:26:35 UTC (rev 275) @@ -43,7 +43,7 @@  </head>

1 0

r273 - trunk/faxtomail-ui-swing/src/main/assembly/min
by echatellier＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: echatellier Date: 2014-06-26 22:48:29 +0200 (Thu, 26 Jun 2014) New Revision: 273 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/273 Log: Fix launch script files Modified: trunk/faxtomail-ui-swing/src/main/assembly/min/launch.bat trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh Modified: trunk/faxtomail-ui-swing/src/main/assembly/min/launch.bat =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/min/launch.bat 2014-06-26 20:36:55 UTC (rev 272) +++ trunk/faxtomail-ui-swing/src/main/assembly/min/launch.bat 2014-06-26 20:48:29 UTC (rev 273) @@ -3,7 +3,7 @@ set OLDDIR=%CD% cd /d %~dp0% -%JAVA_COMMAND% -Xmx1024M -XX:MaxPermSize=128M -Dfaxtomail.log.file=%FAXTOMAIL_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 +java -Xmx1024M -XX:MaxPermSize=128M -Dfaxtomail.log.file=%FAXTOMAIL_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 set exitcode=%ERRORLEVEL% echo Stop FaxToMail with exitcode: %exitcode% cd %OLDDIR% Modified: trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh =================================================================== --- trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh 2014-06-26 20:36:55 UTC (rev 272) +++ trunk/faxtomail-ui-swing/src/main/assembly/min/launch.sh 2014-06-26 20:48:29 UTC (rev 273) @@ -29,9 +29,7 @@ cd $REP -#echo "java command: $JAVA_COMMAND" - -$JAVA_COMMAND $MEMORY $FAXTOMAIL_JVM_OPTS -Dfaxtomail.log.file=$FAXTOMAIL_LOG_FILE -jar ${project.build.finalName}.${project.packaging} $* +java $MEMORY $FAXTOMAIL_JVM_OPTS -Dfaxtomail.log.file=$FAXTOMAIL_LOG_FILE -jar ${project.build.finalName}.${project.packaging} $* exitcode=$? echo "Stop FaxToMail with exitcode: $exitcode" exit $exitcode

1 0

r272 - in trunk: faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content 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/transmit faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by kmorin＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: kmorin Date: 2014-06-26 22:36:55 +0200 (Thu, 26 Jun 2014) New Revision: 272 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/272 Log: - cloture propre de l'appli swing - prise en compte des dossiers affect?\195?\169s ?\195?\160 l'utilisateur Removed: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.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/transmit/MailFolderChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Deleted: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/CloseApplicationAction.java 2014-06-26 20:36:55 UTC (rev 272) @@ -1,63 +0,0 @@ -package com.franciaflex.faxtomail.ui.swing.actions; - -/* - * #%L - * FaxToMail :: UI - * %% - * Copyright (C) 2014 Franciaflex - * %% - * 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.ui.swing.RunFaxToMail; -import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; - -import static org.nuiton.i18n.I18n.t; - -/** - * To close FaxToMail Application. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.1 - */ -public class CloseApplicationAction extends AbstractChangeScreenAction { - - protected int exitCode = RunFaxToMail.NORMAL_EXIT_CODE; - - public CloseApplicationAction(MainUIHandler handler) { - super(handler, false, null); - setSkipCheckCurrentScreen(true); - setActionDescription(t("faxtomail.action.exit.tip")); - } - - public void setExitCode(int exitCode) { - this.exitCode = exitCode; - } - - @Override - public void doAction() throws Exception { - - super.doAction(); - - RunFaxToMail.closeFaxToMail(getHandler(), exitCode); - } - - @Override - public void releaseAction() { - exitCode = RunFaxToMail.NORMAL_EXIT_CODE; - super.releaseAction(); - } -} Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-06-26 20:36:55 UTC (rev 272) @@ -29,8 +29,7 @@ #mainFrame { title: "faxtomail.main.title.applicationName"; - defaultCloseOperation: {JFrame.EXIT_ON_CLOSE}; - //iconImage:{SwingUtil.createImageIcon("allegro_32.png").getImage()}; + defaultCloseOperation: {JFrame.DO_NOTHING_ON_CLOSE}; } #menuFile { @@ -59,7 +58,6 @@ actionIcon: exit; text: "faxtomail.main.action.exit"; toolTipText: "faxtomail.main.action.exit.tip"; - _applicationAction: {com.franciaflex.faxtomail.ui.swing.actions.CloseApplicationAction.class}; _help: {"faxtomail.main.menu.action.exit.help"}; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-06-26 20:36:55 UTC (rev 272) @@ -52,7 +52,7 @@ <JMenuItem id='menuFileRecherche'/> <JMenuItem id='menuFileConfiguration'/> <JSeparator/> - <JMenuItem id='menuFileExit'/> + <JMenuItem id='menuFileExit' onActionPerformed="this.dispose()"/> </JMenu>  Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-06-26 20:36:55 UTC (rev 272) @@ -46,6 +46,8 @@ import javax.swing.*; import java.awt.Cursor; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListenerProxy; @@ -131,6 +133,15 @@ initUI(ui); + getUI().addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + if (quitCurrentScreen()) { + RunFaxToMail.closeFaxToMail(MainUIHandler.this, RunFaxToMail.NORMAL_EXIT_CODE); + } + } + }); + // installation layer de blocage en mode busy // SwingUtil.setLayerUI(ui.getBody(), ui.getBusyBlockLayerUI()); // 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-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-26 20:36:55 UTC (rev 272) @@ -249,7 +249,7 @@ // init tree Map<MailFolder, DefaultMutableTreeNode> nodesByFolder = - FaxToMailUIUtil.initFolderTree(getContext(), ui.getNavigationTree(), model.getFolders()); + FaxToMailUIUtil.initFolderTree(getContext(), ui.getNavigationTree(), model.getFolders(), true); ui.getNavigationTree().addTreeSelectionListener(new TreeSelectionListener() { @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-06-26 20:36:55 UTC (rev 272) @@ -74,7 +74,7 @@ JTree navigationTree = ui.getNavigationTree(); Map<MailFolder, DefaultMutableTreeNode> nodesByFolder = - FaxToMailUIUtil.initFolderTree(getContext(), navigationTree, folders); + FaxToMailUIUtil.initFolderTree(getContext(), navigationTree, folders, false); MailFolder currentFolder = getModel().getMailFolder(); for (MailFolder folder : nodesByFolder.keySet()) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-26 20:36:55 UTC (rev 272) @@ -62,6 +62,8 @@ import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -101,9 +103,10 @@ setApplicationContext(ui, parentUI.getHandler().getContext()); } - public static Map<MailFolder, DefaultMutableTreeNode> initFolderTree(FaxToMailUIContext context, + public static Map<MailFolder, DefaultMutableTreeNode> initFolderTree(final FaxToMailUIContext context, JTree navigationTree, - Collection<MailFolder> folders) { + Collection<MailFolder> folders, + final boolean colorNotAffectedFolders) { DefaultMutableTreeNode root = new DefaultMutableTreeNode("root"); List<MailFolder> foldersToExpand = context.getExpandedFolders(); @@ -118,7 +121,8 @@ FolderTreeNode parentNode = (FolderTreeNode) nodesByFolder.get(parent); if (parentNode == null) { parentNode = new FolderTreeNode(parent); - parentNode.setCanSelect(false); + parentNode.setCanRead(false); + parentNode.setCanSelect(true); nodesByFolder.put(parent, parentNode); } @@ -142,6 +146,23 @@ FolderTreeNode node = (FolderTreeNode) value; setEnabled(node.isCanSelect()); + Font font = component.getFont(); + if (node.isCanRead()) { + font = font.deriveFont(Font.PLAIN); + } else { + font = font.deriveFont(Font.ITALIC); + } + component.setFont(font); + + Color foreground; + if (!colorNotAffectedFolders + || context.getCurrentUser().containsAffectedFolders(node.getMailFolder())) { + foreground = Color.BLACK; + } else { + foreground = Color.LIGHT_GRAY; + } + component.setForeground(foreground); + return component; } }; @@ -170,11 +191,18 @@ FolderTreeNode node = new FolderTreeNode(folder); node.setCanSelect(true); + node.setCanRead(true); result.put(folder, node); parent.add(node); if (folder.isChildrenNotEmpty()) { List<MailFolder> children = new ArrayList<MailFolder>(folder.getChildren()); + CollectionUtils.filter(children, new Predicate<MailFolder>() { + @Override + public boolean evaluate(MailFolder object) { + return !object.isArchiveFolder(); + } + }); Collections.sort(children, new Comparator<MailFolder>() { @Override public int compare(MailFolder o1, MailFolder o2) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FolderTreeNode.java 2014-06-26 20:36:55 UTC (rev 272) @@ -33,6 +33,7 @@ public class FolderTreeNode extends DefaultMutableTreeNode { protected boolean canSelect; + protected boolean canRead; public FolderTreeNode(MailFolder folder) { super(folder); @@ -50,6 +51,14 @@ this.canSelect = canSelect; } + public boolean isCanRead() { + return canRead; + } + + public void setCanRead(boolean canRead) { + this.canRead = canRead; + } + @Override public String toString() { MailFolder folder = (MailFolder) userObject; Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-26 18:53:55 UTC (rev 271) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-26 20:36:55 UTC (rev 272) @@ -888,7 +888,7 @@ <tr> <th>Filtre</th> <th>Dossier</th> - <th>Priorité au chargé de clientelle</th> + <th>Priorité au dossier de la règle</th> <th/> </tr> </thead> @@ -896,7 +896,7 @@ <tr ng-repeat="mailFilter in rootFolderMailFilters[mailFolder.topiaId]"> <td>{{mailFilter.expression}}</td> <td>{{mailFilter.mailFolder.$fullPath}}</td> - <td>{{mailFilter.clientResponsiblePriority ? 'Oui' : 'Non'}}</td> + <td>{{mailFilter.clientResponsiblePriority ? 'Non' : 'Oui'}}</td> <td><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> <span class="glyphicon glyphicon-remove"></span> </a></td> @@ -914,14 +914,14 @@ <select class="form-control" ng-model="newFilter.mailFolder" ng-options="mailFolder.$fullPath for mailFolder in flatMailFolders[mailFolder.topiaId]"></select> </div> <div class="form-group"> - <label for="clientResponsiblePriorityField">Utiliser le chargé de clientelle en priorité : </label> + <label for="clientResponsiblePriorityField">Utiliser le dossier de la règle en priorité : </label> <label class="radio-inline"> <input type="radio" - ng-model="newFilter.clientResponsiblePriority" ng-value="true"> oui + ng-model="newFilter.clientResponsiblePriority" ng-value="false"> oui </label> <label class="radio-inline"> <input type="radio" - ng-model="newFilter.clientResponsiblePriority" ng-value="false"> non + ng-model="newFilter.clientResponsiblePriority" ng-value="true"> non </label> </div> </div>

1 0

r271 - in trunk: faxtomail-persistence/src/main/xmi 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/transmit faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/js
by kmorin＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: kmorin Date: 2014-06-26 20:53:55 +0200 (Thu, 26 Jun 2014) New Revision: 271 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/271 Log: swing : affichage des dossiers parents non lisibles admin : configuration des dossiers d'archives Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo 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/transmit/MailFolderChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) 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-06-26 15:01:57 UTC (rev 270) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-06-26 18:53:55 UTC (rev 271) @@ -255,17 +255,19 @@ @Override public void valueChanged(TreeSelectionEvent e) { FolderTreeNode folderNode = (FolderTreeNode) e.getPath().getLastPathComponent(); - MailFolder folder = folderNode.getMailFolder(); + if (folderNode.isCanSelect()) { + MailFolder folder = folderNode.getMailFolder(); - getModel().setSelectedFolder(folder); - getContext().setCurrentMailFolder(folder); + getModel().setSelectedFolder(folder); + getContext().setCurrentMailFolder(folder); - DemandeUIModel currentEmail = getContext().getCurrentEmail(); - if (currentEmail != null) { - AbstractApplicationTableModel<DemandeUIModel> dataTableModel = (AbstractApplicationTableModel<DemandeUIModel>) dataTable.getModel(); - int row = dataTableModel.getRowIndex(currentEmail); - if (row > 0) { - dataTable.setRowSelectionInterval(row, row); + DemandeUIModel currentEmail = getContext().getCurrentEmail(); + if (currentEmail != null) { + AbstractApplicationTableModel<DemandeUIModel> dataTableModel = (AbstractApplicationTableModel<DemandeUIModel>) dataTable.getModel(); + int row = dataTableModel.getRowIndex(currentEmail); + if (row > 0) { + dataTable.setRowSelectionInterval(row, row); + } } } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-06-26 15:01:57 UTC (rev 270) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-06-26 18:53:55 UTC (rev 271) @@ -96,22 +96,6 @@ } } - DefaultTreeCellRenderer cellRenderer = new DefaultTreeCellRenderer() { - @Override - public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, - boolean expanded, boolean leaf, int row, boolean hasFocus) { - Component component = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); - - FolderTreeNode node = (FolderTreeNode) value; - setEnabled(node.isCanSelect()); - - return component; - } - }; - Icon folderIcon = cellRenderer.getDefaultClosedIcon(); - cellRenderer.setLeafIcon(folderIcon); - navigationTree.setCellRenderer(cellRenderer); - navigationTree.addTreeSelectionListener(new TreeSelectionListener() { @Override public void valueChanged(TreeSelectionEvent e) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-26 15:01:57 UTC (rev 270) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-06-26 18:53:55 UTC (rev 271) @@ -24,7 +24,7 @@ import static org.nuiton.i18n.I18n.t; -import java.awt.Desktop; +import java.awt.*; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -110,13 +110,41 @@ Map<MailFolder, DefaultMutableTreeNode> nodesByFolder = new HashMap<MailFolder, DefaultMutableTreeNode>(); for (MailFolder folder : folders) { nodesByFolder.putAll(FaxToMailUIUtil.createFolderTree(root, folder)); + + DefaultMutableTreeNode node = nodesByFolder.get(folder); + MailFolder parent = folder.getParent(); + + while (parent != null) { + FolderTreeNode parentNode = (FolderTreeNode) nodesByFolder.get(parent); + if (parentNode == null) { + parentNode = new FolderTreeNode(parent); + parentNode.setCanSelect(false); + nodesByFolder.put(parent, parentNode); + } + + parentNode.add(node); + node = parentNode; + parent = parent.getParent(); + } + root.add(node); } TreeModel treeModel = new DefaultTreeModel(root); navigationTree.setModel(treeModel); // use the folder icon for the leaf - DefaultTreeCellRenderer renderer = new DefaultTreeCellRenderer(); + DefaultTreeCellRenderer renderer = new DefaultTreeCellRenderer() { + @Override + public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, + boolean expanded, boolean leaf, int row, boolean hasFocus) { + Component component = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); + + FolderTreeNode node = (FolderTreeNode) value; + setEnabled(node.isCanSelect()); + + return component; + } + }; Icon folderIcon = renderer.getDefaultClosedIcon(); renderer.setLeafIcon(folderIcon); navigationTree.setCellRenderer(renderer); @@ -140,7 +168,8 @@ MailFolder folder) { Map<MailFolder, DefaultMutableTreeNode> result = new HashMap<MailFolder, DefaultMutableTreeNode>(); - DefaultMutableTreeNode node = new FolderTreeNode(folder); + FolderTreeNode node = new FolderTreeNode(folder); + node.setCanSelect(true); result.put(folder, node); parent.add(node); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-26 15:01:57 UTC (rev 270) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-06-26 18:53:55 UTC (rev 271) @@ -144,14 +144,14 @@ faxToMailSession.setAuthenticatedFaxToMailUser(user); // test si l'utilisateur est admin - List<String> adminGroups = serviceContext.getApplicationConfig().getLdapAdminGroups(); - if (user != null && CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { - for (FaxToMailUserGroup group : user.getUserGroups()) { - if (adminGroups.contains(group.getFullPath())) { +// List<String> adminGroups = serviceContext.getApplicationConfig().getLdapAdminGroups(); +// if (user != null && CollectionUtils.isNotEmpty(adminGroups) && user.getUserGroups() != null) { +// for (FaxToMailUserGroup group : user.getUserGroups()) { +// if (adminGroups.contains(group.getFullPath())) { faxToMailSession.setAdmin(true); - } - } - } +// } +// } +// } } } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-26 15:01:57 UTC (rev 270) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-26 18:53:55 UTC (rev 271) @@ -230,7 +230,8 @@ <span class="glyphicon" ng-class="{'glyphicon-chevron-right': !collapsed, 'glyphicon-chevron-down': collapsed}"></span> </a> <a ng-click="editMailFolder(mailFolder)">{{mailFolder.name}} <span class="badge">{{mailFolder.$cumulativeCount}}</span></a> - <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubFolder(this)" style="margin-left: 8px;"><span class="glyphicon glyphicon-plus"></span></a> + <a class="pull-right btn btn-info btn-xs" data-nodrag ng-click="newArchiveSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.hasArchiveFolder && !mailFolder.archiveFolder" tooltip="Créer un dossier d'archive"><span class="glyphicon glyphicon-plus"></span></a> + <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.archiveFolder"><span class="glyphicon glyphicon-plus"></span></a> <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="deleteFolder(this)" ng-disabled="mailFolder.$cumulativeCount > 0" tooltip="{{mailFolder.$cumulativeCount > 0 && 'Ce dossier contient ' + mailFolder.$cumulativeCount + ' demandes !'|| 'Supprimer ce dossier'}}"> <span class="glyphicon glyphicon-remove"></span></a> @@ -247,7 +248,7 @@ </div> </div> - <div class="col-md-8" ng-show="selectedMailFolder"> + <div class="col-md-8" ng-show="!selectedMailFolder.archiveFolder"> <h3>Édition du dossier {{selectedMailFolder.name}}</h3> <div class="panel-group" id="accordion"> @@ -786,6 +787,84 @@ </div> </div> </div> + <div class="col-md-8" ng-show="selectedMailFolder.archiveFolder"> + <h3>Édition du dossier {{selectedMailFolder.name}}</h3> + +  + <div class="panel panel-default"> + <div class="panel-heading"> + <h4 class="panel-title"> + Droits + </h4> + </div> + <div class="panel-body"> +  + <table id="rights" class="table table-bordered"> + <thead> + <tr> + <th>Utilisateur ou groupe</th> + <th>Droits</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="group in selectedMailFolder.rightGroups"> + <td> + <span class="fa fa-users"></span> {{group.fullPath}} + <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeRightGroup($index, group)"> + <span class="glyphicon glyphicon-remove"></span> + </a> + </td> + <td> + <label><input type="checkbox" + ng-model="readRightGroup" + ng-checked="selectedMailFolder.readRightGroups.containsByTopiaId(group)" + ng-disabled="parentScopeValues.readRightGroups.containsByTopiaId(group)" + ng-change="changeReadRightGroup(group)"> Lecture</label> + </td> + </tr> + <tr ng-repeat="user in selectedMailFolder.rightUsers"> + <td> + <span class="fa fa-user"></span> {{user.firstName}} {{user.lastName}} + <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeRightUser($index, user)"> + <span class="glyphicon glyphicon-remove"></span> + </a> + </td> + <td> + <label><input type="checkbox" + ng-model="readRightUser" + ng-checked="selectedMailFolder.readRightUsers.containsByTopiaId(user)" + ng-disabled="parentScopeValues.readRightUsers.containsByTopiaId(user) || selectedMailFolder.writeRightUsers.containsByTopiaId(user)" + ng-change="changeReadRightUser(user)"> Lecture</label> + </td> + </tr> + </tbody> + </table> + <div class="form-inline"> + <div class="form-group"> + <label for="newRightUserField" class="control-label">Nouveau utilisateur :</label> + <select id="newRightUserField" class="form-control" + ng-model="newRightUser" ng-options="user as user.firstName + ' ' + user.lastName for user in users"> + </select> + <a class="btn btn-success btn-xs" ng-click="addRightUser()" ng-disabled="!newRightUser"> + <span class="glyphicon glyphicon-plus"></span> + </a> + </div> + </div> + + <div class="form-inline"> + <div class="form-group"> + <label for="newRightGroupField" class="control-label">Nouveau groupe :</label> + <select id="newRightGroupField" class="form-control" + ng-model="newRightGroup" ng-options="group as group.fullPath for group in groups"> + </select> + <a class="btn btn-success btn-xs" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> + <span class="glyphicon glyphicon-plus"></span> + </a> + </div> + </div> + </div> + </div> + </div> </div> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-26 15:01:57 UTC (rev 270) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-26 18:53:55 UTC (rev 271) @@ -78,6 +78,9 @@ } result.push(mailFolder); + if (mailFolder.archiveFolder) { + parent.hasArchiveFolder = true; + } folderCount += recursiveAddMailFolder(result, mailFolder.children, rootFolder, mailFolder.$fullPath, mailFolder); // et on modifie encore (tant qu'on a commencé !!!) @@ -354,7 +357,7 @@ useCurrentLevelEdiFolder: false, useCurrentLevelRejectResponseMessage: false, useCurrentLevelRejectResponseMailAddress: false, - archiveFolder: false + archiveContainer: false }; // extend node (in faxtomail collapsed = extended) scope.collapse(); @@ -367,6 +370,37 @@ } }; + // new sub folder + $scope.newArchiveSubFolder = function(scope) { + var nodeData = scope.$modelValue; + if (!nodeData.hasArchiveFolder) { + var name = "Archives du dossier " + nodeData.name; + if (name) { + var newNode = { + topiaId: "new_" + guid(), + name: name, + children: [], + useCurrentLevelEtatAttente: false, + useCurrentLevelTableColumns: false, + useCurrentLevelFaxDomain: false, + useCurrentLevelEdiFolder: false, + useCurrentLevelRejectResponseMessage: false, + useCurrentLevelRejectResponseMailAddress: false, + archiveFolder: true + }; + // extend node (in faxtomail collapsed = extended) + scope.collapse(); + // append new node + nodeData.hasArchiveFolder = true; + nodeData.children.push(newNode); + // edition automatique + //$scope.editMailFolder(newNode); + // update flat map + $scope._updateFlatMailFolders(); + } + } + }; + // suppression d'un dossier $scope.deleteFolder = function(scope) { if ($window.confirm("Êtes-vous sûr de vouloir supprimer ce dossier ?")) {

1 0

r270 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by dcosse＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: dcosse Date: 2014-06-26 17:01:57 +0200 (Thu, 26 Jun 2014) New Revision: 270 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/270 Log: refs #4666 add logs Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 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-06-26 14:22:49 UTC (rev 269) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-26 15:01:57 UTC (rev 270) @@ -349,6 +349,9 @@ null, modifiedProperties.toArray(new String[modifiedProperties.size()])); + if (log.isDebugEnabled()) { + log.debug("Message:" +message.getSubject() + " placé dans le dossier " + email.getMailFolder().getName()); + } // suppression des mails sur le serveur distant (automatique par default) if (serviceContext.getApplicationConfig().isMailDelete()) { message.setFlag(Flags.Flag.DELETED, true);

1 0

r269 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by dcosse＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: dcosse Date: 2014-06-26 16:22:49 +0200 (Thu, 26 Jun 2014) New Revision: 269 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/269 Log: refs #4666 r?\195?\169ception des PJs fonctionnel Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 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-06-26 12:51:38 UTC (rev 268) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-26 14:22:49 UTC (rev 269) @@ -303,7 +303,6 @@ if (mailFolder != null) { email.setMailFolder(mailFolder); modifiedProperties.add(Email.PROPERTY_MAIL_FOLDER); - break; } } @@ -380,7 +379,7 @@ int multiPartCount = mimeMultipart.getCount(); for (int j = 0; j < multiPartCount; j++) { - BodyPart bp = mimeMultipart.getBodyPart(j); + MimeBodyPart bp = (MimeBodyPart) mimeMultipart.getBodyPart(j); Charset charset = getCharset(bp); // if it is a text part, the,n this is the email content @@ -403,14 +402,18 @@ // parse Content-ID (content identifier in html mail content) String[] headers = bp.getHeader("Content-ID"); - if (headers == null) { - break; + String contentID = null; + if (headers != null) { + contentID = headers[0]; + contentID = contentID.replaceFirst("^<(.*)>$", "$1"); } - String contentID = headers[0]; + // remove the guillemets between the id - contentID = contentID.replaceFirst("^<(.*)>$", "$1"); - - if (fileName == null) { + + + if (fileName == null && contentID == null) { + break; + } else if (fileName == null) { fileName = contentID; }

1 0

r268 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by dcosse＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: dcosse Date: 2014-06-26 14:51:38 +0200 (Thu, 26 Jun 2014) New Revision: 268 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/268 Log: fixes #5336 refs #46660 correction sauvegarde des filtres de mail (la map n'est plus bas?\195?\169e sur le topia id mais sur la naturalId: expression). La redirection sur le dossier du charg?\195?\169 de clientelle est fonctionnelle Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.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/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-26 09:46:42 UTC (rev 267) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-26 12:51:38 UTC (rev 268) @@ -80,6 +80,14 @@ private static final Log log = LogFactory.getLog(ConfigurationService.class); + + protected static final Function<MailFilter, String> GET_EXPRESSION = new Function<MailFilter, String>() { + @Override + public String apply(MailFilter input) { + return input == null ? null : input.getExpression(); + } + }; + /** * Return unique database configuration. * @@ -323,17 +331,17 @@ int position = 0; List<MailFilter> filters = dao.findAll(); - Map<String, MailFilter> filterById = new HashMap<>(Maps.uniqueIndex(filters, TopiaEntities.getTopiaIdFunction())); + // order by naturalId + Map<String, MailFilter> filterByExpression = new HashMap<>(Maps.uniqueIndex(filters, GET_EXPRESSION)); for (MailFilter mailFilter : mailFilters) { - MailFilter filter; - boolean create = mailFilter.getTopiaId() == null; + MailFilter filter = filterByExpression.remove(mailFilter.getExpression().toLowerCase()); + boolean create = filter == null; if (create) { filter = dao.newInstance(); - } else { - filter = filterById.remove(mailFilter.getTopiaId()); } - filter.setExpression(mailFilter.getExpression()); + + filter.setExpression(mailFilter.getExpression().toLowerCase()); filter.setClientResponsiblePriority(mailFilter.isClientResponsiblePriority()); // mailFilter.getMailFolder().getTopiaId() can start with new_ @@ -349,7 +357,7 @@ position++; } - dao.deleteAll(filterById.values()); + dao.deleteAll(filterByExpression.values()); } /** Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-26 09:46:42 UTC (rev 267) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-26 12:51:38 UTC (rev 268) @@ -80,6 +80,19 @@ return result; } + public Collection<MailFilter> getFiltersForRecipient(String recipient) { + MailFilterTopiaDao filterTopiaDao = getPersistenceContext().getMailFilterDao(); + + PaginationParameter tpb = PaginationParameter.of(0, -1, MailFilter.PROPERTY_POSITION, false); + + String query = "FROM " + MailFilter.class.getCanonicalName() + " WHERE :recipient LIKE " + MailFilter.PROPERTY_EXPRESSION; + Map<String, Object> params = new HashMap<>(); + params.put("recipient", recipient); + + Collection<MailFilter> filters = filterTopiaDao.find(query, params, tpb); + return filters; + } + public List<MailFolder> getAllMailFolders() { MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); return new ArrayList<MailFolder>(dao.findAll()); @@ -194,4 +207,10 @@ return result; } + public MailFolder getFolderForFaxToMailUser(FaxToMailUser customerResponsible) { + MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); + MailFolder result = dao.forCustomerResponsiblesContains(customerResponsible).findAnyOrNull(); + return result; + } + } 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-06-26 09:46:42 UTC (rev 267) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-26 12:51:38 UTC (rev 268) @@ -51,10 +51,13 @@ import javax.mail.Session; import javax.mail.Store; import javax.mail.internet.ContentType; +import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.MailFilter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.Charsets; import org.apache.commons.io.FileUtils; @@ -224,6 +227,7 @@ recipients.addAll(Arrays.asList(ccRecipients)); } + MailFilter filter = null; for (Address address : recipients) { String recipient = address.toString(); @@ -233,21 +237,17 @@ recipient = recipient.replaceFirst("^.*<(.*)>$", "$1"); recipient = recipient.toLowerCase(); - MailFolder mailFolder = mailFolderService.getFolderForRecipient(recipient); + Collection<MailFilter> filters = mailFolderService.getFiltersForRecipient(recipient); - if (mailFolder != null) { - if (log.isDebugEnabled()){ - log.debug("\tTo : " + address + " -> " + (mailFolder != null ? mailFolder.getName() : "none")); - } - + if (CollectionUtils.isNotEmpty(filters)) { + filter = filters.iterator().next(); email.setRecipient(recipient); - email.setMailFolder(mailFolder); modifiedProperties.add(Email.PROPERTY_RECIPIENT); - modifiedProperties.add(Email.PROPERTY_MAIL_FOLDER); break; } + } - if (email.getMailFolder() == null) { + if (filter == null) { if (log.isDebugEnabled()) { log.debug("Can't place mail " + message.getSubject() + " in any folder"); if (log.isTraceEnabled()) { @@ -282,11 +282,30 @@ email.setObject(object); modifiedProperties.add(Email.PROPERTY_OBJECT); modifiedProperties.add(Email.PROPERTY_CLIENT); + } + email.setClient(client); - //TODO kmorin 20140602 find the responsible's folder -// client.getCustomerResponsible() + MailFolder mailFolder = null; + if (filter.isClientResponsiblePriority()) { + if ( + client == null || + client.getPersonInCharge() == null || + client.getPersonInCharge().getAffectedFolders() == null || + client.getPersonInCharge().getAffectedFolders().isEmpty()) { + mailFolder = filter.getMailFolder(); + } else { + FaxToMailUser personInCharge = client.getPersonInCharge(); + mailFolder = mailFolderService.getFolderForFaxToMailUser(personInCharge); + } + } else { + mailFolder = filter.getMailFolder(); } - email.setClient(client); + if (mailFolder != null) { + email.setMailFolder(mailFolder); + modifiedProperties.add(Email.PROPERTY_MAIL_FOLDER); + break; + } + } Date receivedDate = message.getReceivedDate(); @@ -360,7 +379,6 @@ MimeMultipart mimeMultipart = new MimeMultipart(dataSource); int multiPartCount = mimeMultipart.getCount(); - for (int j = 0; j < multiPartCount; j++) { BodyPart bp = mimeMultipart.getBodyPart(j); Charset charset = getCharset(bp);

1 0

r267 - in trunk: faxtomail-service/src/test/resources/csv faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by dcosse＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: dcosse Date: 2014-06-26 11:46:42 +0200 (Thu, 26 Jun 2014) New Revision: 267 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/267 Log: refs #4654 correction permettant de retrouver le client d'un mail Modified: trunk/faxtomail-service/src/test/resources/csv/clients.csv trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-service/src/test/resources/csv/clients.csv =================================================================== --- trunk/faxtomail-service/src/test/resources/csv/clients.csv 2014-06-26 02:49:55 UTC (rev 266) +++ trunk/faxtomail-service/src/test/resources/csv/clients.csv 2014-06-26 09:46:42 UTC (rev 267) @@ -2,4 +2,4 @@ 253042;FX;John Doe;A;71 Allo;NULL;NULL;03 12 34 56 78;john(a)doe.fr;99153;NULL; 253142;FX;Gerard Menvussa;A+;40 Nabi;NULL;NULL;05 12 23 34 45;gerard.menvussa(a)code.com;99154;NULL; 253242;FX;Ella Elli;NULL;38 LA;NULL;NULL;04 98 87 76 65;NULL;99184;NULL; - +253243;FX;Cossé David;NULL;38 LA;NULL;NULL;04 98 87 76 65;david.cosse(a)sfr.fr;22152;NULL; \ No newline at end of file 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-06-26 02:49:55 UTC (rev 266) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-26 09:46:42 UTC (rev 267) @@ -231,6 +231,7 @@ // some reciepient are like "toto tutu<toto.tutu73(a)gmail.com>" // the regex is to extract email address from it recipient = recipient.replaceFirst("^.*<(.*)>$", "$1"); + recipient = recipient.toLowerCase(); MailFolder mailFolder = mailFolderService.getFolderForRecipient(recipient); @@ -261,6 +262,11 @@ Address[] addresses = message.getFrom(); if (addresses != null && addresses.length > 0) { String sender = addresses[0].toString(); + // some sender are like "toto tutu<toto.tutu73(a)gmail.com>" + // the regex is to extract email address from it + sender = sender.replaceFirst("^.*<(.*)>$", "$1"); + sender = sender.toLowerCase(); + email.setSender(sender); modifiedProperties.add(Email.PROPERTY_SENDER);

1 0

r266 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/js
by kmorin＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: kmorin Date: 2014-06-26 04:49:55 +0200 (Thu, 26 Jun 2014) New Revision: 266 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/266 Log: - apply move rights - write rights implies reading rights Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-25 08:25:10 UTC (rev 265) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-06-26 02:49:55 UTC (rev 266) @@ -114,6 +114,29 @@ } } + public List<MailFolder> getRootMailFoldersWithMoveRights(FaxToMailUser user) { + List<MailFolder> rootFolders = getRootMailFolders(); + List<MailFolder> result = new ArrayList<>(); + + for (MailFolder folder : rootFolders) { + findMoveFolders(folder, user, result); + } + + return result; + } + + protected void findMoveFolders(MailFolder folder, FaxToMailUser user, List<MailFolder> folders) { + if (folder.containsMoveRightUsers(user) + || !CollectionUtils.intersection(folder.getMoveRightGroups(), user.getUserGroups()).isEmpty()) { + folders.add(folder); + + } else if (folder.isChildrenNotEmpty()) { + for (MailFolder child : folder.getChildren()) { + findMoveFolders(child, user, folders); + } + } + } + public List<MailFolder> getMailFolders(Collection<String> ids) { MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); return new ArrayList<MailFolder>(dao.forTopiaIdIn(ids).findAll()); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-06-25 08:25:10 UTC (rev 265) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-06-26 02:49:55 UTC (rev 266) @@ -69,7 +69,8 @@ } // init tree - Collection<MailFolder> folders = getContext().getMailFolderService().getRootMailFolders(); + Collection<MailFolder> folders = getContext().getMailFolderService(). + getRootMailFoldersWithMoveRights(getContext().getCurrentUser()); JTree navigationTree = ui.getNavigationTree(); Map<MailFolder, DefaultMutableTreeNode> nodesByFolder = @@ -78,13 +79,16 @@ for (MailFolder folder : nodesByFolder.keySet()) { DefaultMutableTreeNode node = nodesByFolder.get(folder); + if (node.getClass().isAssignableFrom(FolderTreeNode.class)) { FolderTreeNode folderTreeNode = (FolderTreeNode) node; MailFolder folderWithAllowMoveDemandIntoFolder = folder; + while (folderWithAllowMoveDemandIntoFolder.getAllowMoveDemandIntoFolder() == null && folderWithAllowMoveDemandIntoFolder.getParent() != null) { folderWithAllowMoveDemandIntoFolder = folderWithAllowMoveDemandIntoFolder.getParent(); } + folderTreeNode.setCanSelect(!currentFolder.equals(folder) && Boolean.TRUE.equals(folderWithAllowMoveDemandIntoFolder.getAllowMoveDemandIntoFolder()) && (CollectionUtils.isEmpty(foldersWithEtatAttente) @@ -92,7 +96,7 @@ } } - navigationTree.setCellRenderer(new DefaultTreeCellRenderer() { + DefaultTreeCellRenderer cellRenderer = new DefaultTreeCellRenderer() { @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { @@ -103,7 +107,10 @@ return component; } - }); + }; + Icon folderIcon = cellRenderer.getDefaultClosedIcon(); + cellRenderer.setLeafIcon(folderIcon); + navigationTree.setCellRenderer(cellRenderer); navigationTree.addTreeSelectionListener(new TreeSelectionListener() { @Override Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-25 08:25:10 UTC (rev 265) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-26 02:49:55 UTC (rev 266) @@ -742,7 +742,7 @@ <label><input type="checkbox" ng-model="readRightUser" ng-checked="selectedMailFolder.readRightUsers.containsByTopiaId(user)" - ng-disabled="parentScopeValues.readRightUsers.containsByTopiaId(user)" + ng-disabled="parentScopeValues.readRightUsers.containsByTopiaId(user) || selectedMailFolder.writeRightUsers.containsByTopiaId(user)" ng-change="changeReadRightUser(user)"> Lecture</label> <label><input type="checkbox" ng-model="writeRightUser" Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-25 08:25:10 UTC (rev 265) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-26 02:49:55 UTC (rev 266) @@ -328,7 +328,8 @@ var newRoot = { topiaId: "new_" + guid(), name: name, - children: [] + children: [], + archiveFolder: false }; $scope.mailFolders.push(newRoot); $scope._updateFlatMailFolders(); // update flat map @@ -352,7 +353,8 @@ useCurrentLevelFaxDomain: false, useCurrentLevelEdiFolder: false, useCurrentLevelRejectResponseMessage: false, - useCurrentLevelRejectResponseMailAddress: false + useCurrentLevelRejectResponseMailAddress: false, + archiveFolder: false }; // extend node (in faxtomail collapsed = extended) scope.collapse(); @@ -878,6 +880,7 @@ if (index != -1) { $scope.selectedMailFolder.writeRightUsers.splice(index, 1); } else { + $scope.selectedMailFolder.readRightUsers.push(user); $scope.selectedMailFolder.writeRightUsers.push(user); } };

1 0

r265 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print
by dcosse＠users.forge.codelutin.com June 25, 2014

June 25, 2014

Author: dcosse Date: 2014-06-25 10:25:10 +0200 (Wed, 25 Jun 2014) New Revision: 265 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/265 Log: refs #4656 ligne d?\195?\169comment?\195?\169 afin de ne pas avoir le message d'erreur d'impression lorsque ce n'est pas n?\195?\169cessaire Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-25 07:54:00 UTC (rev 264) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-06-25 08:25:10 UTC (rev 265) @@ -162,7 +162,7 @@ if (StringUtils.isNotBlank(attachmentFile.getFilename())) { FaxToMailUIUtil.print(attachmentFile, true); } -// attachmentsToPrint.remove(attachmentFile); + attachmentsToPrint.remove(attachmentFile); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Could not print attachement.", e); @@ -170,7 +170,6 @@ } } - // TODO DCossé 23/06/14 not sure it works if (!attachmentsToPrint.isEmpty()) { StringBuilder fileNames = new StringBuilder();

1 0