Author: echatellier Date: 2014-06-20 18:21:36 +0200 (Fri, 20 Jun 2014) New Revision: 247 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/247 Log: Ajout de la priorite au charg?\195?\169 de clientelle Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.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/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-20 16:21:15 UTC (rev 246) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-20 16:21:36 UTC (rev 247) @@ -334,6 +334,7 @@ filter = filterById.remove(mailFilter.getTopiaId()); } filter.setExpression(mailFilter.getExpression()); + filter.setClientResponsiblePriority(mailFilter.isClientResponsiblePriority()); // mailFilter.getMailFolder().getTopiaId() can start with new_ MailFolder mailFolder = mailFolderCache.get(mailFilter.getMailFolder().getTopiaId()); 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-20 16:21:15 UTC (rev 246) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 16:21:36 UTC (rev 247) @@ -784,6 +784,7 @@ <tr> <th>Filtre</th> <th>Dossier</th> + <th>Priorité au chargé de clientelle</th> <th/> </tr> </thead> @@ -791,6 +792,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><a class="btn btn-danger btn-xs" ng-click="removeFilter(mailFolder, mailFilter)"> <span class="glyphicon glyphicon-remove"></span> </a></td> @@ -807,6 +809,17 @@ <label for="folderField">Dossier</label> <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 class="radio-inline"> + <input type="radio" + ng-model="newFilter.clientResponsiblePriority" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="newFilter.clientResponsiblePriority" ng-value="false"> non + </label> + </div> </div> <button type="button" class="btn btn-success" ng-disabled="!newFilter.expression || !newFilter.mailFolder" ng-click="addNewFilter(mailFolder)"> <i class="glyphicon glyphicon-plus"></i> Ajouter Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 16:21:15 UTC (rev 246) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 16:21:36 UTC (rev 247) @@ -891,7 +891,7 @@ ConfigurationModule.controller('ConfigurationFilterController', ['$scope', '$window', 'ConfigurationData', function($scope, $window, ConfigurationData) { //{Object} New accout empty filter - $scope.newFilter = {}; + $scope.newFilter = {clientResponsiblePriority:false}; // option de la configuration 'sortable' $scope.sortableOptions = { @@ -912,7 +912,7 @@ } $scope.rootFolderMailFilters[rootMailFolder.topiaId].push($scope.newFilter); // clear form - $scope.newFilter = {}; + $scope.newFilter = {clientResponsiblePriority:false}; }; // remove filter