Conjunto 7b75b73 en sipes

Fecha y hora:

29/08/2017 15:04:00 (hace 7 años)

Autor:

Sipes Apn <root@…>

Branches:

stable

Children:

7fee1ef

Parents:

a8b1f3f

Mensaje:

se arreglo para que verificara que las politicas tenian causas criticas

Fichero:

• 0.3-modules/politicas_proyectos/politicas_proyectos.module (modificado) (5 diferencias)

0.3-modules/politicas_proyectos/politicas_proyectos.module

@@ -291 +291 @@
     $form['#proyectos_operativos_fields'][] = 'field_proyectos_solucion';
     $form['#proyectos_operativos_fields'][] = 'field_proyectos_carabobo';
-    $year = variable_get('situacional_actual_preliminar_anho_creacion', 0);
-    $tipo_plan = 'situacion_actual';
-    $planns = _situacion_actual_preliminar_get_planns();
-    $plan = $planns[$tipo_plan];
-    $fathers = $form['#ente_planificador']->ente_planificador_hierarchical['fathers'];
     $politicas = _politicas_proyectos_references($form['#ente_planificador']->nid, 1);
     $form['#politicas'] = $politicas;
@@ -304 +299 @@
     $form['#mpcc'] = array();
     $form['#pdlp'] = array();
-    $causas_criticas = _politicas_proyectos_get_politicas_causas($politicas['politicas']);
+    $causas_criticas = _politicas_proyectos_get_politicas_causas($form['#politicas']['politicas']);
+    $politicas = array();
+    //solo deje aquellas politicas que contengan causas criticas
+    foreach($form['#politicas']['politicas'] as $id => $pol) {
+      if (isset($causas_criticas[$id]) && is_array($causas_criticas[$id]) && count($causas_criticas[$id])) {
+        $politicas[$id] = $pol;
+      }
+    }
+    $form['#politicas']['politicas'] = $politicas;
     $form['#causas_criticas'] = $causas_criticas;
     $form['#carabobo'] = array();
@@ -325 +328 @@
     $form['#politicas_campo'] = 'field_proyecto_mcti';
     $form['#politica'] = $politica;
-    if (count($politica)) {
+    if (count($form['#politica'])) {
       $busca_causas = array();
-      foreach($politica as $id) {
-        $busca_causas += $form['#causas_criticas'][$id];
+      foreach($form['#politica'] as $id) {
+        if (isset($form['#causas_criticas'][$id]) && is_array($form['#causas_criticas'][$id]) && count($form['#causas_criticas'][$id])) {
+          foreach($form['#causas_criticas'][$id] as $causa) {
+            $busca_causas[$causa] = $causa;
+          }
+        }
       }
       $descriptores_c = _politicas_proyectos_get_causas_all_causas('criticas', $busca_causas);
@@ -481 +488 @@
   $causas = array();
   if (count($politicas)) {
-    $sql = "SELECT p.field_politicas_causas_nid AS causa, p.nid FROM {content_field_politicas_causas} AS p INNER JOIN {node} AS n ON n.nid = p.nid AND n.vid = p.vid WHERE p.nid in("; 
+    $sql = "SELECT p.field_politicas_causas_nid AS causa, p.nid FROM {content_field_politicas_causas} AS p INNER JOIN {node} AS n ON n.nid = p.nid AND n.vid = p.vid INNER JOIN {node} AS nc ON nc.nid = p.field_politicas_causas_nid INNER JOIN {content_type_causas} AS cc ON cc.nid = nc.nid AND cc.vid = nc.vid AND cc.field_causa_critica_value = '1' WHERE p.nid in(";
     $inputs = array();
     $implode_sql = array();
@@ -507 +514 @@
   $descriptores = array();
   if (count($causas)) {
-    $sql = "SELECT d.*, ds." . $campo . " AS causa FROM {" . $tabla . "} AS ds INNER JOIN {content_type_descriptores} AS d ON d.nid = ds.nid AND d.vid = ds.vid INNER JOIN {node} AS n ON n.nid = ds.nid AND n.vid = ds.vid WHERE ";
+    $sql = "SELECT d.*, ds." . $campo . " AS causa FROM {" . $tabla . "} AS ds INNER JOIN {content_type_descriptores} AS d ON d.nid = ds.nid AND d.vid = ds.vid INNER JOIN {node} AS n ON n.nid = ds.nid AND n.vid = ds.vid INNER JOIN {node} AS nc ON nc.nid = ds." . $campo . " INNER JOIN {content_type_causas} AS cc ON cc.nid = nc.nid AND cc.vid = nc.vid AND cc.field_causa_critica_value = '1' WHERE ";
     $inputs = array();
     foreach($causas as $causa) {