Merge branch 'iss6175-implementar-nuevo-organigrama' into 'desarrollo'

#42 Iss6175 implementar nuevo organigrama



See merge request !61

client/app/app.scss

@@ -228,9 +228,9 @@ input[type=checkbox].with-font:checked ~ label:before {
 @import 'tiposEntidad/tiposEntidad.scss';
 @import '../components/footer/footer.scss';
 @import '../components/modal/modal.scss';
+@import '../components/organigrama/framework/angular-treant-js/Treant.scss';
+@import '../components/organigrama/framework/angular-treant-js/collapsable.scss';
+@import '../components/organigrama/framework/angular-treant-js/custom-colored.scss';
+@import '../components/organigrama/framework/angular-treant-js/vendor/perfect-scrollbar/perfect-scrollbar.scss';
 @import '../components/organigrama/framework/jquery.orgchart.scss';
-@import '../components/organigrama/framework/treant-js/Treant.scss';
-@import '../components/organigrama/framework/treant-js/collapsable.scss';
-@import '../components/organigrama/framework/treant-js/custom-colored.scss';
-@import '../components/organigrama/framework/treant-js/vendor/perfect-scrollbar/perfect-scrollbar.scss';
 // endinjector

client/app/cargos/modals/cargos.editar.modal.controller.js

@@ -14,24 +14,24 @@
       this.cargoConvocatoria = Object.assign({cargo_superior_id: null}, this.cargoInicial);
 
       this.entidadSeleccionada = parametro.entidad;
-      this.entidades = {rows: [this.entidadSeleccionada], count: 1}
+      this.entidades = {rows: [this.entidadSeleccionada], count: 1};
 
       this.unidad = parametro.unidad;
-      this.unidadService.getUnidades()
+      this.entidadService.unidadesOrganizacionales(this.entidadSeleccionada._id)
         .then(unidades => {
           this.unidades = unidades;
           this.unidadSeleccionada = this.unidades.rows.find(x=>x._id === this.unidad._id);
         });
-      this.service.getCargos()
+      this.unidadService.cargos(this.unidad._id)
         .then(cargosSuperiores => {
           this.cargosSuperiores = cargosSuperiores;
           this.cargoSuperiorSeleccionada = this.cargosSuperiores.rows.find(x=>x._id === this.cargoInicial.cargo_superior_id);
         });
-      if(this.cargoInicial){
+      if (this.cargoInicial) {
         this.entidadId = this.entidadSeleccionada._id;
         this.entidadService.tiposCargo(this.entidadId)
-          .then(tiposCargos=>{
-            this.tiposCargo  = tiposCargos;
+          .then(tiposCargos=> {
+            this.tiposCargo = tiposCargos;
             this.tipoCargoSeleccionada = this.tiposCargo.rows.find(x=>x._id === this.cargoInicial.fk_tipo_cargo);
           })
 

client/app/entidades/entidades.service.js

@@ -26,6 +26,7 @@
             method: 'GET',
             url: appConfig.serverAddress + '/api/entidades/:id/convocatorias'
           },
+          
           cargosDisponibles: {
             isArray: false,
             method: 'GET',
@@ -34,6 +35,11 @@
           tiposCargo: {
             method: 'GET',
             url: appConfig.serverAddress + '/api/entidades/:id/tiposCargo'
+          },
+          ordenarUnidades: {
+            method: 'PUT',
+            isArray: true,
+            url: appConfig.serverAddress + '/api/entidades/:id/ordenarUnidades'
           }
         })
     }
@@ -48,7 +54,7 @@
       return this.resource.get(parametros).$promise;
     }
 
-    getOrganigrama(id) {
+    organigrama(id) {
       return this.resource.organigrama({id: id}).$promise;
     }
 
@@ -82,6 +88,10 @@
       return this.resource.tiposCargo({id: id}).$promise;
     }
 
+    ordenarUnidades(id, parametros) {
+      return this.resource.ordenarUnidades({id: id}, parametros).$promise;
+    }
+
   }
 
   angular.module('moduloPersonalApp')

client/app/entidades/modals/entidades.editar.modal.controller.js

