From echatellier@users.forge.codelutin.com Sun Jun  8 22:44:40 2014
From: echatellier@users.forge.codelutin.com
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] r152 - in trunk:
	faxtomail-persistence/src/main/xmi
	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
Date: Sun, 08 Jun 2014 22:44:40 +0200
Message-ID: <20140608204440.5A483181DF1@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6614602979361937183=="

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

Author: echatellier
Date: 2014-06-08 22:44:39 +0200 (Sun, 08 Jun 2014)
New Revision: 152

Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/152

Log:
Ajout des chefs de groupes

Modified:
   trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties
   trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo
   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.properties
=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-persistence/src/main/xmi/faxtomail.properties	2014-06-08 =
14:30:45 UTC (rev 151)
+++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties	2014-06-08 =
20:44:39 UTC (rev 152)
@@ -94,3 +94,6 @@
=20
 # FaxToMailUserGroup
 com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup.attribute.=
name.tagvalue.naturalId=3Dtrue
+
+# GroupChef
+com.franciaflex.faxtomail.persistence.entities.GroupChef.attribute.userGroup=
.tagvalue.notNull=3Dtrue

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/java/com/franciaflex/faxtomail/web/=
action/admin/ConfigurationAction.java
=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/java/com/franciaflex/faxtomail/web/action=
/admin/ConfigurationAction.java	2014-06-08 14:30:45 UTC (rev 151)
+++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action=
/admin/ConfigurationAction.java	2014-06-08 20:44:39 UTC (rev 152)
@@ -41,6 +41,7 @@
 import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser;
 import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup;
 import com.franciaflex.faxtomail.persistence.entities.FolderAction;
+import com.franciaflex.faxtomail.persistence.entities.GroupChef;
 import com.franciaflex.faxtomail.persistence.entities.MailAction;
 import com.franciaflex.faxtomail.persistence.entities.MailField;
 import com.franciaflex.faxtomail.persistence.entities.MailFilter;

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-08 14:30:45 UTC (rev 151)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuratio=
n-input.jsp	2014-06-08 20:44:39 UTC (rev 152)
@@ -73,6 +73,7 @@
           <li><a href=3D"#tabs-filters" data-toggle=3D"tab">Filtres de mail<=
/a></li>
           <li><a href=3D"#tabs-search" data-toggle=3D"tab">Recherche</a></li>
           <li><a href=3D"#tabs-mailaccounts" data-toggle=3D"tab">Comptes mai=
l</a></li>
+          <li><a href=3D"#tabs-chefgroup" data-toggle=3D"tab">Chef de groupe=
</a></li>
         </ul>
=20
         <div class=3D"tab-content active" ng-controller=3D"ConfigurationMisc=
Controller">
@@ -145,7 +146,7 @@
                 </table>
               </div>
=20
-              <div class=3D"col-md-7" ng-if=3D"selectedEtatAttente">
+              <div class=3D"col-md-8" ng-if=3D"selectedEtatAttente">
                 <h3>=C3=89dition de l'=C3=A9tat d'attente {{selectedEtatAtte=
nte.label}}</h3>
                 Actions autoris=C3=A9es lorsque la demande est <strong>valid=
e</strong> :
                 <label class=3D"checkbox" ng-repeat=3D"(mailAction,label) in=
 mailActions">
@@ -159,7 +160,7 @@
                     ng-click=3D"changeEtatAttenteInvalidAction(mailAction)">=
 {{label}}
                 </label>
               </div>
-              <div class=3D"col-md-7" ng-if=3D"!selectedEtatAttente">
+              <div class=3D"col-md-8" ng-if=3D"!selectedEtatAttente">
                 <em>S=C3=A9lectionnez un =C3=A9tat d'attente.</em>
               </div>
             </div>
@@ -183,7 +184,7 @@
                 </table>
               </div>
=20
-              <div class=3D"col-md-7" ng-if=3D"selectedDemandType">
+              <div class=3D"col-md-8" ng-if=3D"selectedDemandType">
                 <h3>=C3=89dition du type de document {{selectedDemandType.la=
bel}}</h3>
                 Champs obligatoires pour le type de document :
                 <label class=3D"checkbox" ng-repeat=3D"(mailField,label) in =
mailFields">
@@ -191,7 +192,7 @@
                     ng-click=3D"changeDemandTypeField(mailField)"> {{label}}
                 </label>
               </div>
