Author: echatellier Date: 2014-06-02 22:10:28 +0200 (Mon, 02 Jun 2014) New Revision: 123 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/123 Log: Ajout des droits d'?\195?\169criture et des charg?\195?\169s de clientelle Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo 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-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-02 18:45:22 UTC (rev 122) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-02 20:10:28 UTC (rev 123) @@ -181,15 +181,15 @@ <table class="table table-bordered"> <thead> <tr> - <th>Adresse email</th> + <th>Utilisateur</th> <th>Action</th> </tr> </thead> <tbody> - <tr ng-repeat="customerResponsible in selectedMailFolder.customerResponsibles track by $index"> + <tr ng-repeat="customerResponsible in selectedMailFolder.customerResponsibles"> <td> <span class="glyphicon glyphicon-user"></span> - {{customerResponsible}}</td> + {{customerResponsible.firstName}} {{customerResponsible.lastName}}</td> <td> <a class="pull-right btn btn-danger btn-xs" ng-click="removeCustomerResponsible($index)"> <span class="glyphicon glyphicon-remove"></span> @@ -199,7 +199,7 @@ </tbody> </table> - Nouveau : <input type="email" ng-model="newCustomerResponsible" placeholder="nom.prenom@franciaflex.fr" /> + Nouveau : <select ng-model="newCustomerResponsible" ng-options="user as user.firstName + ' ' + user.lastName for user in users"></select> <a class="btn btn-success btn-xs" ng-click="addCustomerResponsible()" ng-disabled="!newCustomerResponsible"> <span class="glyphicon glyphicon-ok"></span> </a> @@ -283,16 +283,30 @@ <tr> <th>Utilisateur ou groupe</th> <th>Type</th> + <th>Action</th> </tr> </thead> <tbody> - + <tr ng-repeat="user in selectedMailFolder.writeRightUsers"> + <td> + {{user.firstName}} {{user.lastName}} + </td> + <td> + Ecriture + </td> + <td> + <a class="pull-right btn btn-danger btn-xs" ng-click="removeWriteRightUser($index)"> + <span class="glyphicon glyphicon-remove"></span> + </a> + </td> + </tr> </tbody> </table> <div class="form-group"> - Nouveau utilisateur : <input type="email" ng-model="newReplyAddress" placeholder="nom.prenom@franciaflex.fr" /> - <a class="btn btn-success btn-xs" ng-click="addReplyAddress()" ng-disabled="!newReplyAddress"> + Nouveau utilisateur : + <select ng-model="newWriteRightUser" ng-options="user as user.firstName + ' ' + user.lastName for user in users"></select> + <a class="btn btn-success btn-xs" ng-click="addWriteRightUser()" ng-disabled="!newWriteRightUser"> <span class="glyphicon glyphicon-ok"></span> </a> </div> @@ -409,14 +423,17 @@ <input type="radio" name="rejectUnknownSenderField" ng-model="selectedMailFolder.rejectUnknownSender" ng-value="undefined"> valeur du noeud parent </label> - </div> + </div> - - <div class="form-group"> <label for="ediFolderField">Dossier (FS) de dépôt des demandes EDI</label> <input type="text" class="form-control" id="ediFolderField" ng-model="selectedMailFolder.ediFolder"> </div> + + <div class="form-group"> + <label for="faxDomainField">Domaines des fax</label> + <input type="text" class="form-control" id="faxDomainField" ng-model="selectedMailFolder.faxDomain"> + </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-02 18:45:22 UTC (rev 122) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-02 20:10:28 UTC (rev 123) @@ -138,6 +138,8 @@ $scope.newReplyAddress; // {Array} Colonnes selectionnées pour le dossier courant $scope.folderTableColumns; + // {Array} Users + $scope.users = ConfigurationData.users; // creation d'un nouveau noeud racine $scope.newRoot = function() { @@ -171,6 +173,9 @@ if (!$scope.selectedMailFolder.folderTableColumns) { $scope.selectedMailFolder.folderTableColumns = []; } + if (!$scope.selectedMailFolder.writeRightUsers) { + $scope.selectedMailFolder.writeRightUsers = []; + } // initialise la liste des colonnes pour le dossier courant $scope.folderTableColumns = []; @@ -238,6 +243,17 @@ $scope.selectedMailFolder.replyAddresses.splice(index, 1); }; + // add reply address + $scope.addWriteRightUser = function() { + $scope.selectedMailFolder.writeRightUsers.push($scope.newWriteRightUser); + delete $scope.newWriteRightUser; + }; + + // remove customer responsible + $scope.removeWriteRightUser = function(index) { + $scope.selectedMailFolder.writeRightUsers.splice(index, 1); + }; + // selection/deselection d'un état d'attente possible pour ce dossier $scope.changeFolderEtatAttente = function(etatAttente) { var index = $scope.selectedMailFolder.etatAttente.indexOf(etatAttente);