+'use strict';
+(()=> {
+  class EntidadEditarModalController {
+    constructor($uibModalInstance, parametros, EntidadService, tipoEntidadService) {
+      this.enviado = false;
+      this.errores = {};
+      this.modal = $uibModalInstance;
+
+      this.service = EntidadService;
+
+      this.entidad = parametros.entidad;
+
+      this.entidades = Object.assign({}, this.entidad);
+
+      this.entidadesSuperior = {};
+      tipoEntidadService.getTiposEntidad({ordenarPor: 'nombre'})
+        .then(tipoEntidad=> {
+          this.tiposEntidad = tipoEntidad;
+          this.tipoEntidadSeleccionado = this.tiposEntidad.rows.find(x=>x._id == this.entidad.fk_tipo_entidad);
+        });
+      EntidadService.getEntidades()
+        .then(entidad=> {
+          this.entidadesSuperior = entidad;
+          this.entidadesSuperiorSeleccionado = this.entidadesSuperior.rows.find(x=>x._id == this.entidad.fk_entidad_superior);
+        });
+    }
+
+    guardarEntidad(form) {
+      this.enviado = true;
+      if (form.$valid) {
+        this.entidades.fk_tipo_entidad = this.tipoEntidadSeleccionado._id;
+        if (this.entidadesSuperiorSeleccionado) {
+          this.entidades.fk_entidad_superior = this.entidadesSuperiorSeleccionado._id;
+        }
+        this.service.editarEntidad(this.entidad._id, this.entidades)
+          .then(entidad=> {
+            this.modal.close(entidad);
+          })
+          .catch(err=> {
+            this.errores.otros = err.data.message;
+          })
+      }
+    }
+  }
+  angular.module('moduloPersonalApp')
+    .controller('EntidadEditarModalCtrl', EntidadEditarModalController);
+})();

client/app/entidades/organigrama/entidades.organigrama.html

@@ -11,16 +11,8 @@
     </div>
   </div>
 </div>
-<!--<div class="container-fluid">-->
-  <!--<div class="row">-->
-    <!--<div id="chart" class="orgchart-primary">-->
-    <!--</div>-->
-  <!--</div>-->
-<!--</div>-->
-<!--<br>-->
 <div class="container-fluid">
   <div class="row">
     <div class="chart" id="collapsable-example"></div>
-    </div>
   </div>
 </div>

client/app/personas/modals/personas.editar.modal.controller.js

@@ -16,16 +16,13 @@
       this.enviado = true;
       if (form.$valid) {
         this.service.editarPersona(this.persona._id, this.persona)
-          .then((persona)=>{
+          .then((persona)=> {
             this.modal.close(persona);
           })
       }
     }
-
-
-
   }//class
 
-angular.module('moduloPersonalApp')
-.controller('PersonaEditarModalCtrl', PersonaEditarModalController);
+  angular.module('moduloPersonalApp')
+    .controller('PersonaEditarModalCtrl', PersonaEditarModalController);
 })();

client/app/unidadesOrganizacional/editar/unidadesOrganizacional.editar.html

@@ -29,7 +29,7 @@
           </tr>
           </thead>
           <tbody>
-          <tr ng-repeat-start="unidad in vm.unidadesOrganizacionales.rows" ng-click="unidad.expanded = true;vm.obtenerOficinasCargos(unidad);">
+          <tr ng-repeat-start="unidad in vm.unidadesOrganizacionales.rows">
             <td>{{unidad.sigla| uppercase}}</td>
             <td>{{unidad.nombre}}</td>
             <td class="text-center">

