Conjunto 0cf8c36 en sipes

Fecha y hora:

21/08/2017 15:54:47 (hace 7 años)

Autor:

Sipes Apn <root@…>

Branches:

stable

Children:

ca4bae1

Parents:

604b644

Mensaje:

se modifico el manejador para el filtro del anho del proyecto en vidtas

Ubicación:

0.3-modules/proyectos_operativos_mcti/includes/views

Ficheros:

• proyectos_operativos_mcti.views.inc (modificado) (2 diferencias)
• views_handler_filter_proyecto_year.inc (modificado) (2 diferencias)

0.3-modules/proyectos_operativos_mcti/includes/views/proyectos_operativos_mcti.views.inc

@@ -57 +57 @@
      ),
      'argument' => array(
-       'handler' => 'views_handler_argument_string',
+       'handler' => 'views_handler_argument_numeric',
      ),
    );
@@ -145 +145 @@
        //proyectos
        'views_handler_filter_proyecto_year' => array(
-         'parent' => 'views_handler_filter_many_to_one',
+         'file' => 'views_handler_filter_proyecto_year.inc',
+         'parent' => 'views_handler_filter_numeric',
        ),
        'handler_field_proyecto_year' => array(

0.3-modules/proyectos_operativos_mcti/includes/views/views_handler_filter_proyecto_year.inc

@@ -26 +26 @@
   *
   * @author Cenditel Merida - Ing. Jose Puentes
+  * @author Cenditel Merida - Phd. Juan Vizcarrondo (update)
   * @date 2014-11-19 // (año-mes-dia)
+  * @date 2017-08-21 // (año-mes-dia)
   * @version 0.2 // (0.1)
   *
@@ -34 +36 @@
  * Generar filtro por el año del proyecto en views
  */
-class views_handler_filter_proyecto_year extends views_handler_filter_many_to_one {
-  function get_value_options() {  }
-  function value_form(&$form, &$form_state) {
-    $years = array();
-    $years[0] = t('Todos');
-    $current_year = date("Y");
-    for($i = $current_year - 10; $i <= $current_year; $i++) {
-      $years[$i] = $i;
-    }
-    $form['value']['year'] = array(
-      '#type' =>'select',
-      '#options' => $years,
+class views_handler_filter_proyecto_year extends views_handler_filter_numeric {
+  function option_definition() {
+    $options = parent::option_definition();
+    $options['proyect_year'] = array('default' => FALSE);
+    return $options;
+  }
+  function options_form(&$form, &$form_state) {
+    parent::options_form($form, $form_state);
+    $form['proyect_year'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Use project year'),
+      '#default_value' => $this->options['proyect_year'],
+      '#description' => t('use project year, when check use current project. if use values in operators these will be add project year (eg value = 2 AND operators Is less than, then year < project_year + 2)'),
     );
   }
-  function query() {
-    $aid = explode('_',$this->field);
-    $aid = $aid[1];
-    $this->ensure_my_table();
-    $field = "$this->table_alias.$this->real_field";
-    $upper = '';
-    $operation_attribute = "=";
-    if($this->operator == 'not in') {
-      $operation_attribute = '<>';
+  function op_between($field) {
+    $year = $this->options['proyect_year'] ? variable_get('proyectos_operativos_anho_creacion', 0) : 0;
+    $is_null = $this->check_for_null($field);
+    $min = $year? $year - $this->value['min'] : $this->value['min'];
+    $max = $year + $this->value['max'];
+    if ($this->operator == 'between') {
+      $this->query->add_where($this->options['group'], "$field >= %d $is_null", $min);
+      $this->query->add_where($this->options['group'], "$field <= %d $is_null", $max);
     }
-    if(!is_array($this->value)) {
-      $this->value = array($this->value);
-}
-    foreach ($this->value as &$value) {
-      if ($value) {
-        $this->query->add_where($this->options['group'], "$upper(%s) %s  %d", $field, $operation_attribute, $value);
-      }
+    else {
+      $this->query->add_where($this->options['group'], "$field <= %d OR $field >= %d $is_null", $min, $max);
     }
   }
+  function op_simple($field) {
+    $year = $this->options['proyect_year'] ? variable_get('proyectos_operativos_anho_creacion', 0) : 0;
+    $value = $year + $this->value['value'];
+    $is_null = $this->check_for_null($field);
+    $this->query->add_where($this->options['group'], "$field $this->operator %d $is_null", $value);
+  }
 }