Merge branch 'develop' into release

.console.env.sample

@@ -0,0 +1 @@
+API_URL=http://api-proxy

.db.env.sample

@@ -0,0 +1,5 @@
+MYSQL_HOST=
+MYSQL_ROOT_PASSWORD=
+MYSQL_DATABASE=
+MYSQL_USER=
+MYSQL_PASSWORD=

.env.sample

@@ -1,5 +1 @@
-MYSQL_HOST=
-MYSQL_ROOT_PASSWORD=
-MYSQL_DATABASE=
-MYSQL_USER=
-MYSQL_PASSWORD=
+COMPOSE_PROFILES=

.gitignore

@@ -13,5 +13,3 @@
 
 # Python
 **/.idea/
-
-**/uploads/

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

.idea/contabilidad.iml

@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/kint-php/kint" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/zeuxisoo/slim-whoops" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phar-io/version" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phar-io/manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/theseer/tokenizer" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/webmozart/assert" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/philo/laravel-blade" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/nesbot/carbon" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/type" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/diff" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/illuminate/support" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/lines-of-code" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/illuminate/filesystem" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/object-enumerator" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/illuminate/events" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/comparator" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/illuminate/contracts" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/psr/simple-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/code-unit" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/illuminate/view" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/psr/http-server-handler" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/doctrine/instantiator" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/exporter" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/illuminate/container" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/psr/http-factory" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/doctrine/inflector" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/cli-parser" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/psr/container" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/version" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/psr/http-message" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/complexity" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/psr/http-server-middleware" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/recursion-context" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/psr/log" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/resource-operations" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/global-state" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/environment" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phpdocumentor/reflection-docblock" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/code-unit-reverse-lookup" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phpdocumentor/type-resolver" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/symfony/polyfill-mbstring" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/sebastian/object-reflector" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phpdocumentor/reflection-common" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/symfony/finder" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/symfony/deprecation-contracts" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/symfony/translation-contracts" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/filp/whoops" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/symfony/polyfill-ctype" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/symfony/debug" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/nyholm/psr7-server" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/symfony/translation" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/nyholm/psr7" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/symfony/polyfill-php80" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/nikic/php-parser" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/nikic/fast-route" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/php-di/php-di" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/php-di/phpdoc-reader" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/php-di/slim-bridge" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/php-di/invoker" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phpunit/php-code-coverage" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phpunit/phpunit" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phpunit/php-text-template" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phpunit/php-invoker" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phpunit/php-file-iterator" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phpunit/php-timer" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/myclabs/deep-copy" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/phpspec/prophecy" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/opis/closure" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/php-http/message-factory" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/rubellum/slim-blade-view" />
-      <excludeFolder url="file://$MODULE_DIR$/ui/vendor/slim/slim" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/contabilidad.iml" filepath="$PROJECT_DIR$/.idea/contabilidad.iml" />
-    </modules>
-  </component>
-</project>

.idea/php.xml

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PhpIncludePathManager">
-    <include_path>
-      <path value="$PROJECT_DIR$/ui/vendor/kint-php/kint" />
-      <path value="$PROJECT_DIR$/ui/vendor/zeuxisoo/slim-whoops" />
-      <path value="$PROJECT_DIR$/ui/vendor/phar-io/version" />
-      <path value="$PROJECT_DIR$/ui/vendor/phar-io/manifest" />
-      <path value="$PROJECT_DIR$/ui/vendor/theseer/tokenizer" />
-      <path value="$PROJECT_DIR$/ui/vendor/webmozart/assert" />
-      <path value="$PROJECT_DIR$/ui/vendor/philo/laravel-blade" />
-      <path value="$PROJECT_DIR$/ui/vendor/nesbot/carbon" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/type" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/diff" />
-      <path value="$PROJECT_DIR$/ui/vendor/illuminate/support" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/lines-of-code" />
-      <path value="$PROJECT_DIR$/ui/vendor/illuminate/filesystem" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/object-enumerator" />
-      <path value="$PROJECT_DIR$/ui/vendor/illuminate/events" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/comparator" />
-      <path value="$PROJECT_DIR$/ui/vendor/illuminate/contracts" />
-      <path value="$PROJECT_DIR$/ui/vendor/psr/simple-cache" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/code-unit" />
-      <path value="$PROJECT_DIR$/ui/vendor/illuminate/view" />
-      <path value="$PROJECT_DIR$/ui/vendor/psr/http-server-handler" />
-      <path value="$PROJECT_DIR$/ui/vendor/doctrine/instantiator" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/exporter" />
-      <path value="$PROJECT_DIR$/ui/vendor/illuminate/container" />
-      <path value="$PROJECT_DIR$/ui/vendor/psr/http-factory" />
-      <path value="$PROJECT_DIR$/ui/vendor/doctrine/inflector" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/cli-parser" />
-      <path value="$PROJECT_DIR$/ui/vendor/psr/container" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/version" />
-      <path value="$PROJECT_DIR$/ui/vendor/psr/http-message" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/complexity" />
-      <path value="$PROJECT_DIR$/ui/vendor/psr/http-server-middleware" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/recursion-context" />
-      <path value="$PROJECT_DIR$/ui/vendor/psr/log" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/resource-operations" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/global-state" />
-      <path value="$PROJECT_DIR$/ui/vendor/composer" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/environment" />
-      <path value="$PROJECT_DIR$/ui/vendor/phpdocumentor/reflection-docblock" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/code-unit-reverse-lookup" />
-      <path value="$PROJECT_DIR$/ui/vendor/phpdocumentor/type-resolver" />
-      <path value="$PROJECT_DIR$/ui/vendor/symfony/polyfill-mbstring" />
-      <path value="$PROJECT_DIR$/ui/vendor/sebastian/object-reflector" />
-      <path value="$PROJECT_DIR$/ui/vendor/phpdocumentor/reflection-common" />
-      <path value="$PROJECT_DIR$/ui/vendor/symfony/finder" />
-      <path value="$PROJECT_DIR$/ui/vendor/symfony/deprecation-contracts" />
-      <path value="$PROJECT_DIR$/ui/vendor/symfony/translation-contracts" />
-      <path value="$PROJECT_DIR$/ui/vendor/filp/whoops" />
-      <path value="$PROJECT_DIR$/ui/vendor/symfony/polyfill-ctype" />
-      <path value="$PROJECT_DIR$/ui/vendor/symfony/debug" />
-      <path value="$PROJECT_DIR$/ui/vendor/nyholm/psr7-server" />
-      <path value="$PROJECT_DIR$/ui/vendor/symfony/translation" />
-      <path value="$PROJECT_DIR$/ui/vendor/nyholm/psr7" />
-      <path value="$PROJECT_DIR$/ui/vendor/symfony/polyfill-php80" />
-      <path value="$PROJECT_DIR$/ui/vendor/nikic/php-parser" />
-      <path value="$PROJECT_DIR$/ui/vendor/nikic/fast-route" />
-      <path value="$PROJECT_DIR$/ui/vendor/php-di/php-di" />
-      <path value="$PROJECT_DIR$/ui/vendor/php-di/phpdoc-reader" />
-      <path value="$PROJECT_DIR$/ui/vendor/php-di/slim-bridge" />
-      <path value="$PROJECT_DIR$/ui/vendor/php-di/invoker" />
-      <path value="$PROJECT_DIR$/ui/vendor/phpunit/php-code-coverage" />
-      <path value="$PROJECT_DIR$/ui/vendor/phpunit/phpunit" />
-      <path value="$PROJECT_DIR$/ui/vendor/phpunit/php-text-template" />
-      <path value="$PROJECT_DIR$/ui/vendor/phpunit/php-invoker" />
-      <path value="$PROJECT_DIR$/ui/vendor/phpunit/php-file-iterator" />
-      <path value="$PROJECT_DIR$/ui/vendor/phpunit/php-timer" />
-      <path value="$PROJECT_DIR$/ui/vendor/myclabs/deep-copy" />
-      <path value="$PROJECT_DIR$/ui/vendor/phpspec/prophecy" />
-      <path value="$PROJECT_DIR$/ui/vendor/opis/closure" />
-      <path value="$PROJECT_DIR$/ui/vendor/php-http/message-factory" />
-      <path value="$PROJECT_DIR$/ui/vendor/rubellum/slim-blade-view" />
-      <path value="$PROJECT_DIR$/ui/vendor/slim/slim" />
-    </include_path>
-  </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
-    <option name="suggestChangeDefaultLanguageLevel" value="false" />
-  </component>
-  <component name="PhpUnit">
-    <phpunit_settings>
-      <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/ui/vendor/autoload.php" />
-    </phpunit_settings>
-  </component>
-</project>

api/.gitignore

@@ -0,0 +1 @@
+**/uploads/

api/common/Controller/Base.php

@@ -24,4 +24,11 @@ class Base {
     $key = urlencode(base64_encode($signature));
     return $this->withJson($response, ['key' => $key]);
   }
+  public function info(Request $request, Response $response): Response {
+      ob_start();
+      phpinfo();
+      $data = ob_get_clean();
+      $response->getBody()->write($data);
+      return $response;
+  }
 }

api/common/Controller/Categorias.php

