diegoangel / informe-gei

module/Application/config/module.config.php

Indentation +46 added lines, -46 removed lines

@@ -13,50 +13,50 @@
 use Zend\Db\Adapter\AdapterAbstractServiceFactory;
 
 return [
-    'router' => [
-        'routes' => [
-            'home' => [
-                'type' => Literal::class,
-                'options' => [
-                    'route'    => '/',
-                    'defaults' => [
-                        'controller' => Controller\IndexController::class,
-                        'action'     => 'index',
-                    ],
-                ],
-            ],
-            'results' => [
-                'type'    => Segment::class,
-                'options' => [
-                    'route'    => '/resultados',
-                    'defaults' => [
-                        'controller' => Controller\ResultsController::class,
-                        'action'     => 'index',
-                    ],
-                ],
-            ],
-        ],
-    ],
-    'controllers' => [
-        'factories' => [
-            Controller\IndexController::class => InvokableFactory::class,
-            Controller\ResultsController::class => InvokableFactory::class,
-        ],
-    ],
-    'view_manager' => [
-        'display_not_found_reason' => true,
-        'display_exceptions'       => true,
-        'doctype'                  => 'HTML5',
-        'not_found_template'       => 'error/404',
-        'exception_template'       => 'error/index',
-        'template_map' => [
-            'layout/layout'           => __DIR__ . '/../view/layout/layout.phtml',
-            'application/index/index' => __DIR__ . '/../view/application/index/index.phtml',
-            'error/404'               => __DIR__ . '/../view/error/404.phtml',
-            'error/index'             => __DIR__ . '/../view/error/index.phtml',
-        ],
-        'template_path_stack' => [
-            __DIR__ . '/../view',
-        ],
-    ],
+	'router' => [
+		'routes' => [
+			'home' => [
+				'type' => Literal::class,
+				'options' => [
+					'route'    => '/',
+					'defaults' => [
+						'controller' => Controller\IndexController::class,
+						'action'     => 'index',
+					],
+				],
+			],
+			'results' => [
+				'type'    => Segment::class,
+				'options' => [
+					'route'    => '/resultados',
+					'defaults' => [
+						'controller' => Controller\ResultsController::class,
+						'action'     => 'index',
+					],
+				],
+			],
+		],
+	],
+	'controllers' => [
+		'factories' => [
+			Controller\IndexController::class => InvokableFactory::class,
+			Controller\ResultsController::class => InvokableFactory::class,
+		],
+	],
+	'view_manager' => [
+		'display_not_found_reason' => true,
+		'display_exceptions'       => true,
+		'doctype'                  => 'HTML5',
+		'not_found_template'       => 'error/404',
+		'exception_template'       => 'error/index',
+		'template_map' => [
+			'layout/layout'           => __DIR__ . '/../view/layout/layout.phtml',
+			'application/index/index' => __DIR__ . '/../view/application/index/index.phtml',
+			'error/404'               => __DIR__ . '/../view/error/404.phtml',
+			'error/index'             => __DIR__ . '/../view/error/index.phtml',
+		],
+		'template_path_stack' => [
+			__DIR__ . '/../view',
+		],
+	],
 ];

Spacing +5 added lines, -5 removed lines

@@ -50,13 +50,13 @@
         'not_found_template'       => 'error/404',
         'exception_template'       => 'error/index',
         'template_map' => [
-            'layout/layout'           => __DIR__ . '/../view/layout/layout.phtml',
-            'application/index/index' => __DIR__ . '/../view/application/index/index.phtml',
-            'error/404'               => __DIR__ . '/../view/error/404.phtml',
-            'error/index'             => __DIR__ . '/../view/error/index.phtml',
+            'layout/layout'           => __DIR__.'/../view/layout/layout.phtml',
+            'application/index/index' => __DIR__.'/../view/application/index/index.phtml',
+            'error/404'               => __DIR__.'/../view/error/404.phtml',
+            'error/index'             => __DIR__.'/../view/error/index.phtml',
         ],
         'template_path_stack' => [
-            __DIR__ . '/../view',
+            __DIR__.'/../view',
         ],
     ],
 ];

module/Application/test/Controller/IndexControllerTest.php

Indentation +37 added lines, -37 removed lines

