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

r99 - in trunk: . faxtomail-ui-web
by echatellier＠users.forge.codelutin.com May 26, 2014

May 26, 2014

Author: echatellier Date: 2014-05-26 18:05:15 +0200 (Mon, 26 May 2014) New Revision: 99 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/99 Log: Fix dependencies Modified: trunk/faxtomail-ui-web/pom.xml trunk/pom.xml Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-05-26 15:31:06 UTC (rev 98) +++ trunk/faxtomail-ui-web/pom.xml 2014-05-26 16:05:15 UTC (rev 99) @@ -209,8 +209,8 @@ </dependency> <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> </dependency> <dependency> @@ -220,11 +220,6 @@ <dependency> <groupId>org.webjars</groupId> - <artifactId>jstree</artifactId> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> <artifactId>bootstrap</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-26 15:31:06 UTC (rev 98) +++ trunk/pom.xml 2014-05-26 16:05:15 UTC (rev 99) @@ -530,13 +530,6 @@ <dependency> <groupId>org.webjars</groupId> - <artifactId>jstree</artifactId> - <version>3.0.0</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.webjars</groupId> <artifactId>bootstrap</artifactId> <version>3.1.1-1</version> <scope>runtime</scope> @@ -561,6 +554,12 @@ <artifactId>nuiton-js-angular-ui-tree</artifactId> <version>2.0.6-1</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>nuiton-js-angularjs</artifactId> + <groupId>org.nuiton.js</groupId> + </exclusion> + </exclusions> </dependency> </dependencies>

1 0

r98 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin js
by echatellier＠users.forge.codelutin.com May 26, 2014

May 26, 2014

Author: echatellier Date: 2014-05-26 17:31:06 +0200 (Mon, 26 May 2014) New Revision: 98 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/98 Log: refs #4662: Sauvegarde colonnes ?\195?\160 afficher et actions possibles Modified: 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-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-05-26 15:02:44 UTC (rev 97) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-05-26 15:31:06 UTC (rev 98) @@ -311,8 +311,8 @@ <div id="collapse5" class="panel-collapse collapse"> <div class="panel-body"> <label class="checkbox" ng-repeat="(etatAttenteAction,label) in etatAttenteActions"> - <input type="checkbox" ng-checked="selectedMailFolder.actions.indexOf(etatAttenteAction) != -1" - ng-click="changeEtatAttenteAction(etatAttenteAction)"> {{label}} + <input type="checkbox" ng-checked="selectedMailFolder.folderActions.indexOf(etatAttenteAction) != -1" + ng-click="changeFolderAction(etatAttenteAction)"> {{label}} </label> </div> </div> @@ -333,7 +333,7 @@ <label class="control-label" for="tableColumns">Champs à afficher dans le tableau (l'ordre peut être changé en faisant un glisser/déposer sur les champs)</label> <div class="controls"> - <input type="hidden" ui-select2-sortable ng-model="mailFolder.searchDisplayColumns" + <input type="hidden" ui-select2-sortable ng-model="folderTableColumns" simple-query="getObjectsData" multiple sortable> </div> @@ -342,7 +342,7 @@ <caption>Aperçu</caption> <thead> <tr> - <th ng-repeat="etatAttenteField in searchDisplayColumns">{{etatAttenteFields[etatAttenteField.id]}}</th> + <th ng-repeat="etatAttenteField in folderTableColumns">{{etatAttenteFields[etatAttenteField.id]}}</th> </tr> </thead> </table> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-05-26 15:02:44 UTC (rev 97) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-05-26 15:31:06 UTC (rev 98) @@ -72,10 +72,14 @@ */ FaxToMailModule.controller('ConfigurationTreeController', ['$scope', '$http', '$window', 'ConfigurationData', function($scope, $http, $window, ConfigurationData) { - // selected mail folder + // {Object} selected mail folder $scope.selectedMailFolder; // {String} add new customer responsible form value $scope.newCustomerResponsible; + // {String} add new customer responsible form value + $scope.newReplyAddress; + // {Array} Colonnes selectionnées pour le dossier courant + $scope.folderTableColumns; // collapse all subnodes (called by init) $scope.collapseAll = function(scope) { @@ -98,8 +102,33 @@ if (!$scope.selectedMailFolder.replyAddresses) { $scope.selectedMailFolder.replyAddresses = []; } + if (!$scope.selectedMailFolder.folderActions) { + $scope.selectedMailFolder.folderActions = []; + } + if (!$scope.selectedMailFolder.folderTableColumns) { + $scope.selectedMailFolder.folderTableColumns = []; + } + + // initialise la liste des colonnes pour le dossier courant + $scope.folderTableColumns = []; + angular.forEach($scope.selectedMailFolder.folderTableColumns, function(folderTableColumn) { + $scope.folderTableColumns.push({ + id: folderTableColumn, + label: $scope.etatAttenteFields[folderTableColumn] + }); + }); }; + // utilisé pour mettre à jour $scope.selectedMailFolder.folderTableColumns si $scope.folderTableColumns change + $scope.$watch("folderTableColumns", function(newValue, oldValue) { + if (newValue != oldValue) { + $scope.selectedMailFolder.folderTableColumns = []; + angular.forEach(newValue, function(elem) { + $scope.selectedMailFolder.folderTableColumns.push(elem.id); + }); + } + }, true); + // new sub folder $scope.newSubFolder = function(scope) { var nodeData = scope.$modelValue; @@ -112,16 +141,16 @@ } }; - // get select2 init data + // fonction retournant l'ensemble des options disponibles $scope.getObjectsData = function(term, result) { - var result2 = []; - angular.forEach($scope.etatAttenteFields, function(v, k) { - result2.push({ - id: k, - label: v + var resultArray = []; + angular.forEach($scope.etatAttenteFields, function(label, field) { + resultArray.push({ + id: field, + label: label }); }); - result(result2); + result(resultArray); }; // add customer responsible @@ -145,6 +174,16 @@ $scope.removeReplyAddress = function(index) { $scope.selectedMailFolder.replyAddresses.splice(index, 1); }; + + // selection/deselection d'une action possible du menu contextuel pour ce dossier + $scope.changeFolderAction = function(etatAttenteAction) { + var index = $scope.selectedMailFolder.folderActions.indexOf(etatAttenteAction); + if (index != -1) { + $scope.selectedMailFolder.folderActions.splice(index, 1); + } else { + $scope.selectedMailFolder.folderActions.push(etatAttenteAction); + } + }; }]); /** @@ -210,11 +249,6 @@ */ FaxToMailModule.controller('ConfigurationSearchController', ['$scope', '$http', 'ConfigurationData', function($scope, $http, ConfigurationData) { - //{Object} Option select2 - $scope.searchSelectOptions = { - 'multiple': true/*, - 'tags': Object.keys($scope.etatAttenteFields)*/ - }; //{Array} Options actuelle $scope.searchDisplayColumns = []; angular.forEach(ConfigurationData.searchDisplayColumns, function(searchDisplayColumn) { @@ -223,16 +257,17 @@ label: $scope.etatAttenteFields[searchDisplayColumn] }); }); - + + // fonction retournant l'ensemble des options disponibles $scope.getObjectsData = function(term, result) { - var result2 = []; - angular.forEach($scope.etatAttenteFields, function(v, k) { - result2.push({ - id: k, - label: v + var resultArray = []; + angular.forEach($scope.etatAttenteFields, function(label, field) { + resultArray.push({ + id: field, + label: label }); }); - result(result2); + result(resultArray); }; }]);

