From echatellier@users.forge.codelutin.com Mon Jun  2 22:10:30 2014
From: echatellier@users.forge.codelutin.com
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] r123 - in trunk:
	faxtomail-persistence/src/main/xmi
	faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
	faxtomail-ui-web/src/main/webapp/js
Date: Mon, 02 Jun 2014 22:10:30 +0200
Message-ID: <20140602201030.83F85181D77@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2911665370389134383=="

--===============2911665370389134383==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/config=
uration-input.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuratio=
n-input.jsp	2014-06-02 18:45:22 UTC (rev 122)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuratio=
n-input.jsp	2014-06-02 20:10:28 UTC (rev 123)
@@ -181,15 +181,15 @@
                         <table class=3D"table table-bordered">
                           <thead>
                             <tr>
-                              <th>Adresse email</th>
+                              <th>Utilisateur</th>
                               <th>Action</th>
                             </tr>
                           </thead>
                           <tbody>
-                            <tr ng-repeat=3D"customerResponsible in selected=
MailFolder.customerResponsibles track by $index">
+                            <tr ng-repeat=3D"customerResponsible in selected=
MailFolder.customerResponsibles">
                               <td>
                                 <span class=3D"glyphicon glyphicon-user"></s=
pan>
-                                {{customerResponsible}}</td>
+                                {{customerResponsible.firstName}} {{customer=
Responsible.lastName}}</td>
                               <td>
                                 <a class=3D"pull-right btn btn-danger btn-xs=
" ng-click=3D"removeCustomerResponsible($index)">
                                   <span class=3D"glyphicon glyphicon-remove"=
></span>
@@ -199,7 +199,7 @@
                           </tbody>
                         </table>
=20
-                        Nouveau : <input type=3D"email" ng-model=3D"newCusto=
merResponsible" placeholder=3D"nom.prenom@franciaflex.fr" />
+                        Nouveau : <select ng-model=3D"newCustomerResponsible=
" ng-options=3D"user as user.firstName + ' ' + user.lastName for user in user=
s"></select>
                         <a class=3D"btn btn-success btn-xs" ng-click=3D"addC=
ustomerResponsible()" ng-disabled=3D"!newCustomerResponsible">
                           <span class=3D"glyphicon glyphicon-ok"></span>
                         </a>
@@ -283,16 +283,30 @@
                             <tr>
                               <th>Utilisateur ou groupe</th>
                               <th>Type</th>
+                              <th>Action</th>
                             </tr>
                           </thead>
                           <tbody>
-                         =20
+                            <tr ng-repeat=3D"user in selectedMailFolder.writ=
eRightUsers">
+                              <td>
+                                {{user.firstName}} {{user.lastName}}
+                              </td>
+                              <td>
+                               Ecriture
+                              </td>
+                              <td>
+                                <a class=3D"pull-right btn btn-danger btn-xs=
" ng-click=3D"removeWriteRightUser($index)">
+                                  <span class=3D"glyphicon glyphicon-remove"=
></span>
+                                </a>
+                              </td>
+                            </tr>
                           </tbody>
                         </table>
                        =20
                         <div class=3D"form-group">
-                          Nouveau utilisateur : <input type=3D"email" ng-mod=
el=3D"newReplyAddress" placeholder=3D"nom.prenom@franciaflex.fr" />
-                          <a class=3D"btn btn-success btn-xs" ng-click=3D"ad=
dReplyAddress()" ng-disabled=3D"!newReplyAddress">
+                          Nouveau utilisateur :
+                          <select ng-model=3D"newWriteRightUser" ng-options=
=3D"user as user.firstName + ' ' + user.lastName for user in users"></select>
+                          <a class=3D"btn btn-success btn-xs" ng-click=3D"ad=
dWriteRightUser()" ng-disabled=3D"!newWriteRightUser">
                             <span class=3D"glyphicon glyphicon-ok"></span>
                           </a>
                         </div>
@@ -409,14 +423,17 @@
                     <input type=3D"radio" name=3D"rejectUnknownSenderField"
                         ng-model=3D"selectedMailFolder.rejectUnknownSender" =
ng-value=3D"undefined"> valeur du noeud parent
                   </label>
-                </div>
+                </div> =20
                =20
-               =20
-               =20
                 <div class=3D"form-group">
                   <label for=3D"ediFolderField">Dossier (FS) de d=C3=A9p=C3=
=B4t des demandes EDI</label>
                   <input type=3D"text" class=3D"form-control" id=3D"ediFolde=
rField" ng-model=3D"selectedMailFolder.ediFolder">
                 </div>
+               =20
+                <div class=3D"form-group">
+                  <label for=3D"faxDomainField">Domaines des fax</label>
+                  <input type=3D"text" class=3D"form-control" id=3D"faxDomai=
nField" ng-model=3D"selectedMailFolder.faxDomain">
+                </div>
               </div>
             </div>
           </div>

Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=C3=A9es pour le dossier courant
     $scope.folderTableColumns;
+    // {Array} Users
+    $scope.users =3D ConfigurationData.users;
=20
     // creation d'un nouveau noeud racine
     $scope.newRoot =3D function() {
@@ -171,6 +173,9 @@
       if (!$scope.selectedMailFolder.folderTableColumns) {
         $scope.selectedMailFolder.folderTableColumns =3D [];
       }
+      if (!$scope.selectedMailFolder.writeRightUsers) {
+        $scope.selectedMailFolder.writeRightUsers =3D [];
+      }
=20
       // initialise la liste des colonnes pour le dossier courant
       $scope.folderTableColumns =3D [];
@@ -238,6 +243,17 @@
       $scope.selectedMailFolder.replyAddresses.splice(index, 1);
     };
=20
+    // add reply address
+    $scope.addWriteRightUser =3D function() {
+      $scope.selectedMailFolder.writeRightUsers.push($scope.newWriteRightUse=
r);
+      delete $scope.newWriteRightUser;
+    };
+
+    // remove customer responsible
+    $scope.removeWriteRightUser =3D function(index) {
+      $scope.selectedMailFolder.writeRightUsers.splice(index, 1);
+    };
+
     // selection/deselection d'un =C3=A9tat d'attente possible pour ce dossi=
er
     $scope.changeFolderEtatAttente =3D function(etatAttente) {
       var index =3D $scope.selectedMailFolder.etatAttente.indexOf(etatAttent=
e);


--===============2911665370389134383==--