-              <div class=3D"col-md-7" ng-if=3D"!selectedDemandType">
+              <div class=3D"col-md-8" ng-if=3D"!selectedDemandType">
                 <em>S=C3=A9lectionnez un type de document.</em>
               </div>
             </div>
@@ -805,6 +806,78 @@
             </div>
           </div>
         </div>
+
+        <div id=3D"tabs-chefgroup" class=3D"tab-pane" ng-controller=3D"Confi=
gurationChefGroupController">
+
+          <div class=3D"row">
+            <div class=3D"col-md-4">
+              <h3>Chef de groupe <input type=3D"button" class=3D"btn btn-suc=
cess btn-xs pull-right" value=3D"Nouveau" ng-click=3D"newGroupChef()" /></h3>
+              <table class=3D"table table-hover">
+                <tbody>
+                  <tr ng-repeat=3D"groupChef in configuration.chefs"
+                      ng-class=3D"{'info' : groupChef =3D=3D selectedGroupCh=
ef}"
+                      ng-click=3D"editGroupChef(groupChef)">
+                    <td>{{groupChef.userGroup ? groupChef.userGroup.fullPath=
 : '(aucun groupe)'}} =20
+                      <a class=3D"btn btn-danger btn-xs pull-right" ng-click=
=3D"removeGroupChef(groupChef, $index)">
+                        <span class=3D"glyphicon glyphicon-remove"></span>
+                      </a>
+                    </td>
+                  </tr>
+                  <tr ng-if=3D"!configuration.chefs || configuration.chefs.l=
ength =3D=3D 0">
+                    <td class=3D"emptyTable">Aucun chef de groupe</td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+
+            <div class=3D"col-md-8" ng-show=3D"selectedGroupChef">
+              <h3>=C3=89dition du chef de groupe</h3>
+             =20
+              <div class=3D"form-inline">
+                <div class=3D"form-group">
+                  <label for=3D"groupChefUserGroupField" class=3D"control-la=
bel">Chef du groupe : </label>
+                  <select id=3D"groupChefUserGroupField" class=3D"form-contr=
ol" ng-model=3D"selectedGroupChef.userGroup"
+                    ng-options=3D"group as group.fullPath for group in group=
s"></select>
+                </div>
+              </div>
+
+              <hr />
+              <table class=3D"table table-hover">
+                <thead>
+                  <tr>
+                    <th>Groupes g=C3=A9r=C3=A9s par le chef de groupe</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr ng-repeat=3D"group in selectedGroupChef.managedGroups">
+                    <td>
+                    <span class=3D"fa fa-users"></span>
+                    {{group.fullPath}}
+                    <a class=3D"btn btn-danger btn-xs pull-right" ng-click=
=3D"removeManagedGroup($index)">
+                      <span class=3D"glyphicon glyphicon-remove"></span>
+                    </a>
+                    </td>
+                  </tr>
+                  <tr ng-if=3D"!selectedGroupChef.managedGroups || selectedG=
roupChef.managedGroups.length =3D=3D 0">
+                    <td class=3D"emptyTable">Aucun groupe g=C3=A9r=C3=A9s</t=
d>
+                  </tr>
+                </tbody>
+              </table>
+              <div class=3D"form-inline">
+                <div class=3D"form-group">
+                  <label for=3D"newManagedGroupField" class=3D"control-label=
">Nouveau groupe :</label>
+                  <select id=3D"newManagedGroupField" class=3D"form-control"
+                      ng-model=3D"newManagedGroup" ng-options=3D"group as gr=
oup.fullPath for group in groups">
+                  </select>
+                  <a class=3D"btn btn-success btn-xs" ng-click=3D"addManaged=
Group()" ng-disabled=3D"!newManagedGroup">
+                    <span class=3D"glyphicon glyphicon-plus"></span>
+                  </a>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
       </div>
       <nav class=3D"navbar navbar-default navbar-fixed-bottom">
         <div class=3D"container">

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-08 14:=
30:45 UTC (rev 151)
+++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js	2014-06-08 20:=
44:39 UTC (rev 152)
@@ -29,6 +29,8 @@
  */
 ConfigurationModule.controller('ConfigurationController', ['$scope', 'Config=
urationData',
   function($scope, ConfigurationData) {
+    //{Object} L'object configuration
+    $scope.configuration =3D ConfigurationData.configuration;
     //{Map} les actions possibles pour les etats d'attentes
     $scope.mailActions =3D ConfigurationData.mailActions;
     //{Map} les champs obligatoires possibles
@@ -45,6 +47,10 @@
     $scope.mailFoldersUsage =3D ConfigurationData.mailFoldersUsage;
     //{Map<MailFolder id, Array<MailFolder>>} liste des=20
     $scope.flatMailFolders;
+    //{Array} All application users
+    $scope.users =3D ConfigurationData.users;
+    // {Array} All application groups
+    $scope.groups =3D ConfigurationData.groups;
=20
     // method priv=C3=A9e recursive pour retourner l'ensemble des dossiers e=
n les modifiant pour ajouter
     // des metadata (full path from root, and root node instance)
@@ -96,8 +102,6 @@
  */
 ConfigurationModule.controller('ConfigurationMiscController', ['$scope', '$w=
indow', 'ConfigurationData',
   function($scope, $window, ConfigurationData) {
-    //{Object} L'object configuration
-    $scope.configuration =3D ConfigurationData.configuration;
=20
     // Ajout d'une nouvelle ligne vide d'extension
     $scope.addExtensionRow =3D function() {
@@ -227,10 +231,6 @@
  */
 ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$w=
indow', 'ConfigurationData',
   function($scope, $window, ConfigurationData) {
-    //{Array} All application users
-    $scope.users =3D ConfigurationData.users;
-    // {Array} All application groups
-    $scope.groups =3D ConfigurationData.groups;
     // {Object} selected mail folder
     $scope.selectedMailFolder;
     // {String} add new customer responsible form value
@@ -575,13 +575,6 @@
         $scope.rootFolderMailFilters[rootMailFolder.topiaId].splice(index2, =
1);
       }
     };
-
-    // define angular filter used to group mailFilters by rootFolders
-    /*$scope.subFolderFilter =3D function(mailFolder) {
-      return function(item) {
-        return item.mailFolder =3D=3D mailFolder || item.mailFolder.$rootFol=
der =3D=3D mailFolder;
-      };
-    };*/
 }]);
=20
=20
@@ -647,3 +640,65 @@
       }
     });
 }]);