client/app/unidadesOrganizacional/modals/unidadesOrganizacional.editar.modal.controller.js

 'use strict';
 (()=> {
   class UnidadOrganizacionalEditarModalController {
-    constructor($uibModalInstance, parametro, UnidadService) {
+    constructor($uibModalInstance, parametro, UnidadService, EntidadService) {
       this.enviado = false;
       this.errores = {};
       this.modal = $uibModalInstance;
+
       this.service = UnidadService;
+      this.entidadService = EntidadService;
 
       this.unidadInicial = parametro.unidad;
       this.unidad = Object.assign({}, this.unidadInicial);
@@ -13,7 +15,7 @@
       this.entidadSeleccionada = parametro.entidad;
       this.entidades = {rows: [this.entidadSeleccionada], count: 1};
 
-      this.service.getUnidades()
+      this.entidadService.unidadesOrganizacionales(this.unidadInicial.fk_entidad)
         .then(unidadesSuperiores => {
           this.unidadesSuperiores = unidadesSuperiores;
           this.unidadSuperiorSeleccionada = this.unidadesSuperiores.rows.find(x=>x._id == this.unidadInicial.unidad_superior_id);
@@ -22,13 +24,13 @@
       //TODO se debe averiguar si una unidad puede cambiar de entidad
 
     }
-      
+
     guardarUnidad(form) {
       this.enviado = true;
       if (form.$valid) {
         if (this.unidadSuperiorSeleccionada) {
           this.unidad.unidad_superior_id = this.unidadSuperiorSeleccionada._id;
-        }else{
+        } else {
           this.unidad.unidad_superior_id = this.unidadSuperiorSeleccionada;
         }
         this.service.editarUnidad(this.unidad._id, this.unidad)
@@ -40,8 +42,6 @@
           });
       }
     }
-
-
   }
   angular.module('moduloPersonalApp')
     .controller('UnidadOrganizacionalEditarModalCtrl', UnidadOrganizacionalEditarModalController);

client/app/unidadesOrganizacional/unidadesOrganizacional.service.js

@@ -5,7 +5,17 @@
     constructor($resource, appConfig) {
       this.resource = $resource(appConfig.serverAddress + '/api/unidadesOrganizacional/:id', {id: '@_id'}, {
         update: {method: 'PUT'},
-        query: {isArray: false}
+        query: {isArray: false},
+        ordenarCargos: {
+          method: 'PUT',
+          isArray: true,
+          url: appConfig.serverAddress + '/api/unidadesOrganizacional/:id/ordenarCargos'
+        },
+        cargos: {
+          isArray: false,
+          method: 'GET',
+          url: appConfig.serverAddress + '/api/unidadesOrganizacional/:id/cargos'
+        }
       });
     }
 
@@ -23,9 +33,16 @@
     }
 
     editarUnidad(id, unidad) {
-      console.log(id);
       return this.resource.update({id: id}, unidad).$promise;
     }
+
+    ordenarCargos(id, parametros) {
+      return this.resource.ordenarCargos({id: id}, parametros).$promise;
+    }
+    
+    cargos(id) {
+      return this.resource.cargos({id: id}).$promise;
+    }
   }
 
   angular.module('moduloPersonalApp')

client/components/organigrama/framework/angular-treant-js/Treant.scss

+/* required LIB STYLES */
+/* .Treant se automatski dodaje na svaki chart conatiner */
+.Treant {
+  position: relative;
+  overflow: hidden;
+  padding: 0 !important;
+}
+
+.Treant > .node,
+.Treant > .pseudo {
+  position: absolute;
+  display: block;
+  visibility: hidden;
+}
+
+.Treant.Treant-loaded .node,
+.Treant.Treant-loaded .pseudo {
+  visibility: visible;
+}
+
+.Treant > .pseudo {
+  width: 0;
+  height: 0;
+  border: none;
+  padding: 0;
+}
+
+.Treant .collapse-switch {
+  width: 3px;
+  height: 3px;
+  display: block;
+  border: 1px solid $brand-primary;
+  position: absolute;
+  top: 1px;
+  right: 1px;
+  cursor: pointer;
+}
+
+.Treant .collapsed .collapse-switch {
+  background-color: #868DEE;
+}
+
+.Treant > .node img {
+  border: none;
+  float: left;
+}

client/components/organigrama/framework/angular-treant-js/app/nodeDB/nodeDB.js

+// import {UTIL} from '../utils/Util';
+//
+// class NodeDB {
+//   constructor(nodeStructure, tree) {
+//     this.db = [];
+//     var self = this;
+//
+//     function itterateChildren(node, parentId) {
+//
+//       var newNode = self.createNode(node, parentId, tree, null);
+//
+//       if (node.children) {
+//
+//         newNode.children = [];
+//
+//         // pseudo node is used for descending children to the next level
+//         if (node.childrenDropLevel && node.childrenDropLevel > 0) {
+//           while (node.childrenDropLevel--) {
+//             // pseudo node needs to inherit the connection style from its parent for continuous connectors
+//             var connStyle = UTIL.cloneObj(newNode.connStyle);
+//             newNode = self.createNode('pseudo', newNode.id, tree, null);
+//             newNode.connStyle = connStyle;
+//             newNode.children = [];
+//           }
+//         }
+//
+//         var stack = (node.stackChildren && !self.hasGrandChildren(node)) ? newNode.id : null;
+//
+//         // svildren are position on separate leves, one beneeth the other
+//         if (stack !== null) {
+//           newNode.stackChildren = [];
+//         }
+//
+//         for (var i = 0, len = node.children.length; i < len; i++) {
+//
+//           if (stack !== null) {
+//             newNode = self.createNode(node.children[i], newNode.id, tree, stack);
+//             if ((i + 1) < len) newNode.children = []; // last node cant have children
+//           } else {
+//             itterateChildren(node.children[i], newNode.id);
+//           }
+//         }
+//       }
+//     }
+//
+//     if (tree.CONFIG.animateOnInit) nodeStructure.collapsed = true;
+//     itterateChildren(nodeStructure, -1); // root node
+//     this.createGeometries(tree);
+//   }
+//
+//   createGeometries(tree) {
+//     var i = this.db.length, node;
+//     while (i--) {
+//       this.get(i).createGeometry(tree);
+//     }
+//   }
+//
+//   get(nodeId) {
+//     return this.db[nodeId]; // get node by ID
+//   }
+//
+//   createNode(nodeStructure, parentId, tree, stackParentId) {
+//
+//     var node = new TreeNode(nodeStructure, this.db.length, parentId, tree, stackParentId);
+//
+//     this.db.push(node);
+//     if (parentId >= 0) this.get(parentId).children.push(node.id); //skip root node
+//
+//     if (stackParentId) {
+//       this.get(stackParentId).stackParent = true;
+//       this.get(stackParentId).stackChildren.push(node.id);
+//     }
+//
+//     return node;
+//   }
+//
+//   getMinMaxCoord(dim, parent, MinMax) { // used for getting the dimensions of the tree, dim = 'X' || 'Y'
+//     // looks for min and max (X and Y) within the set of nodes
+//     var parent = parent || this.get(0),
+//       i = parent.childrenCount(),
+//       MinMax = MinMax || { // start with root node dimensions
+//           min: parent[dim],
+//           max: parent[dim] + ((dim == 'X') ? parent.width : parent.height)
+//         };
+//
+//     while (i--) {
+//
+//       var node = parent.childAt(i),
+//         maxTest = node[dim] + ((dim == 'X') ? node.width : node.height),
+//         minTest = node[dim];
+//
+//       if (maxTest > MinMax.max) {
+//         MinMax.max = maxTest;
+//
+//       }
+//       if (minTest < MinMax.min) {
+//         MinMax.min = minTest;
+//       }
+//
+//       this.getMinMaxCoord(dim, node, MinMax);
+//     }
+//     return MinMax;
+//   }
+//
+//   static hasGrandChildren(nodeStructure) {
+//     var i = nodeStructure.children.length;
+//     while (i--) {
+//       if (nodeStructure.children[i].children) return true;
+//     }
+//   }
+// }
+//
+// export {NodeDB}

client/components/organigrama/framework/angular-treant-js/app/treant/index.js

+// import {TreeStore} from '../treeStore/treeStore';
+//
+// class Treant {
+//   static JSONconfig = {
+//     make: function (configArray) {
+//
+//       var i = configArray.length, node;
+//
+//       this.jsonStructure = {
+//         chart: null,
+//         nodeStructure: null
+//       };
+//       //fist loop: find config, find root;
+//       while (i--) {
+//         node = configArray[i];
+//         if (node.hasOwnProperty('container')) {
+//           this.jsonStructure.chart = node;
+//           continue;
+//         }
+//
+//         if (!node.hasOwnProperty('parent') && !node.hasOwnProperty('container')) {
+//           this.jsonStructure.nodeStructure = node;
+//           node.myID = this.getID();
+//         }
+//       }
+//
+//       this.findChildren(configArray);
+//
+//       return this.jsonStructure;
+//     },
+//
+//     findChildren: function (nodes) {
+//       var parents = [0]; // start witha a root node
+//
+//       while (parents.length) {
+//         var parentId = parents.pop(),
+//           parent = this.findNode(this.jsonStructure.nodeStructure, parentId),
+//           i = 0, len = nodes.length,
+//           children = [];
+//
+//         for (; i < len; i++) {
+//           var node = nodes[i];
+//           if (node.parent && (node.parent.myID == parentId)) { // skip config and root nodes
+//
+//             node.myID = this.getID();
+//
+//             delete node.parent;
+//
+//             children.push(node);
+//             parents.push(node.myID);
+//           }
+//         }
+//
+//         if (children.length) {
+//           parent.children = children;
+//         }
+//       }
+//     },
+//
+//     findNode: function (node, nodeId) {
+//       var childrenLen, found;
+//
+//       if (node.myID === nodeId) {
+//         return node;
+//       } else if (node.children) {
+//         childrenLen = node.children.length;
+//         while (childrenLen--) {
+//           found = this.findNode(node.children[childrenLen], nodeId);
+//           if (found) {
+//             return found;
+//           }
+//         }
+//       }
+//     },
+//
+//     getID: (function () {
+//       var i = 0;
+//       return function () {
+//         return i++;
+//       };
+//     })()
+//   };
+//
+//   constructor(jsonConfig, callback) {
+//     if (jsonConfig instanceof Array) {
+//       jsonConfig = Treant.JSONconfig.make(jsonConfig);
+//     }
+//
+//     var newTree = TreeStore.createTree(jsonConfig);
+//     newTree.positionTree(callback);
+//
+//     this.tree_id = newTree.id;
+//   }
+//
+//   destroy() {
+//     TreeStore.destroy(this.tree_id);
+//   };
+// }
+//
+// export {Treant};

client/components/organigrama/framework/angular-treant-js/app/treeNode/treeNode.js

+// import {UTIL} from '../utils/Util';
+// import {TreeStore} from '../treeStore/treeStore';
+// class TreeNode {
+//   static CONFIG = {
+//     nodeHTMLclass: 'node',
+//
+//     textClass: {
+//       name: 'node-name',
+//       title: 'node-title',
+//       desc: 'node-desc',
+//       contact: 'node-contact'
+//     }
+//   };
+//
+//   constructor(nodeStructure, id, parentId, tree, stackParentId) {
+//     this.id = id;
+//     this.parentId = parentId;
+//     this.treeId = tree.id;
+//     this.prelim = 0;
+//     this.modifier = 0;
+//
+//     this.stackParentId = stackParentId;
+//
+//     // pseudo node is a node with width=height=0, it is invisible, but necessary for the correct positiong of the tree
+//     this.pseudo = nodeStructure === 'pseudo' || nodeStructure['pseudo'];
+//
+//     this.image = nodeStructure.image;
+//
+//     this.link = UTIL.createMerge(tree.CONFIG.node.link, nodeStructure.link);
+//
+//     this.connStyle = UTIL.createMerge(tree.CONFIG.connectors, nodeStructure.connectors);
+//
+//     this.drawLineThrough = nodeStructure.drawLineThrough === false ? false : nodeStructure.drawLineThrough || tree.CONFIG.node.drawLineThrough;
+//
+//     this.collapsable = nodeStructure.collapsable === false ? false : nodeStructure.collapsable || tree.CONFIG.node.collapsable;
+//     this.collapsed = nodeStructure.collapsed;
+//
+//     this.text = nodeStructure.text;
+//
+//     // '.node' DIV
+//     this.nodeInnerHTML = nodeStructure.innerHTML;
+//     this.nodeHTMLclass = (tree.CONFIG.node.HTMLclass ? tree.CONFIG.node.HTMLclass : '') + // globaly defined class for the nodex
+//       (nodeStructure.HTMLclass ? (' ' + nodeStructure.HTMLclass) : '');		// + specific node class
+//
+//     this.nodeHTMLid = nodeStructure.HTMLid;
+//   }