Conjunto 28143b8 en sipes

Fecha y hora:

06/07/2017 15:56:29 (hace 7 años)

Autor:

Sipes Apn <root@…>

Branches:

stable

Children:

96e211e

Parents:

34e3034

Mensaje:

se realizaron varios ajustes relacionados con los padres e hijos de los terminos

Fichero:

• 0.3-modules/ente_planificador_hierarchical/ente_planificador_hierarchical.module (modificado) (12 diferencias)

0.3-modules/ente_planificador_hierarchical/ente_planificador_hierarchical.module

@@ -247 +247 @@
         $node->ente_planificador_hierarchical = array(
           'fathers' => _ente_planificador_hierarchical_get_desc($node->nid, 1),
-          'children' => _ente_planificador_hierarchical_get_desc($node->nid, 0),
+          'children' => _ente_planificador_hierarchical_get_children($node->nid, $node->tipo),
         );
         $hierarchical = variable_get('ente_planificador_hierarchical_count', 2);
@@ -255 +255 @@
         }
       }
-
     break;
     case 'presave':
@@ -319 +318 @@
             $fathers = '';
             $sep = '';
-            foreach($node->ente_planificador_hierarchical['children'] as $level => $ente) {
-              $fathers .= $sep . l($ente['title'], 'node/'. $ente['nid']);
-              $sep = ' > ';
+            foreach($node->ente_planificador_hierarchical['children'] as $nid => $ente) {
+              $fathers .= $sep . l($ente['title'], 'node/'. $nid);
+              $sep = ' | ';
             }
           $node->content['ente_planificador_hierarchical_childrens'] = array(
@@ -333 +332 @@
   }
 }
-
-
-
+/**
+ *
+ */
 function ente_planificador_hierarchical_obtiene_tipos_alter(&$tipos) {
   $hierarchical = variable_get('ente_planificador_hierarchical_count', 2);
-  for($i = 1; $i < $hierarchical + 1; $i++) {
+  for ($i = 1; $i < $hierarchical + 1; $i++) {
     if ($i == 1) {
       $tipos[$i] = t(variable_get('ente_planificador_hierarchical_text_' . $i, 'Actor estratégico-táctico'));
@@ -356 +355 @@
     if ($wid){
       $states = workflow_get_states($wid);
-
       $form['buttons']['#weight'] = 1000;
       if (count($states)) {
@@ -366 +364 @@
         );
         $hierarchical = variable_get('ente_planificador_hierarchical_count', 2);
-        for($i = 1; $i < $hierarchical + 1; $i++) {
+        for ($i = 1; $i < $hierarchical + 1; $i++) {
           $form['workflow_formuladores']['proyectos_operativos_state_form_' . $i] = array(
             '#type' => 'select',
@@ -374 +372 @@
             '#multiple' => FALSE,
           );
-
-
         }
       }
@@ -386 +382 @@
       $ente_planificador = ente_planificador_leer_ente_planificadores($form['node']['#value']->field_proyecto_ente[0]['nid']);
       $hierarchical = variable_get('ente_planificador_hierarchical_count', 2);
-      for($i = 1; $i < $hierarchical + 1; $i++) {
-//print_r($ente_planificador);
+      for ($i = 1; $i < $hierarchical + 1; $i++) {
         if ($ente_planificador->tipo != $i) {
           $estado = variable_get('proyectos_operativos_state_form_' . $i, 0);
@@ -595 +590 @@
 }
 
-function _ente_planificador_hierarchical_get_desc($nid, $father = 1, $level = 0) {
+function _ente_planificador_hierarchical_get_desc($nid, $get_father = 1, $level = 0) {
   $fathers = array();
   //get fathers
-  if ($father) {
+  if ($get_father) {
     $sql = 'SELECT father.father as nid, father.level, n.title FROM {ente_planificador_hierarchical} AS father INNER JOIN {node} AS n ON n.nid = father.father WHERE father.nid = %d';
   }
@@ -614 +609 @@
   $query = db_query($sql, $inputs);
   while ($father = db_fetch_object($query)) {
-    $fathers[$father->level] = array(
-      'title' => $father->title,
-      'nid' =>  $father->nid,
-    );
+    if ($get_father) {
+      $fathers[$father->level] = array(
+        'title' => $father->title,
+        'nid' =>  $father->nid,
+        'level' =>  $father->level,
+      );
+    }
+    else {
+      $fathers[$father->nid] = array(
+        'title' => $father->title,
+        'nid' =>  $father->nid,
+        'level' =>  $father->level,
+      );
+    }
   }
   return $fathers;
@@ -657 +662 @@
   $query = db_query($sql, $inputs); 
   while ($father = db_fetch_object($query)) {
-    $fathers[$father->nid] = $father->title; 
+    $fathers[$father->nid] = array(
+      'title' => $father->title,
+      'nid' => $father->nid,
+      'level' => $father->level + 1,
+    );    
   }
   return $fathers;
@@ -720 +729 @@
   );
 }
+
+/**
+ * Implementation of hook_obtiene_macro_alter()
+ */
+function ente_planificador_hierarchical_obtiene_macro_alter(&$actor_macr0, $ente_planificador) {
+  if (count($ente_planificador->ente_planificador_hierarchical['children'])) {
+    if ($ente_planificador->tipo <= variable_get('situacion_actual_preliminar_hierarchical_count', 2)) {
+      $actor_macr0 = $ente_planificador->nid;
+    }
+  }
+  else if (count($ente_planificador->ente_planificador_hierarchical['fathers'])) {
+    $pos = variable_get('situacion_actual_preliminar_hierarchical_count', 2);
+    $actor_macr0 = $ente_planificador->ente_planificador_hierarchical['fathers'][$pos];
+  }
+}