@@ -13,41 +13,41 @@
 
 class IndexControllerTest extends AbstractHttpControllerTestCase
 {
-    public function setUp()
-    {
-        // The module configuration should still be applicable for tests.
-        // You can override configuration here with test case specific values,
-        // such as sample view templates, path stacks, module_listener_options,
-        // etc.
-        $configOverrides = [];
-
-        $this->setApplicationConfig(ArrayUtils::merge(
-            include __DIR__ . '/../../../../config/application.config.php',
-            $configOverrides
-        ));
-
-        parent::setUp();
-    }
-
-    public function testIndexActionCanBeAccessed()
-    {
-        $this->dispatch('/', 'GET');
-        $this->assertResponseStatusCode(200);
-        $this->assertModuleName('application');
-        $this->assertControllerName(IndexController::class); // as specified in router's controller name alias
-        $this->assertControllerClass('IndexController');
-        $this->assertMatchedRouteName('home');
-    }
-
-    public function testIndexActionViewModelTemplateRenderedWithinLayout()
-    {
-        $this->dispatch('/', 'GET');
-        $this->assertQuery('#home-content-wrapper');
-    }
-
-    public function testInvalidRouteDoesNotCrash()
-    {
-        $this->dispatch('/invalid/route', 'GET');
-        $this->assertResponseStatusCode(404);
-    }
+	public function setUp()
+	{
+		// The module configuration should still be applicable for tests.
+		// You can override configuration here with test case specific values,
+		// such as sample view templates, path stacks, module_listener_options,
+		// etc.
+		$configOverrides = [];
+
+		$this->setApplicationConfig(ArrayUtils::merge(
+			include __DIR__ . '/../../../../config/application.config.php',
+			$configOverrides
+		));
+
+		parent::setUp();
+	}
+
+	public function testIndexActionCanBeAccessed()
+	{
+		$this->dispatch('/', 'GET');
+		$this->assertResponseStatusCode(200);
+		$this->assertModuleName('application');
+		$this->assertControllerName(IndexController::class); // as specified in router's controller name alias
+		$this->assertControllerClass('IndexController');
+		$this->assertMatchedRouteName('home');
+	}
+
+	public function testIndexActionViewModelTemplateRenderedWithinLayout()
+	{
+		$this->dispatch('/', 'GET');
+		$this->assertQuery('#home-content-wrapper');
+	}
+
+	public function testInvalidRouteDoesNotCrash()
+	{
+		$this->dispatch('/invalid/route', 'GET');
+		$this->assertResponseStatusCode(404);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         $configOverrides = [];
 
         $this->setApplicationConfig(ArrayUtils::merge(
-            include __DIR__ . '/../../../../config/application.config.php',
+            include __DIR__.'/../../../../config/application.config.php',
             $configOverrides
         ));
 

module/Api/src/Controller/IndicatorsReportController.php

Indentation +46 added lines, -46 removed lines

@@ -12,74 +12,74 @@
  */
 class IndicatorsReportController extends AbstractRestfulController
 {
-    /**
-     *
-     */
-    private $db;
+	/**
+	 *
+	 */
+	private $db;
 
-    public function __construct(AdapterInterface $db)
-    {
-        $this->db = $db;
-    }
+	public function __construct(AdapterInterface $db)
+	{
+		$this->db = $db;
+	}
 
-    public function getIndicatorAction()
-    {
-        $params = $this->params()->fromRoute();
+	public function getIndicatorAction()
+	{
+		$params = $this->params()->fromRoute();
 
-        $indicador_id = (int)$params['indicador_id'];
+		$indicador_id = (int)$params['indicador_id'];
 
-        $response = [];
+		$response = [];
 
-        // DATOS GENERALES DEL INDICADOR
+		// DATOS GENERALES DEL INDICADOR
 
-        $sql = "SELECT * FROM indicador WHERE id = ?";
+		$sql = "SELECT * FROM indicador WHERE id = ?";
 
-        $params = [
+		$params = [
            
-            $indicador_id
-        ];
+			$indicador_id
+		];
 
-        $statement = $this->db->createStatement($sql, $params);
-        $arrIndicador = $statement->execute();
+		$statement = $this->db->createStatement($sql, $params);
+		$arrIndicador = $statement->execute();
 
-        while ($indicador = $arrIndicador->next()) {
-            $response['indicador'] = $indicador;
-            break;
-        }
+		while ($indicador = $arrIndicador->next()) {
+			$response['indicador'] = $indicador;
+			break;
+		}
 
 
-        $sql = "SELECT * FROM indicador_valor 
+		$sql = "SELECT * FROM indicador_valor 
                 WHERE indicador_id = ?
                 ORDER BY ano ASC";
 
-        $params = [
+		$params = [
            
-            $indicador_id
-        ];
+			$indicador_id
+		];
 
-        $statement = $this->db->createStatement($sql, $params);
-        $arrValores = $statement->execute();
+		$statement = $this->db->createStatement($sql, $params);
+		$arrValores = $statement->execute();
 
-        $arrAnos = [];
-        $arrValor = [];
+		$arrAnos = [];
+		$arrValor = [];
 
-        while ($a = $arrValores->next()) {
-            // SI EL NOMBRE TIENE UNA COMA LO TENGO QUE PONER ENTRE COMILLAS
-            $arrAnos[]  = $a['ano'];
-            $arrValor[] = $a['valor'];
-        }
+		while ($a = $arrValores->next()) {
+			// SI EL NOMBRE TIENE UNA COMA LO TENGO QUE PONER ENTRE COMILLAS
+			$arrAnos[]  = $a['ano'];
+			$arrValor[] = $a['valor'];
+		}
 
-        $arrAnos = array_merge(array('x'), $arrAnos);
-        $response['column_1'] = $arrAnos;
+		$arrAnos = array_merge(array('x'), $arrAnos);
+		$response['column_1'] = $arrAnos;
 
-        $arrValor = array_merge(array($indicador['nombre']), $arrValor);
-        $response['column_2'] = $arrValor;
+		$arrValor = array_merge(array($indicador['nombre']), $arrValor);
+		$response['column_2'] = $arrValor;
 
-        $response['unidad'] = $indicador['unidad'];
-        $response['descripcion'] = nl2br($indicador['descripcion']);
+		$response['unidad'] = $indicador['unidad'];
+		$response['descripcion'] = nl2br($indicador['descripcion']);
 
-        $response['colores'] = "#8064a2";
+		$response['colores'] = "#8064a2";
 
-        return new JsonModel($response);
-    }
+		return new JsonModel($response);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     {
         $params = $this->params()->fromRoute();
 
-        $indicador_id = (int)$params['indicador_id'];
+        $indicador_id = (int) $params['indicador_id'];
 
         $response = [];
 

module/Api/src/Controller/DistributionReportController.php

Indentation +188 added lines, -188 removed lines

@@ -12,73 +12,73 @@ 
  */
 class DistributionReportController extends AbstractRestfulController
 {
-    /**
-     *
-     */
-    private $db;
+	/**
+	 *
+	 */
+	private $db;
 
-    public function __construct(AdapterInterface $db)
-    {
-        $this->db = $db;
-    }
+	public function __construct(AdapterInterface $db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     * DISTRIBUCION DE TODOS LOS SECTORES
-     */
-    public function getWholeSectoralDistributionAction()
-    {
-        $params = $this->params()->fromRoute();
+	/**
+	 * DISTRIBUCION DE TODOS LOS SECTORES
+	 */
+	public function getWholeSectoralDistributionAction()
+	{
+		$params = $this->params()->fromRoute();
 
-        $ano = (int)$params['ano'];
+		$ano = (int)$params['ano'];
 
-        $response = [];
+		$response = [];
 
-        $sql = 'SELECT SUM(e.valor) as total, e.sector_id, s.nombre, s.color, s.descripcion
+		$sql = 'SELECT SUM(e.valor) as total, e.sector_id, s.nombre, s.color, s.descripcion
             FROM emision e 
             INNER JOIN sector s ON e.sector_id = s.id
             WHERE e.ano = ?
             GROUP BY e.sector_id';
         
-        $parameters = [
-            $ano,
-        ];
+		$parameters = [
+			$ano,
+		];
 
-        $statement = $this->db->createStatement($sql, $parameters);
+		$statement = $this->db->createStatement($sql, $parameters);
 
-        $results = $statement->execute();
+		$results = $statement->execute();
 
-        if (!$results->isQueryResult()) {
-            $this->response->setStatusCode(404);
-        }
+		if (!$results->isQueryResult()) {
+			$this->response->setStatusCode(404);
+		}
 
-        $i = 1;
+		$i = 1;
 
-        while ($a = $results->next()) {
-            $response['sector_'.$i][]      = $a['nombre'];
-            $response['sector_'.$i][]      = $a['total'];
-            $response['colores'][]         = $a['color'];
-            $response['descripciones'][]   = $a['descripcion'];
+		while ($a = $results->next()) {
+			$response['sector_'.$i][]      = $a['nombre'];
+			$response['sector_'.$i][]      = $a['total'];
+			$response['colores'][]         = $a['color'];
+			$response['descripciones'][]   = $a['descripcion'];
 
-            $i++;
-        }
+			$i++;
+		}
 
-        return new JsonModel($response);
-    }
+		return new JsonModel($response);
+	}
 
-    /**
-     *  DISTRIBUCION POR SECTOR
-     */
-    public function getSectoralDistributionAction()
-    {
-        $params = $this->params()->fromRoute();
+	/**
+	 *  DISTRIBUCION POR SECTOR
+	 */
+	public function getSectoralDistributionAction()
+	{
+		$params = $this->params()->fromRoute();
 
-        $response = [];
-        $arrGraphData = [];
+		$response = [];
+		$arrGraphData = [];
 
-        $ano = (int)$params['ano'];
-        $sector_id  = (int)$params['sector_id'];
+		$ano = (int)$params['ano'];
+		$sector_id  = (int)$params['sector_id'];
 
-        $sql = 'SELECT SUM(e.valor) as total, a.id, a.nombre
+		$sql = 'SELECT SUM(e.valor) as total, a.id, a.nombre
             FROM emision e 
             INNER JOIN sector s ON e.sector_id = s.id
             INNER JOIN actividad a ON a.id = e.actividad_id
@@ -89,27 +89,27 @@ 
             GROUP BY a.id
             ORDER BY a.nombre';
 
-        $parameters = [
-            $sector_id,
-            $ano,
-        ];
+		$parameters = [
+			$sector_id,
+			$ano,
+		];
 
-        $statement = $this->db->createStatement($sql, $parameters);
+		$statement = $this->db->createStatement($sql, $parameters);
 
-        $results = $statement->execute();
+		$results = $statement->execute();
 
-        $totalActividades = 0;
+		$totalActividades = 0;
 
-        while ($a = $results->next()) {
-            $arrActividades = [
-                'label' => $a['nombre'],
-                'value' => round($a['total'], 2)
-            ];
+		while ($a = $results->next()) {
+			$arrActividades = [
+				'label' => $a['nombre'],
+				'value' => round($a['total'], 2)
+			];
 
-            $totalActividades += $a['total'];
+			$totalActividades += $a['total'];
 
-            // EN CADA ACTIVIDAD HAGO QUE HACER EL SEARCH DE LA SUBACTIVIDAD
-            $sql = 'SELECT SUM(e.valor) as total, a.id, a.nombre
+			// EN CADA ACTIVIDAD HAGO QUE HACER EL SEARCH DE LA SUBACTIVIDAD
+			$sql = 'SELECT SUM(e.valor) as total, a.id, a.nombre
                 FROM emision e 
                 INNER JOIN subactividad a ON a.id = e.subactividad_id
                 WHERE 1 
@@ -120,34 +120,34 @@ 
                 GROUP BY a.id
                 ORDER BY a.nombre';
 
-            $parameters = [
-                $sector_id,
-                $a['id'],
-                $ano,
-            ];
+			$parameters = [
+				$sector_id,
+				$a['id'],
+				$ano,
+			];
 
-            $statement = $this->db->createStatement($sql, $parameters);
+			$statement = $this->db->createStatement($sql, $parameters);
 
-            $results2 = $statement->execute();
+			$results2 = $statement->execute();
 
-            if ($results2->isQueryResult()) {
-                $arrSubactividades = [];
+			if ($results2->isQueryResult()) {
+				$arrSubactividades = [];
 
-                $i = 0;
+				$i = 0;
 
-                while ($a2 = $results2->next()) {
-                    $arrSubactividades[$i] = [
-                        'label' => $a2['nombre'],
-                        'value' => round($a2['total'], 2)
-                    ];
+				while ($a2 = $results2->next()) {
+					$arrSubactividades[$i] = [
+						'label' => $a2['nombre'],
+						'value' => round($a2['total'], 2)
+					];
 
 
-                    if ($sector_id == 3 || $sector_id == 4) {
-                        continue;
-                    }
+					if ($sector_id == 3 || $sector_id == 4) {
+						continue;
+					}
 
-                    // TODO: ACA EN CADA SUBACTIVIDAD TENDRIA QUE HACER EL SEARCH DE LA CATEGORIA
-                    $sql = 'SELECT SUM(e.valor) as total, a.id, a.nombre
+					// TODO: ACA EN CADA SUBACTIVIDAD TENDRIA QUE HACER EL SEARCH DE LA CATEGORIA
+					$sql = 'SELECT SUM(e.valor) as total, a.id, a.nombre
                         FROM emision e 
                         INNER JOIN categoria a ON a.id = e.categoria_id
                         WHERE 1 
@@ -159,167 +159,167 @@ 
                         GROUP BY a.id
                         ORDER BY a.nombre';
 
-                    $parameters = [
-                        $sector_id,
-                        $a['id'],
-                        $a2['id'],
-                        $ano,
-                    ];
-
-                    $statement = $this->db->createStatement($sql, $parameters);
-
-                    $results3 = $statement->execute();
-
-                    if ($results3->isQueryResult()) {
-                        $arrCategorias = [];
-
-                        while ($a3 = $results3->next()) {
-                            $arrCategorias[] = [
-                                'label'=>$a3['nombre'],
-                                'value'=>round($a3['total'], 2)
-                            ];
-                        }
-                        $arrSubactividades[$i]['inner'] = $arrCategorias;
-                    }
-                    $i++;
-                }
-
-                $arrActividades['inner'] = $arrSubactividades;
-            }
+					$parameters = [
+						$sector_id,
+						$a['id'],
+						$a2['id'],
+						$ano,
+					];
+
+					$statement = $this->db->createStatement($sql, $parameters);
+
+					$results3 = $statement->execute();
+
+					if ($results3->isQueryResult()) {
+						$arrCategorias = [];
+
+						while ($a3 = $results3->next()) {
+							$arrCategorias[] = [
+								'label'=>$a3['nombre'],
+								'value'=>round($a3['total'], 2)
+							];
+						}
+						$arrSubactividades[$i]['inner'] = $arrCategorias;
+					}
+					$i++;
+				}
+
+				$arrActividades['inner'] = $arrSubactividades;
+			}
             
-            $arrGraphData[] = $arrActividades;
-        }
+			$arrGraphData[] = $arrActividades;
+		}
 
 
-        $response['graph_data'] = $arrGraphData;
-        $response['totalActividades'] = $totalActividades;
+		$response['graph_data'] = $arrGraphData;
+		$response['totalActividades'] = $totalActividades;
 
 
 
-        /**
-         *  BUSCO LA INFO DEL SECTOR
-         */
+		/**
+		 *  BUSCO LA INFO DEL SECTOR
+		 */
 
-        $sql = 'SELECT * FROM sector WHERE id = ?';
+		$sql = 'SELECT * FROM sector WHERE id = ?';
         
-        $parameters = [
-            $sector_id
-        ];
+		$parameters = [
+			$sector_id
+		];
 
-        $statement = $this->db->createStatement($sql, $parameters);
+		$statement = $this->db->createStatement($sql, $parameters);
 
-        $results = $statement->execute();
+		$results = $statement->execute();
 
-        if (!$results->isQueryResult()) {
-            $this->response->setStatusCode(404);
-        }
+		if (!$results->isQueryResult()) {
+			$this->response->setStatusCode(404);
+		}
 
-        while ($arrSector = $results->next()) {
-            $response['sector'] = $arrSector;
-        }
+		while ($arrSector = $results->next()) {
+			$response['sector'] = $arrSector;
+		}
 
-        return new JsonModel($response);
-    }
+		return new JsonModel($response);
+	}
 
-    /**
-     *
-     */
-     public function getGasesDistributionAction()
-     {
-         $params = $this->params()->fromRoute();
+	/**
+	 *
+	 */
+	 public function getGasesDistributionAction()
+	 {
+		 $params = $this->params()->fromRoute();
 
-         $ano = (int)$params['ano'];
+		 $ano = (int)$params['ano'];
 
-         $response = [];
+		 $response = [];
 
-         $sql = 'SELECT e.gas_id, g.nombre, g.color, sum(e.valor) as total
+		 $sql = 'SELECT e.gas_id, g.nombre, g.color, sum(e.valor) as total
             FROM emision e
             LEFT JOIN gas g ON (e.gas_id = g.id)
             where e.ano = ? GROUP BY e.gas_id ORDER BY total DESC';
 
-         $parameters = [
-            $ano,
-        ];
+		 $parameters = [
+			$ano,
+		];
 
-         $statement = $this->db->createStatement($sql, $parameters);
+		 $statement = $this->db->createStatement($sql, $parameters);
 
-         $results = $statement->execute();
+		 $results = $statement->execute();
 
-         $response['gases'][] = 'x';
-         $response['valores'][] = 'Gases';
+		 $response['gases'][] = 'x';
+		 $response['valores'][] = 'Gases';
 
-         while ($a = $results->next()) {
-             $response['gases'][]   = (strpos($a['nombre'], ',')) ? '"'.$a['nombre'].'"' : $a['nombre'];
-             $response['valores'][] = round($a['total']);
-             $response['colores'][] = $a['color'];
-         }
-         return new JsonModel($response);
-     }
+		 while ($a = $results->next()) {
+			 $response['gases'][]   = (strpos($a['nombre'], ',')) ? '"'.$a['nombre'].'"' : $a['nombre'];
+			 $response['valores'][] = round($a['total']);
+			 $response['colores'][] = $a['color'];
+		 }
+		 return new JsonModel($response);
+	 }
 
-    public function getSectoralGasesDistributionAction()
-    {
-        $params = $this->params()->fromRoute();
+	public function getSectoralGasesDistributionAction()
+	{
+		$params = $this->params()->fromRoute();
 
-        $ano = (int)$params['ano'];
+		$ano = (int)$params['ano'];
 
-        $response = [];
+		$response = [];
 
-        // PRIMERA FILA LA DE LOS GASES
+		// PRIMERA FILA LA DE LOS GASES
 
-        $sql = 'SELECT g.nombre, sum(e.valor) as total
+		$sql = 'SELECT g.nombre, sum(e.valor) as total
             FROM emision e
             LEFT JOIN gas g ON (e.gas_id = g.id)
             where e.ano = ? GROUP BY e.gas_id ORDER BY total DESC';
 
-        $parameters = [
-            $ano,
-        ];
+		$parameters = [
+			$ano,
+		];
 
-        $statement = $this->db->createStatement($sql, $parameters);
+		$statement = $this->db->createStatement($sql, $parameters);
 
-        $arrGases = $statement->execute();
+		$arrGases = $statement->execute();
 
-        $sql = 'SELECT s.nombre
+		$sql = 'SELECT s.nombre
             FROM sector s 
             ORDER BY s.nombre';
 
-        $statement = $this->db->createStatement($sql);
+		$statement = $this->db->createStatement($sql);
 
-        $arrSectores = $statement->execute();
+		$arrSectores = $statement->execute();
 
-        $sql = 'SELECT s.nombre as sector, g.nombre as gas, sum(e.valor) as total
+		$sql = 'SELECT s.nombre as sector, g.nombre as gas, sum(e.valor) as total
             FROM emision e
             LEFT JOIN gas g ON (e.gas_id = g.id)
             LEFT JOIN sector s ON (e.sector_id = s.id)
             where e.ano = ? GROUP BY e.gas_id, e.sector_id ORDER BY total DESC';
 
-        $parameters = [
-            $ano,
-        ];
+		$parameters = [
+			$ano,
+		];
 
-        $statement = $this->db->createStatement($sql, $parameters);
+		$statement = $this->db->createStatement($sql, $parameters);
 
-        $arr = $statement->execute();
+		$arr = $statement->execute();
 
-        $column = 2;
+		$column = 2;
 
-        while ($sector = $arrSectores->next()) {
-            $response['column_'.$column][] = $sector;
+		while ($sector = $arrSectores->next()) {
+			$response['column_'.$column][] = $sector;
 
-            while ($gas = $arrGases->next()) {
-                $response['column_'.$column][] = Utils::returnSectorGas($arr, $sector, $gas['nombre']);
-            }
-            $column++;
-        }
+			while ($gas = $arrGases->next()) {
+				$response['column_'.$column][] = Utils::returnSectorGas($arr, $sector, $gas['nombre']);
+			}
+			$column++;
+		}
 
-        $arrReturnGases = ['x'];
+		$arrReturnGases = ['x'];
         
-        while ($gas = $arrGases->next()) {
-            $arrReturnGases[] = $gas['nombre'];
-        }
+		while ($gas = $arrGases->next()) {
+			$arrReturnGases[] = $gas['nombre'];
+		}
 
-        $response['column_1'] = $arrReturnGases;
+		$response['column_1'] = $arrReturnGases;
       
-        return new JsonModel($response);
-    }
+		return new JsonModel($response);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
     {
         $params = $this->params()->fromRoute();
 
-        $ano = (int)$params['ano'];
+        $ano = (int) $params['ano'];
 
         $response = [];
 
@@ -75,8 +75,8 @@ 
         $response = [];
         $arrGraphData = [];
 
-        $ano = (int)$params['ano'];
-        $sector_id  = (int)$params['sector_id'];
+        $ano = (int) $params['ano'];
+        $sector_id = (int) $params['sector_id'];
 
         $sql = 'SELECT SUM(e.valor) as total, a.id, a.nombre
             FROM emision e 
@@ -228,7 +228,7 @@ 
      {
          $params = $this->params()->fromRoute();
 
-         $ano = (int)$params['ano'];
+         $ano = (int) $params['ano'];
 
          $response = [];
 
@@ -260,7 +260,7 @@ 
     {
         $params = $this->params()->fromRoute();
 
-        $ano = (int)$params['ano'];
+        $ano = (int) $params['ano'];
 
         $response = [];
 

module/Api/src/Controller/EvolutionReportController.php

Indentation +190 added lines, -190 removed lines

@@ -12,175 +12,175 @@ 
  */
 class EvolutionReportController extends AbstractRestfulController
 {
-    /**
-     *
-     */
-    private $db;
+	/**
+	 *
+	 */
+	private $db;
 
-    public function __construct(AdapterInterface $db)
-    {
-        $this->db = $db;
-    }
+	public function __construct(AdapterInterface $db)
+	{
+		$this->db = $db;
+	}
 
-    public function getWholeSectoralEvolutionAction()
-    {
-        $params = $this->params()->fromRoute();
+	public function getWholeSectoralEvolutionAction()
+	{
+		$params = $this->params()->fromRoute();
 
-        $response = [];
+		$response = [];
 
-        // TRAIGO LOS SECTORES CON SUS COLORES
+		// TRAIGO LOS SECTORES CON SUS COLORES
 
-        $sql = "SELECT s.nombre, s.color
+		$sql = "SELECT s.nombre, s.color
             FROM sector s 
             WHERE 1 
             ORDER BY s.nombre ";
 
-        $statement = $this->db->createStatement($sql);
+		$statement = $this->db->createStatement($sql);
 
-        $arrSectores = $statement->execute();
+		$arrSectores = $statement->execute();
 
-        if (!$arrSectores->isQueryResult()) {
-            $this->response->setStatusCode(404);
-        }
+		if (!$arrSectores->isQueryResult()) {
+			$this->response->setStatusCode(404);
+		}
 
-        // TRAIGO LOS VALORES POR ANO
+		// TRAIGO LOS VALORES POR ANO
 
-        $sql = "SELECT s.nombre as sector, e.ano, sum(e.valor) as total
+		$sql = "SELECT s.nombre as sector, e.ano, sum(e.valor) as total
             FROM emision e
             LEFT JOIN sector s ON (e.sector_id = s.id)
             where 1 
             GROUP BY e.ano, s.nombre";
 
-        // LO QUE ESTA ADENTRO DEL LOOP DEBERIA IR ACA
+		// LO QUE ESTA ADENTRO DEL LOOP DEBERIA IR ACA
 
-        $arrAnos = [];
-        $arrValores = [];
-        $arrColores = [];
+		$arrAnos = [];
+		$arrValores = [];
+		$arrColores = [];
 
-        for ($i=1990;$i<=2014;$i++) {
-            $arrAnos[] = $i;
-        }
+		for ($i=1990;$i<=2014;$i++) {
+			$arrAnos[] = $i;
+		}
 
-        $column = 2;
+		$column = 2;
 
-        while ($sector = $arrSectores->next()) {
-            $response['column_'.$column][] = $sector['nombre'];
-            $response['colores'][] =  $sector['color'];
+		while ($sector = $arrSectores->next()) {
+			$response['column_'.$column][] = $sector['nombre'];
+			$response['colores'][] =  $sector['color'];
 
-            foreach ($arrAnos as $ano) {
-                // ATENCION, CABECEADA
-                // ESTOY EJECUTANDO EL QUERY CADA VEZ QUE NECESITO LA LISTA DE VALORES
-                // ESTA PARTE DEBERIA AFUERA DEL LOOP Y SE DEBERIA REUTILIZAR $arrValoresCrudo
-                $statement = $this->db->createStatement($sql);
-                $arrValoresCrudo = $statement->execute();
+			foreach ($arrAnos as $ano) {
+				// ATENCION, CABECEADA
+				// ESTOY EJECUTANDO EL QUERY CADA VEZ QUE NECESITO LA LISTA DE VALORES
+				// ESTA PARTE DEBERIA AFUERA DEL LOOP Y SE DEBERIA REUTILIZAR $arrValoresCrudo
+				$statement = $this->db->createStatement($sql);
+				$arrValoresCrudo = $statement->execute();
 
-                if (!$arrValoresCrudo->isQueryResult()) {
-                    $this->response->setStatusCode(404);
-                }
-                // HASTA ACA
+				if (!$arrValoresCrudo->isQueryResult()) {
+					$this->response->setStatusCode(404);
+				}
+				// HASTA ACA
 
-                $response['column_'.$column][] = Utils::returnSectorAno($arrValoresCrudo, $sector['nombre'], $ano);
-            }
+				$response['column_'.$column][] = Utils::returnSectorAno($arrValoresCrudo, $sector['nombre'], $ano);
+			}
 
-            $column++;
-        }
+			$column++;
+		}
 
 
-        $arrAnos = array_merge(array('x'), $arrAnos);
-        $response['column_1'] = $arrAnos;
+		$arrAnos = array_merge(array('x'), $arrAnos);
+		$response['column_1'] = $arrAnos;
 
 
-        return new JsonModel($response);
-    }
+		return new JsonModel($response);
+	}
 
-    public function getSectoralEvolutionAction()
-    {
-        $params = $this->params()->fromRoute();
+	public function getSectoralEvolutionAction()
+	{
+		$params = $this->params()->fromRoute();
 
-        $sector_id  = (int)$params['sector_id'];
+		$sector_id  = (int)$params['sector_id'];
 
-        $response = [];
+		$response = [];
 
-        // TRAIGO LOS SECTORES CON SUS COLORES
+		// TRAIGO LOS SECTORES CON SUS COLORES
 
-        $sql = "SELECT s.nombre, s.color
+		$sql = "SELECT s.nombre, s.color
             FROM sector s 
             WHERE 1 
             AND s.id = ? 
             ORDER BY s.nombre ";
 
-        $params = [
-            $sector_id,
-        ];
+		$params = [
+			$sector_id,
+		];
 
-        $statement = $this->db->createStatement($sql, $params);
+		$statement = $this->db->createStatement($sql, $params);
 
-        $arrSectores = $statement->execute();
+		$arrSectores = $statement->execute();
 
-        if (!$arrSectores->isQueryResult()) {
-            $this->response->setStatusCode(404);
-        }
+		if (!$arrSectores->isQueryResult()) {
+			$this->response->setStatusCode(404);
+		}
 
-        // TRAIGO LOS VALORES POR ANO
+		// TRAIGO LOS VALORES POR ANO
 
-        $sql = "SELECT s.nombre as sector, e.ano, sum(e.valor) as total
+		$sql = "SELECT s.nombre as sector, e.ano, sum(e.valor) as total
             FROM emision e
             LEFT JOIN sector s ON (e.sector_id = s.id)
             where 1 
             GROUP BY e.ano, s.nombre";
 
-        // LO QUE ESTA ADENTRO DEL LOOP DEBERIA IR ACA
+		// LO QUE ESTA ADENTRO DEL LOOP DEBERIA IR ACA
 
-        $arrAnos = [];
-        $arrValores = [];
-        $arrColores = [];
+		$arrAnos = [];
+		$arrValores = [];
+		$arrColores = [];
 
-        for ($i=1990;$i<=2014;$i++) {
-            $arrAnos[] = $i;
-        }
+		for ($i=1990;$i<=2014;$i++) {
+			$arrAnos[] = $i;
+		}
 
-        $column = 2;
+		$column = 2;
 
-        while ($sector = $arrSectores->next()) {
-            $response['column_'.$column][] = $sector['nombre'];
-            $response['colores'][] =  $sector['color'];
+		while ($sector = $arrSectores->next()) {
+			$response['column_'.$column][] = $sector['nombre'];
+			$response['colores'][] =  $sector['color'];
 
-            foreach ($arrAnos as $ano) {
-                // ATENCION, CABECEADA
-                // ESTOY EJECUTANDO EL QUERY CADA VEZ QUE NECESITO LA LISTA DE VALORES
-                // ESTA PARTE DEBERIA AFUERA DEL LOOP Y SE DEBERIA REUTILIZAR $arrValoresCrudo
-                $statement = $this->db->createStatement($sql);
-                $arrValoresCrudo = $statement->execute();
+			foreach ($arrAnos as $ano) {
+				// ATENCION, CABECEADA
+				// ESTOY EJECUTANDO EL QUERY CADA VEZ QUE NECESITO LA LISTA DE VALORES
+				// ESTA PARTE DEBERIA AFUERA DEL LOOP Y SE DEBERIA REUTILIZAR $arrValoresCrudo
+				$statement = $this->db->createStatement($sql);
+				$arrValoresCrudo = $statement->execute();
 
-                if (!$arrValoresCrudo->isQueryResult()) {
-                    $this->response->setStatusCode(404);
-                }
-                // HASTA ACA
+				if (!$arrValoresCrudo->isQueryResult()) {
+					$this->response->setStatusCode(404);
+				}
+				// HASTA ACA
 
-                $response['column_'.$column][] = Utils::returnSectorAno($arrValoresCrudo, $sector['nombre'], $ano);
-            }
+				$response['column_'.$column][] = Utils::returnSectorAno($arrValoresCrudo, $sector['nombre'], $ano);
+			}
 
-            $column++;
-        }
+			$column++;
+		}
 
 
-        $arrAnos = array_merge(array('x'), $arrAnos);
-        $response['column_1'] = $arrAnos;
+		$arrAnos = array_merge(array('x'), $arrAnos);
+		$response['column_1'] = $arrAnos;
 
 
-        return new JsonModel($response);
-    }
+		return new JsonModel($response);
+	}
 
 
-    public function getSectoralEvolutionSubactivityAction()
-    {
-        $params = $this->params()->fromRoute();
+	public function getSectoralEvolutionSubactivityAction()
+	{
+		$params = $this->params()->fromRoute();
 
-        $sector_id = (int)$params['sector_id'];
+		$sector_id = (int)$params['sector_id'];
 
-        $response = [];
+		$response = [];
 
-        $sql = "SELECT sub.nombre
+		$sql = "SELECT sub.nombre
                 FROM subactividad sub
                 INNER JOIN actividad a ON (a.id = sub.actividad_id)
                 INNER JOIN sector s ON (a.sector_id = s.id)
@@ -188,23 +188,23 @@ 
                 AND s.id = ?
                 ORDER BY sub.nombre";
 
-        $params = [
-            $sector_id,
-        ];
+		$params = [
+			$sector_id,
+		];
 
 
-        $statement = $this->db->createStatement($sql, $params);
+		$statement = $this->db->createStatement($sql, $params);
         
-        $arrSubactividades = $statement->execute();
+		$arrSubactividades = $statement->execute();
 
 
-        if (!$arrSubactividades->isQueryResult()) {
-            $this->response->setStatusCode(404);
-        }
+		if (!$arrSubactividades->isQueryResult()) {
+			$this->response->setStatusCode(404);
+		}
 
-        // TRAIGO LOS VALORES POR ANO
+		// TRAIGO LOS VALORES POR ANO
 
-        $sql = "SELECT sub.nombre as sector, e.ano, SUM(e.valor) as total
+		$sql = "SELECT sub.nombre as sector, e.ano, SUM(e.valor) as total
                 FROM emision e
                 INNER JOIN subactividad sub ON (e.subactividad_id = sub.id)
                 INNER JOIN sector s ON (e.sector_id = s.id)
@@ -214,61 +214,61 @@ 
         
 
 
-        // LO QUE ESTA ADENTRO DEL LOOP DEBERIA IR ACA
+		// LO QUE ESTA ADENTRO DEL LOOP DEBERIA IR ACA
 
-        $arrAnos = [];
-        $arrValores = [];
-        $arrColores = [];
+		$arrAnos = [];
+		$arrValores = [];
+		$arrColores = [];
 
-        for ($i=1990;$i<=2014;$i++) {
-            $arrAnos[] = $i;
-        }
+		for ($i=1990;$i<=2014;$i++) {
+			$arrAnos[] = $i;
+		}
 
-        $column = 2;
+		$column = 2;
 
 
-        while ($subactividad = $arrSubactividades->next()) {
-            $response['column_'.$column][] = $subactividad['nombre'];
-            $response['groups'][] = $subactividad['nombre'];
+		while ($subactividad = $arrSubactividades->next()) {
+			$response['column_'.$column][] = $subactividad['nombre'];
+			$response['groups'][] = $subactividad['nombre'];
 
-            foreach ($arrAnos as $ano) {
-                // ATENCION, CABECEADA
-                // ESTOY EJECUTANDO EL QUERY CADA VEZ QUE NECESITO LA LISTA DE VALORES
-                // ESTA PARTE DEBERIA AFUERA DEL LOOP Y SE DEBERIA REUTILIZAR $arrValoresCrudo
+			foreach ($arrAnos as $ano) {
+				// ATENCION, CABECEADA
+				// ESTOY EJECUTANDO EL QUERY CADA VEZ QUE NECESITO LA LISTA DE VALORES
+				// ESTA PARTE DEBERIA AFUERA DEL LOOP Y SE DEBERIA REUTILIZAR $arrValoresCrudo
                 
-                $statement = $this->db->createStatement($sql, $params);
+				$statement = $this->db->createStatement($sql, $params);
         
-                $arrValoresCrudo = $statement->execute();
+				$arrValoresCrudo = $statement->execute();
 
-                if (!$arrValoresCrudo->isQueryResult()) {
-                    $this->response->setStatusCode(404);
-                }
-                // HASTA ACA
+				if (!$arrValoresCrudo->isQueryResult()) {
+					$this->response->setStatusCode(404);
+				}
+				// HASTA ACA
 
-                $response['column_'.$column][] = Utils::returnSectorAno($arrValoresCrudo, $subactividad['nombre'], $ano);
-            }
+				$response['column_'.$column][] = Utils::returnSectorAno($arrValoresCrudo, $subactividad['nombre'], $ano);
+			}
 
-            $column++;
-        }
+			$column++;
+		}
 
 
-        $arrAnos = array_merge(array('x'), $arrAnos);
-        $response['column_1'] = $arrAnos;
+		$arrAnos = array_merge(array('x'), $arrAnos);
+		$response['column_1'] = $arrAnos;
 
 
-        return new JsonModel($response);
-    }
+		return new JsonModel($response);
+	}
 
-    public function getSectoralEvolutionSubactivityCategoryAction()
-    {
-        $params = $this->params()->fromRoute();
+	public function getSectoralEvolutionSubactivityCategoryAction()
+	{
+		$params = $this->params()->fromRoute();
 
-        $sector_id = (int)$params['sector_id'];
-        $subactividad_id = (int)$params['subactividad_id'];
+		$sector_id = (int)$params['sector_id'];
+		$subactividad_id = (int)$params['subactividad_id'];
 
-        $response = [];
+		$response = [];
 
-        $sql = "SELECT DISTINCT c.nombre
+		$sql = "SELECT DISTINCT c.nombre
                 FROM emision e
                 INNER JOIN subactividad sub ON (e.subactividad_id = sub.id)
                 INNER JOIN sector s ON (e.sector_id = s.id) 
@@ -279,18 +279,18 @@ 
                 ORDER BY c.nombre";
 
 
-        $params = [
+		$params = [
            
-            $sector_id,
-            $subactividad_id
-        ];
+			$sector_id,
+			$subactividad_id
+		];
 
-        $statement = $this->db->createStatement($sql, $params);
-        $arrCategorias = $statement->execute();
+		$statement = $this->db->createStatement($sql, $params);
+		$arrCategorias = $statement->execute();
 
 
 
-        $sql = "SELECT sub.nombre as subcategoria, e.ano, c.nombre, e.valor
+		$sql = "SELECT sub.nombre as subcategoria, e.ano, c.nombre, e.valor
                 FROM emision e
                 INNER JOIN subactividad sub ON (e.subactividad_id = sub.id)
                 INNER JOIN sector s ON (e.sector_id = s.id) 
@@ -300,57 +300,57 @@ 
                 AND sub.id = ? 
                 GROUP BY e.ano, c.nombre";
 
-        $params = [
-            $sector_id,
-            $subactividad_id,
-        ];
+		$params = [
+			$sector_id,
+			$subactividad_id,
+		];
 
         
 
 
-        // LO QUE ESTA ADENTRO DEL LOOP DEBERIA IR ACA
-        $arrAnos = array();
-        $arrValores = array();
-        $arrColores = array();
+		// LO QUE ESTA ADENTRO DEL LOOP DEBERIA IR ACA
+		$arrAnos = array();
+		$arrValores = array();
+		$arrColores = array();
 
 
-        for ($i=1990;$i<=2014;$i++) {
-            $arrAnos[] = $i;
-        }
+		for ($i=1990;$i<=2014;$i++) {
+			$arrAnos[] = $i;
+		}
 
-        $column = 2;
+		$column = 2;
 
-        // // // pr($arrCategorias);
-        // // // pr($arr);
+		// // // pr($arrCategorias);
+		// // // pr($arr);
 
-        while ($categoria = $arrCategorias->next()) {
-            $response['column_'.$column][] = $categoria['nombre'];
-            $response['groups'][] = $categoria['nombre'];
+		while ($categoria = $arrCategorias->next()) {
+			$response['column_'.$column][] = $categoria['nombre'];
+			$response['groups'][] = $categoria['nombre'];
 
-            foreach ($arrAnos as $ano) {
+			foreach ($arrAnos as $ano) {
 
-                // ATENCION, CABECEADA
-                // ESTOY EJECUTANDO EL QUERY CADA VEZ QUE NECESITO LA LISTA DE VALORES
-                // ESTA PARTE DEBERIA AFUERA DEL LOOP Y SE DEBERIA REUTILIZAR $arrValoresCrudo
-                $statement = $this->db->createStatement($sql, $params);
-                $arrValoresCrudo = $statement->execute();
+				// ATENCION, CABECEADA
+				// ESTOY EJECUTANDO EL QUERY CADA VEZ QUE NECESITO LA LISTA DE VALORES
+				// ESTA PARTE DEBERIA AFUERA DEL LOOP Y SE DEBERIA REUTILIZAR $arrValoresCrudo
+				$statement = $this->db->createStatement($sql, $params);
+				$arrValoresCrudo = $statement->execute();
                 
-                if (!$arrValoresCrudo->isQueryResult()) {
-                    $this->response->setStatusCode(404);
-                }
-                // HASTA ACA
+				if (!$arrValoresCrudo->isQueryResult()) {
+					$this->response->setStatusCode(404);
+				}
+				// HASTA ACA
 
 
-                $response['column_'.$column][] = Utils::returnCategoriaAno($arrValoresCrudo, $categoria['nombre'], $ano);
-            }
+				$response['column_'.$column][] = Utils::returnCategoriaAno($arrValoresCrudo, $categoria['nombre'], $ano);
+			}
 
-            $column++;
-        }
+			$column++;
+		}
 
 
-        $arrAnos = array_merge(array('x'), $arrAnos);
-        $response['column_1'] = $arrAnos;
+		$arrAnos = array_merge(array('x'), $arrAnos);
+		$response['column_1'] = $arrAnos;
         
-        return new JsonModel($response);
-    }
+		return new JsonModel($response);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -57,7 +57,7 @@ 
         $arrValores = [];
         $arrColores = [];
 
-        for ($i=1990;$i<=2014;$i++) {
+        for ($i = 1990; $i <= 2014; $i++) {
             $arrAnos[] = $i;
         }
 
@@ -65,7 +65,7 @@ 
 
         while ($sector = $arrSectores->next()) {
             $response['column_'.$column][] = $sector['nombre'];
-            $response['colores'][] =  $sector['color'];
+            $response['colores'][] = $sector['color'];
 
             foreach ($arrAnos as $ano) {
                 // ATENCION, CABECEADA
@@ -97,7 +97,7 @@ 
     {
         $params = $this->params()->fromRoute();
 
-        $sector_id  = (int)$params['sector_id'];
+        $sector_id = (int) $params['sector_id'];
 
         $response = [];
 
@@ -135,7 +135,7 @@ 
         $arrValores = [];
         $arrColores = [];
 
-        for ($i=1990;$i<=2014;$i++) {
+        for ($i = 1990; $i <= 2014; $i++) {
             $arrAnos[] = $i;
         }
 
@@ -143,7 +143,7 @@ 
 
         while ($sector = $arrSectores->next()) {
             $response['column_'.$column][] = $sector['nombre'];
-            $response['colores'][] =  $sector['color'];
+            $response['colores'][] = $sector['color'];
 
             foreach ($arrAnos as $ano) {
                 // ATENCION, CABECEADA
@@ -176,7 +176,7 @@ 
     {
         $params = $this->params()->fromRoute();
 
-        $sector_id = (int)$params['sector_id'];
+        $sector_id = (int) $params['sector_id'];
 
         $response = [];
 
@@ -220,7 +220,7 @@ 
         $arrValores = [];
         $arrColores = [];
 
-        for ($i=1990;$i<=2014;$i++) {
+        for ($i = 1990; $i <= 2014; $i++) {
             $arrAnos[] = $i;
         }
 
@@ -263,8 +263,8 @@ 
     {
         $params = $this->params()->fromRoute();
 
-        $sector_id = (int)$params['sector_id'];
-        $subactividad_id = (int)$params['subactividad_id'];
+        $sector_id = (int) $params['sector_id'];
+        $subactividad_id = (int) $params['subactividad_id'];
 
         $response = [];
 
@@ -314,7 +314,7 @@ 
         $arrColores = array();
 
 
-        for ($i=1990;$i<=2014;$i++) {
+        for ($i = 1990; $i <= 2014; $i++) {
             $arrAnos[] = $i;
         }
 

module/Api/src/Model/DistribucionReportTransactionScript.php

Indentation +4 added lines, -4 removed lines

@@ -10,8 +10,8 @@
 */
 class DistributionReportTransactionScript
 {
-    public function __construct()
-    {
-        # code...
-    }
+	public function __construct()
+	{
+		# code...
+	}
 }

module/Api/src/Helper/Utils.php

Indentation +36 added lines, -36 removed lines

@@ -4,46 +4,46 @@
 
 final class Utils
 {
-    public static function returnSectorGas($arr, $sector, $gas)
-    {
-        foreach ($arr as $val) {
-            if ($val['sector'] == $sector && $val['gas'] == $gas) {
-                return $val['total'];
-            }
-        }
-        return 0;
-    }
+	public static function returnSectorGas($arr, $sector, $gas)
+	{
+		foreach ($arr as $val) {
+			if ($val['sector'] == $sector && $val['gas'] == $gas) {
+				return $val['total'];
+			}
+		}
+		return 0;
+	}
 
-    public static function returnSectorAno($arr, $sector, $ano)
-    {
-        while ($val = $arr->next()) {
-            if ($val['sector'] == $sector && $val['ano'] == $ano) {
-                return $val['total'];
-            }
-        }
+	public static function returnSectorAno($arr, $sector, $ano)
+	{
+		while ($val = $arr->next()) {
+			if ($val['sector'] == $sector && $val['ano'] == $ano) {
+				return $val['total'];
+			}
+		}
         
-        return 0;
-    }
+		return 0;
+	}
 
-    public static function returnSubactividadAno($arr, $subactividad, $ano)
-    {
-        foreach ($arr as $val) {
-            if (trim($val['nombre']) == trim($subactividad) && $val['ano'] == $ano) {
-                return $val['valor'];
-            }
-        }
+	public static function returnSubactividadAno($arr, $subactividad, $ano)
+	{
+		foreach ($arr as $val) {
+			if (trim($val['nombre']) == trim($subactividad) && $val['ano'] == $ano) {
+				return $val['valor'];
+			}
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 
-    public static function returnCategoriaAno($arr, $categoria, $ano)
-    {
-        while ($val = $arr->next()) {
-            if (trim($val['nombre']) == trim($categoria) && $val['ano'] == $ano) {
-                return $val['valor'];
-            }
-        }
+	public static function returnCategoriaAno($arr, $categoria, $ano)
+	{
+		while ($val = $arr->next()) {
+			if (trim($val['nombre']) == trim($categoria) && $val['ano'] == $ano) {
+				return $val['valor'];
+			}
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 }

module/Api/src/Module.php

Indentation +5 added lines, -5 removed lines

@@ -9,10 +9,10 @@
 
 class Module
 {
-    const VERSION = '3.0.2';
+	const VERSION = '3.0.2';
 
-    public function getConfig()
-    {
-        return include __DIR__ . '/../config/module.config.php';
-    }
+	public function getConfig()
+	{
+		return include __DIR__ . '/../config/module.config.php';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,6 +13,6 @@
 
     public function getConfig()
     {
-        return include __DIR__ . '/../config/module.config.php';
+        return include __DIR__.'/../config/module.config.php';
     }
 }

module/Api/src/Factory/EvolutionReportControllerFactory.php

Indentation +6 added lines, -6 removed lines

@@ -12,10 +12,10 @@
  */
 class EvolutionReportControllerFactory implements FactoryInterface
 {
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
-    {
-        return new EvolutionReportController(
-            $container->get(AdapterInterface::class)
-        );
-    }
+	public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+	{
+		return new EvolutionReportController(
+			$container->get(AdapterInterface::class)
+		);
+	}
 }