+
+
+/**
+ * Chef de groupe controller.
+ */
+ConfigurationModule.controller('ConfigurationChefGroupController', ['$scope'=
, '$window', 'ConfigurationData',
+  function($scope, $window, ConfigurationData) {
+    //{Object} Chef de group en cours d'edition
+    $scope.selectedGroupChef;
+    //{Object} Nouveau group selectionn=C3=A9
+    $scope.newManagedGroup;
+
+    // change instances
+    if (!$scope.configuration.chefs) {
+      $scope.configuration.chefs =3D [];
+    }
+    angular.forEach($scope.groups, function(group) {
+      angular.forEach($scope.configuration.chefs, function(chef) {
+        if (chef.userGroup.topiaId =3D=3D group.topiaId) {
+          chef.userGroup =3D group;
+        }
+        // managedGroups is not necessary to change here
+      });
+    });
+
+    // ajout d'un nouveau chef de groupe
+    $scope.newGroupChef =3D function() {
+      var groupChef =3D {
+          managedGroups : []
+      };
+      $scope.configuration.chefs.push(groupChef);
+      $scope.editGroupChef(groupChef);
+    };
+
+    // edition d'un chef de groupe
+    $scope.editGroupChef =3D function(groupChef) {
+      $scope.selectedGroupChef =3D groupChef;
+    };
+
+    // suppression d'un chef de groupe
+    $scope.removeGroupChef =3D function(groupChef, index) {
+      if ($window.confirm("=C3=8Ates-vous s=C3=BBr de vouloir supprimer ce c=
hef de groupe ?")) {
+        $scope.configuration.chefs.splice(index, 1);
+        if (groupChef =3D=3D $scope.selectedGroupChef) {
+          delete $scope.selectedGroupChef;
+        }
+      }
+    };
+
+    // Ajout d'un nouveau group g=C3=A9r=C3=A9
+    $scope.addManagedGroup =3D function() {
+      $scope.selectedGroupChef.managedGroups.push($scope.newManagedGroup);
+      delete $scope.newManagedGroup;
+    };
+   =20
+    // Suppression d'un group g=C3=A9r=C3=A9s
+    $scope.removeManagedGroup =3D function(index) {
+      if ($window.confirm("=C3=8Ates-vous s=C3=BBr de vouloir supprimer ce g=
roupe g=C3=A9r=C3=A9s ?")) {
+        $scope.selectedGroupChef.managedGroups.splice(index, 1);
+      }
+    };
+}]);


--===============6614602979361937183==--