1 0

Build failed in Jenkins: faxtomail-ci » FaxToMail :: Persistence #75
by admin+ci-codelutin.com＠codelutin.com May 26, 2014

May 26, 2014

See <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…> Changes: [echatellier] Use topia snapshot to use ordered association on enumeration ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building FaxToMail :: Persistence 0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… (2 KB at 10.8 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 9.9 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… (806 B at 28.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (806 B at 19.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (15 KB at 435.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/nui… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/nui… (2 KB at 48.6 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/nui… (2 KB at 31.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (2 KB at 45.3 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (2 KB at 38.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/jax… (805 B at 20.2 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/jax… (805 B at 23.1 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ faxtomail-persistence --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ faxtomail-persistence --- [INFO] [INFO] --- eugene-maven-plugin:2.9:generate (generate-entities) @ faxtomail-persistence --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/faxtomail-group/org/nuiton/top… (2 KB at 28.8 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 34.7 KB/sec) [INFO] Process phase [zargo] [INFO] Generate one file in 14.69ms. [INFO] Process phase [xmi] INFO [pool-1-thread-1 for channel] (Resource.java:296) getURLs - search URLs pattern: .*/default-java.xmi in 50 urls in 731.774ms [INFO] Generate one file in 1.568s. [INFO] Process phase [model] [INFO] Process phase [generator] [INFO] Apply generator JavaInterfaceTransformer [INFO] Apply generator TopiaMetaTransformer [INFO] Generate 138 files in 372.003ms. [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (scan-sources) @ faxtomail-persistence --- [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-persistence >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ faxtomail-persistence --- [INFO] Copying faxtomail-persistence.properties to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-persistence <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (scan-sources) @ faxtomail-persistence --- [WARNING] bundle fr_FR contains 28/43 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ faxtomail-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] Copying 19 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ faxtomail-persistence --- [INFO] Compiling 132 source files to <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>: Recompile with -Xlint:unchecked for details. [INFO] 2 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>:[668,33] method getEntityByIndex in class org.nuiton.topia.persistence.util.TopiaEntityHelper cannot be applied to given types; required: java.util.Collection<E>,int found: java.util.List<com.franciaflex.faxtomail.persistence.entities.Field>,int reason: inferred type does not conform to declared bound(s) inferred: com.franciaflex.faxtomail.persistence.entities.Field bound(s): org.nuiton.topia.persistence.TopiaEntity [ERROR] <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>:[215,33] method getEntityByIndex in class org.nuiton.topia.persistence.util.TopiaEntityHelper cannot be applied to given types; required: java.util.Collection<E>,int found: java.util.List<com.franciaflex.faxtomail.persistence.entities.Field>,int reason: inferred type does not conform to declared bound(s) inferred: com.franciaflex.faxtomail.persistence.entities.Field bound(s): org.nuiton.topia.persistence.TopiaEntity [INFO] 2 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 1

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

May 26, 2014

Author: echatellier Date: 2014-05-26 17:02:44 +0200 (Mon, 26 May 2014) New Revision: 97 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/97 Log: refs #4662: Sauvegarde des adresses de r?\195?\169ponse et charg?\195?\169 de clientele Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 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/reply/ReplyFormUIHandler.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.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-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-05-26 13:25:59 UTC (rev 96) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-05-26 15:02:44 UTC (rev 97) @@ -240,7 +240,7 @@ // categories MailFolder chargesClientelle = folderDao.create(MailFolder.PROPERTY_NAME, "Chargés de clientèle", MailFolder.PROPERTY_PARENT, franciaflex, - MailFolder.PROPERTY_REPLY_ADRESSES, Lists.newArrayList("no-reply(a)franciaflex.com")); + MailFolder.PROPERTY_REPLY_ADDRESSES, Lists.newArrayList("no-reply(a)franciaflex.com")); folders.put("Chargés de clientèle", chargesClientelle); Collections.shuffle(etatAttentes); 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-05-26 13:25:59 UTC (rev 96) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-05-26 15:02:44 UTC (rev 97) @@ -24,6 +24,21 @@ * #L% */ +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaIdFactory; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; +import org.nuiton.util.pagination.PaginationParameter; + import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; @@ -32,19 +47,6 @@ import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.collect.Lists; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaIdFactory; -import org.nuiton.util.pagination.PaginationParameter; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; - /** * @author kmorin <kmorin(a)codelutin.com> * @since 0.1 @@ -88,7 +90,12 @@ return new ArrayList<MailFolder>(dao.forTopiaIdIn(ids).findAll()); } - public Collection<MailFolder> saveMailFolders(Collection<MailFolder> mailFolders) { + public void saveMailFolders(Collection<MailFolder> mailFolders) { + saveMailFolders(null, mailFolders); + getPersistenceContext().commit(); + } + + protected Collection<MailFolder> saveMailFolders(MailFolder parent, Collection<MailFolder> mailFolders) { if (mailFolders == null) { return null; } @@ -96,23 +103,36 @@ MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); TopiaIdFactory factory = getPersistenceContext().getTopiaIdFactory(); + Binder<MailFolder, MailFolder> binderMailFolder = BinderFactory.newBinder(MailFolder.class); for (MailFolder mailFolder : mailFolders) { - Collection<MailFolder> children = saveMailFolders(mailFolder.getChildren()); + Collection<MailFolder> children = saveMailFolders(mailFolder, mailFolder.getChildren()); + MailFolder currentMailFolder; if (!factory.isTopiaId(mailFolder.getTopiaId())) { - mailFolder.setTopiaId(null); - mailFolder.setChildren(children); - mailFolder = dao.create(mailFolder); - result.add(mailFolder); + currentMailFolder = dao.create(); + } else { + currentMailFolder = dao.findByTopiaId(mailFolder.getTopiaId()); + } + + binderMailFolder.copyExcluding(mailFolder, currentMailFolder, + MailFolder.PROPERTY_TOPIA_ID, + MailFolder.PROPERTY_TOPIA_CREATE_DATE, + MailFolder.PROPERTY_TOPIA_VERSION, + MailFolder.PROPERTY_CHILDREN, + MailFolder.PROPERTY_PARENT); + currentMailFolder.setChildren(children); + currentMailFolder.setParent(parent); + + if (mailFolder.isPersisted()) { + currentMailFolder = dao.update(currentMailFolder); } else { - MailFolder original = dao.findByTopiaId(mailFolder.getTopiaId()); - original.setName(mailFolder.getName()); - original.setChildren(children); - original = dao.update(original); - result.add(original); + currentMailFolder = dao.create(currentMailFolder); } + result.add(currentMailFolder); } + + getPersistenceContext().commit(); return result; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-05-26 13:25:59 UTC (rev 96) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-05-26 15:02:44 UTC (rev 97) @@ -131,7 +131,7 @@ MailFolder folder = demand.getMailFolder(); Collection<String> folderReplyAdresses; do { - folderReplyAdresses = folder.getReplyAdresses(); + folderReplyAdresses = folder.getReplyAddresses(); folder = folder.getParent(); } while (CollectionUtils.isEmpty(folderReplyAdresses) && folder != null); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-05-26 13:25:59 UTC (rev 96) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-05-26 15:02:44 UTC (rev 97) @@ -65,20 +65,6 @@ protected List<MailFolder> mailFolders; - //protected UserService userService; - - //protected List<MailFolder> mailFolders; - - //protected Map<String, String> mailFoldersFlat; - - //protected List<MailFilterUIBean> mailFilters; - - //protected List<FaxToMailUser> allUsers; - - //protected List<FaxToMailUserGroup> allUserGroups; - - //protected String activeTab; - @Override public void prepare() throws Exception { configuration = configurationService.getConfiguration(); @@ -100,6 +86,7 @@ configurationService.saveConfiguration(configuration); referentielService.saveEtatAttente(etatAttentes); + mailFolderService.saveMailFolders(mailFolders); return result; } @@ -144,156 +131,8 @@ return mailFolders; } - public void setMailFolders(List<MailFolder> mailFolders) { - this.mailFolders = mailFolders; + public void setMailFoldersJson(String json) { + Type type = new TypeToken<List<MailFolder>>() {}.getType(); + this.mailFolders = getGson().fromJson(json, type); } - - /*public void setMailFolderService(MailFolderService mailFolderService) { - this.mailFolderService = mailFolderService; - } - - public void setUserService(UserService userService) { - this.userService = userService; - }*/ - - /*public String getActiveTab() { - return activeTab; - } - - public void setActiveTab(String activeTab) { - this.activeTab = activeTab; - }*/ - - /*public Map<String, String> getEmailFields() { - Map<String, String> result = new HashMap<>(); - result.put(Email.PROPERTY_SENDER, "Adresse email"); - result.put(Email.PROPERTY_RECEPTION_DATE, "Date de réception"); - result.put(Email.PROPERTY_EDI_CODE_NUMBER, "Code EDI"); - result.put(Email.PROPERTY_OBJECT, "Objet"); - result.put(Email.PROPERTY_PROJECT_REFERENCE, "Référence travaux"); - result.put(Email.PROPERTY_PRIORITY, "Priorité"); - result.put(Email.PROPERTY_RANGE_ROW, "Gamme"); - result.put(Email.PROPERTY_MAIL_FOLDER, "Dossier"); - result.put(Email.PROPERTY_CLIENT, "Code Client"); - result.put(Email.PROPERTY_DEMAND_STATUS, "Statut"); - result.put(Email.PROPERTY_DEMAND_TYPE, "Type"); - result.put(Email.PROPERTY_TAKEN_BY, "Pris par"); - result.put(Email.PROPERTY_ETAT_ATTENTE, "État attente"); - result.put(Email.PROPERTY_ATTACHMENT, "Pièces jointes"); - return result; - } - - public String getFoldersTreeAsJson() { - if (company == null) { - return null; - } - GsonBuilder gsonBuilder = new GsonBuilder(); - String mailFolders = gsonBuilder.create().toJson(company.getMailFolder()); - return mailFolders; - } - - public void setFoldersTreeAsJson(String json) { - GsonBuilder gsonBuilder = new GsonBuilder().registerTypeAdapter(MailFolder.class, new MailFolderDeserializer()); - mailFolders = Arrays.asList((MailFolder[])gsonBuilder.create().fromJson(json, MailFolder[].class)); - log.debug(mailFolders); - } - - public Map<String, String> getAllFoldersFlat() { - if (mailFoldersFlat == null) { - mailFoldersFlat = new LinkedHashMap<>(); - if (company.getMailFolder() != null) { - List<MailFolder> folders = new ArrayList<>(company.getMailFolder()); - Collections.sort(folders, new Comparator<MailFolder>() { - @Override - public int compare(MailFolder o1, MailFolder o2) { - return ComparatorUtils.NATURAL_COMPARATOR.compare(o1.getName(), o2.getName()); - } - }); - for (MailFolder folder : folders) { - mailFoldersFlat.putAll(getAllFoldersFlat(folder, "")); - } - } - } - return mailFoldersFlat; - } - - public List<MailFilterUIBean> getMailFilters() { - if (mailFilters == null) { - mailFilters = new ArrayList<>(); - } - return mailFilters; - } - - public void setMailFilters(List<MailFilterUIBean> mailFilters) { - this.mailFilters = mailFilters; - } - - public List<FaxToMailUser> getAllUsers() { - if (allUsers == null) { - allUsers = userService.getAllUsers(); - } - return allUsers; - } - - public List<FaxToMailUserGroup> getAllUserGroups() { - if (allUserGroups == null) { - allUserGroups = userService.getAllUserGroups(); - } - return allUserGroups; - } - - protected Map<String, String> getAllFoldersFlat(MailFolder mailFolder, String prefix) { - Map<String, String> result = new LinkedHashMap<>(); - prefix += "/" + mailFolder.getName(); - result.put(mailFolder.getTopiaId(), prefix); - log.debug(prefix); - - if (mailFolder.getChildren() != null) { - List<MailFolder> children = new ArrayList<>(mailFolder.getChildren()); - Collections.sort(children, new Comparator<MailFolder>() { - @Override - public int compare(MailFolder o1, MailFolder o2) { - return ComparatorUtils.NATURAL_COMPARATOR.compare(o1.getName(), o2.getName()); - } - }); - for (MailFolder child : children) { - result.putAll(getAllFoldersFlat(child, prefix)); - } - } - return result; - } - - protected class MailFolderDeserializer implements JsonDeserializer<MailFolder> { - - @Override - public MailFolder deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { - MailFolder mailFolder = new MailFolderImpl(); - JsonObject o = json.getAsJsonObject(); - - String name = o.get(MailFolder.PROPERTY_NAME).getAsString(); - mailFolder.setName(name); - - MailFolder[] children = context.deserialize(o.get(MailFolder.PROPERTY_CHILDREN), MailFolder[].class); - List<MailFolder> mailFolders = Arrays.asList(children); - mailFolder.setChildren(mailFolders); - - String topiaId = o.get(MailFolder.PROPERTY_TOPIA_ID).getAsString(); - mailFolder.setTopiaId(topiaId); - - return mailFolder; - } - } - - public static class MailFilterUIBean extends MailFilterImpl { - - protected String mailFolderId; - - public String getMailFolderId() { - return mailFolderId; - } - - public void setMailFolderId(String mailFolderId) { - this.mailFolderId = mailFolderId; - } - }*/ } 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-05-26 13:25:59 UTC (rev 96) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-05-26 15:02:44 UTC (rev 97) @@ -60,17 +60,21 @@ <div class="navbar-header"> <a href="<s:url value='/' />" class="navbar-brand">FaxToMail</a> </div> - + <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> + <ul class="nav navbar-nav"> + <li class="active"><a href="<s:url action='configuration-input' />" class="navbar-brand">Configuration</a></li> + <li><a href="<s:url action='import-input' />" class="navbar-brand">Import</a></li> + </ul> + </div> </div> </header> - + <div id="main-container" class="container"> <h1 class="page-header">Configuration</h1> <s:form id="main_form" action="configuration" ng-controller="ConfigurationController"> - - <s:hidden name="companyId"/> + <s:hidden name="activeTab"/> <ul id="tabs" class="nav nav-tabs"> @@ -79,7 +83,7 @@ <li><a href="#tabs-tree" data-toggle="tab">Arborescence</a></li> <li><a href="#tabs-filters" data-toggle="tab">Filtres de mail</a></li> <li><a href="#tabs-search" data-toggle="tab">Recherche</a></li> -  + <li><a href="#tabs-ldap" data-toggle="tab">Groupes lDAP</a></li> </ul> <div class="tab-content active" ng-controller="ConfigurationMiscController"> @@ -94,10 +98,6 @@ label="Refuser les mails dont l'email est inconnu de la base client" cssClass="margin-bottom25"/> - <s:textfield name="configuration.ediFolder" - label="Dossier de dépôt du fichier pour l'EDI" - cssClass="span12"/> - <s:textfield name="configuration.convertToPdfCommand" label="Ligne de commande de conversion de fichier X en pdf" cssClass="span12"/> @@ -152,19 +152,20 @@ </div> <div id="tabs-tree" class="tab-pane" ng-controller="ConfigurationTreeController"> - + <input type="hidden" name="mailFoldersJson" value="{{mailFolders}}" /> + <div class="row"> <div class="col-md-4"> <script type="text/ng-template" id="nodes_renderer.html"> <div ui-tree-handle ng-click="editMailFolder(mailFolder)" ng-class="{'bg-warning' : mailFolder == selectedMailFolder}"> - <a class="btn btn-success btn-xs" data-nodrag ng-click="toggle(this)"> - <span class="glyphicon" ng-class="{'glyphicon-chevron-right': collapsed, 'glyphicon-chevron-down': !collapsed}"></span> + <a class="btn btn-success btn-xs" data-nodrag ng-click="toggle(this)" ng-disabled="!mailFolder.children || mailFolder.children.length == 0"> + <span class="glyphicon" ng-class="{'glyphicon-chevron-right': !collapsed, 'glyphicon-chevron-down': collapsed}"></span> </a> {{mailFolder.name}} - <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="remove(this)"><span class="glyphicon glyphicon-remove"></span></a> - <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubItem(this)" style="margin-right: 8px;"><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;"><span class="glyphicon glyphicon-plus"></span></a> + <a class="pull-right btn btn-danger btn-xs" data-nodrag ng-click="remove(this)" ng-if="!mailFolder.topiaId"><span class="glyphicon glyphicon-remove"></span></a> </div> - <ol ui-tree-nodes="options" ng-model="mailFolder.children" ng-class="{hidden: collapsed}"> + <ol ui-tree-nodes="options" ng-model="mailFolder.children" ng-class="{hidden: !collapsed}"> <li ng-repeat="mailFolder in mailFolder.children" ui-tree-node ng-include="'nodes_renderer.html'"> </li> </ol> @@ -176,7 +177,7 @@ </div> </div> - <div class="col-md-8" ng-if="selectedMailFolder"> + <div class="col-md-8" ng-show="selectedMailFolder"> <div class="panel-group" id="accordion">  @@ -184,13 +185,35 @@ <div class="panel-heading"> <h4 class="panel-title"> <a data-toggle="collapse" data-parent="#accordion" href="#collapse1"> - Liste des chargés de clientèle {{selectedMailFolder.name}} + Liste des chargés de clientèle </a> </h4> </div> <div id="collapse1" class="panel-collapse collapse"> <div class="panel-body"> - Toto + <table class="table table-bordered"> + <thead> + <tr> + <th>Adresse email</th> + <th>Action</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="customerResponsible in selectedMailFolder.customerResponsibles track by $index"> + <td>{{customerResponsible}}</td> + <td> + <a class="pull-right btn btn-danger btn-xs" ng-click="removeCustomerResponsible($index)"> + <span class="glyphicon glyphicon-remove"></span> + </a> + </td> + </tr> + </tbody> + </table> + + Nouveau : <input type="email" ng-model="newCustomerResponsible" /> + <a class="btn btn-success btn-xs" ng-click="addCustomerResponsible()" ng-disabled="!newCustomerResponsible"> + <span class="glyphicon glyphicon-ok"></span> + </a> </div> </div> </div> @@ -206,7 +229,29 @@ </div> <div id="collapse2" class="panel-collapse collapse"> <div class="panel-body"> - Toto + <table class="table table-bordered"> + <thead> + <tr> + <th>Adresse email</th> + <th>Action</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="replyAddress in selectedMailFolder.replyAddresses track by $index"> + <td>{{replyAddress}}</td> + <td> + <a class="pull-right btn btn-danger btn-xs" ng-click="removeReplyAddress($index)"> + <span class="glyphicon glyphicon-remove"></span> + </a> + </td> + </tr> + </tbody> + </table> + + Nouveau : <input type="email" ng-model="newReplyAddress" /> + <a class="btn btn-success btn-xs" ng-click="addReplyAddress()" ng-disabled="!newReplyAddress"> + <span class="glyphicon glyphicon-ok"></span> + </a> </div> </div> </div> @@ -222,7 +267,9 @@ </div> <div id="collapse3" class="panel-collapse collapse"> <div class="panel-body"> - Toto + <label class="checkbox" ng-repeat="etatAttente in etatAttentes"> + <input type="checkbox"> {{etatAttente.label}} + </label> </div> </div> </div> @@ -238,7 +285,16 @@ </div> <div id="collapse4" class="panel-collapse collapse"> <div class="panel-body"> - Toto +  + <table id="rights" class="table table-bordered"> + <thead> + <tr> + <th>Utilisateur ou groupe</th> + <th>Type</th> + </tr> + </thead> + <tbody></tbody> + </table> </div> </div> </div> @@ -254,7 +310,10 @@ </div> <div id="collapse5" class="panel-collapse collapse"> <div class="panel-body"> - Toto + <label class="checkbox" ng-repeat="(etatAttenteAction,label) in etatAttenteActions"> + <input type="checkbox" ng-checked="selectedMailFolder.actions.indexOf(etatAttenteAction) != -1" + ng-click="changeEtatAttenteAction(etatAttenteAction)"> {{label}} + </label> </div> </div> </div> @@ -270,11 +329,27 @@ </div> <div id="collapse6" class="panel-collapse collapse"> <div class="panel-body"> - Toto + <div class="control-group"> + <label class="control-label" for="tableColumns">Champs à afficher dans le tableau (l'ordre peut être changé en faisant un glisser/déposer sur les champs)</label> + + <div class="controls"> + <input type="hidden" ui-select2-sortable ng-model="mailFolder.searchDisplayColumns" + simple-query="getObjectsData" multiple sortable> + </div> + + <div> + <table id='table-snapshot' class="table table-bordered"> + <caption>Aperçu</caption> + <thead> + <tr> + <th ng-repeat="etatAttenteField in searchDisplayColumns">{{etatAttenteFields[etatAttenteField.id]}}</th> + </tr> + </thead> + </table> + </div> </div> </div> </div> - </div> <div class="checkbox"> @@ -294,6 +369,7 @@ </div> </div> </div> + </div> <div id="tabs-filters" class="tab-pane" ng-controller="ConfigurationFilterController"> <table class="table table-hover table-bordered"> @@ -349,6 +425,10 @@ </div> </div> + <div id="tabs-ldap" class="tab-pane" ng-controller="ConfigurationLdapController"> + Comming soon ... + </div> + <nav class="navbar navbar-default navbar-fixed-bottom"> <div class="container"> <button type="submit" class="btn btn-primary navbar-btn pull-right">Valider</button> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-05-26 13:25:59 UTC (rev 96) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-05-26 15:02:44 UTC (rev 97) @@ -10,6 +10,8 @@ $scope.etatAttenteActions = ConfigurationData.etatAttenteActions; //{Map} les champs obligatoires possibles $scope.etatAttenteFields = ConfigurationData.etatAttenteFields; + //{Array} les etats d'attentes disponibles + $scope.etatAttentes = ConfigurationData.etatAttentes; }]); /** @@ -25,8 +27,7 @@ */ FaxToMailModule.controller('ConfigurationWaitController', ['$scope', '$http', 'ConfigurationData', function($scope, $http, ConfigurationData) { - //{Array} les etats d'attentes disponibles - $scope.etatAttentes = ConfigurationData.etatAttentes; + //{Object} etat d'attente selectionné $scope.selectedEtatAttente; @@ -69,20 +70,81 @@ /** * Mail folder tab controller. */ -FaxToMailModule.controller('ConfigurationTreeController', ['$scope', '$http', 'ConfigurationData', - function($scope, $http, ConfigurationData) { +FaxToMailModule.controller('ConfigurationTreeController', ['$scope', '$http', '$window', 'ConfigurationData', + function($scope, $http, $window, ConfigurationData) { // selected mail folder $scope.selectedMailFolder; + // {String} add new customer responsible form value + $scope.newCustomerResponsible; - // toggle node + // collapse all subnodes (called by init) + $scope.collapseAll = function(scope) { + scope.collapseAll(); + }; + + // toggle node (expand or collapse) $scope.toggle = function(scope) { scope.toggle(); }; - + // edit mail folder $scope.editMailFolder = function(mailFolder) { $scope.selectedMailFolder = mailFolder; + + // edit undefined collections + if (!$scope.selectedMailFolder.customerResponsibles) { + $scope.selectedMailFolder.customerResponsibles = []; + } + if (!$scope.selectedMailFolder.replyAddresses) { + $scope.selectedMailFolder.replyAddresses = []; + } }; + + // new sub folder + $scope.newSubFolder = function(scope) { + var nodeData = scope.$modelValue; + var name = $window.prompt("Nom du nouveau noeud ? "); + if (name) { + nodeData.children.push({ + name: name, + children: [] + }); + } + }; + + // get select2 init data + $scope.getObjectsData = function(term, result) { + var result2 = []; + angular.forEach($scope.etatAttenteFields, function(v, k) { + result2.push({ + id: k, + label: v + }); + }); + result(result2); + }; + + // add customer responsible + $scope.addCustomerResponsible = function() { + $scope.selectedMailFolder.customerResponsibles.push($scope.newCustomerResponsible); + delete $scope.newCustomerResponsible; + }; + + // remove customer responsible + $scope.removeCustomerResponsible = function(index) { + $scope.selectedMailFolder.customerResponsibles.splice(index, 1); + }; + + // add reply address + $scope.addReplyAddress = function() { + $scope.selectedMailFolder.replyAddresses.push($scope.newReplyAddress); + delete $scope.newReplyAddress; + }; + + // remove customer responsible + $scope.removeReplyAddress = function(index) { + $scope.selectedMailFolder.replyAddresses.splice(index, 1); + }; }]); /** @@ -173,3 +235,12 @@ result(result2); }; }]); + + +/** + * Ldap tab controller. + */ +FaxToMailModule.controller('ConfigurationLdapController', ['$scope', '$http', 'ConfigurationData', + function($scope, $http, ConfigurationData) { + +}]); \ No newline at end of file

1 0

r96 - in trunk: . faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web
by echatellier＠users.forge.codelutin.com May 26, 2014

May 26, 2014

Author: echatellier Date: 2014-05-26 15:25:59 +0200 (Mon, 26 May 2014) New Revision: 96 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/96 Log: Use topia snapshot to use ordered association on enumeration Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-ui-web/pom.xml trunk/pom.xml Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java 2014-05-26 13:25:01 UTC (rev 95) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/AbstractFaxToMailTopiaDao.java 2014-05-26 13:25:59 UTC (rev 96) @@ -29,11 +29,11 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.internal.AbstractTopiaDao; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.pagination.PaginationParameter; public abstract class AbstractFaxToMailTopiaDao<E extends TopiaEntity> extends AbstractTopiaDao<E> { - public <K> List<K> find(String hql, Map<String, Object> hqlParameters, TopiaPagerBean pager) { + public <K> List<K> find(String hql, Map<String, Object> hqlParameters, PaginationParameter pager) { return super.find(hql, hqlParameters, pager); } Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) 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-05-26 13:25:01 UTC (rev 95) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-05-26 13:25:59 UTC (rev 96) @@ -24,20 +24,19 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; -import com.google.common.base.Preconditions; import com.google.common.collect.Lists; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaIdFactory; -import org.nuiton.topia.persistence.pager.TopiaPagerBean; +import org.nuiton.util.pagination.PaginationParameter; import java.util.ArrayList; import java.util.Collection; @@ -57,9 +56,7 @@ public MailFolder getFolderForRecipient(String recipient) { MailFilterTopiaDao filterTopiaDao = getPersistenceContext().getMailFilterDao(); - TopiaPagerBean tpb = new TopiaPagerBean(); - tpb.setSortColumn(MailFilter.PROPERTY_POSITION); - tpb.setSortAscendant(true); + PaginationParameter tpb = PaginationParameter.of(-1, -1, MailFilter.PROPERTY_POSITION, false); String query = "FROM " + MailFilter.class.getCanonicalName() + " WHERE :recipient LIKE " + MailFilter.PROPERTY_EXPRESSION; Map<String, Object> params = new HashMap<>(); Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-05-26 13:25:01 UTC (rev 95) +++ trunk/faxtomail-ui-web/pom.xml 2014-05-26 13:25:59 UTC (rev 96) @@ -217,22 +217,22 @@ <groupId>org.webjars</groupId> <artifactId>angularjs</artifactId> </dependency> - + <dependency> <groupId>org.webjars</groupId> <artifactId>jstree</artifactId> </dependency> - + <dependency> <groupId>org.webjars</groupId> <artifactId>bootstrap</artifactId> </dependency> - + <dependency> <groupId>org.webjars</groupId> <artifactId>jquery</artifactId> </dependency> - + <dependency> <groupId>org.webjars</groupId> <artifactId>select2</artifactId> @@ -242,6 +242,11 @@ <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular-ui-tree</artifactId> </dependency> + + <dependency> + <groupId>org.webjars</groupId> + <artifactId>angular-ui-utils</artifactId> + </dependency> </dependencies> <build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-26 13:25:01 UTC (rev 95) +++ trunk/pom.xml 2014-05-26 13:25:59 UTC (rev 96) @@ -105,7 +105,7 @@ <nuitonWebVersion>1.16</nuitonWebVersion> <eugeneVersion>2.9</eugeneVersion> - <topiaVersion>3.0-beta-4</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.3.176</h2Version> @@ -523,6 +523,13 @@ <dependency> <groupId>org.webjars</groupId> + <artifactId>angular-ui-utils</artifactId> + <version>0.1.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.webjars</groupId> <artifactId>jstree</artifactId> <version>3.0.0</version> <scope>runtime</scope>

1 0

r95 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by echatellier＠users.forge.codelutin.com May 26, 2014

May 26, 2014

Author: echatellier Date: 2014-05-26 15:25:01 +0200 (Mon, 26 May 2014) New Revision: 95 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/95 Log: Typo Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-05-26 10:25:20 UTC (rev 94) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailApplicationListener.java 2014-05-26 13:25:01 UTC (rev 95) @@ -59,7 +59,7 @@ log.info("init FaxToMail web ui"); } - log.debug("scheduler lanuched"); + log.debug("scheduler launched"); applicationContext = new FaxToMailApplicationContext();

1 0

Jenkins build became unstable: faxtomail-ci » FaxToMail :: Service #24
by admin+ci-codelutin.com＠codelutin.com May 26, 2014

May 26, 2014

See <http://ci.codelutin.com/jenkins/job/faxtomail-ci/com.franciaflex.faxtomail$…>

1 50

Build failed in Jenkins: faxtomail-ci » FaxToMail :: UI #69
by admin+ci-codelutin.com＠codelutin.com May 26, 2014

May 26, 2014

1 5

r94 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing 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/
by echatellier＠users.forge.codelutin.com May 26, 2014

May 26, 2014

Author: echatellier Date: 2014-05-26 12:25:20 +0200 (Mon, 26 May 2014) New Revision: 94 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/94 Log: Remove company and brand from model Removed: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/CompanyService.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 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-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.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/AbstractFaxToMailDemandListHandler.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-05-26 10:25:20 UTC (rev 94) @@ -35,9 +35,6 @@ com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.filename.tagvalue.notNull=true com.franciaflex.faxtomail.persistence.entities.AttachmentFile.attribute.content.tagvalue.notNull=true -# Company -com.franciaflex.faxtomail.persistence.entities.Company.attribute.name.tagvalue.naturalId=true - # MailFolder com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.parent.tagvalue.naturalId=true com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.parent.tagvalue.notNull=false Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceSupport.java 2014-05-26 10:25:20 UTC (rev 94) @@ -26,7 +26,6 @@ import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; -import com.franciaflex.faxtomail.services.service.CompanyService; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.FaxToMailWebApplicationContext; @@ -68,10 +67,6 @@ return newService(DecoratorService.class); } - public CompanyService getCompanyService() { - return newService(CompanyService.class); - } - public ConfigurationService getConfigurationService() { return newService(ConfigurationService.class); } Deleted: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/CompanyService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/CompanyService.java 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/CompanyService.java 2014-05-26 10:25:20 UTC (rev 94) @@ -1,134 +0,0 @@ -package com.franciaflex.faxtomail.services.service; - -/* - * #%L - * FaxToMail :: Service - * $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.Company; -import com.franciaflex.faxtomail.persistence.entities.CompanyTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.Configuration; -import com.franciaflex.faxtomail.persistence.entities.EmailAccount; -import com.franciaflex.faxtomail.persistence.entities.EmailAccountTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.MailFilter; -import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; -import com.google.common.base.Function; -import com.google.common.base.Preconditions; -import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntities; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * @author kmorin <kmorin(a)codelutin.com> - * @since x.x - */ -public class CompanyService extends FaxToMailServiceSupport { - - private static final Log log = LogFactory.getLog(CompanyService.class); - - public List<Company> getAllCompanies() { - CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); - List<Company> companies = new ArrayList<>(dao.findAll()); - return companies; - } - - public Company getCompany(String id) { - CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); - Company company = dao.findByTopiaId(id); - return company; - } - - public Company getCompanyByName(String name) { - CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); - Company company = dao.forNameEquals(name).findAny(); - return company; - } - - /*public Company saveCompany(Company company, Collection<MailFolder> mailFolders, Map<MailFilter, String> mailFilters) { - Preconditions.checkNotNull(company); - - ConfigurationService configurationService = getConfigurationService(); - configurationService.saveConfiguration(company.getConfiguration()); - - MailFolderService mailFolderService = getMailFolderService(); - mailFolders = mailFolderService.saveMailFolders(mailFolders); - company.setMailFolder(mailFolders); - - if (mailFilters != null) { - Map<String, MailFolder> foldersById = Maps.uniqueIndex(mailFolders, TopiaEntities.getTopiaIdFunction()); - for (MailFilter filter : mailFilters.keySet()) { - MailFolder folder = foldersById.get(mailFilters.get(filter)); - filter.setMailFolder(folder); - } - } - Collection<MailFilter> filters = saveMailFilters(mailFilters.keySet()); - company.setMailFilter(filters); - - CompanyTopiaDao dao = getPersistenceContext().getCompanyDao(); - company = dao.update(company); - - getPersistenceContext().commit(); - - return company; - }*/ - - public Collection<MailFilter> saveMailFilters(Collection<MailFilter> mailFilters) { - MailFilterTopiaDao dao = getPersistenceContext().getMailFilterDao(); - - Collection<MailFilter> result = new ArrayList<>(); - for (MailFilter mailFilter : mailFilters) { - - MailFilter filter; - boolean create = mailFilter.getTopiaId() == null; - if (create) { - filter = dao.newInstance(); - } else { - filter = dao.findByTopiaId(mailFilter.getTopiaId()); - } - filter.setExpression(mailFilter.getExpression()); - filter.setMailFolder(mailFilter.getMailFolder()); - - if (create) { - filter = dao.create(filter); - } else { - filter = dao.update(filter); - } - result.add(filter); - } - return result; - } - - public Collection<EmailAccount> getEmailAccounts() { - EmailAccountTopiaDao emailAccountTopiaDao = getPersistenceContext().getEmailAccountDao(); - return new ArrayList<>(emailAccountTopiaDao.findAll()); - } -} 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-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-05-26 10:25:20 UTC (rev 94) @@ -24,6 +24,8 @@ * #L% */ +import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.apache.commons.logging.Log; @@ -32,6 +34,10 @@ import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.ConfigurationImpl; import com.franciaflex.faxtomail.persistence.entities.ConfigurationTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.EmailAccount; +import com.franciaflex.faxtomail.persistence.entities.EmailAccountTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.MailFilter; +import com.franciaflex.faxtomail.persistence.entities.MailFilterTopiaDao; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.collect.Lists; @@ -73,5 +79,35 @@ getPersistenceContext().commit(); return config; } + + public Collection<MailFilter> saveMailFilters(Collection<MailFilter> mailFilters) { + MailFilterTopiaDao dao = getPersistenceContext().getMailFilterDao(); + Collection<MailFilter> result = new ArrayList<>(); + for (MailFilter mailFilter : mailFilters) { + + MailFilter filter; + boolean create = mailFilter.getTopiaId() == null; + if (create) { + filter = dao.newInstance(); + } else { + filter = dao.findByTopiaId(mailFilter.getTopiaId()); + } + filter.setExpression(mailFilter.getExpression()); + filter.setMailFolder(mailFilter.getMailFolder()); + + if (create) { + filter = dao.create(filter); + } else { + filter = dao.update(filter); + } + result.add(filter); + } + return result; + } + + public Collection<EmailAccount> getEmailAccounts() { + EmailAccountTopiaDao emailAccountTopiaDao = getPersistenceContext().getEmailAccountDao(); + return new ArrayList<>(emailAccountTopiaDao.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-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-05-26 10:25:20 UTC (rev 94) @@ -26,8 +26,6 @@ import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.entities.Client; -import com.franciaflex.faxtomail.persistence.entities.Company; -import com.franciaflex.faxtomail.persistence.entities.CompanyTopiaDao; import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.ConfigurationTopiaDao; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; @@ -234,39 +232,23 @@ int etatAttenteSize = etatAttentes.size(); - // root folders + // root folders (~companies) + MailFolder franciaflex = folderDao.create(MailFolder.PROPERTY_NAME, "Franciaflex"); + MailFolder faber = folderDao.create(MailFolder.PROPERTY_NAME, "Faber"); + MailFolder franceFermeture = folderDao.create(MailFolder.PROPERTY_NAME, "France-fermeture"); + + // categories MailFolder chargesClientelle = folderDao.create(MailFolder.PROPERTY_NAME, "Chargés de clientèle", + MailFolder.PROPERTY_PARENT, franciaflex, MailFolder.PROPERTY_REPLY_ADRESSES, Lists.newArrayList("no-reply(a)franciaflex.com")); folders.put("Chargés de clientèle", chargesClientelle); Collections.shuffle(etatAttentes); MailFolder sav = folderDao.create(MailFolder.PROPERTY_NAME, "SAV", + MailFolder.PROPERTY_PARENT, franciaflex, MailFolder.PROPERTY_ETAT_ATTENTE, etatAttentes.subList(0, random.nextInt(etatAttenteSize - 8) + 2)); folders.put("SAV", sav); - // companies - CompanyTopiaDao companyTopiaDao = getPersistenceContext().getCompanyDao(); - ConfigurationTopiaDao configurationTopiaDao = getPersistenceContext().getConfigurationDao(); -// Configuration configuration = configurationTopiaDao.create(Configuration.PROPERTY_TABLE_COLUMNS, -// Email.PROPERTY_PRIORITY + "," + -// Email.PROPERTY_DEMAND_TYPE + "," + -// Email.PROPERTY_OBJECT + "," + -// "clientCode," + -// Email.PROPERTY_SENDER + "," + -// Email.PROPERTY_RECEPTION_DATE + "," + -// Email.PROPERTY_DEMAND_STATUS + "," + -// "pfNb,savNb," + -// Email.PROPERTY_TAKEN_BY + "," + -// "lastAttachmentOpeningUser," + -// Email.PROPERTY_ATTACHMENT -// ); - //Configuration configuration = configurationTopiaDao.create(); - Company fx = companyTopiaDao.create(Company.PROPERTY_NAME, "Franciaflex"/*, - Company.PROPERTY_CONFIGURATION, configuration, - Company.PROPERTY_MAIL_FOLDER, folders.values()*/); - companyTopiaDao.create(Company.PROPERTY_NAME, "Faber"/*, Company.PROPERTY_CONFIGURATION, configurationTopiaDao.create()*/); - companyTopiaDao.create(Company.PROPERTY_NAME, "France Fermeture"/*, Company.PROPERTY_CONFIGURATION, configurationTopiaDao.create()*/); - // user folders Collections.shuffle(etatAttentes); MailFolder cyrilFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Cyril", @@ -306,11 +288,7 @@ try { InputStream emailAccountsPropertiesStream = ClassLoader.getSystemResourceAsStream("email_accounts.csv"); if (emailAccountsPropertiesStream != null) { - - List<EmailAccount> emailAccounts = getReferentielService().importEmailAccounts(emailAccountsPropertiesStream); - - fx.addAllEmailAccount(emailAccounts); - companyTopiaDao.update(fx); + getReferentielService().importEmailAccounts(emailAccountsPropertiesStream); } } catch(Exception e) { @@ -318,14 +296,10 @@ } // email filters - try { InputStream emailFiltersPropertiesStream = ClassLoader.getSystemResourceAsStream("email_filters.csv"); if (emailFiltersPropertiesStream != null) { - List<MailFilter> mailFilters = getReferentielService().importEmailFilters(emailFiltersPropertiesStream, folders); - - //fx.addAllMailFilter(mailFilters); - //companyTopiaDao.update(fx); + getReferentielService().importEmailFilters(emailFiltersPropertiesStream, folders); } } catch(Exception e) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-05-26 10:25:20 UTC (rev 94) @@ -23,7 +23,6 @@ */ import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.entities.Company; import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; @@ -32,7 +31,6 @@ import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.persistence.RessourceClassLoader; -import com.franciaflex.faxtomail.services.service.CompanyService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.InitFaxToMailService; import com.franciaflex.faxtomail.services.service.MailFolderService; @@ -533,10 +531,6 @@ return serviceContext.newService(MailFolderService.class); } - public CompanyService getCompanyService() { - return serviceContext.newService(CompanyService.class); - } - public UserService getUserService() { return serviceContext.newService(UserService.class); } 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-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-26 10:25:20 UTC (rev 94) @@ -26,7 +26,6 @@ import com.ezware.oxbow.swingbits.table.filter.ITableFilter; import com.ezware.oxbow.swingbits.table.filter.JTableFilter; import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; -import com.franciaflex.faxtomail.persistence.entities.Company; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; 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-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-05-26 10:25:20 UTC (rev 94) @@ -24,7 +24,6 @@ * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Company; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-05-26 10:25:20 UTC (rev 94) @@ -25,8 +25,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.Company; -import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; @@ -65,7 +63,6 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableModel; import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; 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-05-26 09:38:31 UTC (rev 93) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-05-26 10:25:20 UTC (rev 94) @@ -75,7 +75,7 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.services.service.CompanyService; +import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.MailFolderService; @@ -96,8 +96,8 @@ public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { serviceContext = (FaxToMailServiceContext) jobExecutionContext.getMergedJobDataMap().get(SERVICE_CONTEXT); - CompanyService companyService = serviceContext.newService(CompanyService.class); - Collection<EmailAccount> emailAccounts = companyService.getEmailAccounts(); + ConfigurationService configurationService = serviceContext.newService(ConfigurationService.class); + Collection<EmailAccount> emailAccounts = configurationService.getEmailAccounts(); for (EmailAccount account : emailAccounts) { if ("pop3".equals(account.getProtocol().toLowerCase())) {

1 0

r93 - trunk
by echatellier＠users.forge.codelutin.com May 26, 2014

May 26, 2014

Author: echatellier Date: 2014-05-26 11:38:31 +0200 (Mon, 26 May 2014) New Revision: 93 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/93 Log: Use snapshot Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-23 09:00:11 UTC (rev 92) +++ trunk/pom.xml 2014-05-26 09:38:31 UTC (rev 93) @@ -552,7 +552,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular-ui-tree</artifactId> - <version>2.0.6-1-SNAPSHOT</version> + <version>2.0.6-1</version> <scope>runtime</scope> </dependency> </dependencies>

1 0