Conjunto 4b7848a en sipp


Ignorar:
Fecha y hora:
09/11/2015 16:07:46 (hace 9 años)
Autor:
José Gregorio Puentes <jpuentes@…>
Branches:
0.3-stable
Children:
d96c05e
Parents:
f4301be
Mensaje:

se agregaron los campos codigo, objetivos y justificacion a la vista de consultas, asi como se corrigio el error de suma en los empleos

Fichero:
1 editado

Leyenda

No modificado
Añadido
Eliminado

  • 0.3-stable-modules/proyectos_operativos/proyectos_operativos.module

    r9b93a87 r4b7848a  
    18811881    $inputs[] = $user->entes;
    18821882    $inputs[] = variable_get('proyectos_operativos_state_naprobado', NULL);
    1883     $sql .= "SELECT ac.nid, ac.year, w.sid, n.created, n.title as nombre, u.name, n.uid, e.title AS ente, ctpo.field_proyecto_titulo_value FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid  WHERE ac.ente = %d AND w.sid <> %d";
     1883    $sql .= "SELECT ac.nid, ac.year, w.sid, n.created, n.title as nombre, u.name, n.uid, e.title AS ente, ctpo.field_proyecto_titulo_value, ctpo.field_proyecto_codigo_n_etap_value, ctpo.field_proyecto_og_value, ctpo.field_proyecto_justificacion_value FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid  WHERE ac.ente = %d AND w.sid <> %d";
    18841884    $sql_count .= "SELECT COUNT(ac.nid) FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid  WHERE ac.ente = %d AND w.sid <> %d";
    18851885//    $sql .= "SELECT ac.nid, ac.year, w.sid, n.created, n.title as nombre, u.name, n.uid, e.title AS ente FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid WHERE ac.ente = %d AND w.sid <> %d";
    … …  
    18871887  elseif (user_access('admin planificador')) {
    18881888    $inputs[] = variable_get('proyectos_operativos_state_naprobado', NULL);
    1889     $sql .= "SELECT ac.nid, ac.year, ac.ente, w.sid, n.created, n.title as nombre,  u.name, n.uid, e.title AS enten, ctpo.field_proyecto_titulo_value FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid  LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid WHERE w.sid <> %d";
     1889    $sql .= "SELECT ac.nid, ac.year, ac.ente, w.sid, n.created, n.title as nombre,  u.name, n.uid, e.title AS enten, ctpo.field_proyecto_titulo_value, ctpo.field_proyecto_codigo_n_etap_value, ctpo.field_proyecto_og_value, ctpo.field_proyecto_justificacion_value FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid  LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid WHERE w.sid <> %d";
    18901890    $sql_count .= "SELECT COUNT(ac.nid) FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid  LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid WHERE w.sid <> %d";
    18911891//    $sql .= "SELECT ac.nid, ac.year, ac.ente, w.sid, n.created, n.title as nombre,  u.name, n.uid, e.title AS enten FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid WHERE w.sid <> %d";
    … …  
    19211921    $cab++;
    19221922  }
    1923   $header[] = array('data' => t('Proyecto'));
     1923  $header[] = array('data' => t('Proyecto'));
     1924  $header[] = array('data' => t('Codigo Nueva Etapa'));
     1925  $header[] = array('data' => t('Objetivos Específicos'));
     1926  $header[] = array('data' => t('Justificación'));
    19241927  $header[] = array('data' => t('Año'));
    19251928  $header[] = array('data' => t('Estado'));
    … …  
    19301933  $rows = array();
    19311934  while($ac = db_fetch_object($result)) {
     1935    $proyect = node_load($ac->nid);
    19321936    $row = array();
     1937    $items = array();
    19331938    $color = variable_get('proyectos_operativos_state_color_' . $ac->sid, array());
    19341939    if (user_access('admin planificador')) {
    19351940      $row[] = array('data' => l($ac->enten, 'node/' . $ac->ente), 'style' => 'background:' . $color, );
    19361941    }
     1942    //lista de los objetivos generales
     1943    foreach ($proyect->field_proyecto_oe as $item) {
     1944      $text = substr($item["value"], 0 , 150);
     1945      $items[] = $text . '...';
     1946    }
    19371947    $nombre_proyecto = $ac->field_proyecto_titulo_value ? $ac->field_proyecto_titulo_value : $ac->nombre;
    19381948    $row[] = array('data' => $nombre_proyecto, 'style' => 'background:' . $color, );
    1939 //    $row[] = array('data' => $ac->nombre,);
     1949    $row[] = array('data' => $ac->field_proyecto_codigo_n_etap_value, 'style' => 'background:' . $color, );
     1950    $row[] = array('data' => theme('item_list', $items), 'style' => 'background:' . $color, );
     1951    $row[] = array('data' => $ac->field_proyecto_justificacion_value, 'style' => 'background:' . $color, );
    19401952    $row[] = array('data' => $ac->year, 'style' => 'background:' . $color, );
    19411953    $estad0 = $ac->sid == $first_state ? t('Ingresado') : $states['states'][$ac->sid];
    … …  
    19521964    $rows[] = $row;
    19531965  }
    1954   $output .= theme('table', $header, $rows);
     1966  $table_attributes = array('style' => 'width:1400px; margin-left: -200px; margin-top: 30px;');
     1967  $output .= theme('table', $header, $rows, $table_attributes);
    19551968  $output .= theme('pager', NULL);
    19561969  if ($fecha) {
    … …  
    19982011    $inputs[] = variable_get('proyectos_operativos_state_naprobado', NULL);
    19992012    $inputs[] = variable_get('proyectos_operativos_state_aprobado', NULL);
    2000     $sql .= "SELECT ac.nid, ac.year, w.sid, n.created, n.title as nombre, u.name, n.uid, e.title AS ente, ctpo.field_proyecto_titulo_value FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid  WHERE ac.ente = %d AND w.sid <> %d AND w.sid <> %d";
     2013    $sql .= "SELECT ac.nid, ac.year, w.sid, n.created, n.title as nombre, u.name, n.uid, e.title AS ente, ctpo.field_proyecto_titulo_value, ctpo.field_proyecto_codigo_n_etap_value, ctpo.field_proyecto_og_value, ctpo.field_proyecto_justificacion_value FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid  WHERE ac.ente = %d AND w.sid <> %d AND w.sid <> %d";
    20012014    $sql_count .= "SELECT COUNT(ac.nid) FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid  WHERE ac.ente = %d AND w.sid <> %d AND w.sid <> %d";
    2002 //    $sql .= "SELECT ac.nid, ac.year, w.sid, n.created, n.title as nombre, u.name, n.uid, e.title AS ente FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid WHERE ac.ente = %d AND w.sid <> %d";
    20032015  }
    20042016  elseif (user_access('admin planificador')) {
    20052017    $inputs[] = variable_get('proyectos_operativos_state_naprobado', NULL);
    20062018    $inputs[] = variable_get('proyectos_operativos_state_aprobado', NULL);
    2007     $sql .= "SELECT ac.nid, ac.year, ac.ente, w.sid, n.created, n.title as nombre,  u.name, n.uid, e.title AS enten, ctpo.field_proyecto_titulo_value FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid  LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid WHERE w.sid <> %d AND w.sid <> %d";
     2019    $sql .= "SELECT ac.nid, ac.year, ac.ente, w.sid, n.created, n.title as nombre,  u.name, n.uid, e.title AS enten, ctpo.field_proyecto_titulo_value, ctpo.field_proyecto_codigo_n_etap_value, ctpo.field_proyecto_og_value, ctpo.field_proyecto_justificacion_value FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid  LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid WHERE w.sid <> %d AND w.sid <> %d";
    20082020    $sql_count .= "SELECT COUNT(ac.nid) FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid  LEFT JOIN {content_type_proyectos_operativos} AS ctpo ON ctpo.nid = n.nid AND ctpo.vid = n.vid WHERE w.sid <> %d AND w.sid <> %d";
    2009 //    $sql .= "SELECT ac.nid, ac.year, ac.ente, w.sid, n.created, n.title as nombre,  u.name, n.uid, e.title AS enten FROM {proyectos_operativos} AS ac INNER JOIN {node} AS n ON n.nid = ac.nid INNER JOIN {users} AS u ON u.uid = n.uid INNER JOIN {node} as e ON e.nid = ac.ente INNER JOIN {workflow_node} AS w ON w.nid = ac.nid WHERE w.sid <> %d";
    20102021    $proyectos_operativos_search_ac_ente = isset($_SESSION['proyectos_operativos']) && isset($_SESSION['proyectos_operativos']['ente']) ? $_SESSION['proyectos_operativos']['ente'] : 0;
    20112022    if ($proyectos_operativos_search_ac_ente) {
    … …  
    20392050    $cab++;
    20402051  }
    2041   $header[] = array('data' => t('Proyecto'));
     2052  $header[] = array('data' => t('Proyecto'));
     2053  $header[] = array('data' => t('Codigo Nueva Etapa'));
     2054  $header[] = array('data' => t('Objetivos Específicos'));
     2055  $header[] = array('data' => t('Justificación'));
    20422056  $header[] = array('data' => t('Año'));
    20432057  $header[] = array('data' => t('Estado'));
    … …  
    20492063  while($ac = db_fetch_object($result)) {
    20502064    $row = array();
     2065    $items = array();
     2066    $proyect = node_load($ac->nid);
    20512067    $color = variable_get('proyectos_operativos_state_color_' . $ac->sid, array());
    20522068    if (user_access('admin planificador')) {
    20532069      $row[] = array('data' => l($ac->enten, 'node/' . $ac->ente), 'style' => 'background:' . $color, );
    20542070    }
     2071    //lista de los objetivos generales
     2072    foreach ($proyect->field_proyecto_oe as $item) {
     2073      $text = substr($item["value"], 0 , 150);
     2074      $items[] = $text . '...';
     2075    }
    20552076    $nombre_proyecto = $ac->field_proyecto_titulo_value ? $ac->field_proyecto_titulo_value : $ac->nombre;
    20562077    $row[] = array('data' => $nombre_proyecto, 'style' => 'background:' . $color, );
    2057 //    $row[] = array('data' => $ac->nombre,);
     2078    $row[] = array('data' => $ac->field_proyecto_codigo_n_etap_value, 'style' => 'background:' . $color, );
     2079    $row[] = array('data' => theme('item_list', $items), 'style' => 'background:' . $color, );
     2080    $row[] = array('data' => $ac->field_proyecto_justificacion_value, 'style' => 'background:' . $color, );
    20582081    $row[] = array('data' => $ac->year, 'style' => 'background:' . $color, );
    20592082    $estad0 = $ac->sid == $first_state ? t('Ingresado') : $states['states'][$ac->sid];
    … …  
    20702093    $rows[] = $row;
    20712094  }
    2072   $output .= theme('table', $header, $rows);
     2095  $table_attributes = array('style' => 'width:1400px; margin-left: -200px; margin-top: 30px;');
     2096  $output .= theme('table', $header, $rows, $table_attributes);
    20732097  $output .= theme('pager', NULL);
    20742098  if ($fecha) {
    … …  
    28042828    }
    28052829  }
     2830  $sumas['beneficiarios'] = array();
    28062831  if (is_array($field_form) && count($field_form)) {
    28072832    module_load_include('inc', 'content', 'includes/content.node_form');
    … …  
    28302855  }
    28312856  if (is_array($field_form) && count($field_form)) {
     2857    $sumas['beneficiarios']['empleos_generados'] = 'empleos_generados';
    28322858    module_load_include('inc', 'content', 'includes/content.node_form');
    28332859    foreach ($field_form as $field_id) {
    … …  
    30203046    $totales = 0;
    30213047    $total_arreglo = array();
    3022     $sumas['beneficiarios'] = array();
    30233048    $vid = variable_get('proyectos_operativos_extra_bene', 0);
    30243049    //$terms = taxonomy_get_tree($vid);
    … …  
    30943119    }
    30953120    $sumas['beneficiarios']['todosbeneficiarios'] = 'todosbeneficiarios';
    3096     $sumas['beneficiarios']['empleos_generados'] = 'empleos_generados';
    3097     drupal_add_js($sumas, 'setting');
    30983121    $form['#sumas'] = $sumas;
    30993122    $form['beneficiario'][$aux . '_' . $aui]['#suffix'] .= '<td align="center"><div class="todosbeneficiarios_total">' . $totales . '</div></td></tr>';
    … …  
    31113134      ),
    31123135    );
     3136  }
     3137  if (count($sumas)) {
     3138    drupal_add_js($sumas, 'setting');
    31133139  }
    31143140  $field_form = array();
Nota: Vea TracChangeset para ayuda en el uso del visor de conjuntos de cambios.