Author: echatellier Date: 2014-06-08 15:21:04 +0200 (Sun, 08 Jun 2014) New Revision: 150 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/150 Log: Fix charg?\195?\169s de clientelle 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-06-08 12:48:03 UTC (rev 149) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-08 13:21:04 UTC (rev 150) @@ -321,12 +321,18 @@ </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"> + <label for="ediFolderField">Dossier de dépôt des demandes EDI sur le serveur</label> + <div class="input-group"> + <input type="text" class="form-control" id="ediFolderField" ng-model="selectedMailFolder.ediFolder"> + <span class="input-group-addon btn btn-info" ng-disabled="selectedMailFolder.ediFolder" + tooltip="Fonctionnalité à venir"> + <i class="fa fa-cogs"></i> Test + </span> + </div> </div> <div class="form-group"> - <label for="faxDomainField">Domaines des fax</label> + <label for="faxDomainField">Domaine des fax</label> <input type="text" class="form-control" id="faxDomainField" ng-model="selectedMailFolder.faxDomain"> </div> </div> @@ -354,7 +360,7 @@ <tbody> <tr ng-repeat="customerResponsible in selectedMailFolder.customerResponsibles"> <td> - <span class="glyphicon glyphicon-user"></span> + <span class="fa fa-user"></span> {{customerResponsible.firstName}} {{customerResponsible.lastName}}</td> <td> <a class="pull-right btn btn-danger btn-xs" ng-click="removeCustomerResponsible($index)"> @@ -362,13 +368,22 @@ </a> </td> </tr> + <tr ng-if="!selectedMailFolder.customerResponsibles || selectedMailFolder.customerResponsibles.length == 0"> + <td colspan="2" class="emptyTable">Aucun chargé de clientelle défini</td> + </tr> </tbody> </table> - 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> + <div class="form-inline"> + <div class="form-group"> + <label for="newCustomerResponsibleField" class="control-label">Nouveau :</label> + <select id="newCustomerResponsibleField" class="form-control" ng-model="newCustomerResponsible" + ng-options="user as user.firstName + ' ' + user.lastName for user in users"></select> + </div> + <a class="btn btn-success btn-xs" ng-click="addCustomerResponsible()" ng-disabled="!newCustomerResponsible"> + <span class="glyphicon glyphicon-plus"></span> + </a> + </div> </div> </div> </div> @@ -416,7 +431,7 @@ <input id="newAddressField" class="form-control" name="address" type="email" ng-model="newReplyAddress" placeholder="nom.prenom@franciaflex.fr" /> </div> <a class="btn btn-success btn-xs" ng-click="addReplyAddress()" ng-disabled="!newReplyAddress"> - <span class="glyphicon glyphicon-ok"></span> + <span class="glyphicon glyphicon-plus"></span> </a> </div> @@ -454,7 +469,7 @@ <input id="newDomainField" class="form-control" type="text" name="domain" ng-model="newReplyDomain" placeholder="franciaflex.fr" /> </div> <a class="btn btn-success btn-xs" ng-click="addReplyDomain()" ng-disabled="!newReplyDomain"> - <span class="glyphicon glyphicon-ok"></span> + <span class="glyphicon glyphicon-plus"></span> </a> </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-08 12:48:03 UTC (rev 149) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-08 13:21:04 UTC (rev 150) @@ -227,6 +227,10 @@ */ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$window', 'ConfigurationData', function($scope, $window, ConfigurationData) { + //{Array} Users + $scope.users = ConfigurationData.users; + // {Array} Groups + $scope.groups = ConfigurationData.groups; // {Object} selected mail folder $scope.selectedMailFolder; // {String} add new customer responsible form value @@ -347,7 +351,9 @@ // remove customer responsible $scope.removeCustomerResponsible = function(index) { - $scope.selectedMailFolder.customerResponsibles.splice(index, 1); + if ($window.confirm("Êtes-vous sûr de vouloir supprimer ce chargé de clientelle ?")) { + $scope.selectedMailFolder.customerResponsibles.splice(index, 1); + } }; // add reply address @@ -359,7 +365,9 @@ // remove customer responsible $scope.removeReplyAddress = function(index) { - $scope.selectedMailFolder.replyAddresses.splice(index, 1); + if ($window.confirm("Êtes-vous sûr de vouloir supprimer cette adresse ?")) { + $scope.selectedMailFolder.replyAddresses.splice(index, 1); + } }; // add reply domain @@ -371,7 +379,9 @@ // remove customer responsible $scope.removeReplyDomain = function(index) { - $scope.selectedMailFolder.replyDomains.splice(index, 1); + if ($window.confirm("Êtes-vous sûr de vouloir supprimer ce domaine ?")) { + $scope.selectedMailFolder.replyDomains.splice(index, 1); + } }; // selection/deselection d'un état d'attente possible pour ce dossier @@ -400,11 +410,6 @@ */ ConfigurationModule.controller('ConfigurationRigthsController', ['$scope', '$window', 'ConfigurationData', function($scope, $window, ConfigurationData) { - // {Array} Users - $scope.users = ConfigurationData.users; - // {Array} Groups - $scope.groups = ConfigurationData.groups; - // {Array} Parent folders write right users $scope.parentsWriteRightUsers; // {Array} Parent folders write rigth groups