@@ -13,33 +13,35 @@ class Categorias {
 
   public function __invoke(Request $request, Response $response, Factory $factory, Service $service): Response {
     $categorias = $factory->find(Categoria::class)->many();
-    array_walk($categorias, function(&$item) use ($service) {
-        $arr = $item->toArray();
-        $arr['cuentas'] = array_map(function($item) {
-            return $item->toArray();
-        }, $item->cuentas());
-        $maps = ['activo', 'pasivo', 'ganancia', 'perdida'];
-        foreach ($maps as $m) {
-            $p = $m . 's';
-            $t = ucfirst($m);
-            $cuentas = $item->getCuentasOf($t);
-            if ($cuentas === false or $cuentas === null) {
-                $arr[$p] = 0;
-                continue;
+    if ($categorias !== null) {
+        array_walk($categorias, function(&$item) use ($service) {
+            $arr = $item->toArray();
+            if ($item->cuentas()) {
+                $arr['cuentas'] = array_map(function($item) {
+                    return $item->toArray();
+                }, $item->cuentas());
             }
-            $arr[$p] = array_reduce($cuentas, function($sum, $item) use($service) {
-                return $sum + $item->saldo($service, true);
-            });
-        }
-        $item = $arr;
-    });
-    if ($categorias) {
-      usort($categorias, function($a, $b) {
-        return strcmp($a['nombre'], $b['nombre']);
-      });
+            $maps = ['activo', 'pasivo', 'ganancia', 'perdida'];
+            foreach ($maps as $m) {
+                $p = $m . 's';
+                $t = ucfirst($m);
+                $cuentas = $item->getCuentasOf($t);
+                if ($cuentas === false or $cuentas === null) {
+                    $arr[$p] = 0;
+                    continue;
+                }
+                $arr[$p] = array_reduce($cuentas, function($sum, $item) use($service) {
+                    return $sum + $item->saldo($service, true);
+                });
+            }
+            $item = $arr;
+        });
+        usort($categorias, function($a, $b) {
+            return strcmp($a['nombre'], $b['nombre']);
+        });
     }
     $output = [
-      'categorias' => $categorias
+        'categorias' => $categorias
     ];
     return $this->withJson($response, $output);
   }

api/common/Controller/Consolidados.php

@@ -0,0 +1,66 @@
+<?php
+namespace Contabilidad\Common\Controller;
+
+use Carbon\Carbon;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Message\ResponseInterface as Response;
+use ProVM\Common\Factory\Model as Factory;
+use ProVM\Common\Define\Controller\Json;
+use Contabilidad\Common\Service\Consolidar as Service;
+use Contabilidad\Cuenta;
+use Contabilidad\Consolidado;
+
+class Consolidados {
+    use Json;
+
+    public function __invoke(Request $request, Response $response, Factory $factory, $cuenta_id): Response {
+        $consolidados = $factory->find(Consolidados::class)->where([['cuenta_id' => $cuenta_id]])->many();
+        $output = [
+            'consolidados' => array_map(function($item) {
+                return $item->toArray();
+            }, $consolidados)
+        ];
+        return $this->withJson($response, $output);
+    }
+    public function add(Request $request, Response $response, Factory $factory): Response {
+        $input = json_decode($request->getBody()->getContents());
+        $output = [
+            'input' => $input,
+            'consolidados' => []
+        ];
+        if (!is_array($input)) {
+            $input = [$input];
+        }
+        foreach ($input as $data) {
+            $consolidado = Consolidado::add($factory, $data);
+            $status = $consolidado->save();
+            $output['consolidados'] []= [
+                'consolidado' => $consolidado->toArray(),
+                'added' => $status
+            ];
+        }
+        return $this->withJson($response, $output);
+    }
+    public function cli(Request $request, Response $response, Service $service): Response {
+        try {
+            if (!$service->isConsolidado()) {
+                $service->consolidar();
+            }
+        } catch (\Error | \Exception $e) {
+            error_log($e);
+            throw $e;
+        }
+        return $this->withJson($response, []);
+    }
+    public function update(Request $request, Response $response, Factory $factory, Service $service, $mes, $cuenta_id): Response {
+        try {
+            $cuenta = $factory->find(Cuenta::class)->one($cuenta_id);
+            $mes = Carbon::parse($mes);
+            $service->consolidarCuenta($cuenta, $mes);
+        } catch (\Error | \Exception $e) {
+            error_log($e);
+            throw $e;
+        }
+        return $this->withJson($response, []);
+    }
+}

api/common/Controller/Cuentas.php

@@ -1,8 +1,10 @@
 <?php
 namespace Contabilidad\Common\Controller;
 
+use Contabilidad\Transaccion;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
+use Carbon\Carbon;
 use ProVM\Common\Define\Controller\Json;
 use ProVM\Common\Factory\Model as Factory;
 use Contabilidad\Common\Service\TiposCambios as Service;
@@ -12,8 +14,13 @@ class Cuentas {
   use Json;
 
   public function __invoke(Request $request, Response $response, Factory $factory): Response {
-    $cuentas = $factory->find(Cuenta::class)->array();
+    $cuentas = $factory->find(Cuenta::class)->many();
     if ($cuentas) {
+        array_walk($cuentas, function (&$item) {
+           $arr = $item->toArray();
+           $arr['categoria'] = $item->categoria()->toArray();
+           $item = $arr;
+        });
       usort($cuentas, function($a, $b) {
           $t = strcmp($a['tipo']['descripcion'], $b['tipo']['descripcion']);
           if ($t != 0) {
@@ -77,6 +84,15 @@ class Cuentas {
     ];
     return $this->withJson($response, $output);
   }
+  public function categoria(Request $request, Response $response, Factory $factory, $cuenta_id): Response {
+      $cuenta = $factory->find(Cuenta::class)->one($cuenta_id);
+      $output = [
+          'input' => $cuenta_id,
+          'cuenta' => $cuenta?->toArray(),
+          'categoria' => $cuenta?->categoria()->toArray()
+      ];
+      return $this->withJson($response, $output);
+  }
   public function entradas(Request $request, Response $response, Factory $factory, $cuenta_id): Response {
     $cuenta = $factory->find(Cuenta::class)->one($cuenta_id);
     $entradas = null;
@@ -95,6 +111,24 @@ class Cuentas {
     ];
     return $this->withJson($response, $output);
   }
+  protected function transaccionToArray(Service $service, Cuenta $cuenta, Transaccion $transaccion): array {
+      $arr = $transaccion->toArray();
+      if ($cuenta->moneda()->codigo === 'CLP') {
+          if ($transaccion->debito()->moneda()->codigo !== 'CLP' or $transaccion->credito()->moneda()->codigo !== 'CLP') {
+              if ($transaccion->debito()->moneda()->codigo !== 'CLP') {
+                  $c = $transaccion->debito();
+              } else {
+                  $c = $transaccion->credito();
+              }
+              $service->get($transaccion->fecha(), $c->moneda()->id);
+              $arr['valor'] = $transaccion->valor;
+              $arr['valorFormateado'] = $cuenta->moneda()->format($arr['valor']);
+          }
+      }
+      $arr['debito']['categoria'] = $transaccion->debito()->categoria()->toArray();
+      $arr['credito']['categoria'] = $transaccion->credito()->categoria()->toArray();
+      return $arr;
+  }
   public function transacciones(Request $request, Response $response, Factory $factory, Service $service, $cuenta_id, $limit = null, $start = 0): Response {
     $cuenta = $factory->find(Cuenta::class)->one($cuenta_id);
     $transacciones = null;
@@ -102,20 +136,7 @@ class Cuentas {
       $transacciones = $cuenta->transacciones($limit, $start);
       if (count($transacciones) > 0) {
           foreach ($transacciones as &$transaccion) {
-              $arr = $transaccion->toArray();
-              if ($cuenta->moneda()->codigo === 'CLP') {
-                  if ($transaccion->debito()->moneda()->codigo !== 'CLP' or $transaccion->credito()->moneda()->codigo !== 'CLP') {
-                      if ($transaccion->debito()->moneda()->codigo !== 'CLP') {
-                          $c = $transaccion->debito();
-                      } else {
-                          $c = $transaccion->credito();
-                      }
-                      $service->get($transaccion->fecha(), $c->moneda()->id);
-                      $arr['valor'] = $c->moneda()->cambiar($transaccion->fecha(), $transaccion->valor);
-                      $arr['valorFormateado'] = $cuenta->moneda()->format($arr['valor']);
-                  }
-              }
-              $transaccion = $arr;
+              $transaccion = $this->transaccionToArray($service, $cuenta, $transaccion);
           }
       }
     }
@@ -126,6 +147,40 @@ class Cuentas {
     ];
     return $this->withJson($response, $output);
   }
+  public function transaccionesMonth(Request $request, Response $response, Factory $factory, Service $service, $cuenta_id, $month): Response {
+      $cuenta = $factory->find(Cuenta::class)->one($cuenta_id);
+      $month = Carbon::parse($month);
+      $transacciones = null;
+      if ($cuenta !== null) {
+          $transacciones = $cuenta->transaccionesMonth($month);
+          if (count($transacciones) > 0) {
+              foreach ($transacciones as &$transaccion) {
+                  $transaccion = $this->transaccionToArray($service, $cuenta, $transaccion);
+              }
+          }
+      }
+      $output = [
+          'input' => compact('cuenta_id', 'month'),
+          'cuenta' => $cuenta?->toArray(),
+          'transacciones' => $transacciones
+      ];
+      return $this->withJson($response, $output);
+  }
+  public function transaccionesAcumulation(Request $request, Response $response, Factory $factory, $cuenta_id, $date): Response {
+      $cuenta = $factory->find(Cuenta::class)->one($cuenta_id);
+      $f = Carbon::parse($date);
+      $acum = 0;
+      if ($cuenta !== null) {
+          $acum = $cuenta->acumulacion($f);
+      }
+      $output = [
+          'input' => compact('cuenta_id', 'date'),
+          'cuenta' => $cuenta?->toArray(),
+          'format' => $cuenta->moneda()->toArray(),
+          'acumulation' => $acum
+      ];
+      return $this->withJson($response, $output);
+  }
   public function transaccionesAmount(Request $request, Response $response, Factory $factory, $cuenta_id): Response {
     $cuenta = $factory->find(Cuenta::class)->one($cuenta_id);
     $transacciones = 0;

api/common/Controller/Files.php

@@ -0,0 +1,76 @@
+<?php
+namespace Contabilidad\Common\Controller;
+
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Message\ResponseInterface as Response;
+use ProVM\Common\Define\Controller\Json;
+use Contabilidad\Common\Service\FileHandler as Handler;
+use ProVM\Common\Factory\Model as Factory;
+use Contabilidad\Cuenta;
+
+class Files {
+    use Json;
+
+    public function __invoke(Request $request, Response $response, Handler $handler): Response {
+        $files = $handler->listFiles();
+        usort($files, function($a, $b) {
+            $f = strcmp($a->folder, $b->folder);
+            if ($f == 0) {
+                return strcmp($a->filename, $b->filename);
+            }
+            return $f;
+        });
+        return $this->withJson($response, compact('files'));
+    }
+    public function upload(Request $request, Response $response, Handler $handler, Factory $factory): Response {
+        $post = $request->getParsedBody();
+        $cuenta = $factory->find(Cuenta::class)->one($post['cuenta']);
+        $file = $request->getUploadedFiles()['archivo'];
+        $new_name = implode(' - ', [$cuenta->nombre, $cuenta->categoria()->nombre, $post['fecha']]);
+        $output = [
+            'input' => [
+                'name' => $file->getClientFilename(),
+                'type' => $file->getClientMediaType(),
+                'size' => $file->getSize(),
+                'error' => $file->getError()
+            ],
+            'new_name' => $new_name,
+            'uploaded' => $handler->uploadFile($file, $new_name)
+        ];
+        return $this->withJson($response, $output);
+    }
+    public function get(Request $request, Response $response, Handler $handler, $folder, $filename): Response {
+        $file = $handler->getFile($folder, $filename);
+        return $response
+            ->withHeader('Content-Type', $handler->getType($folder))
+            ->withHeader('Content-Disposition', 'attachment; filename=' . $filename)
+            ->withAddedHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
+            ->withHeader('Cache-Control', 'post-check=0, pre-check=0')
+            ->withHeader('Pragma', 'no-cache')
+            ->withBody($file);
+    }
+    public function edit(Request $request, Response $response, Handler $handler, Factory $factory, $folder, $filename): Response {
+        $post = json_decode($request->getBody());
+        $cuenta = $factory->find(Cuenta::class)->one($post->cuenta);
+        $new_name = implode(' - ', [$cuenta->nombre, $cuenta->categoria()->nombre, $post->fecha]);
+        $output = [
+            'input' => [
+                'folder' => $folder,
+                'filename' => $filename,
+                'post' => $post
+            ],
+            'edited' => $handler->editFilename($folder, $filename, $new_name)
+        ];
+        return $this->withJson($response, $output);
+    }
+    public function delete(Request $request, Response $response, Handler $handler, $folder, $filename): Response {
+        $output = [
+            'input' => [
+                'folder' => $folder,
+                'filename' => $filename
+            ],
+            'deleted' => $handler->deleteFile($folder, $filename)
+        ];
+        return $this->withJson($response, $output);
+    }
+}

api/common/Controller/Import.php

@@ -3,19 +3,47 @@ namespace Contabilidad\Common\Controller;
 
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Container\ContainerInterface as Container;
 use ProVM\Common\Define\Controller\Json;
 use ProVM\Common\Factory\Model as Factory;
 use Contabilidad\Common\Service\DocumentHandler as Handler;
+use Contabilidad\Cuenta;
 
 class Import {
     use Json;
 
-    public function __invoke(Request $request, Response $response, Factory $factory): Response {
-      $post = $request->getParsedBody();
-      return $this->withJson($response, $post);
+    public function __invoke(Request $request, Response $response, Factory $factory, Container $container): Response {
+        $post =$request->getParsedBody();
+        $cuenta = $factory->find(Cuenta::class)->one($post['cuenta']);
+        $file = $request->getUploadedFiles()['archivo'];
+        $valid_media = [
+            'text/csv' => 'csvs',
+            'application/pdf' => 'pdfs',
+            'application/vnd.ms-excel' => 'xlss',
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'xlss',
+            'application/json' => 'jsons'
+        ];
+        if ($file->getError() === 0 and in_array($file->getClientMediaType(), array_keys($valid_media))) {
+            $filenfo = new \SplFileInfo($file->getClientFilename());
+            $new_name = implode('.', [implode(' - ', [$cuenta->nombre, $cuenta->categoria()->nombre, $post['fecha']]), $filenfo->getExtension()]);
+            $to = implode(DIRECTORY_SEPARATOR, [$container->get('folders')->uploads, $valid_media[$file->getClientMediaType()], $new_name]);
+            $file->moveTo($to);
+            $status = file_exists($to);
+        }
+        $output = [
+            'input' => [
+                'name' => $file->getClientFilename(),
+                'type' => $file->getClientMediaType(),
+                'size' => $file->getSize(),
+                'error' => $file->getError()
+            ],
+            'new_name' => $new_name,
+            'uploaded' => $status
+        ];
+        return $this->withJson($response, $output);
     }
     public function uploads(Request $request, Response $response, Handler $handler): Response {
-      $output = $handler->handle();
-      return $this->withJson($response, $output);
+        $output = $handler->handle();
+        return $this->withJson($response, $output);
     }
 }

api/common/Controller/Queues.php

@@ -0,0 +1,47 @@
+<?php
+namespace Contabilidad\Common\Controller;
+
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Message\ResponseInterface as Response;
+use ProVM\Common\Factory\Model as Factory;
+use ProVM\Common\Define\Controller\Json;
+use Contabilidad\Queue;
+
+class Queues {
+    use Json;
+
+    public function __invoke(Request $request, Response $response, Factory $factory): Response {
+        $queues = $factory->find(Queue::class)->many();
+        $output = [
+            'queues' => array_map(function($item) {return $item->toArray();}, $queues)
+        ];
+        return $this->withJson($response, $output);
+    }
+    public function pending(Request $request, Response $response, Factory $factory): Response {
+        $pending = $factory->find(Queue::class)->where([['processed', 0]])->many();
+        $output = [
+            'pending' => array_map(function($item) {return $item->toArray();}, $pending)
+        ];
+        return $this->withJson($response, $output);
+    }
+    public function processed(Request $request, Response $response, Factory $factory): Response {
+        $input = json_decode($request->getBody()->getContents());
+        $output = [
+            'input' => $input,
+            'queues' => []
+        ];
+        if (!is_array($input->processed)) {
+            $input->processed = [$input->processed];
+        }
+        foreach ($input->processed as $id) {
+            $queue = $factory->find(Queue::class)->one($id);
+            $queue->setProcessed(true);
+            $status = $queue->save();
+            $output['queues'] []= [
+                'queue' => $queue->toArray(),
+                'processed' => $status
+            ];
+        }
+        return $this->withJson($response, $output);
+    }
+}

api/common/Controller/TiposCategorias.php

@@ -1,6 +1,7 @@
 <?php
 namespace Contabilidad\Common\Controller;
 
+use Contabilidad\TipoCuenta;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
 use ProVM\Common\Define\Controller\Json;
@@ -13,31 +14,22 @@ class TiposCategorias {
 
     public function __invoke(Request $request, Response $response, Factory $factory, Service $service): Response {
         $tipos = $factory->find(TipoCategoria::class)->many();
-        array_walk($tipos, function(&$item) use ($service) {
-            $arr = $item->toArray();
-            $arr['categorias'] = array_map(function($item) {
-                return $item->toArray();
-            }, $item->categorias());
-            $arr['saldo'] = abs($item->saldo($service));
-            $maps = ['activo', 'pasivo', 'ganancia', 'perdida'];
-            foreach ($maps as $m) {
-                $p = $m . 's';
-                $t = ucfirst($m);
-                $cuentas = $item->getCuentasOf($t);
-                if ($cuentas === false or $cuentas === null) {
-                    $arr[$p] = 0;
-                    continue;
+        if ($tipos !== null) {
+            array_walk($tipos, function(&$item) use ($service) {
+                $arr = $item->toArray();
+                $arr['categorias'] = $item->categorias();
+                if ($arr['categorias'] !== null) {
+                    $arr['categorias'] = array_map(function($item) {
+                        return $item->toArray();
+                    }, $item->categorias());
                 }
-                $arr[$p] = array_reduce($cuentas, function($sum, $item) use($service) {
-                    return $sum + $item->saldo($service, true);
-                });
-            }
-            $item = $arr;
-        });
-        if ($tipos) {
-          usort($tipos, function($a, $b) {
-            return strcmp($a['descripcion'], $b['descripcion']);
-          });
+                $arr['saldo'] = abs($item->saldo($service));
+                $arr['totales'] = $item->getTotales($service);
+                $item = $arr;
+            });
+            usort($tipos, function($a, $b) {
+                return strcmp($a['descripcion'], $b['descripcion']);
+            });
         }
         $output = [
           'tipos' => $tipos
@@ -90,19 +82,7 @@ class TiposCategorias {
         if ($categorias !== null) {
           array_walk($categorias, function(&$item) use ($service) {
               $arr = $item->toArray($service);
-              $maps = ['activo', 'pasivo', 'ganancia', 'perdida'];
-              foreach ($maps as $m) {
-                  $p = $m . 's';
-                  $t = ucfirst($m);
-                  $cuentas = $item->getCuentasOf($t);
-                  if ($cuentas === false or $cuentas === null) {
-                      $arr[$p] = 0;
-                      continue;
-                  }
-                  $arr[$p] = array_reduce($cuentas, function($sum, $item) use($service) {
-                      return $sum + $item->saldo($service, true);
-                  });
-              }
+              $arr['totales'] = $item->getTotales($service);
               $item = $arr;
           });
         }
@@ -117,6 +97,19 @@ class TiposCategorias {
     public function balance(Request $request, Response $response, Factory $factory, Service $service): Response {
         $tipos = $factory->find(TipoCategoria::class)->many();
         $balance = array_reduce($tipos, function($sum, $item) use ($service) {
+            $totales = $item->getTotales($service);
+            if (!is_array($sum)) {
+                $sum = [];
+            }
+            foreach ($totales as $p => $total) {
+                if (!isset($sum[$p])) {
+                    $sum[$p] = 0;
+                }
+                $sum[$p] += $total;
+            }
+            return $sum;
+        });
+        /*$balance = array_reduce($tipos, function($sum, $item) use ($service) {
             $maps = ['activo', 'pasivo', 'ganancia', 'perdida'];
             foreach ($maps as $m) {
                 $p = $m . 's';
@@ -133,7 +126,7 @@ class TiposCategorias {
                 });
             }
             return $sum;
-        });
+        });*/
         return $this->withJson($response, $balance);
     }
 }

api/common/Controller/Transacciones.php

@@ -5,24 +5,28 @@ use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
 use ProVM\Common\Define\Controller\Json;
 use ProVM\Common\Factory\Model as Factory;
+use Contabilidad\Common\Service\Queuer as Service;
 use Contabilidad\Transaccion;
 
 class Transacciones {
   use Json;
 
+  protected function parseTransacciones(?array $transacciones): ?array {
+      if ($transacciones !== null) {
+          usort($transacciones, function($a, $b) {
+              $d = $a['fecha'] - $b['fecha'];
+              if ($d === 0) {
+                  return strcmp($a['cuenta']['nombre'], $b['cuenta']['nombre']);
+              }
+              return $d;
+          });
+      }
+      return $transacciones;
+  }
   public function __invoke(Request $request, Response $response, Factory $factory): Response {
     $transacciones = $factory->find(Transaccion::class)->array();
-    if ($transacciones !== null) {
-      usort($transacciones, function($a, $b) {
-        $d = $a['fecha'] - $b['fecha'];
-        if ($d === 0) {
-          return strcmp($a['cuenta']['nombre'], $b['cuenta']['nombre']);
-        }
-        return $d;
-      });
-    }
     $output = [
-      'transacciones' => $transacciones
+      'transacciones' => $this->parseTransacciones($transacciones)
     ];
     return $this->withJson($response, $output);
   }
@@ -52,17 +56,33 @@ class Transacciones {
     ];
     return $this->withJson($response, $output);
   }
-  public function edit(Request $request, Response $response, Factory $factory, $transaccion_id): Response {
+  public function edit(Request $request, Response $response, Factory $factory, Service $queuer, $transaccion_id): Response {
     $transaccion = $factory->find(Transaccion::class)->one($transaccion_id);
     $output = [
       'input' => $transaccion_id,
       'old' => $transaccion->toArray()
     ];
+    $old_cuentas = ['credito' => $transaccion->credito_id, 'debito_id' => $transaccion->debito_id];
     $input = json_decode($request->getBody());
     $transaccion->edit($input);
+    $new_cuentas = ['credito' => $transaccion->credito_id, 'debito_id' => $transaccion->debito_id];
+    $cuentas = [];
+    foreach ($new_cuentas as $tipo => $id) {
+        if ($old_cuentas[$tipo] != $id) {
+            $cuentas []= $old_cuentas[$tipo];
+            $cuentas []= $id;
+        }
+    }
+    $this->updateConsolidar($queuer, $transaccion->fecha(), $cuentas);
+
     $output['transaccion'] = $transaccion->toArray();
     return $this->withJson($response, $output);
   }
+  protected function updateConsolidar(Service $queuer, \DateTimeInterface $mes, $cuentas) {
+      foreach ($cuentas as $cuenta_id) {
+          $queuer->queue('update_consolidar', ['mes' => $mes->format('Y-m-1'), 'cuenta' => $cuenta_id]);
+      }
+  }
   public function delete(Request $request, Response $response, Factory $factory, $transaccion_id): Response {
     $transaccion = $factory->find(Transaccion::class)->one($transaccion_id);
     $output = [

api/common/Middleware/Consolidar.php

@@ -0,0 +1,20 @@
+<?php
+namespace Contabilidad\Common\Middleware;
+
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Server\RequestHandlerInterface as Handler;
+use Psr\Http\Message\ResponseInterface as Response;
+use Contabilidad\Common\Service\Consolidar as ConsolidarService;
+
+class Consolidar {
+    protected $service;
+    public function __construct(ConsolidarService $service) {
+        $this->service = $service;
+    }
+    public function __invoke(Request $request, Handler $handler): Response {
+        if (!$this->service->isConsolidado()) {
+            $this->service->queue();
+        }
+        return $handler->handle($request);
+    }
+}

api/common/Service/Consolidar.php

@@ -0,0 +1,174 @@
+<?php
+namespace Contabilidad\Common\Service;
+
+use Carbon\Carbon;
+use \Model;
+use ProVM\Common\Factory\Model as ModelFactory;
+use Contabilidad\Consolidado;
+use Contabilidad\Cuenta;
+use Contabilidad\Transaccion;
+
+class Consolidar {
+    public function __construct(ModelFactory $factory, Queuer $queuer) {
+        $this->setFactory($factory);
+        $this->setQueuer($queuer);
+    }
+    protected ModelFactory $factory;
+    public function setFactory(ModelFactory $factory): Consolidar {
+        $this->factory = $factory;
+        return $this;
+    }
+    protected Queuer $queuer;
+    public function setQueuer(Queuer $queuer): Consolidar {
+        $this->queuer = $queuer;
+        return $this;
+    }
+    protected $cuentas;
+    public function getCuentas() {
+        if ($this->cuentas === null) {
+            $this->cuentas = $this->factory->find(Cuenta::class)->many();
+        }
+        return $this->cuentas;
+    }
+
+    public function isConsolidado(): bool {
+        $cuentas = $this->getCuentas();
+        if ($cuentas === null) {
+            return true;
+        }
+        foreach ($cuentas as $cuenta) {
+            $transacciones = $cuenta->hasTransacciones();
+            if (!$transacciones) {
+                continue;
+            }
+            $pendientes = $cuenta->hasConsolidadosPending();
+            if ($pendientes) {
+                return false;
+            }
+        }
+        return true;
+    }
+    public function queue() {
+        $this->queuer->queue('consolidar');
+    }
+    public function consolidar() {
+        ini_set('max_execution_time', 60*5);
+
+        foreach ($this->getCuentas() as $cuenta) {
+            if (!$cuenta->hasTransacciones()) {
+                continue;
+            }
+            $first = $this->getFirst($cuenta);
+            $last = $this->getLast($cuenta);
+            for ($current = $first->copy()->startOfMonth(); $current < $last->copy()->addMonthWithoutOverflow()->endOfMonth(); $current = $current->copy()->addMonthWithoutOverflow()) {
+                $this->consolidarCuenta($cuenta, $current);
+            }
+        }
+    }
+    public function consolidarCuenta(Cuenta $cuenta, Carbon $mes) {
+        if (!$cuenta->hasTransacciones($mes)) {
+            return;
+        }
+        $transacciones = $this->getTransacciones($cuenta, $mes);
+        if (count($transacciones) == 0) {
+            return;
+        }
+        array_walk($transacciones, function(&$item) use ($cuenta) {
+            $item->valor = $item->transformar($cuenta->moneda());
+        });
+        $saldo = array_reduce($transacciones, function($sum, $item) {
+            return $sum + $item->valor;
+        });
+        if ($cuenta->tipo()->cargo()) {
+            $saldo += -1;
+        }
+        $consolidado = $this->factory->find(Consolidado::class)->where([['cuenta_id', $cuenta->id], ['fecha', $mes->format('Y-m-1')]])->one();
+        if ($consolidado === null) {
+            $data = [
+                'cuenta_id' => $cuenta->id,
+                'fecha' => $mes->format('Y-m-1'),
+                'periodo' => 'P1M',
+                'saldo' => $saldo
+            ];
+            $consolidado = $this->factory->create(Consolidado::class, $data);
+        }
+        $consolidado->saldo = $saldo;
+        $consolidado->save();
+    }
+    public function getFirst(Cuenta $cuenta): ?Carbon {
+        $first = [
+            Model::factory(Transaccion::class)
+                ->select('fecha')
+                ->whereEqual('debito_id', $cuenta->id)
+                ->orderByAsc('fecha')
+                ->findOne(),
+            Model::factory(Transaccion::class)
+                ->select('fecha')
+                ->whereEqual('credito_id', $cuenta->id)
+                ->orderByAsc('fecha')
+                ->findOne()
+        ];
+        if (!$first[0]) {
+            if (!$first[1]) {
+                return null;
+            }
+            return $first[1]->fecha();
+        }
+        if (!$first[1]) {
+            return $first[0]->fecha();
+        }
+        if ($first[0]->fecha() < $first[1]->fecha()) {
+            return $first[0]->fecha();
+        }
+        return $first[1]->fecha();
+    }
+    public function getLast(Cuenta $cuenta): ?Carbon {
+        $fechas = [
+            Model::factory(Transaccion::class)
+                ->select('fecha')
+                ->whereEqual('debito_id', $cuenta->id)
+                ->orderByDesc('fecha')
+                ->findOne(),
+            Model::factory(Transaccion::class)
+                ->select('fecha')
+                ->whereEqual('credito_id', $cuenta->id)
+                ->orderByDesc('fecha')
+                ->findOne()
+        ];
+        if (!$fechas[0]) {
+            if (!$fechas[1]) {
+                return null;
+            }
+            return $fechas[1]->fecha();
+        }
+        if (!$fechas[1]) {
+            return $fechas[0]->fecha();
+        }
+        if ($fechas[0]->fecha() > $fechas[1]->fecha()) {
+            return $fechas[0]->fecha();
+        }
+        return $fechas[1]->fecha();
+    }
+    public function getTransacciones(Cuenta $cuenta, Carbon $fecha) {
+        $start = $fecha->copy()->startOfMonth();
+        $end = $fecha->copy()->endOfMonth();
+        $debitos = Model::factory(Transaccion::class)
+            ->whereEqual('debito_id', $cuenta->id)
+            ->whereRaw("fecha BETWEEN '{$start->format('Y-m-d')}' AND '{$end->format('Y-m-d')}'")
+            ->findMany();
+        if ($debitos) {
+            array_walk($debitos, function(&$item) {
+                $item->valor *= -1;
+            });
+        }
+        $creditos =  Model::factory(Transaccion::class)
+            ->whereEqual('credito_id', $cuenta->id)
+            ->whereRaw("fecha BETWEEN '{$start->format('Y-m-d')}' AND '{$end->format('Y-m-d')}'")
+            ->findMany();
+        $transacciones = array_merge($debitos, $creditos);
+        foreach ($transacciones as &$transaccion) {
+            $transaccion->setFactory($this->factory);
+        }
+        return $transacciones;
+    }
+}

api/common/Service/FileHandler.php

@@ -0,0 +1,112 @@
+<?php
+namespace Contabilidad\Common\Service;
+
+use Psr\Http\Message\UploadedFileInterface;
+use Psr\Http\Message\StreamInterface;
+use Nyholm\Psr7\Stream;
+
+class FileHandler {
+    protected $base_folder;
+    protected $valid_types;
+    protected $folders;
+    public function __construct(object $params) {
+        $this->base_folder = $params->folder;
+        $this->addValidTypes(array_keys($params->types));
+        $this->addFolders($params->types);
+    }
+    public function addFolders(array $folders): FileHandler {
+        foreach ($folders as $type => $folder) {
+            $this->addFolder($type, $folder);
+        }
+        return $this;
+    }
+    public function addFolder(string $type, string $folder): FileHandler {
+        $this->folders[$type] = $folder;
+        return $this;
+    }
+    public function addValidTypes(array $valid_types): FileHandler {
+        foreach ($valid_types as $type) {
+            $this->addValidType($type);
+        }
+        return $this;
+    }
+    public function addValidType(string $type): FileHandler {
+        $this->valid_types []= $type;
+        return $this;
+    }
+    public function getType(string $folder): string {
+        return array_search($folder, $this->folders);
+    }
+
+    public function uploadFile(UploadedFileInterface $file, string $new_name = null): bool {
+        if ($file->getError() !== UPLOAD_ERR_OK) {
+            return false;
+        }
+        if (!in_array($file->getClientMediaType(), $this->valid_types)) {
+            return false;
+        }
+        if ($new_name === null) {
+            $new_name = $file->getClientFilename();
+        }
+        $filenfo = new \SplFileInfo($file->getClientFilename());
+        if (!str_contains($new_name, $filenfo->getExtension())) {
+            $new_name .= '.' . $filenfo->getExtension();
+        }
+        $to = implode(DIRECTORY_SEPARATOR, [$this->base_folder, $this->folders[$file->getClientMediaType()], $new_name]);
+        $file->moveTo($to);
+        return file_exists($to);
+    }
+    public function listFiles(): array {
+        $output = [];
+        foreach ($this->folders as $f) {
+            $folder = implode(DIRECTORY_SEPARATOR, [$this->base_folder, $f]);
+            if (!file_exists($folder)) {
+                continue;
+            }
+            $files = new \DirectoryIterator($folder);
+            foreach ($files as $file) {
+                if ($file->isDir()) {
+                    continue;
+                }
+                $output []= (object) ['folder' => $f, 'filename' => $file->getBasename()];
+            }
+        }
+        return $output;
+    }
+    protected function validateFilename(string $folder, string $filename): bool|string {
+        if (!in_array($folder, $this->folders)) {
+            return false;
+        }
+        $f = implode(DIRECTORY_SEPARATOR, [$this->base_folder, $folder, $filename]);
+        if (!file_exists($f)) {
+            return false;
+        }
+        return $f;
+    }
+    public function getInfo(string $folder, string $filename): \SplFileInfo|bool {
+        if (!$f = $this->validateFilename($folder, $filename)) {
+            return false;
+        }
+        return new \SplFileInfo($f);
+    }
+    public function getFile(string $folder, string $filename): StreamInterface|bool {
+        if (!$f = $this->validateFilename($folder, $filename)) {
+            return false;
+        }
+        return Stream::create(file_get_contents($f));
+    }
+    public function editFilename(string $folder, string $filename, string $new_name): bool {
+        if (!$f = $this->validateFilename($folder, $filename)) {
+            return false;
+        }
+        $info = new \SplFileInfo($f);
+        $new = implode(DIRECTORY_SEPARATOR, [$this->base_folder, $folder, $new_name . '.' . $info->getExtension()]);
+        return rename($f, $new);
+    }
+    public function deleteFile(string $folder, string $filename): bool {
+        if (!$f = $this->validateFilename($folder, $filename)) {
+            return false;
+        }
+        return unlink($f);
+    }
+}

api/common/Service/Queuer.php

@@ -0,0 +1,47 @@
+<?php
+namespace Contabilidad\Common\Service;
+
+use ProVM\Common\Factory\Model as Factory;
+use Contabilidad\Queue;
+use Contabilidad\QueueArgument;
+
+class Queuer {
+    protected Factory $factory;
+    public function __construct(Factory $factory) {
+        $this->setFactory($factory);
+    }
+    public function setFactory(Factory $factory): Queuer {
+        $this->factory = $factory;
+        return $this;
+    }
+    public function queue(string $command, array $arguments = []) {
+        if ($this->isProcessed($command, $arguments)) {
+            return;
+        }
+        $queue = $this->factory->create(Queue::class, ['command' => $command, 'created' => (new \DateTime('now'))->format('Y-m-d H:i:s')]);
+        $queue->save();
+        if (count($arguments) > 0) {
+            foreach ($arguments as $argument => $value) {
+                $arg = $this->factory->create(QueueArgument::class, ['queue_id' => $queue->id, 'argument' => $argument, 'value' => $value]);
+                $arg->save();
+            }
+        }
+    }
+    public function isProcessed(string $command, array $arguments = []): bool {
+        $queues = $this->find($command, $arguments);
+        if ($queues == null or count($queues) === 0) {
+            return false;
+        }
+        return true;
+    }
+    public function find(string $command, array $arguments = []): ?array {
+        $queues = $this->factory->find(Queue::class)->where([['command', $command], ['processed', 0]])->many();
+        if ($queues === null) {
+            return null;
+        }
+        if (count($arguments) > 0) {
+            $queues = array_filter($queues, function($item) use ($arguments) {return count($arguments) === count($item->matchArguments($arguments));});
+        }
+        return $queues;
+    }
+}

api/common/Service/TiposCambios.php

@@ -5,6 +5,7 @@ use Carbon\Carbon;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Exception\ServerException;
 use ProVM\Common\Factory\Model as Factory;
 use Contabilidad\Moneda;
 use Contabilidad\TipoCambio;
@@ -20,30 +21,22 @@ class TiposCambios {
         $this->base_url = $api_url;
         $this->key = $api_key;
     }
-    public function get(string $fecha, int $moneda_id) {
-        $fecha = Carbon::parse($fecha);
-        $moneda = $this->factory->find(Moneda::class)->one($moneda_id);
-        if ($moneda->codigo == 'USD') {
-            if ($fecha->weekday() == 0) {
-                $fecha = $fecha->subWeek()->weekday(5);
-            }
-            if ($fecha->weekday() == 6) {
-                $fecha = $fecha->weekday(5);
-            }
+    protected function getWeekday(\DateTimeInterface $fecha) {
+        if ($fecha->weekday() == 0) {
+            return $fecha->subWeek()->weekday(5);
         }
-        $cambio = $moneda->cambio($fecha);
-        if ($cambio) {
-            if ($cambio->desde()->id != $moneda->id) {
-                return 1 / $cambio->valor;
-            }
-            return $cambio->valor;
+        if ($fecha->weekday() == 6) {
+            return $fecha->weekday(5);
         }
+        return $fecha;
+    }
+    protected function getValor(\DateTimeInterface $fecha, string $moneda_codigo) {
         $data = [
             'fecha' => $fecha->format('Y-m-d'),
-            'desde' => $moneda->codigo
+            'desde' => $moneda_codigo
         ];
         $headers = [
-            'Authorization' => 'Bearer ' . $this->key
+            'Authorization' => "Bearer {$this->key}"
         ];
         $url = implode('/', [
             $this->base_url,
@@ -52,15 +45,39 @@ class TiposCambios {
         ]);
         try {
             $response = $this->client->request('POST', $url, ['json' => $data, 'headers' => $headers]);
-        } catch (ConnectException | RequestException $e) {
+        } catch (ConnectException | RequestException | ServerException $e) {
             error_log($e);
             return null;
         }
         if ($response->getStatusCode() !== 200) {
+            error_log('Could not connect to python API.');
             return null;
         }
         $result = json_decode($response->getBody());
-        $valor = $result->serie[0]->valor;
+        if (isset($result->message) and $result->message === 'Not Authorized') {
+            error_log('Not authorized for connecting to python API.');
+            return null;
+        }
+        return $result->serie[0]->valor;
+    }
+    public function get(string $fecha, int $moneda_id) {
+        $fecha = Carbon::parse($fecha);
+        $moneda = $this->factory->find(Moneda::class)->one($moneda_id);
+        if ($moneda->codigo == 'USD') {
+            $fecha = $this->getWeekday($fecha);
+        }
+        // If a value exists in the database
+        $cambio = $moneda->cambio($fecha);
+        if ($cambio !== null) {
+            if ($cambio->desde()->id != $moneda->id) {
+                return 1 / $cambio->valor;
+            }
+            return $cambio->valor;
+        }
+        $valor = $this->getValor($fecha, $moneda->codigo);
+        if ($valor === null) {
+            return 1;
+        }
         $data = [
             'fecha' => $fecha->format('Y-m-d H:i:s'),
             'desde_id' => $moneda->id,

api/db/migrations/20211029150754_tipo_cuenta.php

@@ -20,7 +20,7 @@ final class TipoCuenta extends AbstractMigration
     {
         $this->table('tipos_cuenta')
             ->addColumn('descripcion', 'string')
-            ->addColumn('color', 'string', ['length' => 6])
+            ->addColumn('color', 'string', ['length' => 6, 'default' => 'ffffff'])
             ->create();
     }
 }

api/db/migrations/20211029152716_categoria.php

@@ -21,7 +21,7 @@ final class Categoria extends AbstractMigration
         $this->table('categorias')
             ->addColumn('nombre', 'string')
             ->addColumn('tipo_id', 'integer')
-            ->addForeignKey('tipo_id', 'tipos_categoria')
+            ->addForeignKey('tipo_id', 'tipos_categoria', ['delete' => 'cascade', 'update' => 'cascade'])
             ->create();
     }
 }

api/db/migrations/20211029152732_cuenta.php

@@ -21,9 +21,9 @@ final class Cuenta extends AbstractMigration
       $this->table('cuentas')
         ->addColumn('nombre', 'string')
         ->addColumn('categoria_id', 'integer')
-        ->addForeignKey('categoria_id', 'categorias')
+        ->addForeignKey('categoria_id', 'categorias', ['delete' => 'cascade', 'update' => 'cascade'])
         ->addColumn('tipo_id', 'integer')
-        ->addForeignKey('tipo_id', 'tipos_cuenta')
+        ->addForeignKey('tipo_id', 'tipos_cuenta', ['delete' => 'cascade', 'update' => 'cascade'])
         ->create();
     }
 }

api/db/migrations/20211029152738_estado_coneccion.php

@@ -20,10 +20,10 @@ final class EstadoConeccion extends AbstractMigration
     {
       $this->table('estados_coneccion')
         ->addColumn('coneccion_id', 'integer')
-        ->addForeignKey('coneccion_id', 'conecciones')
+        ->addForeignKey('coneccion_id', 'conecciones', ['delete' => 'cascade', 'update' => 'cascade'])
         ->addColumn('fecha', 'date')
         ->addColumn('tipo_id', 'integer')
-        ->addForeignKey('tipo_id', 'tipos_estado_coneccion')
+        ->addForeignKey('tipo_id', 'tipos_estado_coneccion', ['delete' => 'cascade', 'update' => 'cascade'])
         ->create();
     }
 }

api/db/migrations/20211029152752_transaccion.php

@@ -20,9 +20,9 @@ final class Transaccion extends AbstractMigration
     {
       $this->table('transacciones')
         ->addColumn('debito_id', 'integer')
-        ->addForeignKey('debito_id', 'cuentas')
+        ->addForeignKey('debito_id', 'cuentas', ['delete' => 'cascade', 'update' => 'cascade'])
         ->addColumn('credito_id', 'integer')
-        ->addForeignKey('credito_id', 'cuentas')
+        ->addForeignKey('credito_id', 'cuentas', ['delete' => 'cascade', 'update' => 'cascade'])
         ->addColumn('fecha', 'datetime')
         ->addColumn('glosa', 'string')
         ->addColumn('detalle', 'text')

api/db/migrations/20211204210207_cuenta_moneda.php

@@ -20,7 +20,7 @@ final class CuentaMoneda extends AbstractMigration
     {
         $this->table('cuentas')
             ->addColumn('moneda_id', 'integer')
-            ->addForeignKey('moneda_id', 'monedas')
+            ->addForeignKey('moneda_id', 'monedas', ['delete' => 'cascade', 'update' => 'cascade'])
             ->update();
     }
 }

api/db/migrations/20211205002439_tipo_cambio.php

@@ -21,9 +21,9 @@ final class TipoCambio extends AbstractMigration
         $this->table('tipos_cambio')
             ->addColumn('fecha', 'datetime')
             ->addColumn('desde_id', 'integer')
-            ->addForeignKey('desde_id', 'monedas')
+            ->addForeignKey('desde_id', 'monedas', ['delete' => 'cascade', 'update' => 'cascade'])
             ->addColumn('hasta_id', 'integer')
-            ->addForeignKey('hasta_id', 'monedas')
+            ->addForeignKey('hasta_id', 'monedas', ['delete' => 'cascade', 'update' => 'cascade'])
             ->addColumn('valor', 'double')
             ->create();
     }

api/db/migrations/20220325185534_queue.php

@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class Queue extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change(): void
+    {
+        $this->table('queue')
+            ->addColumn('command', 'string')
+            ->addColumn('created', 'datetime')
+            ->addColumn('processed', 'boolean', ['default' => 0])
+            ->create();
+    }
+}

api/db/migrations/20220325185539_queue_arguments.php

@@ -0,0 +1,28 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class QueueArguments extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change(): void
+    {
+        $this->table('queue_arguments')
+            ->addColumn('queue_id', 'integer')
+            ->addForeignKey('queue_id', 'queue', ['delete' => 'cascade', 'update' => 'cascade'])
+            ->addColumn('argument', 'string', ['length' => 100])
+            ->addColumn('value', 'string')
+            ->create();
+    }
+}

api/db/migrations/20220325191129_consolidados.php

@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class Consolidados extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change(): void
+    {
+        $this->table('consolidados')
+            ->addColumn('cuenta_id', 'integer')
+            ->addForeignKey('cuenta_id', 'cuentas', ['delete' => 'cascade', 'update' => 'cascade'])
+            ->addColumn('fecha', 'date')
+            ->addColumn('periodo', 'string', ['length' => 50])
+            ->addColumn('saldo', 'double')
+            ->create();
+    }
+}

api/nginx.conf

@@ -5,25 +5,26 @@ server {
   access_log /var/log/nginx/access.log;
   root /app/public;
 
+  client_max_body_size 50M;
+
   location / {
     try_files $uri $uri/ /index.php?$query_string;
   }
 
   location ~ \.php$ {
+
     if ($request_method = 'OPTIONS') {
-      add_header 'Access-Control-Max-Age' 1728000;
       add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Headers' 'Authorization,Accept,Origin,DNT,X-CustomHeader,Keep-Alive,User-Agent,
-      X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
+      add_header 'Access-Control-Allow-Headers' 'Authorization,Accept,Origin,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
       add_header 'Access-Control-Allow-Methods' 'GET,POST,OPTIONS,PUT,DELETE,PATCH';
+      add_header 'Access-Control-Max-Age' 1728000;
       add_header 'Content-Type' 'application/json';
       add_header 'Content-Length' 0;
       return 204;
     }
 
     add_header 'Access-Control-Allow-Origin' '*';
-    add_header 'Access-Control-Allow-Headers' 'Authorization,Accept,Origin,DNT,X-CustomHeader,Keep-Alive,User-Agent,
-    X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
+    add_header 'Access-Control-Allow-Headers' 'Authorization,Accept,Origin,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
     add_header 'Access-Control-Allow-Methods' 'GET,POST,OPTIONS,PUT,DELETE,PATCH';
 
     try_files $uri =404;

api/php.ini

@@ -1,2 +1,4 @@
 log_errors = true
-error_log = /var/log/php/error.log
+error_log = /var/log/php/error.log
+upload_max_filesize = 50M
+max_input_vars = 5000

api/public/index.php

@@ -1,7 +1,13 @@
 <?php
-require_once implode(DIRECTORY_SEPARATOR, [
-  dirname(__DIR__),
-  'setup',
-  'app.php'
-]);
-$app->run();
+try {
+    ini_set('error_reporting', E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+    $app = require_once implode(DIRECTORY_SEPARATOR, [
+      dirname(__DIR__),
+      'setup',
+      'app.php'
+    ]);
+    $app->run();
+} catch (Error | Exception $e) {
+    error_log($e);
+    throw $e;
+}

api/resources/routes/base.php

@@ -3,4 +3,5 @@ use Contabilidad\Common\Controller\Base;
 
 $app->get('/key/generate[/]', [Base::class, 'generate_key']);
 $app->get('/balance[/]', [Contabilidad\Common\Controller\TiposCategorias::class, 'balance']);
+$app->get('/info', [Base::class, 'info']);
 $app->get('/', Base::class);

api/resources/routes/consolidar.php

@@ -0,0 +1,7 @@
+<?php
+use Contabilidad\Common\Controller\Consolidados;
+
+$app->group('/consolidar', function($app) {
+    $app->get('/update/{mes}/{cuenta_id}', [Consolidados::class, 'update']);
+    $app->get('[/]', [Consolidados::class, 'cli']);
+});

api/resources/routes/cuentas.php

@@ -9,8 +9,11 @@ $app->group('/cuenta/{cuenta_id}', function($app) {
   $app->get('/entradas', [Cuentas::class, 'entradas']);
   $app->group('/transacciones', function($app) {
     $app->get('/amount', [Cuentas::class, 'transaccionesAmount']);
+    $app->get('/month/{month}', [Cuentas::class, 'transaccionesMonth']);
+    $app->get('/acum/{date}', [Cuentas::class, 'transaccionesAcumulation']);
     $app->get('[/{limit:[0-9]+}[/{start:[0-9]+}]]', [Cuentas::class, 'transacciones']);
   });
+  $app->get('/categoria', [Cuentas::class, 'categoria']);
   $app->put('/edit', [Cuentas::class, 'edit']);
   $app->delete('/delete', [Cuentas::class, 'delete']);
   $app->get('[/]', [Cuentas::class, 'show']);

api/resources/routes/queues.php

@@ -0,0 +1,8 @@
+<?php
+use Contabilidad\Common\Controller\Queues;
+
+$app->group('/queues', function($app) {
+    $app->get('/pending', [Queues::class, 'pending']);
+    $app->post('/processed', [Queues::class, 'processed']);
+    $app->get('[/]', Queues::class);
+});

api/resources/routes/transacciones.php

@@ -2,11 +2,11 @@
 use Contabilidad\Common\Controller\Transacciones;
 
 $app->group('/transacciones', function($app) {
-  $app->post('/add[/]', [Transacciones::class, 'add']);
-  $app->get('[/]', Transacciones::class);
+    $app->post('/add[/]', [Transacciones::class, 'add']);
+    $app->get('[/]', Transacciones::class);
 });
 $app->group('/transaccion/{transaccion_id}', function($app) {
-  $app->put('/edit', [Transacciones::class, 'edit']);
-  $app->delete('/delete', [Transacciones::class, 'delete']);
-  $app->get('[/]', [Transacciones::class, 'show']);
+    $app->put('/edit', [Transacciones::class, 'edit']);
+    $app->delete('/delete', [Transacciones::class, 'delete']);
+    $app->get('[/]', [Transacciones::class, 'show']);
 });

api/resources/routes/uploads.php

@@ -0,0 +1,12 @@
+<?php
+use Contabilidad\Common\Controller\Files;
+
+$app->group('/uploads', function($app) {
+    $app->post('/add[/]', [Files::class, 'upload']);
+    $app->get('[/]', Files::class);
+});
+$app->group('/upload/{folder}/{filename}', function($app) {
+    $app->put('[/]', [Files::class, 'edit']);
+    $app->delete('[/]', [Files::class, 'delete']);
+    $app->get('[/]', [Files::class, 'get']);
+});

api/setup/app.php

@@ -44,3 +44,5 @@ if (file_exists($folder)) {
 
 include_once 'databases.php';
 include_once 'router.php';
+
+return $app;

api/setup/middlewares/03_consolidar.php

@@ -0,0 +1,4 @@
+<?php
+use Contabilidad\Common\Middleware\Consolidar;
+
+$app->add(new Consolidar($app->getContainer()->get(\Contabilidad\Common\Service\Consolidar::class)));

api/setup/settings/02_common.php

@@ -19,7 +19,7 @@ return [
       'public'
     ]);
     $arr['uploads'] = implode(DIRECTORY_SEPARATOR, [
-      $arr['public'],
+      $arr['base'],
       'uploads'
     ]);
     $arr['pdfs'] = implode(DIRECTORY_SEPARATOR, [

api/setup/setups/02_common.php

@@ -2,9 +2,9 @@
 use Psr\Container\ContainerInterface as Container;
 
 return [
-  GuzzleHttp\Client::class => function(Container $c) {
-    return new GuzzleHttp\Client();
-  },
+    GuzzleHttp\Client::class => function(Container $c) {
+        return new GuzzleHttp\Client();
+    },
     Contabilidad\Common\Service\Auth::class => function(Container $c) {
         return new Contabilidad\Common\Service\Auth($c->get('api_key'));
     },
@@ -14,27 +14,27 @@ return [
             $c->get(Contabilidad\Common\Service\Auth::class)
         );
     },
-  Contabilidad\Common\Service\PdfHandler::class => function(Container $c) {
-    return new Contabilidad\Common\Service\PdfHandler($c->get(GuzzleHttp\Client::class), $c->get('folders')->pdfs, implode('/', [
-      $c->get('urls')->python,
-      'pdf',
-      'parse'
-    ]));
-  },
-  Contabilidad\Common\Service\CsvHandler::class => function(Container $c) {
-    return new Contabilidad\Common\Service\CsvHandler($c->get('folders')->csvs);
-  },
-  Contabilidad\Common\Service\XlsHandler::class => function(Container $c) {
-    return new Contabilidad\Common\Service\XlsHandler($c->get('folders')->xlss);
-  },
-  Contabilidad\Common\Service\DocumentHandler::class => function(Container $c) {
-    $handlers = [
-      $c->get(Contabilidad\Common\Service\XlsHandler::class),
-      $c->get(Contabilidad\Common\Service\CsvHandler::class),
-      $c->get(Contabilidad\Common\Service\PdfHandler::class)
-    ];
-    return new Contabilidad\Common\Service\DocumentHandler($handlers);
-  },
+    Contabilidad\Common\Service\PdfHandler::class => function(Container $c) {
+        return new Contabilidad\Common\Service\PdfHandler($c->get(GuzzleHttp\Client::class), $c->get('folders')->pdfs, implode('/', [
+            $c->get('urls')->python,
+            'pdf',
+            'parse'
+        ]));
+    },
+    Contabilidad\Common\Service\CsvHandler::class => function(Container $c) {
+        return new Contabilidad\Common\Service\CsvHandler($c->get('folders')->csvs);
+    },
+    Contabilidad\Common\Service\XlsHandler::class => function(Container $c) {
+        return new Contabilidad\Common\Service\XlsHandler($c->get('folders')->xlss);
+    },
+    Contabilidad\Common\Service\DocumentHandler::class => function(Container $c) {
+        $handlers = [
+            $c->get(Contabilidad\Common\Service\XlsHandler::class),
+            $c->get(Contabilidad\Common\Service\CsvHandler::class),
+            $c->get(Contabilidad\Common\Service\PdfHandler::class)
+        ];
+        return new Contabilidad\Common\Service\DocumentHandler($handlers);
+    },
     Contabilidad\Common\Service\TiposCambios::class => function(Container $c) {
         return new Contabilidad\Common\Service\TiposCambios(
             $c->get(GuzzleHttp\Client::class),
@@ -42,5 +42,17 @@ return [
             $c->get('python_api'),
             $c->get('python_key')
         );
+    },
+    Contabilidad\Common\Service\FileHandler::class => function(Container $c) {
+        return new Contabilidad\Common\Service\FileHandler((object) [
+            'folder' => $c->get('folders')->uploads,
+            'types' => [
+                'text/csv' => 'csvs',
+                'application/pdf' => 'pdfs',
+                'application/vnd.ms-excel' => 'xlss',
+                'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'xlss',
+                'application/json' => 'jsons'
+            ]
+        ]);
     }
 ];

api/setup/setups/03_consolidar.php

@@ -0,0 +1,11 @@
+<?php
+use Psr\Container\ContainerInterface as Container;
+
+return [
+    \Contabilidad\Common\Service\Queuer::class => function(Container $container) {
+        return new \Contabilidad\Common\Service\Queuer($container->get(\ProVM\Common\Factory\Model::class));
+    },
+    \Contabilidad\Common\Service\Consolidar::class => function(Container $container) {
+        return new \Contabilidad\Common\Service\Consolidar($container->get(\ProVM\Common\Factory\Model::class), $container->get(\Contabilidad\Common\Service\Queuer::class));
+    }
+];

api/src/Categoria.php

@@ -18,6 +18,11 @@ class Categoria extends Model {
   public function cuentas() {
     if ($this->cuentas === null) {
       $this->cuentas = $this->parentOf(Cuenta::class, [Model::CHILD_KEY => 'categoria_id']);
+      if ($this->cuentas !== null) {
+          usort($this->cuentas, function($a, $b) {
+              return strcmp($a->nombre, $b->nombre);
+          });
+      }
     }
     return $this->cuentas;
   }
@@ -41,33 +46,43 @@ class Categoria extends Model {
           ])
           ->many();
   }
-  protected $activos;
-  public function activos() {
-      if ($this->activos === null) {
-          $this->activos = $this->getCuentasOf('Activo');
+  protected $cuentas_of;
+  public function getCuentas() {
+      if ($this->cuentas_of === null) {
+          $tipos = $this->factory->find(TipoCuenta::class)->many();
+          $cos = [];
+          foreach ($tipos as $tipo) {
+              $p = strtolower($tipo->descripcion) . 's';
+              $cos[$p] = [];
+              $cuentas = $this->getCuentasOf($tipos->descripcion);
+              if ($cuentas === null) {
+                  continue;
+              }
+              $cos[$p] = $cuentas;
+          }
+          $this->cuentas_of = $cos;
       }
-      return $this->activos();
+      return $this->cuentas_of;
   }
-  protected $pasivos;
-  public function pasivos() {
-      if ($this->pasivos === null) {
-          $this->activos = $this->getCuentasOf('Pasivo');
+  protected $totales;
+  public function getTotales(Service $service) {
+      if ($this->totales === null) {
+          $tipos = $this->factory->find(TipoCuenta::class)->many();
+          $totals = [];
+          foreach ($tipos as $tipo) {
+              $p = strtolower($tipo->descripcion) . 's';
+              $totals[$p] = 0;
+              $cuentas = $this->getCuentasOf($tipo->descripcion);
+              if ($cuentas === null) {
+                  continue;
+              }
+              $totals[$p] = array_reduce($cuentas, function($sum, $item) use ($service) {
+                  return $sum + $item->saldo($service, true);
+              });
+          }
+          $this->totales = $totals;
       }
-      return $this->pasivos;
-  }
-  protected $ganancias;
-  public function ganancias() {
-      if ($this->ganancias === null) {
-          $this->ganancias = $this->getCuentasOf('Ganancia');
-      }
-      return $this->ganancias;
-  }
-  protected $perdidas;
-  public function perdidas() {
-      if ($this->perdidas === null) {
-          $this->perdidas = $this->getCuentasOf('Perdida');
-      }
-      return $this->perdidas;
+      return $this->totales;
   }
 
   protected $saldo;
@@ -89,4 +104,10 @@ class Categoria extends Model {
     }
     return $this->saldo;
   }
+
+  public function toArray(): array {
+      $arr = parent::toArray();
+      $arr['tipo'] = $this->tipo()->toArray();
+      return $arr;
+  }
 }

api/src/Consolidado.php

@@ -0,0 +1,48 @@
+<?php
+namespace Contabilidad;
+
+use DateTimeInterface;
+use DateInterval;
+use Carbon\Carbon;
+use Carbon\CarbonInterval;
+use ProVM\Common\Alias\Model;
+
+/**
+ * @property int $id
+ * @property Cuenta $cuenta_id
+ * @property DateTimeInterface $fecha
+ * @property DateInterval $periodo
+ * @property float $saldo
+ */
+class Consolidado extends Model {
+    public static $_table = 'consolidados';
+
+    protected $cuenta;
+    public function cuenta() {
+        if ($this->cuenta === null) {
+            $this->cuenta = $this->childOf(Cuenta::class, [Model::SELF_KEY => 'cuenta_id']);
+        }
+        return $this->cuenta;
+    }
+    public function fecha(DateTimeInterface $fecha = null) {
+        if ($fecha === null) {
+            return Carbon::parse($this->fecha);
+        }
+        if ($this->periodo()->days > 31) {
+            $this->fecha = $fecha->format('Y-1-1');
+        } else {
+            $this->fecha = $fecha->format('Y-m-1');
+        }
+        return $this;
+    }
+    public function periodo(DateInterval $periodo = null) {
+        if ($periodo === null) {
+            return new CarbonInterval($this->periodo);
+        }
+        $this->periodo = CarbonInterval::getDateIntervalSpec($periodo);
+        return $this;
+    }
+    public function saldo() {
+        return $this->saldo;
+    }
+}

api/src/Cuenta.php

@@ -52,10 +52,64 @@ class Cuenta extends Model {
     }
     return $this->abonos;
   }
+  protected $consolidados;
+  public function consolidados() {
+      if ($this->consolidados === null) {
+          $this->consolidados = $this->parentOf(Consolidado::class, [Model::CHILD_KEY => 'cuenta_id']);
+      }
+      return $this->consolidados;
+  }
+  public function hasConsolidados(\DateTimeInterface $mes = null): bool {
+      $t = Carbon::now();
+      $q = Model::factory(Consolidado::class)
+          ->whereEqual('cuenta_id', $this->id);
+      if ($mes !== null) {
+          //$q = $q->whereEqual('fecha', $mes->format('Y-m-1'));
+          $q = $q->whereRaw("fecha BETWEEN '{$mes->format('Y-m-1')}' AND '{$mes->format('Y-m-t')}'");
+      }
+      $q = $q->count('id');
+      return (bool) $q;
+  }
+    public function hasConsolidadosPending(\DateTimeInterface $mes = null): bool {
+        $t = Carbon::now();
+        $q = Model::factory(Consolidado::class)
+            ->whereEqual('cuenta_id', $this->id)
+            ->whereGte('fecha', $t->copy()->subMonthNoOverflow()->startOfMonth()->format('Y-m-d'));
+        if ($mes !== null) {
+            $q = $q->whereRaw("fecha BETWEEN '{$mes->format('Y-m-1')}' AND '{$mes->format('Y-m-t')}'");
+        }
+        return !(bool) $q
+            ->orderByDesc('fecha')
+            ->count('id');
+    }
+  public function hasTransacciones(\DateTimeInterface $mes = null): bool {
+      $q = Model::factory(Transaccion::class)
+          ->select('transacciones.*')
+          ->join('cuentas', 'cuentas.id = transacciones.debito_id OR cuentas.id = transacciones.credito_id')
+          ->whereEqual('cuentas.id', $this->id);
+      if ($mes !== null) {
+          $q = $q->whereRaw("fecha BETWEEN '{$mes->format('Y-m-1')}' AND '{$mes->format('Y-m-t')}'");
+      }
+      return (bool) $q->count('transacciones.id');
+  }
   protected $transacciones;
+  protected function parseTransaccion(Transaccion $transaccion) {
+      $transaccion->setFactory($this->factory);
+      if ($this->tipo()->cargo()) {
+          if ($transaccion->credito_id == $this->id) {
+              $transaccion->valor = -$transaccion->valor;
+          }
+      } else {
+          if ($transaccion->debito_id == $this->id) {
+              $transaccion->valor = -$transaccion->valor;
+          }
+      }
+      $transaccion->valor = $transaccion->transformar($this->moneda());
+      return $transaccion;
+  }
   public function transacciones($limit = null, $start = 0) {
-    if ($this->transacciones === null) {
       $transacciones = Model::factory(Transaccion::class)
+        ->select('transacciones.*')
         ->join('cuentas', 'cuentas.id = transacciones.debito_id OR cuentas.id = transacciones.credito_id')
         ->whereEqual('cuentas.id', $this->id)
         ->orderByAsc('transacciones.fecha');
@@ -63,15 +117,43 @@ class Cuenta extends Model {
         $transacciones = $transacciones->limit($limit)
           ->offset($start);
       }
-      $this->transacciones = $transacciones->findMany();
-      foreach ($this->transacciones as &$transaccion) {
-        $transaccion->setFactory($this->factory);
-        if ($transaccion->desde_id === $this->id) {
-          $transaccion->valor = - $transaccion->valor;
-        }
+      $transacciones = $transacciones->findMany();
+      foreach ($transacciones as &$transaccion) {
+          $transaccion = $this->parseTransaccion($transaccion);
       }
-    }
-    return $this->transacciones;
+      return $transacciones;
+  }
+  public function transaccionesMonth(Carbon $month) {
+      $start = $month->copy()->startOfMonth();
+      $end = $month->copy()->endOfMonth();
+
+      $transacciones = Model::factory(Transaccion::class)
+        ->select('transacciones.*')
+        ->join('cuentas', 'cuentas.id = transacciones.debito_id OR cuentas.id = transacciones.credito_id')
+        ->whereEqual('cuentas.id', $this->id)
+        ->whereRaw("transacciones.fecha BETWEEN '{$start->format('Y-m-d')}' AND '{$end->format('Y-m-d')}'")
+        ->orderByAsc('transacciones.fecha');
+      $transacciones = $transacciones->findMany();
+
+      foreach ($transacciones as &$transaccion) {
+          $transaccion = $this->parseTransaccion($transaccion);
+      }
+
+      return $transacciones;
+  }
+  public function acumulacion(Carbon $date) {
+      $consolidados = $this->consolidados();
+      if ($consolidados === null) {
+          return 0;
+      }
+      $saldo = 0;
+      foreach ($consolidados as $consolidado) {
+          if ($consolidado->fecha() >= $date) {
+              continue;
+          }
+          $saldo += $consolidado->saldo();
+      }
+      return $saldo;
   }
   protected $saldo;
   public function saldo(Service $service = null, $in_clp = false) {

api/src/Moneda.php

@@ -16,25 +16,28 @@ class Moneda extends Model {
     protected static $fields = ['denominacion', 'codigo'];
 
     public function format($valor) {
-        return implode('', [
+        return trim(implode('', [
            $this->prefijo,
            number_format($valor, $this->decimales, ',', '.'),
            $this->sufijo
-        ]);
+        ]));
     }
-    public function cambio(\DateTime $fecha) {
+    public function cambio(\DateTime $fecha, Moneda $moneda = null) {
+        if ($moneda === null) {
+            $moneda = $this->factory->find(Moneda::class)->one(1);
+        }
         $cambio = $this->factory->find(TipoCambio::class)
-            ->where([['desde_id', $this->id], ['hasta_id', 1], ['fecha', $fecha->format('Y-m-d H:i:s')]])
+            ->where([['desde_id', $this->id], ['hasta_id', $moneda->id], ['fecha', $fecha->format('Y-m-d H:i:s')]])
             ->one();
-        if (!$cambio) {
+        if ($cambio === null) {
             $cambio = $this->factory->find(TipoCambio::class)
-                ->where([['hasta_id', $this->id], ['desde_id', 1], ['fecha', $fecha->format('Y-m-d H:i:s')]])
+                ->where([['hasta_id', $this->id], ['desde_id', $moneda->id], ['fecha', $fecha->format('Y-m-d H:i:s')]])
                 ->one();
         }
         return $cambio;
     }
-    public function cambiar(\DateTime $fecha, float $valor) {
-        $cambio = $this->cambio($fecha);
+    public function cambiar(\DateTime $fecha, float $valor, Moneda $moneda = null) {
+        $cambio = $this->cambio($fecha, $moneda);
         if (!$cambio) {
             return $valor;
         }
@@ -43,4 +46,14 @@ class Moneda extends Model {
         }
         return $cambio->transform($valor);
     }
+
+    public function toArray(): array {
+        $arr = parent::toArray();
+        $arr['format'] = [
+            'prefijo' => $this->prefijo,
+            'sufijo' => $this->sufijo,
+            'decimales' => $this->decimales
+        ];
+        return $arr;
+    }
 }

api/src/Queue.php

@@ -0,0 +1,98 @@
+<?php
+namespace Contabilidad;
+
+use DateTimeInterface;
+use Carbon\Carbon;
+use ProVM\Common\Alias\Model;
+use ProVM\Common\Factory\Model as Factory;
+
+/**
+ * @property int $id
+ * @property string $command
+ * @property DateTimeInterface $created
+ * @property bool $processed
+ */
+class Queue extends Model {
+    public static $_table = 'queue';
+    protected static $fields = ['command', 'created', 'processed'];
+
+    public function created(DateTimeInterface $fecha = null) {
+        if ($fecha === null) {
+            return Carbon::parse($this->created);
+        }
+        $this->created = $fecha->format('Y-m-d H:i:s');
+        return $this;
+    }
+    public function hasArguments(): bool {
+        return Model::factory(QueueArgument::class)
+            ->whereEqual('queue_id', $this->id)
+            ->groupBy('queue_id')
+            ->count('id') > 0;
+    }
+    protected $arguments;
+    public function arguments() {
+        if ($this->arguments === null) {
+            $this->arguments = $this->parentOf(QueueArgument::class, [Model::CHILD_KEY => 'queue_id']);
+        }
+        return $this->arguments;
+    }
+    public function matchArguments(array $arguments): array {
+        $args = $this->arguments();
+        if ($args === null) {
+            return [];
+        }
+        $matched = [];
+        foreach ($arguments as $argument => $value) {
+            foreach ($args as $arg) {
+                if ($arg->argument == $argument and $arg->value == $value) {
+                    $matched []= $arg;
+                }
+            }
+        }
+        return $matched;
+    }
+    public function isProcessed(): bool {
+        return $this->processed > 0;
+    }
+    public function setProcessed(bool $processed): Queue {
+        $this->processed = $processed ? 1 : 0;
+        return $this;
+    }
+
+    public static function find(Factory $factory, $data) {
+        $where = [
+            'command' => $data['command'],
+            'processed' => $data['processed'] ?? 0
+        ];
+        array_walk($where, function(&$item, $key) {
+            $item = [$key, $item];
+        });
+        $where = array_values($where);
+        return $factory->find(Queue::class)->where($where)->one();
+    }
+
+    public function toArray(): array
+    {
+        $arr = parent::toArray();
+        $cmd = [(string) $this];
+        $arr['arguments'] = [];
+        if ($this->hasArguments()) {
+            $arr['arguments'] = array_map(function($item) use (&$cmd) {
+                $cmd []= (string) $item;
+                return $item->toArray();
+            }, $this->arguments());
+        }
+        $arr['cmd'] = implode(' ', $cmd);
+        return $arr;
+    }
+
+    public function __toString(): string {
+        $str = "{$this->command}";
+        $arguments = $this->arguments();
+        if ($arguments !== null and count($arguments) > 0) {
+            $arguments = implode(' ', array_map(function($item) {return (string) $item;}, $arguments));
+            $str .= " {$arguments}";
+        }
+        return $str;
+    }
+}

api/src/QueueArgument.php

@@ -0,0 +1,26 @@
+<?php
+namespace Contabilidad;
+
+use ProVM\Common\Alias\Model;
+
+/**
+ * @property int $id
+ * @property Queue $queue_id
+ * @property string $argument
+ * @property string $value
+ */
+class QueueArgument extends Model {
+    public static $_table = 'queue_arguments';
+
+    protected $queue;
+    public function queue() {
+        if ($this->queue === null) {
+            $this->queue = $this->childOf(Queue::class, [Model::SELF_KEY => 'queue_id']);
+        }
+        return $this->queue;
+    }
+
+    public function __toString(): string {
+        return "--{$this->argument} '{$this->value}'";
+    }
+}

api/src/TipoCategoria.php

@@ -10,20 +10,20 @@ use Contabilidad\Common\Service\TiposCambios as Service;
  * @property int $activo
  */
 class TipoCategoria extends Model {
-  public static $_table = 'tipos_categoria';
-  protected static $fields = ['descripcion', 'activo'];
+    public static $_table = 'tipos_categoria';
+    protected static $fields = ['descripcion', 'activo'];
 
-  protected $categorias;
-  public function categorias() {
-    if ($this->categorias === null) {
-      $this->categorias = $this->parentOf(Categoria::class, [Model::CHILD_KEY => 'tipo_id']);
+    protected $categorias;
+    public function categorias() {
+        if ($this->categorias === null) {
+            $this->categorias = $this->parentOf(Categoria::class, [Model::CHILD_KEY => 'tipo_id']);
+        }
+        return $this->categorias;
     }
-    return $this->categorias;
-  }
 
     public function getCuentasOf($tipo) {
         return $this->factory->find(Cuenta::class)
-            ->select([['cuentas', '*']])
+            ->select('cuentas.*')
             ->join([
                 ['tipos_cuenta', 'tipos_cuenta.id', 'cuentas.tipo_id'],
                 ['categorias', 'categorias.id', 'cuentas.categoria_id']
@@ -33,11 +33,31 @@ class TipoCategoria extends Model {
                 ['categorias.tipo_id', $this->id]
             ])->many();
     }
+    protected $totales;
+    public function getTotales(Service $service) {
+        if ($this->totales === null) {
+            $tipos = $this->factory->find(TipoCuenta::class)->many();
+            $totals = [];
+            foreach ($tipos as $tipo) {
+                $p = strtolower($tipo->descripcion) . 's';
+                $totals[$p] = 0;
+                $cuentas = $this->getCuentasOf($tipo->descripcion);
+                if ($cuentas === null) {
+                    continue;
+                }
+                $totals[$p] = array_reduce($cuentas, function($sum, $item) use ($service) {
+                    return $sum + $item->saldo($service, true);
+                });
+            }
+            $this->totales = $totals;
+        }
+        return $this->totales;
+    }
 
   protected $saldo;
   public function saldo(Service $service = null) {
       if ($this->saldo === null) {
-          $this->saldo = array_reduce($this->categorias(), function($sum, $item) use ($service) {
+          $this->saldo = array_reduce($this->categorias() ?? [], function($sum, $item) use ($service) {
              return $sum + $item->saldo($service);
           });
       }

api/src/TipoCuenta.php

@@ -9,6 +9,19 @@ use ProVM\Common\Alias\Model;
  * @property string $color
  */
 class TipoCuenta extends Model {
-  public static $_table = 'tipos_cuenta';
-  protected static $fields = ['descripcion', 'color'];
+    public static $_table = 'tipos_cuenta';
+    protected static $fields = ['descripcion', 'color'];
+
+    public function cargo()
+    {
+        $tipos = [
+            'activo',
+            'perdida',
+            'banco'
+        ];
+        if (in_array(strtolower($this->descripcion), $tipos)) {
+            return false;
+        }
+        return true;
+    }
 }

api/src/Transaccion.php

@@ -13,10 +13,11 @@ use ProVM\Common\Alias\Model;
  * @property string $glosa
  * @property string $detalle
  * @property double $valor
+ * @property Moneda $moneda_id
  */
 class Transaccion extends Model {
   public static $_table = 'transacciones';
-  protected static $fields = ['debito_id', 'credito_id', 'fecha', 'glosa', 'detalle', 'valor'];
+  protected static $fields = ['debito_id', 'credito_id', 'fecha', 'glosa', 'detalle', 'valor', 'moneda_id'];
 
   protected $debito;
   public function debito() {
@@ -37,6 +38,21 @@ class Transaccion extends Model {
       return Carbon::parse($this->fecha);
     }
     $this->fecha = $fecha->format('Y-m-d');
+    return $this;
+  }
+  protected $moneda;
+  public function moneda() {
+      if ($this->moneda === null) {
+          $this->moneda = $this->childOf(Moneda::class, [Model::SELF_KEY => 'moneda_id']);
+      }
+      return $this->moneda;
+  }
+
+  public function transformar(Moneda $moneda = null) {
+      if (($moneda !== null and $this->moneda()->id === $moneda->id) or ($moneda === null and $this->moneda()->id === 1)) {
+          return $this->valor;
+      }
+      return $this->moneda()->cambiar($this->fecha(), $this->valor, $moneda);
   }
 
   public function toArray(): array {

console/Dockerfile

@@ -0,0 +1,12 @@
+FROM php:8-cli
+
+RUN apt-get update -y && apt-get install -y cron git libzip-dev zip
+
+RUN docker-php-ext-install zip
+
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
+WORKDIR /app
+
+CMD ["cron", "-f", "-l", "2"]
+ENTRYPOINT ["cron", "-f", "-l", "2"]

console/bin/console

@@ -0,0 +1,7 @@
+<?php
+$app = require_once implode(DIRECTORY_SEPARATOR, [
+    dirname(__FILE__, 2),
+    'setup',
+    'app.php'
+]);
+$app->run();

console/common/Command/Consolidar.php

@@ -0,0 +1,37 @@
+<?php
+namespace Contabilidad\Common\Command;
+
+use Psr\Http\Client\ClientInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Consolidar extends Command {
+    protected $client;
+    public function __construct(ClientInterface $client = null, string $name = null) {
+        parent::__construct($name);
+        $this->setClient($client);
+    }
+
+    public function setClient(ClientInterface $client) {
+        $this->client = $client;
+        return $this;
+    }
+    public function getClient(): ClientInterface {
+        return $this->client;
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output) {
+        try {
+            $response = $this->getClient()->get('/consolidar');
+            if ($response->getStatusCode() === 200) {
+                return Command::SUCCESS;
+            }
+            error_log($response->getReasonPhrase());
+            return Command::FAILURE;
+        } catch (\Exception $e) {
+            error_log($e);
+            return Command::FAILURE;
+        }
+    }
+}

console/common/Command/Queue.php

@@ -0,0 +1,53 @@
+<?php
+namespace Contabilidad\Common\Command;
+
+use Psr\Http\Client\ClientInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Queue extends Command {
+    protected $client;
+    public function __construct(ClientInterface $client = null, string $name = null) {
+        parent::__construct($name);
+        $this->setClient($client);
+    }
+
+    public function setClient(ClientInterface $client) {
+        $this->client = $client;
+        return $this;
+    }
+    public function getClient(): ClientInterface {
+        return $this->client;
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output)
+    {
+        $response = $this->getClient()->get('/queues/pending');
+        if ($response->getStatusCode() !== 200) {
+            return Command::FAILURE;
+        }
+        $data = json_decode($response->getBody()->getContents());
+        $output = [
+            'input' => $data,
+            'processed' => []
+        ];
+        foreach ($data->pending as $queue) {
+            $log = "Running {$queue->command} from queue. Created in {$queue->created}.";
+            error_log($log);
+            $cmd = '/usr/local/bin/php /app/bin/console ' . $queue->cmd;
+            exec($cmd, $result, $code);
+            if ($code != Command::SUCCESS) {
+                error_log(var_export($queue, true));
+                error_log(var_export($result, true));
+                continue;
+            }
+            $output['processed'] []= $queue->id;
+        }
+        $response = $this->getClient()->post('/queues/processed', ['json' => $output]);
+        if ($response->getStatusCode() !== 200) {
+            return Command::FAILURE;
+        }
+        return Command::SUCCESS;
+    }
+}

console/common/Command/UpdateConsolidar.php

@@ -0,0 +1,38 @@
+<?php
+namespace Contabilidad\Common\Command;
+
+use Psr\Http\Client\ClientInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class UpdateConsolidar extends Command {
+    protected $client;
+    public function __construct(ClientInterface $client = null, string $name = null) {
+        parent::__construct($name);
+        $this->setClient($client);
+    }
+
+    public function setClient(ClientInterface $client) {
+        $this->client = $client;
+        return $this;
+    }
+    public function getClient(): ClientInterface {
+        return $this->client;
+    }
+    public function execute(InputInterface $input, OutputInterface $output) {
+        try {
+            $mes = $input->getArgument('mes');
+            $cuenta = $input->getArgument('cuenta');
+            $response = $this->getClient()->get("/consolidar/update/{$mes}/{$cuenta}/");
+            if ($response->getStatusCode() === 200) {
+                return Command::SUCCESS;
+            }
+            error_log($response->getReasonPhrase());
+            return Command::FAILURE;
+        } catch (\Exception $e) {
+            error_log($e);
+            return Command::FAILURE;
+        }
+    }
+}

console/common/Define/Application.php

@@ -0,0 +1,21 @@
+<?php
+namespace Contabilidad\Common\Define;
+
+use Psr\Container\ContainerInterface as Container;
+use Symfony\Component\Console\Application as Base;
+
+class Application extends Base {
+    public function __construct(Container $container = null, string $name = 'UNKNOWN', string $version = 'UNKNOWN')
+    {
+        parent::__construct($name, $version);
+        $this->setContainer($container);
+    }
+    protected $container;
+    public function setContainer(Container $container) {
+        $this->container = $container;
+        return $this;
+    }
+    public function getContainer() {
+        return $this->container;
+    }
+}

console/composer.json

@@ -0,0 +1,25 @@
+{
+    "name": "provm/contabilidad-console",
+    "type": "project",
+    "require": {
+        "symfony/console": "^6.0",
+        "php-di/php-di": "^6.3",
+        "nesbot/carbon": "^2.57",
+        "guzzlehttp/guzzle": "^7.4"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5",
+        "kint-php/kint": "^4.1"
+    },
+    "authors": [
+        {
+            "name": "Aldarien",
+            "email": "aldarien85@gmail.com"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "Contabilidad\\Common\\": "common/"
+        }
+    }
+}

console/crontab

@@ -0,0 +1,24 @@
+# Edit this file to introduce tasks to be run by cron.
+# 
+# Each task to run has to be defined through a single line
+# indicating with different fields when the task will be run
+# and what command to run for the task
+# 
+# To define the time you can provide concrete values for
+# minute (m), hour (h), day of month (dom), month (mon),
+# and day of week (dow) or use '*' in these fields (for 'any').
+# 
+# Notice that tasks will be started based on the cron's system
+# daemon's notion of time and timezones.
+# 
+# Output of the crontab jobs (including errors) is sent through
+# email to the user the crontab file belongs to (unless redirected).
+# 
+# For example, you can run a backup of all your user accounts
+# at 5 a.m every week with:
+# 0 5 * * 1 tar -zcf /var/backups/home.tgz /home/
+# 
+# For more information see the manual pages of crontab(5) and cron(8)
+# 
+# m h  dom mon dow   command
+0 2 * * * /usr/local/bin/php /app/bin/console queue

console/php.ini

@@ -0,0 +1,4 @@
+[PHP]
+display_errors = E_ALL
+log_errors = true
+error_log = /var/log/php/error.log

console/setup/app.php

@@ -0,0 +1,39 @@
+<?php
+use DI\ContainerBuilder as Builder;
+use Contabilidad\Common\Define\Application;
+
+require_once 'composer.php';
+
+$builder = new Builder();
+$folders = [
+    'settings',
+    'setups'
+];
+foreach ($folders as $f) {
+    $folder = implode(DIRECTORY_SEPARATOR, [__DIR__, $f]);
+    if (!file_exists($folder)) {
+        continue;
+    }
+    $files = new DirectoryIterator($folder);
+    foreach ($files as $file) {
+        if ($file->isDir()) {
+            continue;
+        }
+        $builder->addDefinitions($file->getRealPath());
+    }
+}
+$container = $builder->build();
+$app = new Application($container);
+
+$folder = implode(DIRECTORY_SEPARATOR, [__DIR__, 'commands']);
+if (file_exists($folder)) {
+    $files = new DirectoryIterator($folder);
+    foreach ($files as $file) {
+        if ($file->isDir() or $file->getExtension() != 'php') {
+            continue;
+        }
+        include_once $file->getRealPath();
+    }
+}
+
+return $app;

console/setup/commands/01_queue.php

@@ -0,0 +1,4 @@
+<?php
+use Contabilidad\Common\Command\Queue;
+
+$app->add(new Queue($app->getContainer()->get(\Psr\Http\Client\ClientInterface::class), 'queue'));

console/setup/commands/02_consolidar.php

@@ -0,0 +1,4 @@
+<?php
+use Contabilidad\Common\Command\Consolidar;
+
+$app->add(new Consolidar($app->getContainer()->get(\Psr\Http\Client\ClientInterface::class), 'consolidar'));

console/setup/commands/03_update_consolidar.php

@@ -0,0 +1,4 @@
+<?php
+use Contabilidad\Common\Command\UpdateConsolidar;
+
+$app->add(new UpdateConsolidar($app->getContainer()->get(\Psr\Http\Client\ClientInterface::class), 'update_consolidar'));

console/setup/composer.php

@@ -0,0 +1,6 @@
+<?php
+require_once implode(DIRECTORY_SEPARATOR, [
+  dirname(__DIR__),
+  'vendor',
+  'autoload.php'
+]);

console/setup/settings/02_api.php

@@ -0,0 +1,5 @@
+<?php
+return [
+    'api_url' => $_ENV['API_URL'],
+    'api_key' => $_ENV['API_KEY']
+];

console/setup/setups/02_client.php

@@ -0,0 +1,13 @@
+<?php
+use Psr\Container\ContainerInterface as Container;
+
+return [
+    \Psr\Http\Client\ClientInterface::class => function(Container $container) {
+        return new \GuzzleHttp\Client([
+            'base_uri' => $container->get('api_url'),
+            'headers' => [
+                'Authorization' => "Bearer {$container->get('api_key')}"
+            ]
+        ]);
+    }
+];

docker-compose.yml

@@ -1,15 +1,18 @@
 version: '3'
 
+x-restart: &restart
+  restart: unless-stopped
+
 services:
   api:
     profiles: 
       - api
-    restart: unless-stopped
+    <<: *restart
     image: php
     build:
       context: api
-    env_file: 
-      - .env
+    env_file:
+      - .db.env
       - .api.env
       - .python.env
     volumes:
@@ -19,26 +22,26 @@ services:
   api-proxy:
     profiles: 
       - api
-    restart: unless-stopped
+    <<: *restart
     image: nginx
     ports:
       - "9001:80"
     volumes:
       - ./api/nginx.conf:/etc/nginx/conf.d/default.conf
-      - ./logs/api/:/var/log/nginx/
+      - ./logs/api/proxy/:/var/log/nginx/
       - ./api/:/app/
   db:
     profiles: 
       - api
-    restart: unless-stopped
+    <<: *restart
     image: mariadb
-    env_file: .env
+    env_file: .db.env
     volumes:
       - contabilidad_data:/var/lib/mysql
   adminer:
     profiles: 
       - api
-    restart: unless-stopped
+    <<: *restart
     image: adminer
     ports:
       - "9002:8080"
@@ -46,10 +49,11 @@ services:
   ui:
     profiles: 
       - ui
-    restart: unless-stopped
+    <<: *restart
     image: php-ui
     env_file:
       - .api.env
+      - .env
     build:
       context: ui
     volumes:
@@ -59,19 +63,19 @@ services:
   ui-proxy:
     profiles: 
       - ui
-    restart: unless-stopped
+    <<: *restart
     image: nginx
     ports:
       - "9000:80"
     volumes:
       - ./ui/nginx.conf:/etc/nginx/conf.d/default.conf
-      - ./logs/ui/:/var/log/nginx/
+      - ./logs/ui/proxy/:/var/log/nginx/
       - ./ui/:/app/
 
   python:
     profiles: 
       - python
-    restart: unless-stopped
+    <<: *restart
     build:
       context: ./python
     env_file:
@@ -84,5 +88,21 @@ services:
       - ./api/public/uploads/pdfs/:/app/data/
       - ./logs/python/:/var/log/python/
 
+  console:
+    profiles:
+      - console
+    <<: *restart
+    build:
+      context: ./console
+    env_file:
+      - .api.env
+      - .console.env
+      - .db.env
+    volumes:
+      - ./console/:/app/
+      - ./console/php.ini:/usr/local/etc/php/conf.d/php.ini
+      - ./logs/console/:/var/log/php/
+      - ./console/crontab:/var/spool/cron/crontabs/root
+
 volumes:
   contabilidad_data:

python/Dockerfile

@@ -2,7 +2,7 @@ FROM python
 
 RUN apt-get update -y && apt-get install -y ghostscript python3-tk libgl-dev
 
-RUN pip install flask pyyaml pypdf4 gunicorn camelot-py[cv] pikepdf
+RUN pip install flask pyyaml pypdf4 gunicorn camelot-py[cv] pikepdf httpx
 
 WORKDIR /app
 
@@ -12,4 +12,5 @@ EXPOSE 5000
 
 WORKDIR /app/src
 
-CMD ["gunicorn", "-b 0.0.0.0:5000", "app:app"]
+CMD ["python", "app.py"]
+#CMD ["gunicorn", "-b 0.0.0.0:5000", "app:app"]

python/config/.passwords.yml

@@ -1,3 +1,4 @@
 passwords:
   - 0839
   - 159608395
+  - 15960839

python/src/ai/dictionary.py

@@ -0,0 +1,285 @@
+import json
+import os
+
+import numpy as np
+import sklearn
+import enlighten
+from sklearn.preprocessing import LabelEncoder
+
+import src.contabilidad.pdf as pdf
+import src.contabilidad.text_handler as th
+from src.ai.models import Phrase, phrase_factory, Word, word_factory
+from src.contabilidad.log import LOG_LEVEL
+
+
+class Dictionary:
+    def __init__(self, filename, logger):
+        self.filename = filename
+        self._logger = logger
+        self.__processed = []
+        self.__phrases = None
+        self.__words = None
+        self.load()
+
+    def load(self):
+        if not os.path.isfile(self.filename):
+            return
+        with open(self.filename, 'r') as file:
+            data = json.load(file)
+            if 'words' in data.keys():
+                self.__words = []
+                [self.__words.append(word_factory(w)) for w in data['words']]
+            if 'phrases' in data.keys():
+                self.__phrases = []
+                [self.__phrases.append(phrase_factory(ph)) for ph in data['phrases']]
+            if 'processed' in data.keys():
+                self.__processed = []
+                self.__processed = data['processed']
+
+    def save(self):
+        self.sort_words()
+        self.sort_phrases()
+        with open(self.filename, 'w') as file:
+            json.dump(self.to_json(), file, indent=2)
+
+    def to_data(self):
+        encoder = LabelEncoder()
+        data = encoder.fit_transform([w.get_word() for w in self.get_words()])
+        [self.__words[i].set_fit(f) for i, f in enumerate(data)]
+        print(data)
+        # return [ph.to_data() for ph in self.get_phrases()]
+
+    def to_json(self):
+        output = {
+            'processed': [],
+            'words': [],
+            'phrases': []
+        }
+        if self.__processed is not None and len(self.__processed) > 0:
+            output['processed'] = self.__processed
+        if self.__words is not None and len(self.__words) > 0:
+            output['words'] = [w.to_json() for w in self.__words]
+        if self.__phrases is not None and len(self.__phrases) > 0:
+            output['phrases'] = [p.to_json() for p in self.__phrases]
+        return output
+
+    def find_phrase(self, phrase: Phrase = None, phrase_dict: dict = None, phrase_list: list = None):
+        if not self.__phrases:
+            return -1
+        if phrase is not None:
+            phrase_list = [w.get_word() for w in phrase.get_words()]
+        elif phrase_dict is not None:
+            phrase_list = phrase_dict['words']
+        elif phrase_list is not None:
+            pass
+        else:
+            return -1
+        return find_phrase(self.__phrases, phrase_list)
+
+    def add_phrase(self, phrase: Phrase = None, phrase_dict: dict = None, phrase_list: list = None):
+        if self.__phrases is None:
+            self.__phrases = []
+        if phrase is not None:
+            pass
+        elif phrase_dict is not None:
+            phrase = phrase_factory(phrase_dict)
+        elif phrase_list is not None:
+            phrase = phrase_factory({'words': phrase_list})
+        else:
+            return self
+        i = self.find_phrase(phrase)
+        if i > -1:
+            self.__phrases[i].add_freq()
+            return self
+        self.__phrases.append(phrase)
+        return self
+
+    def add_phrases(self, phrase_list: list):
+        if self.__phrases is None:
+            self.__phrases = []
+        phs = [sorted(w.get_word() for w in p) for p in self.__phrases]
+        with enlighten.get_manager() as manager:
+            with manager.counter(total=len(phrase_list), desc='Phrases', unit='phrases', color='green') as bar1:
+                for i, phrase in enumerate(phrase_list):
+                    # print(f'Adding phrase {i}.')
+                    p2 = sorted([w.get_word() for w in phrase])
+                    if p2 in phs:
+                        k = phs.index(p2)
+                        self.__phrases[k].add_freq()
+                        continue
+                    ph = phrase_factory({'words': phrase})
+                    self.__phrases.append(ph)
+                    phs.append(p2)
+                    bar1.update()
+
+    def get_phrases(self):
+        return self.__phrases
+
+    def sort_phrases(self):
+        if self.__phrases is None:
+            return
+        try:
+            def sort_phrase(p):
+                if p is None:
+                    return 0
+                if isinstance(p, Phrase):
+                    return p.get_freq(), p.get_type().get_desc(), len(p.get_words())
+                return p['frequency'], p['type']['description'], len(p['words'])
+            self.__phrases = sorted(self.__phrases,
+                                    key=sort_phrase)
+        except Exception as e:
+            self._logger.log(repr(self.__phrases), LOG_LEVEL.ERROR)
+            self._logger.log(e)
+        return self
+
+    def sort_words(self):
+        if self.__words is None:
+            return
+        try:
+            def sort_word(w):
+                if w is None:
+                    return 0
+                if isinstance(w, Word):
+                    return w.get_freq(), w.get_type().get_desc(), w.get_word()
+                return w['frequency'], w['type']['description'], w['word']
+            self.__words = sorted(self.__words, key=sort_word, reverse=True)
+        except Exception as e:
+            self._logger.log(repr(self.__words))
+            self._logger.log(e)
+        return self
+
+    def find_word(self, word: Word = None, word_dict: dict = None, word_str: str = None):
+        if not self.__words:
+            return -1
+        if word is not None:
+            word_str = word.get_word()
+        elif word_dict is not None:
+            word_str = word_dict['word']
+        elif word_str is not None:
+            pass
+        else:
+            return -1
+
+        return find_word(self.__words, word_str)
+
+    def add_word(self, word: Word = None, word_dict: dict = None, word_str: str = None):
+        if self.__words is None:
+            self.__words = []
+        if word is not None:
+            pass
+        elif word_dict is not None:
+            word = word_factory(word_dict)
+        elif word_str is not None:
+            word = word_factory({'word': word_str})
+        else:
+            return self
+        i = self.find_word(word)
+        if i > -1:
+            self.__words[i].add_freq()
+            return self
+        self.__words.append(word)
+        return self
+
+    def add_words(self, words: list):
+        [self.add_word(word=w) for w in words if isinstance(w, Word)]
+        [self.add_word(word_dict=w) for w in words if isinstance(w, dict)]
+        [self.add_word(word_str=w) for w in words if isinstance(w, str)]
+        return self
+
+    def get_words(self):
+        return filter_unique_words(self.__words)
+
+    def match_words(self, word_list: list):
+        new_list = []
+        for w in word_list:
+            wi = self.find_word(word_str=w)
+            new_list.append(self.__words[wi])
+        return new_list
+
+    def append_to_phrase(self, seed: list = None, length: int = 1):
+        if seed is None:
+            return [self.__words[0]]
+        max_index = max(seed) + length
+        if max_index > len(self.__words):
+            if length == 1:
+                return False
+            return self.append_to_phrase(seed, length - 1)
+        return seed + self.__words[max_index]
+
+    def get_possible_phrases(self, word_list):
+        print('Adding words.')
+        self.add_words(word_list)
+
+        print('Creating phrases.')
+        with enlighten.get_manager() as manager:
+            with manager.counter(total=len(word_list)**2, desc='Phrases', unit='words', color='red') as bar1:
+                phrases = []
+                for length in range(1, len(word_list) + 1):
+                    bar2 = bar1.add_subcounter(color='green')
+                    for start in range(0, len(word_list)):
+                        phrase = build_phrase(word_list, start, start + length)
+                        phrase = self.match_words(phrase)
+                        phrases.append(phrase)
+                        start += length
+                        bar2.update()
+                    bar1.update()
+
+        print(f'Created {len(phrases)} phrases.')
+        phrases = sorted(phrases, key=lambda e: len(e))
+
+        print('Adding phrases.')
+        # Really slow (~115000 phrases in one pdf)
+        self.add_phrases(phrases)
+        return self.__phrases
+
+    def is_processed(self, filename: str):
+        return os.path.basename(filename) in self.__processed
+
+    def process(self, filename: str, password: str = None):
+        if self.is_processed(filename):
+            print('Already processed.')
+            return
+        t = filename.split('.')
+        temp = os.path.realpath(os.path.join(os.path.dirname(filename), t[0] + '-temp.pdf'))
+        print('Removing PDF encryption.')
+        pdf.remove_encryption(filename, password, temp)
+        print('Getting text')
+        obj = pdf.get_text(temp)
+        os.remove(temp)
+        print('Getting possible phrases.')
+        phrases = self.get_possible_phrases(th.split_words(obj))
+        self.__processed.append(os.path.basename(filename))
+        return phrases
+
+
+def build_phrase(word_list, start: int, end: int = None):
+    if end is None:
+        return word_list[start:]
+    return word_list[start:end]
+
+
+def filter_unique_words(words):
+    new_list = []
+    for w in words:
+        if w not in new_list:
+            new_list.append(w)
+    return new_list
+
+
+def validate_phrase(phrase):
+    return True
+
+
+def find_phrase(phrases: list, phrase: list):
+    phrase_list = [sorted([w.get_word() for w in p.get_words()]) for p in phrases]
+    sphrase = sorted(phrase)
+    if sphrase in phrase_list:
+        return phrase_list.index(sphrase)
+    return -1
+
+
+def find_word(words: list, word: str):
+    word_list = [w.get_word() for w in words]
+    if word in word_list:
+        return word_list.index(word)
+    return -1

python/src/ai/models.py

@@ -0,0 +1,243 @@
+import json
+
+
+class Type:
+    def __init__(self, _id, _description):
+        self.__id = _id
+        self.__description = _description
+
+    def get_id(self):
+        return self.__id
+
+    def get_desc(self):
+        return self.__description
+
+    def to_json(self):
+        return self.get_id()
+
+    def __repr__(self):
+        return json.dumps({
+            'id': self.get_id(),
+            'description': self.get_desc()
+        })
+
+
+def type_factory(_type: str, _id: int):
+    if _type == 'Word' or _type == 'WordType':
+        t = WordType()
+    elif _type == 'Phrase' or _type == 'PhraseType':
+        t = PhraseType()
+    else:
+        return None
+    t.load(_id)
+    return t
+
+
+class WordType(Type):
+    STRING = 0
+    NUMERIC = 1
+    CURRENCY = 2
+    DATE = 4
+
+    def __init__(self):
+        super().__init__(0, 'string')
+
+    def load(self, word_type: int):
+        if word_type == self.STRING:
+            self.__description = 'string'
+        elif word_type == self.NUMERIC:
+            self.__description = 'numeric'
+        elif word_type == self.CURRENCY:
+            self.__description = 'currency'
+        elif word_type == self.DATE:
+            self.__description = 'date'
+        return self
+
+
+class PhraseType(Type):
+    TEXT = 0
+    TITLE = 1
+    HEADER = 2
+    MOVEMENT = 4
+    INVALID = 99
+
+    def __init__(self):
+        super(PhraseType, self).__init__(0, 'text')
+
+    def load(self, phrase_type: int):
+        if phrase_type == self.TEXT:
+            self.__description = 'text'
+        elif phrase_type == self.TITLE:
+            self.__description = 'title'
+        elif phrase_type == self.HEADER:
+            self.__description = 'header'
+
+
+class Word:
+    def __init__(self):
+        self.__id = 0
+        self.__word = None
+        self.__type_id = 0
+        self.__type = None
+        self.__frequency = 1
+
+    def set_id(self, idx: int):
+        self.__id = idx
+        return self
+
+    def set_word(self, word: str):
+        self.__word = word
+        return self
+
+    def set_type(self, word_type):
+        if isinstance(word_type, WordType):
+            self.__type_id = word_type.get_id()
+            # self.__type = word_type
+        if isinstance(word_type, int):
+            self.__type_id = word_type
+            # self.__type = type_factory('Word', word_type)
+        return self
+
+    def add_freq(self, amount: int = 1):
+        self.__frequency += amount
+        return self
+
+    def get_id(self) -> int:
+        return self.__id
+
+    def get_word(self) -> str:
+        return self.__word
+
+    def get_type_id(self) -> int:
+        return self.__type_id
+
+    def get_type(self) -> WordType:
+        if self.__type is None:
+            self.__type = type_factory('Word', self.__type_id)
+        return self.__type
+
+    def get_freq(self) -> int:
+        return self.__frequency
+
+    def to_json(self) -> dict:
+        output = {
+            'id': self.get_id(),
+            'word': self.get_word(),
+            'type': self.get_type_id(),
+            'freq': self.get_freq()
+        }
+        return output
+
+    def __repr__(self):
+        return json.dumps(self.to_json())
+
+
+def word_factory(word: dict) -> Word:
+    w = Word()
+    w.set_id(word['id'])
+    w.set_word(word['word'])
+    if 'type' in word:
+        w.set_type(word['type'])
+    if 'freq' in word:
+        w.add_freq(word['freq'] - 1)
+    return w
+
+
+class Phrase:
+    def __init__(self):
+        self.__id = 0
+        self.__words = None
+        self.__type_id = 0
+        self.__type = None
+        self.__frequency = 1
+
+    def set_id(self, idx: int):
+        self.__id = idx
+        return self
+
+    def add_word(self, word):
+        if isinstance(word, Word):
+            self.__words.append(word.get_id())
+        if isinstance(word, dict):
+            if 'id' in word:
+                self.__words.append(word['id'])
+        if isinstance(word, int):
+            self.__words.append(word)
+        return self
+
+    def set_words(self, words: list):
+        if self.__words is None:
+            self.__words = []
+        for w in words:
+            if isinstance(w, Word):
+                self.add_word(w)
+            if isinstance(w, dict):
+                self.add_word(w)
+            if isinstance(w, int):
+                self.add_word(w)
+        return self
+
+    def set_type(self, phrase_type):
+        if isinstance(phrase_type, PhraseType):
+            self.__type_id = phrase_type.get_id()
+            # self.__type = phrase_type
+        if isinstance(phrase_type, int):
+            self.__type_id = phrase_type
+            # self.__type = type_factory('Phrase', phrase_type)
+        return self
+
+    def add_freq(self, amount: int = 1):
+        self.__frequency += amount
+        return self
+
+    def get_id(self) -> int:
+        return self.__id
+
+    def get_words(self) -> list:
+        return self.__words
+
+    def get_type_id(self) -> int:
+        return self.__type_id
+
+    def get_type(self) -> PhraseType:
+        if self.__type is None:
+            self.__type = type_factory('Phrase', self.__type_id)
+        return self.__type
+
+    def get_freq(self) -> int:
+        return self.__frequency
+
+    def match(self, word_list: list):
+        if len(word_list) != len(self.__words):
+            return False
+        new_words = sorted(self.__words)
+        new_list = sorted(word_list)
+        if new_words == new_list:
+            return True
+        return False
+
+    def to_json(self):
+        output = {
+            'id': self.get_id(),
+            'words': self.get_words(),
+            'type': self.get_type_id(),
+            'freq': self.get_freq()
+        }
+        return output
+
+    def __repr__(self):
+        return json.dumps(self.to_json())
+
+    def __len__(self):
+        return len(self.get_words())
+
+
+def phrase_factory(phrase: dict) -> Phrase:
+    ph = Phrase()
+    ph.set_id(phrase['id'])
+    ph.set_words(phrase['words'])
+    if 'type' in phrase:
+        ph.set_type(phrase['type'])
+    if 'freq' in phrase:
+        ph.add_freq(phrase['freq'] - 1)
+    return ph

python/src/ai/network.py

@@ -0,0 +1,126 @@
+import json
+import os
+import time
+import timeit
+
+import tensorflow as tf
+import sklearn
+import numpy as np
+from sklearn.preprocessing import LabelEncoder
+
+import src.contabilidad.pdf as pdf
+import src.contabilidad.text_handler as th
+
+
+class Layer:
+    def __init__(self):
+        self.__weights = None
+        self.__bias = None
+
+    def set_size(self, inputs: int, size: int):
+        self.__weights = [[0 for j in range(0, inputs)] for i in range(0, size)]
+        self.__bias = [0 for i in range(0, size)]
+
+    def add_weight(self, vector: list, idx: int = None):
+        if idx is None:
+            self.__weights.append(vector)
+            return self
+        self.__weights = self.__weights[:idx] + [vector] + self.__weights[idx:]
+        return self
+
+    def set_weight(self, value: float, weight_index: int, input_index: int):
+        self.__weights[weight_index][input_index] = value
+
+    def set_bias(self, value: list):
+        self.__bias = value
+
+    def train(self, input_values: list, output_values: list):
+        output = self.get_output(input_values)
+        errors = []
+        for i, v in enumerate(output):
+            error = (output_values[i] - v) / output_values[i]
+            new_value = v * error
+
+    def to_json(self):
+        return {
+            'bias': self.__bias,
+            'weights': self.__weights
+        }
+
+    def get_output(self, vector: list):
+        output = []
+        for i, weight in enumerate(self.__weights):
+            val = 0
+            for j, v in enumerate(weight):
+                val += v * vector[j]
+            output[i] = val + self.__bias[i]
+        return output
+
+
+def layer_factory(layer_dict: dict):
+    layer = Layer()
+    layer.set_bias(layer_dict['bias'])
+    [layer.add_weight(w) for w in layer_dict['weights']]
+    return layer
+
+
+class Network:
+    def __init__(self, filename: str):
+        self._filename = filename
+        self.__layers = None
+
+    def load(self):
+        with open(self._filename) as f:
+            data = json.load(f)
+            if 'layers' in data.keys():
+                self.add_layers(data['layers'])
+
+    def add_layers(self, layers: list):
+        for lr in layers:
+            layer = layer_factory(lr)
+            self.__layers.append(layer)
+
+
+class AI:
+    def __init__(self, dictionary_filename, logger):
+        self.__dict = None
+        self.__network = None
+        self.__sources = None
+        self._phrases = None
+        self.filename = ''
+
+    def add_source(self, text):
+        if self.__sources is None:
+            self.__sources = []
+        self.__sources.append(text)
+        return self
+
+    def set_filename(self, filename: str):
+        self.filename = filename
+        return self
+
+    def process_sources(self):
+        for source in self.__sources:
+            self.process(**source)
+
+    def process(self, filename, password):
+        encoder = LabelEncoder()
+        t = filename.split('.')
+        temp = os.path.realpath(os.path.join(os.path.dirname(filename), t[0] + '-temp.pdf'))
+        pdf.remove_encryption(filename, password, temp)
+        obj = pdf.get_text(temp)
+        os.remove(temp)
+        word_list = th.split_words(obj)
+        fits = encoder.fit_transform(word_list)
+        phrases = []
+        for length in range(1, len(word_list) + 1):
+            for start in range(0, len(word_list)):
+                phrase = word_list[start:(start + length)]
+                phrase = np.append(np.array([fits[word_list.index(w)] for w in phrase]),
+                                   np.zeros([len(word_list) - len(phrase)]))
+                phrases.append(phrase)
+        phrases = np.array(phrases)
+        self._phrases = phrases
+
+    def active_train(self):
+        pass

python/src/app.py

@@ -1,22 +1,43 @@
-import io
 import json
 import os
 import sys
 
-from flask import Flask, request
+import httpx
+from flask import Flask, request, jsonify
 
 import contabilidad.pdf as pdf
 import contabilidad.passwords as passwords
-import contabilidad.log as log
 import contabilidad.text_handler as th
+from contabilidad.log import Log
 
 
 app = Flask(__name__)
-log.logging['filename'] = '/var/log/python/contabilidad.log'
+log = Log('/var/log/python/contabilidad.log')
+api_key = os.environ.get('PYTHON_KEY')
+
+
+def validate_key(request_obj):
+    if 'Authorization' in request_obj.headers:
+        auth = request_obj.headers.get('Authorization')
+        if isinstance(auth, list):
+            auth = auth[0]
+        if 'Bearer' in auth:
+            try:
+                auth = auth.split(' ')[1]
+            except:
+                return False
+        return auth == api_key
+    if 'API_KEY' in request_obj.values:
+        return request_obj.values.get('API_KEY') == api_key
+    if 'api_key' in request_obj.values:
+        return request_obj.values.get('api_key') == api_key
+    return False
 
 
 @app.route('/pdf/parse', methods=['POST'])
 def pdf_parse():
+    if not validate_key(request):
+        return jsonify({'message': 'Not Authorized'})
     data = request.get_json()
     if not isinstance(data['files'], list):
         data['files'] = [data['files']]
@@ -32,6 +53,11 @@ def pdf_parse():
                 continue
             pdf.remove_encryption(filename, p, temp)
         obj = pdf.get_data(temp)
+        try:
+            text = th.text_cleanup(pdf.get_text(temp))
+        except IndexError as ie:
+            print(ie, file=sys.stderr)
+            continue
         outputs = []
         for o in obj:
             out = json.loads(o.df.to_json(orient='records'))
@@ -48,8 +74,35 @@ def pdf_parse():
                     out[i] = line
             outputs.append(out)
         os.remove(temp)
-        output.append({'filename': file['filename'], 'text': outputs})
-    return json.dumps(output)
+        output.append({'bank': text['bank'], 'filename': file['filename'], 'tables': outputs, 'text': text['text']})
+    return jsonify(output)
+
+
+@app.route('/cambio/get', methods=['POST'])
+def cambios():
+    if not validate_key(request):
+        return jsonify({'message': 'Not Authorized'})
+    data = request.get_json()
+    valid = {
+        "CLF": "uf",
+        "IVP": "ivp",
+        "USD": "dolar",
+        "USDo": "dolar_intercambio",
+        "EUR": "euro",
+        "IPC": "ipc",
+        "UTM": "utm",
+        "IMACEC": "imacec",
+        "TPM": "tpm",
+        "CUP": "libra_cobre",
+        "TZD": "tasa_desempleo",
+        "BTC": "bitcoin"
+    }
+    base_url = 'https://mindicador.cl/api/'
+    url = f"{base_url}{valid[data['desde']]}/{'-'.join(list(reversed(data['fecha'].split('-'))))}"
+    res = httpx.get(url)
+    if res.status_code != httpx.codes.OK:
+        return jsonify({'error': 'Valor no encontrado.'})
+    return jsonify(res.json())
 
 
 if __name__ == '__main__':

python/src/contabilidad/log.py

@@ -1,19 +1,65 @@
+import os.path
 import time
-
-
-logging = {
-    'filename': '/var/log/python/error.log'
-}
+import traceback
 
 
 class LOG_LEVEL:
-    INFO = 'INFO'
-    WARNING = 'WARNING'
-    DEBUG = 'DEBUG'
-    ERROR = 'ERROR'
+    INFO = 0
+    WARNING = 1
+    DEBUG = 2
+    ERROR = 4
+
+    @staticmethod
+    def desc(level):
+        mapping = {
+            LOG_LEVEL.INFO: 'INFO',
+            LOG_LEVEL.WARNING: 'WARNING',
+            LOG_LEVEL.DEBUG: 'DEBUG',
+            LOG_LEVEL.ERROR: 'ERROR'
+        }
+        return mapping[level]
 
 
-def log(message, level=LOG_LEVEL.INFO):
-    filename = logging['filename']
-    with open(filename, 'a') as f:
-        f.write(time.strftime('[%Y-%m-%d %H:%M:%S] ') + ' - ' + level + ': ' + message)
+class Logger:
+    def __init__(self):
+        self._logs = []
+
+    def add_log(self, filename: str, min_level: int = LOG_LEVEL.INFO):
+        self._logs.append({'log': Log(filename), 'level': min_level})
+        self._logs.sort(key=lambda e: e['level'])
+        return self
+
+    def log(self, message, level: int = LOG_LEVEL.INFO):
+        for log in self._logs:
+            if log['level'] >= level:
+                log['log'].log(message, level)
+
+
+class Log:
+    MAX_SIZE = 10 * 1024 * 1024
+
+    def __init__(self, filename: str = '/var/log/python/error.log'):
+        self._filename = filename
+
+    def log(self, message, level: int = LOG_LEVEL.INFO):
+        if isinstance(message, Exception):
+            message = traceback.format_exc()
+            if level < LOG_LEVEL.ERROR:
+                level = LOG_LEVEL.ERROR
+        self.rotate_file()
+        with open(self._filename, 'a') as f:
+            f.write(time.strftime('[%Y-%m-%d %H:%M:%S] ') + ' - ' + LOG_LEVEL.desc(level=level) + ': ' + message + "\n")
+
+    def rotate_file(self):
+        if not os.path.isfile(self._filename):
+            return
+        file_size = os.path.getsize(self._filename)
+        if file_size > self.MAX_SIZE:
+            self.next_file()
+
+    def next_file(self):
+        name = self._filename.split('.')
+        n = 1
+        if name[-2].isnumeric():
+            n = int(name[-2]) + 1
+        self._filename = '.'.join([name[0], str(n), name[-1]])

python/src/contabilidad/text_handler.py

@@ -1,48 +1,112 @@
-def text_cleanup(text, filename: str = None):
+def text_cleanup(text: str):
     if isinstance(text, list):
-        output = []
-        for t in text:
-            output.append(text_cleanup(t, filename=filename))
-        return output
-    if filename is None:
-        return text
-    if 'bice' in filename.lower():
-        return bice(text)
-    if 'scotiabank' in filename.lower():
-        return scotiabank(text)
-    return text
+        text = "\n\n\n".join(text)
+    if 'bice' in text.lower():
+        return {'bank': 'BICE', 'text': bice(text)}
+    if 'scotiabank' in text.lower():
+        return {'bank': 'Scotiabank', 'text': scotiabank(text)}
+    if 'TARJETA' in text:
+        return {'bank': 'Scotiabank', 'text': tarjeta(text)}
+    return {'bank': 'unknown', 'text': basic(text)}
 
 
 def bice(text):
-    lines = text.split("\n\n\n")
-    print(lines)
-    return text
+    lines = [t2.strip() for t in text.split("\n\n\n")
+             for t1 in t.split("\n\n") for t2 in t1.split("\n") if t2.strip() != '']
+    output = []
+    output += extract_from_to(lines, 'NOMBRE DEL CLIENTE', end='LAS CONDES', line_length=3)
+    ti = [t for t in lines if 'MOVIMIENTOS DE LA CUENTA CORRIENTE' in t][0]
+    output += extract_from_to(lines, 'LAS CONDES', end=ti, line_length=3)
+    output += [ti]
+    ti = [i for i, t in enumerate(lines) if 'FECHA' in t]
+    output += extract_from_to(lines, ti[0], end=ti[1], line_length=4)
+    output += extract_from_to(lines, 'RESUMEN DEL PERIODO', end='SALDO INICIAL', line_length=1)
+    output += extract_from_to(lines, 'SALDO INICIAL', end='LINEA SOBREGIRO AUTORIZADA', line_length=4)
+    output += extract_from_to(lines, 'LINEA SOBREGIRO AUTORIZADA', end='OBSERVACIONES', line_length=3)
+    output += extract_from_to(lines, 'OBSERVACIONES', line_length=1)
+    return output
 
 
 def scotiabank(text):
-    words = text.split("\n")
+    words = split_words(text)
     output = [words[0]]
-    output = output + extract_from_to(words, 'No. CTA.', end='VENCIMIENTO LINEA DE CREDITO', line_length=3)
-    output = output + extract_from_to(words, 'VENCIMIENTO LINEA DE CREDITO',
-                                      end='NOMBRE EJECUTIVO: LILIAN AVILA MANRIQUEZ', line_length=2)
-    output = output + extract_from_to(words, 'NOMBRE EJECUTIVO: LILIAN AVILA MANRIQUEZ', end='SALDO ANTERIOR',
-                                      line_length=1)
-    output = output + extract_from_to(words, 'SALDO ANTERIOR', end='FECHA', line_length=4)
-    output = output + extract_data(words, 'FECHA', end='ACTUALICE SIEMPRE ANTECEDENTES LEGALES, ', line_length=6,
-                                   merge_list=[['DOCTO', 'No.'], ['SALDO', 'DIARIO']])
-    [print(li) for li in output]
-    return text
+    output += extract_from_to(words, 'No. CTA.', end='VENCIMIENTO LINEA DE CREDITO', line_length=3)
+    output += extract_from_to(words, 'VENCIMIENTO LINEA DE CREDITO',
+                              end='NOMBRE EJECUTIVO: LILIAN AVILA MANRIQUEZ', line_length=2)
+    output += extract_from_to(words, 'NOMBRE EJECUTIVO: LILIAN AVILA MANRIQUEZ', end='SALDO ANTERIOR',
+                              line_length=1)
+    output += extract_from_to(words, 'SALDO ANTERIOR', end='FECHA', line_length=4)
+    output += extract_data(words, 'FECHA', end='ACTUALICE SIEMPRE ANTECEDENTES LEGALES, ', line_length=6,
+                           merge_list=[['DOCTO', 'No.'], ['SALDO', 'DIARIO']])
+    output += extract_from_to(words, 'ACTUALICE SIEMPRE ANTECEDENTES LEGALES, ', 1)
+    return output
 
 
-def extract_from_to(word_list, start, line_length, end: str = None, merge_list=None):
+def tarjeta(text):
+    words = split_words(text)
+    output = ['ESTADO DE CUENTA NACIONAL DE TARJETA DE CRÉDITO']
+    i = [i for i, w in enumerate(words) if 'FECHA ESTADO DE CUENTA' in w][0] + 2
+    output += extract_from_to(words, 'NOMBRE DEL TITULAR', end=i, line_length=2)
+    output += ['I. INFORMACIóN GENERAL']
+    i = [i for i, w in enumerate(words) if 'CUPO TOTAL' in w][1]
+    output += extract_from_to(words, 'CUPO TOTAL', end=i, line_length=3)
+    output += extract_from_to(words, i, end='ROTATIVO', line_length=4)
+    output += extract_from_to(words, 'ROTATIVO', end='TASA INTERÉS VIGENTE', line_length=3)
+    output += extract_from_to(words, 'TASA INTERÉS VIGENTE',
+                              end='CAE se calcula sobre un supuesto de gasto mensual de UF 20 y pagadero en 12 cuotas.',
+                              line_length=4)
+    output += extract_from_to(words, 'DESDE', end='PERÍODO FACTURADO', line_length=2)
+    output += extract_from_to(words, 'PERÍODO FACTURADO', end='II.', line_length=3)
+    output += ['II. DETALLE']
+    output += extract_from_to(words, '1. PERÍODO ANTERIOR', end='SALDO ADEUDADO INICIO PERÍODO ANTERIOR', line_length=3)
+    i = words.index('2. PERÍODO ACTUAL')
+    output += extract_from_to(words, 'SALDO ADEUDADO INICIO PERÍODO ANTERIOR', end=i - 1, line_length=2,
+                              merge_list=[['MONTO FACTURADO A PAGAR (PERÍODO ANTERIOR)', '(A)']], merge_character=" ")
+    output += ['2. PERÍODO ACTUAL']
+    output += extract_from_to(words, 'LUGAR DE', end='1.TOTAL OPERACIONES', line_length=7,
+                              merge_list=[['OPERACIÓN', 'O COBRO'], ['TOTAL A', 'PAGAR'], ['VALOR CUOTA', 'MENSUAL']])
+    i = words.index('1.TOTAL OPERACIONES') + 3
+    output += extract_from_to(words, '1.TOTAL OPERACIONES', end=i, line_length=3)
+    output += extract_from_to(words, i, end='TOTAL PAGOS A LA CUENTA', line_length=7)
+    i = words.index('TOTAL PAGOS A LA CUENTA') + 2
+    output += extract_from_to(words, 'TOTAL PAGOS A LA CUENTA', end=i, line_length=2)
+    output += extract_from_to(words, i, end='TOTAL PAT A LA CUENTA', line_length=8)
+    i = words.index('TOTAL PAT A LA CUENTA') + 2
+    output += extract_from_to(words, 'TOTAL PAT A LA CUENTA', end=i, line_length=2)
+    output += extract_from_to(words, i, end=i + 3, line_length=2,
+                              merge_list=[
+                                  ['2.PRODUCTOS O SERVICIOS VOLUNTARIAMENTE CONTRATADOS SIN MOVIMIENTOS', '(C)']],
+                              merge_character=" ")
+    if '3.CARGOS, COMISIONES, IMPUESTOS Y ABONOS' in words:
+        i = words.index('3.CARGOS, COMISIONES, IMPUESTOS Y ABONOS') + 3
+        output += extract_from_to(words, '3.CARGOS, COMISIONES, IMPUESTOS Y ABONOS', end=i, line_length=3)
+    return output
+
+
+def basic(text):
+    return split_words(text)
+
+
+def split_words(text):
+    if isinstance(text, list):
+        text = "\n\n\n".join(text)
+    words = [t.strip() for t in text.split("\n") if t.strip() != '']
+    return words
+
+
+def extract_from_to(word_list, start, line_length, end=None, merge_list=None, merge_character="\n"):
+    if not isinstance(start, int):
+        start = word_list.index(start)
     if end is not None:
-        return extract_by_line(word_list[word_list.index(start):word_list.index(end)], line_length, merge_list)
-    return extract_by_line(word_list[word_list.index(start):], line_length, merge_list)
+        if not isinstance(end, int):
+            end = word_list.index(end)
+        return extract_by_line(word_list[start:end], line_length, merge_list, merge_character)
+    return extract_by_line(word_list[start:], line_length, merge_list, merge_character)
 
 
-def extract_by_line(word_list, line_length, merge_list=None):
+def extract_by_line(word_list, line_length, merge_list=None, merge_character="\n"):
     if merge_list is not None:
-        word_list = merge_words(word_list, merge_list)
+        word_list = merge_words(word_list, merge_list, merge_character)
     output = []
     line = []
     for k, w in enumerate(word_list):
@@ -54,22 +118,39 @@ def extract_by_line(word_list, line_length, merge_list=None):
     return output
 
 
-def merge_words(word_list, merge_list):
+def merge_words(word_list, merge_list, merge_character):
     for m in merge_list:
-        i = word_list.index(m[0])
-        word_list = word_list[:i] + ["\n".join(m)] + word_list[i+len(m):]
+        ixs = find_words(word_list, m)
+        if ixs is None:
+            continue
+        for i in ixs:
+            word_list = word_list[:i] + [merge_character.join(m)] + word_list[i + len(m):]
     return word_list
 
 
-def extract_data(word_list, start, line_length, end=None, merge_list=None, date_sep='/'):
+def find_words(word_list, find_list):
+    ixs = [i for i, w in enumerate(word_list) if find_list[0] == w]
+    output = []
+    for i in ixs:
+        mistake = False
+        for k, m in enumerate(find_list):
+            if m != word_list[i + k]:
+                mistake = True
+                break
+        if mistake:
+            continue
+        output.append(i)
+    return output
+
+
+def extract_data(word_list, start, line_length, end=None, merge_list=None, merge_character="\n", date_sep='/'):
     word_list = word_list[word_list.index(start):]
     if end is not None:
         word_list = word_list[:word_list.index(end)]
     if merge_list is not None:
-        word_list = merge_words(word_list, merge_list)
+        word_list = merge_words(word_list, merge_list, merge_character)
     output = []
     line = []
-    line_num = 0
     col = 0
     for k, w in enumerate(word_list):
         if col > 0 and col % line_length == 0:
@@ -87,4 +168,5 @@ def extract_data(word_list, start, line_length, end=None, merge_list=None, date_
             continue
         line.append(w)
         col += 1
+    output.append(line)
     return output

python/src/main.py

@@ -3,22 +3,51 @@ import os
 
 import contabilidad.pdf as pdf
 import contabilidad.text_handler as th
+from contabilidad.log import Logger, LOG_LEVEL
+import ai.dictionary as dictionary
+from ai.network import AI
+
+
+def parse_settings(args):
+    output = {'filename': args.filename}
+    if not os.path.isfile(output['filename']):
+        output['filename'] = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data', args.filename))
+    t = args.filename.split('.')
+    output['temp'] = os.path.realpath(os.path.join(os.path.dirname(output['filename']), t[0] + '-temp.pdf'))
+    output['dictionary'] = os.path.join(os.path.dirname(output['filename']), 'dictionary.json')
+    output['network'] = os.path.join(os.path.dirname(output['filename']), 'network.json')
+    output['log_file'] = args.log_file
+    if not os.path.isfile(output['log_file']):
+        output['log_file'] = os.path.join(os.path.dirname(os.path.dirname(output['filename'])), output['log_file'])
+    output['error_log_file'] = os.path.join(os.path.dirname(output['log_file']), 'error.log')
+    output['logger'] = Logger()
+    output['logger'].add_log(output['log_file']).add_log(output['error_log_file'], LOG_LEVEL.ERROR)
+    return output
 
 
 def main(args):
-    filename = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data', args.filename))
-    temp = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'data', args.temp_filename))
-    pdf.remove_encryption(filename, args.password, temp)
-    obj = pdf.get_data(temp)
-    obj = pdf.get_text(filename, args.password)
-    text = th.text_cleanup(obj, filename=str(args.filename))
-    os.remove(temp)
+    settings = parse_settings(args)
+
+    print('Loading AI')
+    network = AI(settings['dictionary'], settings['logger'])
+    network.set_filename(settings['network'])
+    network.add_source({'filename': settings['filename'], 'password': args.password})
+    network.process_sources()
+    exit()
+
+    print('Loading dictionary.')
+    dictio = dictionary.Dictionary(settings['dictionary'], settings['logger'])
+    print('Getting possible phrases.')
+    dictio.process(settings['filename'], args.password)
+    dictio.to_data()
+    # print('Saving dictionary.')
+    # dictio.save()
 
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('-f', '--filename', type=str)
     parser.add_argument('-p', '--password', type=str, default='')
-    parser.add_argument('-t', '--temp_filename', type=str)
+    parser.add_argument('-l', '--log_file', type=str, default=None)
     _args = parser.parse_args()
     main(_args)

ui/Dockerfile

@@ -1,3 +1,9 @@
 FROM php:8-fpm
 
+RUN apt-get update -y && apt-get install -y git libzip-dev zip
+
+RUN docker-php-ext-install zip
+
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
 WORKDIR /app

ui/common/Controller/Cuentas.php

@@ -10,7 +10,8 @@ class Cuentas {
     return $view->render($response, 'cuentas.list');
   }
   public function show(Request $request, Response $response, View $view, $cuenta_id): Response {
-    return $view->render($response, 'cuentas.show', compact('cuenta_id'));
+      $max_transacciones = 100;
+      return $view->render($response, 'cuentas.show', compact('cuenta_id', 'max_transacciones'));
   }
   public function add(Request $request, Response $response, View $view): Response {
     return $view->render($response, 'cuentas.add');

ui/common/Controller/Importar.php

@@ -0,0 +1,12 @@
+<?php
+namespace Contabilidad\Common\Controller;
+
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Message\ResponseInterface as Response;
+use Slim\Views\Blade as View;
+
+class Importar {
+    public function __invoke(Request $request, Response $response, View $view): Response {
+        return $view->render($response, 'importar');
+    }
+}

ui/common/Controller/Queues.php

@@ -0,0 +1,13 @@
+<?php
+namespace Contabilidad\Common\Controller;
+
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Slim\Views\Blade as View;
+
+class Queues
+{
+    public function __invoke(Request $request, Response $response, View $view): Response {
+        return $view->render($response, 'queues.list');
+    }
+}

ui/common/Controller/Uploads.php

@@ -0,0 +1,24 @@
+<?php
+namespace Contabilidad\Common\Controller;
+
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Psr\Http\Message\ResponseInterface as Response;
+use Slim\Views\Blade as View;
+use GuzzleHttp\Client;
+
+class Uploads {
+    public function __invoke(Request $request, Response $response, View $view): Response {
+        return $view->render($response, 'uploads.list');
+    }
+    public function get(Request $request, Response $response, Client $client, $folder, $filename): Response {
+        $resp = $client->get(implode('/', ['upload', $folder, $filename]));
+        $file = $resp->getBody();
+        return $response
+            ->withHeader('Content-Type', $resp->getHeader('Content-Type'))
+            ->withHeader('Content-Disposition', 'attachment; filename=' . $filename)
+            ->withAddedHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
+            ->withHeader('Cache-Control', 'post-check=0, pre-check=0')
+            ->withHeader('Pragma', 'no-cache')
+            ->withBody($file);
+    }
+}

ui/composer.json

@@ -5,10 +5,11 @@
     "require": {
         "php-di/php-di": "^6.3",
         "php-di/slim-bridge": "^3.1",
-        "rubellum/slim-blade-view": "^0.1.1",
         "nyholm/psr7-server": "^1.0",
         "zeuxisoo/slim-whoops": "^0.7.3",
-        "nyholm/psr7": "^1.4"
+        "nyholm/psr7": "^1.4",
+        "guzzlehttp/guzzle": "^7.4",
+        "berrnd/slim-blade-view": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
@@ -24,11 +25,5 @@
       "psr-4": {
         "Contabilidad\\Common\\": "common"
       }
-    },
-    "repositories": [
-      {
-        "type": "git",
-        "url": "http://git.provm.cl/ProVM/controller.git"
-      }
-    ]
+    }
 }

ui/public/assets/scripts/categorias/tipos/list.js

@@ -90,32 +90,37 @@ const tipos_categorias = {
       this.draw()
     })
   },
-  getParent: function() {
-    let parent = $(this.id).find('tbody')
-    if (parent.length === 0) {
-      const table = $('<table></table>').attr('class', 'ui table').append(
-        $('<thead></thead>').append(
-          $('<tr></tr>').append(
-            $('<th></th>').attr('class', 'twelve wide').html('Tipo Categoría')
-          ).append(
-            $('<th></th>').attr('class', 'two wide').html('Activo')
-          ).append(
-            $('<th></th>').attr('class', 'two wide right aligned').append(
-              $('<button></button>').attr('class', 'ui tiny green circular icon button').append(
-                $('<i></i>').attr('class', 'plus icon')
-              )
+  buildParent: function(segment) {
+    const table = $('<table></table>').attr('class', 'ui table').append(
+      $('<thead></thead>').append(
+        $('<tr></tr>').append(
+          $('<th></th>').attr('class', 'twelve wide').html('Tipo Categoría')
+        ).append(
+          $('<th></th>').attr('class', 'two wide').html('Activo')
+        ).append(
+          $('<th></th>').attr('class', 'two wide right aligned').append(
+            $('<button></button>').attr('class', 'ui tiny green circular icon button').append(
+              $('<i></i>').attr('class', 'plus icon')
             )
           )
         )
       )
-      table.find('.ui.button').click((e) => {
-        e.preventDefault()
-        this.add()
-        return false
-      })
-      parent = $('<tbody></tbody>')
-      table.append(parent)
-      $(this.id).append(table)
+    )
+    table.find('.ui.button').click((e) => {
+      e.preventDefault()
+      this.add()
+      return false
+    })
+    parent = $('<tbody></tbody>')
+    table.append(parent)
+    segment.append(table)
+    return parent
+  },
+  getParent: function() {
+    const segment = $(this.id)
+    let parent = segment.find('tbody')
+    if (parent.length === 0) {
+      parent = this.buildParent(segment)
     }
     return parent
   },

ui/public/assets/scripts/cuentas.show.js

@@ -1,231 +0,0 @@
-class Transaccion {
-  constructor({id, debito_id, credito_id, fecha, glosa, detalle, valor, debito, credito, fechaFormateada, valorFormateado}) {
-    this.id = id
-    this.debito_id = debito_id
-    this.credito_id = credito_id
-    this.fecha = {
-      fecha,
-      formateada: fechaFormateada
-    }
-    this.glosa = glosa
-    this.detalle = detalle
-    this.valor = {
-      valor,
-      formateado: valorFormateado
-    }
-    this.debito = debito
-    this.credito = credito
-    this.modal = null
-  }
-  setCuenta(cuenta) {
-    this.cuenta = cuenta
-  }
-  setModal(modal) {
-    this.modal = modal
-  }
-  isDebito() {
-    return this.debito.id === this.cuenta.id;
-  }
-  isIncrement() {
-    const debits = ['Activo', 'Perdida']
-    if (debits.indexOf(this.cuenta.tipo.descripcion)) {
-      return this.isDebito()
-    }
-    return !this.isDebito()
-  }
-  draw({saldo, format}) {
-    const fuente = (this.isDebito()) ? this.credito : this.debito
-    return $('<tr></tr>').append(
-      $('<td></td>').html(this.fecha.formateada)
-    ).append(
-      $('<td></td>').append(
-        $('<a></a>').attr('href', _urls.base + 'cuenta/' + fuente.id).html(fuente.nombre + ' (' + fuente.categoria.nombre + ')')
-      )
-    ).append(
-      $('<td></td>').html(this.glosa + '<br />' + this.detalle)
-    ).append(
-      $('<td></td>').attr('class', 'right aligned').html((this.isIncrement()) ? '' : format.format(this.valor.valor))
-    ).append(
-      $('<td></td>').attr('class', 'right aligned').html((this.isIncrement()) ? format.format(this.valor.valor) : '')
-    ).append(
-      $('<td></td>').attr('class', 'right aligned').html(format.format(saldo))
-    ).append(
-      $('<td></td>').attr('class', 'right aligned')/*.append(
-        $('<button></button>').attr('class', 'ui tiny circular icon button').append(
-          $('<i></i>').attr('class', 'edit icon')
-        ).click((e) => {
-          e.preventDefault()
-          this.edit()
-          return false
-        })
-      )*/.append(
-        $('<button></button>').attr('class', 'ui tiny circular red icon button').append(
-          $('<i></i>').attr('class', 'remove icon')
-        ).click((e) => {
-          e.preventDefault()
-          this.remove()
-          return false
-        })
-      )
-    )
-  }
-  edit() {
-    const form = this.modal.find('form')
-    form.find("[name='fecha']")
-  }
-  remove() {
-    sendDelete(_urls.api + '/transaccion/' + this.id + '/delete').then(() => {
-      transacciones.get().transacciones()
-    })
-  }
-}
-
-const transacciones = {
-  id: '#transacciones',
-  cuenta_id: 0,
-  cuenta: null,
-  transacciones: [],
-  cuentas: [],
-  saldo: 0,
-  get: function() {
-    return {
-      transacciones: () => {
-        let promises = []
-        sendGet(_urls.api + '/cuenta/' + this.cuenta_id + '/transacciones/amount').then((data) => {
-          if (data.cuenta === null) {
-            return
-          }
-          this.cuenta = data.cuenta
-          this.saldo = this.cuenta.saldo
-          $('#cuenta').html(this.cuenta.nombre + ' (' + this.cuenta.categoria.nombre + ')').append(
-              $('<i></i>').attr('class', 'square full icon').css('color', '#' + this.cuenta.tipo.color)
-          )
-          const amount = data.transacciones
-          const step = 50
-          for (let i = 0; i < amount; i += step) {
-            promises.push(
-              sendGet(_urls.api + '/cuenta/' + this.cuenta_id + '/transacciones/' + step + '/' + i)
-            )
-          }
-          if (promises.length > 0) {
-            Promise.all(promises).then((data_arr) => {
-              this.transacciones = []
-              data_arr.forEach(data => {
-                if (data.transacciones === null || data.transacciones.length === 0) {
-                  return
-                }
-                $.each(data.transacciones, (i, el) => {
-                  const tr = new Transaccion(el)
-                  tr.setCuenta(this.cuenta)
-                  tr.setModal(this.modal)
-                  this.transacciones.push(tr)
-                })
-              })
-              this.transacciones.sort((a, b) => {
-                return (new Date(b.fecha)) - (new Date(a.fecha))
-              })
-            }).then(() => {
-              this.draw()
-            })
-          } else {
-            this.draw()
-          }
-        })
-      },
-      cuentas: () => {
-        return sendGet(_urls.api + '/cuentas').then((data) => {
-          if (data.cuentas === null || data.cuentas.length === 0) {
-            return
-          }
-          this.cuentas = data.cuentas
-        }).then(() => {
-          const select = this.modal.find("[name='cuenta']")
-          $.each(this.cuentas, (i, el) => {
-            select.append(
-              $('<option></option>').attr('value', el.id).html(el.nombre + ' (' + el.categoria.nombre + ')')
-            )
-          })
-        })
-      }
-    }
-  },
-  draw: function() {
-    const format = Intl.NumberFormat('es-CL', {style: 'currency', currency: this.cuenta.moneda.codigo})
-    const parent = $(this.id)
-    parent.html('')
-    $.each(this.transacciones, (i, el) => {
-      parent.append(el.draw({saldo: this.saldo, format: format}))
-      this.saldo = this.saldo + parseInt(el.valor.valor) * ((el.isIncrement()) ? 1 : -1)
-    })
-  },
-  add: function() {
-    return {
-      show: () => {
-        this.modal.find('form').trigger('reset')
-        this.modal.modal('show')
-      },
-      exec: () => {
-        const fecha = $("[name='fecha']").val()
-        const data1 = JSON.stringify({
-          desde_id: $("[name='moneda']").val(),
-          hasta_id: 1,
-          fecha: fecha,
-          valor: $("[name='cambio']").val()
-        })
-        sendPut(_urls.api + '/tipos/cambios/add', data1)
-
-        const valor = $("[name='valor']").val()
-        const cuenta = $("[name='cuenta']").val()
-        const data = JSON.stringify({
-          debito_id: (valor < 0) ? this.cuenta_id : cuenta,
-          credito_id: (valor < 0) ? cuenta : this.cuenta_id,
-          fecha: fecha,
-          glosa: $("[name='glosa']").val(),
-          detalle: $("[name='detalle']").val(),
-          valor: (valor < 0) ? -valor : valor
-        })
-        return sendPost(_urls.api + '/transacciones/add', data).then(() => {
-          this.modal.modal('hide')
-          this.get().transacciones()
-        })
-      }
-    }
-  },
-  build: function() {
-    return {
-      modal: () => {
-        this.modal = $('.ui.modal')
-        this.modal.modal()
-        this.modal.find('.close.icon').click(() => {
-          this.modal.modal('hide')
-        })
-        this.modal.find('form').submit((e) => {
-          e.preventDefault()
-          this.add().exec()
-          return false
-        })
-        this.modal.find('.ui.calendar').calendar({
-          type: 'date',
-          formatter: {
-            date: function(date, settings) {
-              if (!date) return ''
-              let day = ('00' + date.getDate()).slice(-2)
-              let month = ('00' + (date.getMonth() + 1)).slice(-2)
-              let year = date.getFullYear()
-              return year + '/' + month + '/' + day
-            }
-          },
-          maxDate: new Date()
-        })
-        this.get().cuentas()
-      }
-    }
-  },
-  setup: function() {
-    this.build().modal()
-    $(this.id).parent().find('.ui.button').click(() => {
-      this.add().show()
-    })
-    this.get().transacciones()
-  }
-}

ui/public/assets/scripts/cuentas/show.js

@@ -0,0 +1,465 @@
+class Transaccion {
+  constructor({id, debito_id, credito_id, fecha, glosa, detalle, valor, debito, credito, fechaFormateada, valorFormateado, format, moneda_id}) {
+    this.id = id
+    this.debito_id = debito_id
+    this.credito_id = credito_id
+    this.fecha = {
+      fecha,
+      formateada: fechaFormateada
+    }
+    this.glosa = glosa
+    this.detalle = detalle
+    this.valor = {
+      valor,
+      formateado: valorFormateado
+    }
+    this.format_array = format
+    this.debito = debito
+    this.credito = credito
+    this.modal = null
+  }
+  setCuenta(cuenta) {
+    this.cuenta = cuenta
+  }
+  setModal(modal) {
+    this.modal = modal
+  }
+  isDebito() {
+    return this.debito.id === this.cuenta.id;
+  }
+  isIncrement() {
+    const debits = ['Activo', 'Perdida']
+    if (debits.indexOf(this.cuenta.tipo.descripcion)) {
+      return this.isDebito()
+    }
+    return !this.isDebito()
+  }
+  draw({saldo, format, format_array, format_call}) {
+    const fuente = (this.isDebito()) ? this.credito : this.debito
+    return $('<tr></tr>').append(
+      $('<td></td>').html(this.fecha.formateada)
+    ).append(
+      $('<td></td>').append(
+        $('<a></a>').attr('href', _urls.base + 'cuenta/' + fuente.id).html(fuente.nombre + ' (' + fuente.categoria.nombre + ')')
+      )
+    ).append(
+      $('<td></td>').html(this.glosa + '<br />' + this.detalle)
+    ).append(
+      $('<td></td>').attr('class', 'right aligned').html((this.isIncrement()) ? '' : format_call({value: this.valor.valor, format, format_array}))
+    ).append(
+      $('<td></td>').attr('class', 'right aligned').html((this.isIncrement()) ? format_call({value: -this.valor.valor, format, format_array}) : '')
+    ).append(
+      $('<td></td>').attr('class', 'right aligned').html(format_call({value: saldo, format_array, format}))
+    ).append(
+      $('<td></td>').attr('class', 'right aligned').append(
+        $('<button></button>').attr('class', 'ui tiny circular icon button').append(
+          $('<i></i>').attr('class', 'edit icon')
+        ).click((e) => {
+          e.preventDefault()
+          this.edit()
+          return false
+        })
+      ).append(
+        $('<button></button>').attr('class', 'ui tiny circular red icon button').append(
+          $('<i></i>').attr('class', 'remove icon')
+        ).click((e) => {
+          e.preventDefault()
+          this.remove()
+          return false
+        })
+      )
+    )
+  }
+  edit() {
+    const form = this.modal.find('form')
+    form.trigger('reset')
+    form.find("[name='id']").val(this.id)
+    form.find(".ui.calendar").calendar('set date', new Date(this.fecha.fecha))
+    form.find("[name='cuenta']").dropdown('set selected', (this.isDebito()) ? this.credito_id : this.credito_id)
+    form.find("[name='glosa']").val(this.glosa)
+    form.find("[name='detalle']").val(this.detalle)
+    form.find("[name='valor']").val(((this.isDebito()) ? -1 : 1) * this.valor.valor)
+    modalToEdit(this.modal)
+    this.modal.modal('show')
+  }
+  remove() {
+    sendDelete(_urls.api + '/transaccion/' + this.id + '/delete').then(() => {
+      transacciones.get().transacciones()
+    })
+  }
+}
+
+const transacciones = {
+  id: '#transacciones',
+  mes: '#mes',
+  buttons: {
+    prev: '#prev_button',
+    left: '#left_button',
+    today: '#today_button',
+    right: '#right_button',
+    next: '#next_button'
+  },
+  cuenta_id: 0,
+  cuenta: null,
+  transacciones: [],
+  cuentas: [],
+  monedas: [],
+  date: new Date(),
+  saldo: 0,
+  acumulation: 0,
+  intl_format: null,
+  max: null,
+  format: ({format_array, format, value}) => {
+    let output = []
+    if (format_array.prefijo !== '') {
+      output.push(format_array.prefijo)
+    }
+    output.push(format.format(Math.round(value * Math.pow(10, format_array.decimales)) / Math.pow(10, format_array.decimales)))
+    if (format_array.sufijo !== '') {
+      output.push(format_array.sufijo)
+    }
+    return output.join('')
+  },
+  get: function() {
+    return {
+      transacciones: () => {
+        this.draw().loading()
+        let promises = []
+        sendGet(_urls.api + '/cuenta/' + this.cuenta_id + '/transacciones/amount').then((data) => {
+          if (data.cuenta === null) {
+            return
+          }
+          this.cuenta = data.cuenta
+          this.intl_format =  Intl.NumberFormat('es-CL')
+          sendGet(_urls.api + '/cuenta/' + this.cuenta_id + '/categoria').then((resp) => {
+            this.cuenta.categoria = resp.categoria
+          }).then(() => {
+            $('#cuenta').html(this.cuenta.nombre + ' (' + this.cuenta.categoria.nombre + ')').append(
+                $('<i></i>').attr('class', 'square full icon').css('color', '#' + this.cuenta.tipo.color)
+            )
+            promises = this.get().transaccionesMes(this.date)
+            if (promises.length > 0) {
+              Promise.all(promises).then((data_arr) => {
+                this.transacciones = []
+                data_arr.forEach(data => {
+                  if (data.transacciones === null || data.transacciones.length === 0) {
+                    return
+                  }
+                  $.each(data.transacciones, (i, el) => {
+                    const tr = new Transaccion(el)
+                    tr.setCuenta(this.cuenta)
+                    tr.setModal(this.modal)
+                    this.transacciones.push(tr)
+                  })
+                })
+                this.transacciones.sort((a, b) => {
+                  return (new Date(b.fecha)) - (new Date(a.fecha))
+                })
+              }).then(() => {
+                this.get().transaccionesAcumulacion(this.date).then((response) => {
+                  this.acumulation = response.acumulation
+                  this.saldo = response.acumulation
+                }).then(() => {
+                  this.draw().table()
+                  this.draw().acumulation()
+                })
+              })
+            } else {
+              this.draw().table()
+            }
+          })
+        })
+      },
+      transaccionesLimit: () => {
+        let promises = []
+        const amount = data.transacciones
+        let step = 50
+        let start = 0
+        if (this.max !== null) {
+          step = Math.min(50, this.max)
+          start = Math.max(0, amount - this.max)
+        }
+        for (let i = start; i <= amount; i += step) {
+          promises.push(
+              sendGet(_urls.api + '/cuenta/' + this.cuenta_id + '/transacciones/' + step + '/' + i)
+          )
+        }
+        return promises
+      },
+      transaccionesMes: (mes) => {
+        let promises = []
+        promises.push(
+            sendGet(_urls.api + '/cuenta/' + this.cuenta_id + '/transacciones/month/' + [mes.getFullYear(), mes.getMonth() + 1, '1'].join('-'))
+        )
+        return promises
+      },
+      transaccionesAcumulacion: (mes) => {
+        return sendGet(_urls.api + '/cuenta/' + this.cuenta_id + '/transacciones/acum/' + [mes.getFullYear(), mes.getMonth() + 1, '1'].join('-'))
+      },
+      cuentas: () => {
+        return sendGet(_urls.api + '/cuentas').then((data) => {
+          if (data.cuentas === null || data.cuentas.length === 0) {
+            return
+          }
+          this.cuentas = data.cuentas
+        }).then(() => {
+          const select = this.modal.find("[name='cuenta']")
+          $.each(this.cuentas, (i, el) => {
+            this.get().categoria(i).then(() => {
+              select.append(
+                $('<option></option>').attr('value', el.id).html(el.nombre + ' (' + el.categoria.nombre + ')')
+              )
+              select.dropdown()
+            })
+          })
+          this.get().monedas().then(() => {
+            const select = this.modal.find("[name='moneda']")
+            $.each(this.monedas, (i, el) => {
+              const option = $('<option></option>').attr('value', el.id).html(el.denominacion)
+              if (el.id === '1') {
+                option.attr('selected', 'selected')
+              }
+              select.append(option)
+            })
+          })
+        })
+      },
+      categoria: (idx) => {
+        return sendGet(_urls.api + '/cuenta/' + this.cuentas[idx].id + '/categoria').then((data) => {
+          this.cuentas[idx].categoria = data.categoria
+        })
+      },
+      monedas: () => {
+        return sendGet(_urls.api + '/monedas').then((response) => {
+          this.monedas = response.monedas
+        })
+      }
+    }
+  },
+  draw: function() {
+    return {
+      loading: () => {
+        const parent = $(this.id)
+        parent.html('')
+        parent.append(
+            $('<tr></tr>').append(
+                $('<td></td>').attr('colspan', 7).append(
+                    $('<div></div>').attr('class', 'ui active dimmer').append(
+                        $('<div></div>').attr('class', 'ui indeterminate elastic text loader').html('Buscando los datos')
+                    )
+                )
+            )
+        )
+      },
+      table: () => {
+        const parent = $(this.id)
+        parent.html('')
+        $.each(this.transacciones, (i, el) => {
+          this.saldo = this.saldo + parseInt(el.valor.valor)// * ((el.isIncrement()) ? 1 : -1)
+          parent.append(el.draw({saldo: this.saldo, format: this.intl_format, format_array: this.cuenta.moneda.format, format_call: this.format}))
+        })
+      },
+      acumulation: () => {
+        const parent = $(this.id)
+        parent.prepend(
+            $('<tr></tr>').append(
+                $('<td></td>').html('')
+            ).append(
+                $('<td></td>').html('')
+            ).append(
+                $('<td></td>').html('Acumulacion Anterior')
+            ).append(
+                $('<td></td>').attr('class', 'right aligned').html('')
+            ).append(
+                $('<td></td>').attr('class', 'right aligned').html('')
+            ).append(
+                $('<td></td>').attr('class', 'right aligned').html(this.format({
+                  format_array: this.cuenta.moneda.format,
+                  format: this.intl_format,
+                  value: this.acumulation
+                }))
+            ).append(
+                $('<td></td>').attr('class', 'right aligned').html('')
+            )
+        )
+      }
+    }
+  },
+  add: function() {
+    return {
+      show: () => {
+        this.modal.find('form').trigger('reset')
+        modalToAdd(this.modal)
+        this.modal.modal('show')
+      },
+      exec: () => {
+        const fecha = $("[name='fecha']").val()
+
+        const valor = $("[name='valor']").val()
+        const cuenta = $("[name='cuenta']").val()
+        const data = JSON.stringify({
+          debito_id: (valor < 0) ? this.cuenta_id : cuenta,
+          credito_id: (valor < 0) ? cuenta : this.cuenta_id,
+          fecha: fecha,
+          glosa: $("[name='glosa']").val(),
+          detalle: $("[name='detalle']").val(),
+          valor: (valor < 0) ? -valor : valor,
+          moneda_id: $("[name='moneda']").val()
+        })
+        return sendPost(_urls.api + '/transacciones/add', data).then(() => {
+          this.modal.modal('hide')
+          this.get().transacciones()
+        })
+      }
+    }
+  },
+  edit: function() {
+    const id = $("[name='id']").val()
+    const fecha = $("[name='fecha']").val()
+    const cuenta = $("[name='cuenta']").val()
+    const glosa = $("[name='glosa']").val()
+    const detalle = $("[name='detalle']").val()
+    const valor = $("[name='valor']").val()
+    const moneda_id = $("[name='moneda']").val()
+    const data = JSON.stringify({
+      debito_id: (valor < 0) ? this.cuenta_id : cuenta,
+      credito_id: (valor < 0) ? cuenta : this.cuenta_id,
+      fecha,
+      glosa,
+      detalle,
+      valor: (valor < 0) ? -valor : valor,
+      moneda_id
+    })
+    return sendPut(_urls.api + '/transaccion/' + id + '/edit', data).then(() => {
+      this.modal.modal('hide')
+      this.get().transacciones()
+    })
+  },
+  changeMonth: function(dif) {
+    let d = this.date
+    d.setMonth(this.date.getMonth() + dif)
+    this.date = d
+    this.checkButtons()
+    $(this.mes).calendar('set date', this.date)
+  },
+  today: function() {
+    this.date = new Date()
+    this.checkButtons()
+    $(this.mes).calendar('set date', this.date)
+  },
+  changeYear: function(dif) {
+    let d = this.date
+    d.setFullYear(this.date.getFullYear() + dif)
+    this.date = d
+    this.checkButtons()
+    $(this.mes).calendar('set date', this.date)
+  },
+  checkButtons: function() {
+    let f = new Date()
+    if (this.date.getMonth() === f.getMonth() && this.date.getFullYear() === f.getFullYear()) {
+      $(this.buttons.right).addClass('disabled')
+    } else {
+      $(this.buttons.right).removeClass('disabled')
+    }
+    if (this.date.toDateString() === f.toDateString()) {
+      $(this.buttons.today).addClass('disabled')
+    } else {
+      $(this.buttons.today).removeClass('disabled')
+    }
+    if (this.date.getFullYear() === f.getFullYear()) {
+      $(this.buttons.next).addClass('disabled')
+    } else {
+      $(this.buttons.next).removeClass('disabled')
+    }
+  },
+  refresh: function () {
+    this.get().transacciones()
+    this.checkButtons()
+  },
+  build: function() {
+    return {
+      modal: () => {
+        this.modal = $('.ui.modal')
+        this.modal.modal()
+        this.modal.find('.close.icon').click(() => {
+          this.modal.modal('hide')
+        })
+        this.modal.find('form').submit((e) => {
+          e.preventDefault()
+          const add = $(e.currentTarget).find('.plus.icon')
+          if (add.length > 0) {
+            this.add().exec()
+          } else {
+            this.edit()
+          }
+          return false
+        })
+        this.modal.find('.ui.calendar').calendar({
+          type: 'date',
+          formatter: {
+            date: function(date, settings) {
+              if (!date) return ''
+              let day = ('00' + date.getDate()).slice(-2)
+              let month = ('00' + (date.getMonth() + 1)).slice(-2)
+              let year = date.getFullYear()
+              return year + '/' + month + '/' + day
+            }
+          },
+          maxDate: new Date()
+        })
+        this.get().cuentas()
+      },
+      mes: () => {
+        const meses = ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Dicembre']
+        $(this.mes).calendar({
+          type: 'month',
+          initialDate: this.date,
+          maxDate: new Date(),
+          text: {
+            months: meses,
+            monthsShort: meses.map((item) => {item.slice(0, 3)})
+          },
+          formatter: {
+            date: function (date, settings) {
+              if (!date) return '';
+              return meses[date.getMonth()] + ', ' + date.getFullYear()
+            }
+          },
+          onChange: (date) => {
+            this.date = date
+            this.refresh()
+          }
+        })
+      },
+      buttons: () => {
+        $(this.buttons.today).click((e) => {
+          this.today()
+        })
+        $(this.buttons.right).click((e) => {
+          this.changeMonth(1)
+        })
+        $(this.buttons.left).click((e) => {
+          this.changeMonth(-1)
+        })
+        $(this.buttons.next).click(() => {
+          this.changeYear(1)
+        })
+        $(this.buttons.prev).click(() => {
+          this.changeYear(-1)
+        })
+      }
+    }
+  },
+  setup: function() {
+    this.build().modal()
+    this.build().mes()
+    this.build().buttons()
+    $(this.id).parent().find('#refresh').click(() => {
+      this.refresh()
+    })
+    $(this.id).parent().find('#add').click(() => {
+      this.add().show()
+    })
+    this.get().transacciones()
+  }
+}

ui/public/assets/scripts/cuentas/tipos/list.js

@@ -55,6 +55,7 @@ class TipoCuenta {
 const tipos_cuentas = {
   id: '#tipos_cuentas',
   tipos: [],
+  modal: null,
   getTipos: function() {
     this.tipos = []
     return sendGet(_urls.api + '/tipos/cuentas').then((data) => {

ui/public/assets/scripts/home.js

@@ -39,22 +39,32 @@ class Cuenta {
       }
       tr.append(td)
     })
-    $("[data-id='" + this.categoria_id + "'][data-class='categoria']").after(tr)
+    const prev = this.prev()
+    prev.after(tr)
+  }
+  prev() {
+    let prev = $("[data-id='" + this.categoria_id + "'][data-class='categoria']")
+    let n = 0
+    while (prev.next().attr('data-class') === 'cuenta') {
+      prev = prev.next()
+      n ++;
+      if (n >= 100) {
+        return prev
+      }
+    }
+    return prev
   }
   remove() {
     $("[data-id='" + this.id + "'][data-class='cuenta']").remove()
   }
 }
 class Categoria {
-  constructor({id, nombre, tipo_id, tipo, activos, pasivos, ganancias, perdidas}) {
+  constructor({id, nombre, tipo_id, tipo, totales}) {
     this.id = id
     this.nombre = nombre
     this.tipo_id = tipo_id
     this.tipo = tipo
-    this.activos = activos
-    this.pasivos = pasivos
-    this.ganancias = ganancias
-    this.perdidas = perdidas
+    this.totales = totales
     this.is_open = false
     this.cuentas = []
   }
@@ -62,7 +72,7 @@ class Categoria {
     this.tipos = tipos
 }
   draw({format}) {
-    const button = $('<button></button>').attr('class', 'ui mini compact icon button').append(
+    const button = $('<button></button>').attr('class', 'ui mini compact circular icon button').append(
       $('<i></i>').attr('class', down_icon + ' icon')
     ).click((e) => {
       const plus = button.find('.' + down_icon.replace(' ', '.') + '.icon')
@@ -85,7 +95,7 @@ class Categoria {
     )
     $.each(this.tipos, (i, el) => {
       tr.append(
-          $('<td></td>').attr('class', 'right aligned').html(format.format(this[el.descripcion.toLowerCase() + 's']))
+          $('<td></td>').attr('class', 'right aligned').html(format.format(this.totales[el.descripcion.toLowerCase() + 's']))
       )
     })
     $("[data-id='" + this.tipo_id + "'][data-class='tipo_categoria']").after(tr)
@@ -143,21 +153,18 @@ class Categoria {
   }
 }
 class TipoCategoria {
-  constructor({id, descripcion, activo, activos, pasivos, ganancias, perdidas}) {
+  constructor({id, descripcion, activo, totales}) {
     this.id = id
     this.descripcion = descripcion
     this.activo = activo
-    this.activos = activos
-    this.pasivos = pasivos
-    this.ganancias = ganancias
-    this.perdidas = perdidas
+    this.totales = totales
     this.categorias = []
   }
   setTipos(tipos) {
     this.tipos = tipos
   }
   draw({format}) {
-    const button = $('<button></button>').attr('class', 'ui mini compact icon button').append(
+    const button = $('<button></button>').attr('class', 'ui mini compact circular icon button').append(
       $('<i></i>').attr('class', down_icon + ' icon')
     ).click((e) => {
       const plus = button.find('.' + down_icon.replace(' ', '.') + '.icon')
@@ -175,7 +182,7 @@ class TipoCategoria {
       )
     )
     $.each(this.tipos, (i, el) => {
-      tr.append($('<td></td>').attr('class', 'right aligned').html(format.format(this[el.descripcion.toLowerCase() + 's'])))
+      tr.append($('<td></td>').attr('class', 'right aligned').html(format.format(this.totales[el.descripcion.toLowerCase() + 's'])))
     })
     return tr
   }
@@ -210,29 +217,61 @@ class TipoCategoria {
   }
 }
 const cuentas = {
-  id: 'cuentas',
+  id: '#cuentas',
   balance: 0,
   tipos: [],
   tipos_categorias: [],
+  build: function() {
+    return {
+      parent: (segment) => {
+        const tr = $('<tr></tr>').append(
+            $('<th></th>').attr('colspan', 3).html('Cuenta')
+        )
+        $.each(this.tipos, (i, el) => {
+          tr.append(
+              $('<th></th>').attr('class', 'right aligned').css('color', '#' + el.color).html(el.descripcion)
+          )
+        })
+        const table = $('<table></table>').attr('class', 'ui striped table').append(
+            $('<thead></thead>').append(tr)
+        )
+        const parent = $('<tbody></tbody>')
+        table.append(parent)
+        segment.append(table)
+        return parent
+      },
+      resultado: (segment) => {
+        segment.append(
+            $('<table></table>').attr('class', 'ui collapsing table').append(
+                $('<tr></tr>').append(
+                    $('<td></td>').html('Ganancias')
+                ).append(
+                    $('<td></td>').attr('data-tipo', 'ganancias')
+                )
+            ).append(
+                $('<tr></tr>').append(
+                    $('<td></td>').html('Perdidas')
+                ).append(
+                    $('<td></td>').attr('data-tipo', 'perdidas')
+                )
+            ).append(
+                $('<tr></tr>').append(
+                    $('<td></td>').html('<b>Resultado</b>')
+                ).append(
+                    $('<td></td>').attr('data-tipo', 'resultado')
+                )
+            )
+        )
+      }
+    }
+  },
   get: function() {
     return {
       parent: () => {
-        let parent = $('#' + this.id)
+        const segment = $(this.id)
+        let parent = segment.find('tbody')
         if (parent.length === 0) {
-          const tr = $('<tr></tr>').append(
-              $('<th></th>').attr('colspan', 3).html('Cuenta')
-          )
-          $.each(this.tipos, (i, el) => {
-            tr.append(
-                $('<th></th>').attr('class', 'right aligned').css('color', '#' + el.color).html(el.descripcion)
-            )
-          })
-          const table = $('<table></table>').attr('class', 'ui striped table').append(
-            $('<thead></thead>').append(tr)
-          )
-          parent = $('<tbody></tbody>').attr('id', this.id)
-          table.append(parent)
-          $('h1.header').after(table)
+          parent = this.build().parent(segment)
         }
         return parent
       },
@@ -250,7 +289,7 @@ const cuentas = {
             return
           }
           $.each(data.tipos, (i, el) => {
-            tipo = new TipoCategoria(el)
+            const tipo = new TipoCategoria(el)
             tipo.setTipos(this.tipos)
             this.tipos_categorias.push(tipo)
           })
@@ -263,6 +302,8 @@ const cuentas = {
           this.balance = data
         }).then(() => {
           this.draw().balance()
+        }).then(() => {
+          this.draw().resultado()
         })
       }
     }
@@ -298,6 +339,17 @@ const cuentas = {
           )
         })
         foot.append(tr)
+      },
+      resultado: () => {
+        const div = $('#resultado')
+        if (div.find("[data-tipo='resultado']").length === 0) {
+          div.html('')
+          this.build().resultado(div)
+        }
+        const format = Intl.NumberFormat('es-CL', {style: 'currency', currency: 'CLP'})
+        div.find("[data-tipo='ganancias']").html(format.format(this.balance['ganancias']))
+        div.find("[data-tipo='perdidas']").html(format.format(this.balance['perdidas']))
+        div.find("[data-tipo='resultado']").html('<b>' + format.format(this.balance['ganancias'] - this.balance['perdidas']) + '</b>')
       }
     }
   },