Merge branch 'release'

.env.sample

@@ -1,3 +1,4 @@
+COMPOSE_PROFILES=
 MYSQL_HOST=
 MYSQL_ROOT_PASSWORD=
 MYSQL_DATABASE=

.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) {
+    if ($categorias !== null) {
-        $arr = $item->toArray();
+        array_walk($categorias, function(&$item) use ($service) {
-        $arr['cuentas'] = array_map(function($item) {
+            $arr = $item->toArray();
-            return $item->toArray();
+            if ($item->cuentas()) {
-        }, $item->cuentas());
+                $arr['cuentas'] = array_map(function($item) {
-        $maps = ['activo', 'pasivo', 'ganancia', 'perdida'];
+                    return $item->toArray();
-        foreach ($maps as $m) {
+                }, $item->cuentas());
-            $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) {
+            $maps = ['activo', 'pasivo', 'ganancia', 'perdida'];
-                return $sum + $item->saldo($service, true);
+            foreach ($maps as $m) {
-            });
+                $p = $m . 's';
-        }
+                $t = ucfirst($m);
-        $item = $arr;
+                $cuentas = $item->getCuentasOf($t);
-    });
+                if ($cuentas === false or $cuentas === null) {
-    if ($categorias) {
+                    $arr[$p] = 0;
-      usort($categorias, function($a, $b) {
+                    continue;
-        return strcmp($a['nombre'], $b['nombre']);
+                }
-      });
+                $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/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'] = $c->moneda()->cambiar($transaccion->fecha(), $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,7 +136,7 @@ class Cuentas {
       $transacciones = $cuenta->transacciones($limit, $start);
       if (count($transacciones) > 0) {
           foreach ($transacciones as &$transaccion) {
-              $arr = $transaccion->toArray();
+              /*$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') {
@@ -115,7 +149,9 @@ class Cuentas {
                       $arr['valorFormateado'] = $cuenta->moneda()->format($arr['valor']);
                   }
               }
-              $transaccion = $arr;
+              $arr['debito']['categoria'] = $transaccion->debito()->categoria()->toArray();
+              $arr['credito']['categoria'] = $transaccion->credito()->categoria()->toArray();*/
+              $transaccion = $this->transaccionToArray($service, $cuenta, $transaccion);
           }
       }
     }
@@ -126,6 +162,55 @@ 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) {
+                  /*$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']);
+                      }
+                  }
+                  $arr['debito']['categoria'] = $transaccion->debito()->categoria()->toArray();
+                  $arr['credito']['categoria'] = $transaccion->credito()->categoria()->toArray();*/
+                  $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 {
+    public function __invoke(Request $request, Response $response, Factory $factory, Container $container): Response {
-      $post = $request->getParsedBody();
+        $post =$request->getParsedBody();
-      return $this->withJson($response, $post);
+        $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();
+        $output = $handler->handle();
-      return $this->withJson($response, $output);
+        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) {
+        if ($tipos !== null) {
-            $arr = $item->toArray();
+            array_walk($tipos, function(&$item) use ($service) {
-            $arr['categorias'] = array_map(function($item) {
+                $arr = $item->toArray();
-                return $item->toArray();
+                $arr['categorias'] = $item->categorias();
-            }, $item->categorias());
+                if ($arr['categorias'] !== null) {
-            $arr['saldo'] = abs($item->saldo($service));
+                    $arr['categorias'] = array_map(function($item) {
-            $maps = ['activo', 'pasivo', 'ganancia', 'perdida'];
+                        return $item->toArray();
-            foreach ($maps as $m) {
+                    }, $item->categorias());
-                $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) {
+                $arr['saldo'] = abs($item->saldo($service));
-                    return $sum + $item->saldo($service, true);
+                $arr['totales'] = $item->getTotales($service);
-                });
+                $item = $arr;
-            }
+            });
-            $item = $arr;
+            usort($tipos, function($a, $b) {
-        });
+                return strcmp($a['descripcion'], $b['descripcion']);
-        if ($tipos) {
+            });
-          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'];
+              $arr['totales'] = $item->getTotales($service);
-              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;
           });
         }
@@ -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/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/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) {
+    protected function getWeekday(\DateTimeInterface $fecha) {
-        $fecha = Carbon::parse($fecha);
+        if ($fecha->weekday() == 0) {
-        $moneda = $this->factory->find(Moneda::class)->one($moneda_id);
+            return $fecha->subWeek()->weekday(5);
-        if ($moneda->codigo == 'USD') {
-            if ($fecha->weekday() == 0) {
-                $fecha = $fecha->subWeek()->weekday(5);
-            }
-            if ($fecha->weekday() == 6) {
-                $fecha = $fecha->weekday(5);
-            }
         }
-        $cambio = $moneda->cambio($fecha);
+        if ($fecha->weekday() == 6) {
-        if ($cambio) {
+            return $fecha->weekday(5);
-            if ($cambio->desde()->id != $moneda->id) {
-                return 1 / $cambio->valor;
-            }
-            return $cambio->valor;
         }
+        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/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,
+      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';
-      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,
+    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';
-    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
+upload_max_filesize = 50M
+max_input_vars = 5000

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/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/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/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) {
+    GuzzleHttp\Client::class => function(Container $c) {
-    return new GuzzleHttp\Client();
+        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) {
+    Contabilidad\Common\Service\PdfHandler::class => function(Container $c) {
-    return new Contabilidad\Common\Service\PdfHandler($c->get(GuzzleHttp\Client::class), $c->get('folders')->pdfs, implode('/', [
+        return new Contabilidad\Common\Service\PdfHandler($c->get(GuzzleHttp\Client::class), $c->get('folders')->pdfs, implode('/', [
-      $c->get('urls')->python,
+            $c->get('urls')->python,
-      'pdf',
+            'pdf',
-      'parse'
+            'parse'
-    ]));
+        ]));
-  },
+    },
-  Contabilidad\Common\Service\CsvHandler::class => function(Container $c) {
+    Contabilidad\Common\Service\CsvHandler::class => function(Container $c) {
-    return new Contabilidad\Common\Service\CsvHandler($c->get('folders')->csvs);
+        return new Contabilidad\Common\Service\CsvHandler($c->get('folders')->csvs);
-  },
+    },
-  Contabilidad\Common\Service\XlsHandler::class => function(Container $c) {
+    Contabilidad\Common\Service\XlsHandler::class => function(Container $c) {
-    return new Contabilidad\Common\Service\XlsHandler($c->get('folders')->xlss);
+        return new Contabilidad\Common\Service\XlsHandler($c->get('folders')->xlss);
-  },
+    },
-  Contabilidad\Common\Service\DocumentHandler::class => function(Container $c) {
+    Contabilidad\Common\Service\DocumentHandler::class => function(Container $c) {
-    $handlers = [
+        $handlers = [
-      $c->get(Contabilidad\Common\Service\XlsHandler::class),
+            $c->get(Contabilidad\Common\Service\XlsHandler::class),
-      $c->get(Contabilidad\Common\Service\CsvHandler::class),
+            $c->get(Contabilidad\Common\Service\CsvHandler::class),
-      $c->get(Contabilidad\Common\Service\PdfHandler::class)
+            $c->get(Contabilidad\Common\Service\PdfHandler::class)
-    ];
+        ];
-    return new Contabilidad\Common\Service\DocumentHandler($handlers);
+        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/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;
+  protected $cuentas_of;
-  public function activos() {
+  public function getCuentas() {
-      if ($this->activos === null) {
+      if ($this->cuentas_of === null) {
-          $this->activos = $this->getCuentasOf('Activo');
+          $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;
+  protected $totales;
-  public function pasivos() {
+  public function getTotales(Service $service) {
-      if ($this->pasivos === null) {
+      if ($this->totales === null) {
-          $this->activos = $this->getCuentasOf('Pasivo');
+          $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;
+      return $this->totales;
-  }
-  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;
   }
 
   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/Cuenta.php

@@ -1,7 +1,9 @@
 <?php
 namespace Contabilidad;
 
+use DateTimeInterface;
 use Carbon\Carbon;
+use PhpParser\Node\Expr\AssignOp\Mod;
 use ProVM\Common\Alias\Model;
 use Contabilidad\Common\Service\TiposCambios as Service;
 
@@ -54,8 +56,8 @@ class Cuenta extends Model {
   }
   protected $transacciones;
   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 +65,52 @@ class Cuenta extends Model {
         $transacciones = $transacciones->limit($limit)
           ->offset($start);
       }
-      $this->transacciones = $transacciones->findMany();
+      $transacciones = $transacciones->findMany();
-      foreach ($this->transacciones as &$transaccion) {
+      foreach ($transacciones as &$transaccion) {
         $transaccion->setFactory($this->factory);
-        if ($transaccion->desde_id === $this->id) {
+        if ($transaccion->debito_id === $this->id) {
           $transaccion->valor = - $transaccion->valor;
         }
       }
-    }
+      return $transacciones;
-    return $this->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->setFactory($this->factory);
+          if ($transaccion->desde_id === $this->id) {
+              $transaccion->valor = - $transaccion->valor;
+          }
+      }
+
+      return $transacciones;
+  }
+  public function acumulacion(Carbon $date) {
+      $abonos = Model::factory(Transaccion::class)
+          ->whereEqual('credito_id', $this->id)
+          ->whereLt('fecha', $date->format('Y-m-d'))
+          ->groupBy('credito_id')
+          ->sum('valor');
+      $cargos = Model::factory(Transaccion::class)
+          ->whereEqual('debito_id', $this->id)
+          ->whereLt('fecha', $date->format('Y-m-d'))
+          ->groupBy('debito_id')
+          ->sum('valor');
+
+      if (in_array($this->tipo()->descripcion, ['activo', 'banco', 'perdida'])) {
+        return $abonos - $cargos;
+      }
+      return $cargos - $abonos;
   }
   protected $saldo;
   public function saldo(Service $service = null, $in_clp = false) {

api/src/Moneda.php

@@ -16,17 +16,17 @@ 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) {
         $cambio = $this->factory->find(TipoCambio::class)
             ->where([['desde_id', $this->id], ['hasta_id', 1], ['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')]])
                 ->one();
@@ -43,4 +43,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/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';
+    public static $_table = 'tipos_categoria';
-  protected static $fields = ['descripcion', 'activo'];
+    protected static $fields = ['descripcion', 'activo'];
 
-  protected $categorias;
+    protected $categorias;
-  public function categorias() {
+    public function categorias() {
-    if ($this->categorias === null) {
+        if ($this->categorias === null) {
-      $this->categorias = $this->parentOf(Categoria::class, [Model::CHILD_KEY => 'tipo_id']);
+            $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);
           });
       }

docker-compose.yml

@@ -50,6 +50,7 @@ services:
     image: php-ui
     env_file:
       - .api.env
+      - .env
     build:
       context: ui
     volumes:

python/src/ai/network.py

@@ -1,5 +1,8 @@
 import json
 import os
+import time
+import timeit
+
 import tensorflow as tf
 import sklearn
 import numpy as np
@@ -83,6 +86,7 @@ class AI:
         self.__dict = None
         self.__network = None
         self.__sources = None
+        self._phrases = None
         self.filename = ''
 
     def add_source(self, text):
@@ -108,7 +112,6 @@ class AI:
         os.remove(temp)
         word_list = th.split_words(obj)
         fits = encoder.fit_transform(word_list)
-        print(fits)
         phrases = []
         for length in range(1, len(word_list) + 1):
             for start in range(0, len(word_list)):
@@ -117,7 +120,7 @@ class AI:
                                    np.zeros([len(word_list) - len(phrase)]))
                 phrases.append(phrase)
         phrases = np.array(phrases)
-        print(phrases.shape)
+        self._phrases = phrases
 
     def active_train(self):
         pass

python/src/ai/phrase.py

@@ -1,102 +0,0 @@
-import json
-from src.ai.word import Word, WordType
-
-
-class PhraseType:
-    TEXT = 0
-    TITLE = 1
-    HEADER = 2
-    MOVEMENT = 3
-    INVALID = 99
-
-    def __init__(self):
-        self.__id = 0
-        self.__description = 'text'
-
-    def get_id(self):
-        return self.__id
-
-    def get_desc(self):
-        return self.__description
-
-    def to_json(self):
-        return self.__id
-
-    def load(self, phrase_id: int):
-        self.__id = phrase_id
-        if phrase_id == self.TITLE:
-            self.__description = 'title'
-        elif phrase_id == self.HEADER:
-            self.__description = 'header'
-        elif phrase_id == self.MOVEMENT:
-            self.__description = 'movement'
-        elif phrase_id == self.INVALID:
-            self.__description = 'invalid'
-        return self
-
-
-def phrase_factory(phrase: list, phrase_type: int = None, frec: int = 1):
-    pt = PhraseType()
-    if phrase_type is not None:
-        pt.load(phrase_type)
-    ph = Phrase()
-    ph.set_phrase(phrase).set_type(pt).add_frec(frec - 1)
-    return ph
-
-
-class Phrase:
-    def __init__(self):
-        self.__phrase = None
-        self.__type = None
-        self.__frec = 1
-
-    def to_json(self):
-        return {
-            'phrase': [w.to_json() for w in self.__phrase],
-            'type': self.__type.to_json(),
-            'frec': self.__frec
-        }
-
-    def set_phrase(self, phrase: list):
-        [self.add_word(w) for w in phrase]
-        return self
-
-    def get_phrase(self):
-        return self.__phrase
-
-    def set_type(self, phrase_type: PhraseType):
-        self.__type = phrase_type
-        return self
-
-    def get_type(self):
-        return self.__type
-
-    def add_word(self, word: Word, pos: int = None):
-        if self.__phrase is None:
-            self.__phrase = []
-        if pos is None:
-            self.__phrase.append(word)
-            return self
-        self.__phrase = self.__phrase[:pos] + [word] + self.__phrase[pos:]
-        return self
-
-    def add_frec(self, amount: int = 1):
-        self.__frec += amount
-
-    def match(self, words: list):
-        if len(words) != len(self.__phrase):
-            return False
-        for w in self.__phrase:
-            if w not in words:
-                return False
-        return True
-
-    def __repr__(self):
-        print(self.__phrase)
-        return json.dumps({
-            'phrase': [w.to_json() for w in self.get_phrase()],
-            'type': self.get_type().get_desc()
-        })
-
-    def __len__(self):
-        return len(self.__phrase)

python/src/ai/word.py

@@ -1,84 +0,0 @@
-import json
-
-
-class WordType:
-    STRING = 0
-    NUMERIC = 1
-    CURRENCY = 2
-    DATE = 3
-
-    def __init__(self):
-        self.__id = 0
-        self.__description = 'string'
-
-    def to_json(self):
-        return self.__id
-
-    def load(self, word_id: int):
-        self.__id = word_id
-        if word_id == self.NUMERIC:
-            self.__description = 'numeric'
-        elif word_id == self.CURRENCY:
-            self.__description = 'currency'
-        elif word_id == self.DATE:
-            self.__description = 'data'
-        return self
-
-    def get_id(self):
-        return self.__id
-
-    def get_desc(self):
-        return self.__description
-
-    def __repr__(self):
-        return {
-            'id': self.get_id(),
-            'description': self.get_desc()
-        }
-
-
-def word_factory(word: str, word_type: int = None, frec: int = 1):
-    wt = WordType()
-    if word_type is not None:
-        wt.load(word_type)
-    w = Word()
-    w.set_word(word).set_type(wt).add_frec(frec - 1)
-    return w
-
-
-class Word:
-    def __init__(self):
-        self.__word = None
-        self.__type = None
-        self.__frec = 1
-
-    def to_json(self):
-        return {
-            'word': self.__word,
-            'type': self.__type.to_json(),
-            'frec': self.__frec
-        }
-
-    def set_word(self, word: str):
-        self.__word = word
-        return self
-
-    def get_word(self):
-        return self.__word
-
-    def set_type(self, word_type: WordType):
-        self.__type = word_type
-        return self
-
-    def get_type(self):
-        return self.__type
-
-    def add_frec(self, amount: int = 1):
-        self.__frec += amount
-        return self
-
-    def __repr__(self):
-        return json.dumps({
-            'word': self.get_word(),
-            'type': self.get_type().get_desc()
-        })

python/src/app.py

@@ -22,7 +22,10 @@ def validate_key(request_obj):
         if isinstance(auth, list):
             auth = auth[0]
         if 'Bearer' in auth:
-            auth = auth.split(' ')[1]
+            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

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/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/cuentas.show.js

@@ -1,5 +1,5 @@
 class Transaccion {
-  constructor({id, debito_id, credito_id, fecha, glosa, detalle, valor, debito, credito, fechaFormateada, valorFormateado}) {
+  constructor({id, debito_id, credito_id, fecha, glosa, detalle, valor, debito, credito, fechaFormateada, valorFormateado, format}) {
     this.id = id
     this.debito_id = debito_id
     this.credito_id = credito_id
@@ -13,6 +13,7 @@ class Transaccion {
       valor,
       formateado: valorFormateado
     }
+    this.format_array = format
     this.debito = debito
     this.credito = credito
     this.modal = null
@@ -33,7 +34,7 @@ class Transaccion {
     }
     return !this.isDebito()
   }
-  draw({saldo, format}) {
+  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)
@@ -44,13 +45,13 @@ class Transaccion {
     ).append(
       $('<td></td>').html(this.glosa + '<br />' + this.detalle)
     ).append(
-      $('<td></td>').attr('class', 'right aligned').html((this.isIncrement()) ? '' : format.format(this.valor.valor))
+      $('<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.format(this.valor.valor) : '')
+      $('<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.format(saldo))
+      $('<td></td>').attr('class', 'right aligned').html(format_call({value: saldo, format_array, format}))
     ).append(
-      $('<td></td>').attr('class', 'right aligned')/*.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) => {
@@ -58,7 +59,7 @@ class Transaccion {
           this.edit()
           return false
         })
-      )*/.append(
+      ).append(
         $('<button></button>').attr('class', 'ui tiny circular red icon button').append(
           $('<i></i>').attr('class', 'remove icon')
         ).click((e) => {
@@ -71,7 +72,15 @@ class Transaccion {
   }
   edit() {
     const form = this.modal.find('form')
-    form.find("[name='fecha']")
+    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(() => {
@@ -82,56 +91,110 @@ class Transaccion {
 
 const transacciones = {
   id: '#transacciones',
+  mes: '#mes',
+  buttons: {
+    prev: '#prev_button',
+    left: '#left_button',
+    right: '#right_button',
+    next: '#next_button'
+  },
   cuenta_id: 0,
   cuenta: null,
   transacciones: [],
   cuentas: [],
+  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.saldo = this.cuenta.saldo
+          this.intl_format =  Intl.NumberFormat('es-CL')
-          $('#cuenta').html(this.cuenta.nombre + ' (' + this.cuenta.categoria.nombre + ')').append(
+          sendGet(_urls.api + '/cuenta/' + this.cuenta_id + '/categoria').then((resp) => {
-              $('<i></i>').attr('class', 'square full icon').css('color', '#' + this.cuenta.tipo.color)
+            this.cuenta.categoria = resp.categoria
-          )
+          }).then(() => {
-          const amount = data.transacciones
+            //this.saldo = this.cuenta.saldo
-          const step = 50
+            $('#cuenta').html(this.cuenta.nombre + ' (' + this.cuenta.categoria.nombre + ')').append(
-          for (let i = 0; i < amount; i += step) {
+                $('<i></i>').attr('class', 'square full icon').css('color', '#' + this.cuenta.tipo.color)
-            promises.push(
-              sendGet(_urls.api + '/cuenta/' + this.cuenta_id + '/transacciones/' + step + '/' + i)
             )
-          }
+            promises = this.get().transaccionesMes(this.date)
-          if (promises.length > 0) {
+            if (promises.length > 0) {
-            Promise.all(promises).then((data_arr) => {
+              Promise.all(promises).then((data_arr) => {
-              this.transacciones = []
+                this.transacciones = []
-              data_arr.forEach(data => {
+                data_arr.forEach(data => {
-                if (data.transacciones === null || data.transacciones.length === 0) {
+                  if (data.transacciones === null || data.transacciones.length === 0) {
-                  return
+                    return
-                }
+                  }
-                $.each(data.transacciones, (i, el) => {
+                  $.each(data.transacciones, (i, el) => {
-                  const tr = new Transaccion(el)
+                    const tr = new Transaccion(el)
-                  tr.setCuenta(this.cuenta)
+                    tr.setCuenta(this.cuenta)
-                  tr.setModal(this.modal)
+                    tr.setModal(this.modal)
-                  this.transacciones.push(tr)
+                    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()
                 })
               })
-              this.transacciones.sort((a, b) => {
+            } else {
-                return (new Date(b.fecha)) - (new Date(a.fecha))
+              this.draw().table()
-              })
+            }
-            }).then(() => {
+          })
-              this.draw()
-            })
-          } else {
-            this.draw()
-          }
         })
       },
+      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) {
@@ -141,22 +204,69 @@ const transacciones = {
         }).then(() => {
           const select = this.modal.find("[name='cuenta']")
           $.each(this.cuentas, (i, el) => {
-            select.append(
+            this.get().categoria(i).then(() => {
-              $('<option></option>').attr('value', el.id).html(el.nombre + ' (' + el.categoria.nombre + ')')
+              select.append(
-            )
+                $('<option></option>').attr('value', el.id).html(el.nombre + ' (' + el.categoria.nombre + ')')
+              )
+            })
           })
         })
+      },
+      categoria: (idx) => {
+        return sendGet(_urls.api + '/cuenta/' + this.cuentas[idx].id + '/categoria').then((data) => {
+          this.cuentas[idx].categoria = data.categoria
+        })
       }
     }
   },
   draw: function() {
-    const format = Intl.NumberFormat('es-CL', {style: 'currency', currency: this.cuenta.moneda.codigo})
+    return {
-    const parent = $(this.id)
+      loading: () => {
-    parent.html('')
+        const parent = $(this.id)
-    $.each(this.transacciones, (i, el) => {
+        parent.html('')
-      parent.append(el.draw({saldo: this.saldo, format: format}))
+        parent.append(
-      this.saldo = this.saldo + parseInt(el.valor.valor) * ((el.isIncrement()) ? 1 : -1)
+            $('<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 {
@@ -172,7 +282,7 @@ const transacciones = {
           fecha: fecha,
           valor: $("[name='cambio']").val()
         })
-        sendPut(_urls.api + '/tipos/cambios/add', data1)
+        sendPost(_urls.api + '/tipos/cambios/add', data1)
 
         const valor = $("[name='valor']").val()
         const cuenta = $("[name='cuenta']").val()
@@ -191,6 +301,56 @@ const 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 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
+    })
+    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)
+  },
+  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.getFullYear() === f.getFullYear()) {
+      $(this.buttons.next).addClass('disabled')
+    } else {
+      $(this.buttons.next).removeClass('disabled')
+    }
+  },
+  refresh: function () {
+    this.get().transacciones()
+  },
   build: function() {
     return {
       modal: () => {
@@ -201,7 +361,12 @@ const transacciones = {
         })
         this.modal.find('form').submit((e) => {
           e.preventDefault()
-          this.add().exec()
+          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({
@@ -218,12 +383,53 @@ const transacciones = {
           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.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.id).parent().find('.ui.button').click(() => {
+    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/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.totales = totales
-    this.pasivos = pasivos
-    this.ganancias = ganancias
-    this.perdidas = perdidas
     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.totales = totales
-    this.pasivos = pasivos
-    this.ganancias = ganancias
-    this.perdidas = perdidas
     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(
+          parent = this.build().parent(segment)
-              $('<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)
         }
         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>')
       }
     }
   },

ui/public/assets/scripts/tipos_categorias.list.js

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

@@ -0,0 +1,221 @@
+class Archivo {
+    constructor({folder, filename}) {
+        this.folder = folder
+        this.filename = filename
+        this.modal = null
+    }
+    setModal(modal) {
+        this.modal = modal
+        return this
+    }
+    draw() {
+        return $('<tr></tr>').append(
+            $('<td></td>').append(
+                $('<a></a>').attr('class', 'item').attr('href', _urls.base + ['upload', this.folder, this.filename].join('/')).html(this.filename)
+            )
+        ).append(
+            $('<td></td>').attr('class', 'right aligned').append(
+                $('<button></button>').attr('class', 'ui mini circular icon button').append(
+                    $('<i></i>').attr('class', 'edit icon')
+                ).click((e) => {
+                    e.preventDefault()
+                    const t = e.currentTarget
+                    this.edit()
+                    return false
+                })
+            ).append(
+                $('<button></button>').attr('class', 'ui mini red circular icon button').append(
+                    $('<i></i>').attr('class', 'remove icon')
+                ).click((e) => {
+                    e.preventDefault()
+                    const t = e.currentTarget
+                    this.remove()
+                    return false
+                })
+            )
+        )
+    }
+    edit() {
+        this.modal.find('form').trigger('reset')
+        this.modal.find('form').find("[name='folder']").val(this.folder)
+        this.modal.find('form').find("[name='old_filename']").val(this.filename)
+        this.modal.find('form').find("[name='filename']").val(this.filename)
+        this.modal.modal('show')
+    }
+    remove() {
+        return sendDelete([_urls.api, 'upload', this.folder, this.filename].join('/')).then((data) => {
+            if (data.deleted) {
+                archivos.get()
+            }
+        })
+    }
+}
+const archivos = {
+    id: '#archivos',
+    archivos: [],
+    modals: {
+        add: null,
+        edit: null
+    },
+    build: function() {
+        return {
+            parent: (segment) => {
+                const table = $('<table></table>').attr('class', 'ui striped table').append(
+                    $('<thead></thead>').append(
+                        $('<tr></tr>').append(
+                            $('<th></th>').html('Archivo')
+                        ).append(
+                            $('<th></th>').attr('class', 'right aligned').append(
+                                $('<button></button>').attr('class', 'ui tiny green circular icon button').append(
+                                    $('<i></i>').attr('class', 'plus icon')
+                                ).click((e) => {
+                                    e.preventDefault()
+                                    this.add()
+                                    return false
+                                })
+                            )
+                        )
+                    )
+                )
+                const parent = $('<tbody></tbody>')
+                table.append(parent)
+                segment.append(table)
+                return parent
+            }
+        }
+    },
+    get: function() {
+        return {
+            parent: () => {
+                const segment = $(this.id)
+                let parent = segment.find('tbody')
+                if (parent.length === 0) {
+                    parent = this.build().parent(segment)
+                }
+                return parent
+            },
+            archivos: () => {
+                return sendGet(_urls.api + '/uploads').then((data) => {
+                    if (data.files === null || data.files.length === 0) {
+                        return
+                    }
+                    this.archivos = []
+                    $.each(data.files, (i, el) => {
+                        const arch = new Archivo(el)
+                        arch.setModal(this.modals.edit)
+                        this.archivos.push(arch)
+                    })
+                }).then(() => {
+                    this.draw()
+                })
+            },
+            cuentas: () => {
+                return sendGet(_urls.api + '/cuentas')
+            }
+        }
+    },
+    draw: function() {
+        const tbody = this.get().parent()
+        tbody.empty()
+        $.each(this.archivos, (i, el) => {
+            tbody.append(el.draw())
+        })
+    },
+    add: function() {
+        this.modals.add.find('form').trigger('reset')
+        this.modals.add.find("[name='cuenta']").dropdown('clear')
+        this.modals.add.modal('show')
+    },
+    doAdd: function() {
+        const data = new FormData(this.modals.add.find('form')[0])
+        return sendPost(_urls.api + '/uploads/add', data, true).then((resp) => {
+            this.modals.add.modal('hide')
+            this.get().archivos()
+        })
+    },
+    doEdit: function() {
+        const folder = this.modals.edit.find("[name='folder']").val()
+        const filename = this.modals.edit.find("[name='old_filename']").val()
+        const data = JSON.stringify({
+            cuenta: this.modals.edit.find("[name='cuenta']").val(),
+            fecha: this.modals.edit.find("[name='fecha']").val()
+        })
+        sendPut([_urls.api, 'upload', folder, filename].join('/'), data).then((resp) => {
+            this.modals.edit.modal('hide')
+            if (resp.edited) {
+                this.get().archivos()
+            }
+        })
+    },
+    updateCalendar: function(modal) {
+        const today = new Date()
+        const start = new Date(today.getFullYear(), today.getMonth() - 1)
+        modal.find('.ui.calendar').calendar({
+            type: 'month',
+            initialDate: start,
+            maxDate: start,
+            months: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+            monthsShort: ['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic'],
+            formatter: {
+                date: function(date, settings) {
+                    if (!date) return ''
+                    const year = date.getFullYear()
+                    const month = (date.getMonth() + 1).toString().padStart(2, '0')
+                    return [year, month].join('-')
+                }
+            }
+        })
+    },
+    updateCuentas: function(modal, data) {
+        if (data.cuentas === null || data.cuentas.length === 0) {
+            return
+        }
+        const select = modal.find("select[name='cuenta']")
+        let values = []
+        $.each(data.cuentas, (i, el) => {
+            const nombre = [el.nombre, el.categoria.nombre].join(' - ')
+            values.push({
+                name: nombre,
+                value: el.id,
+                text: nombre
+            })
+        })
+        select.dropdown({values})
+    },
+    setupModal: function() {
+        this.modals.add = $('#add_modal')
+        this.modals.edit = $('#edit_modal')
+        $.each(this.modals, (i, el) => {
+            el.modal().find('.close.icon').click(() => {
+                el.modal('hide')
+            })
+            this.updateCalendar(el)
+        })
+        this.modals.add.find('form').submit((e) => {
+            e.preventDefault()
+            this.doAdd()
+            return false
+        })
+        this.modals.add.find('#archivo_btn').css('cursor', 'pointer').click(() => {
+            this.modals.add.find("[name='archivo']").trigger('click')
+        })
+        this.modals.add.find("[name='archivo']").change((e) => {
+            const arch = $(e.currentTarget)
+            const filename = arch[0].files[0].name
+            this.modals.add.find('#archivo_btn').find('input').val(filename)
+        })
+        this.modals.edit.find('form').submit((e) => {
+            e.preventDefault()
+            this.doEdit()
+            return false
+        })
+        this.get().cuentas().then((data) => {
+            this.updateCuentas(this.modals.add, data)
+            this.updateCuentas(this.modals.edit, data)
+        })
+    },
+    setup: function() {
+        this.setupModal()
+        this.get().archivos()
+    }
+}

ui/resources/routes/importar.php

@@ -0,0 +1,4 @@
+<?php
+use Contabilidad\Common\Controller\Importar;
+
+$app->get('/importar[/]', Importar::class);

ui/resources/routes/uploads.php

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

ui/resources/views/categorias/base.blade.php

@@ -8,7 +8,7 @@
       Categorías
     @endif
   </h1>
-  <div class="ui segment">
+  <div class="ui basic fitted segment">
     @yield('categorias_content')
   </div>
 @endsection

ui/resources/views/categorias/tipos/base.blade.php

@@ -8,7 +8,7 @@
       Tipos Categoría
     @endif
   </h1>
-  <div class="ui segment">
+  <div class="ui basic fitted segment">
     @yield('tipos_categorias_content')
   </div>
 @endsection

ui/resources/views/config/list.blade.php

@@ -1 +1,8 @@
 @extends('config.base')
+
+@section('config_content')
+    <h3>Configuraciones Generales</h3>
+    <div class="ui basic segment">
+
+    </div>
+@endsection

ui/resources/views/config/menu.blade.php

@@ -1,4 +1,5 @@
 <div class="ui vertical fluid borderless menu">
     @include('config.menu.tipos_categorias')
     @include('config.menu.tipos_cuentas')
+    @include('config.menu.files')
 </div>

ui/resources/views/config/menu/files.blade.php

@@ -0,0 +1,4 @@
+<a class="item" href="{{$urls->base}}uploads">
+    Archivos
+</a>
+

ui/resources/views/cuentas/base.blade.php

@@ -8,7 +8,7 @@
       Cuentas
     @endif
   </h1>
-  <div class="ui segment">
+  <div class="ui basic fitted segment">
     @yield('cuentas_content')
   </div>
 @endsection

ui/resources/views/cuentas/show.blade.php

@@ -5,6 +5,26 @@
 @endsection
 
 @section('cuentas_content')
+  <div class="ui right aligned header">
+    <div class="ui calendar" id="mes">
+      <div class="ui input right icon">
+        <input type="text" placeholder="Mes" />
+        <i class="calendar icon"></i>
+      </div>
+    </div>
+    <div class="ui icon button" id="prev_button">
+      <i class="double left angle icon"></i>
+    </div>
+    <div class="ui icon button" id="left_button">
+      <i class="left angle icon"></i>
+    </div>
+    <div class="ui icon disabled button" id="right_button">
+      <i class="right angle icon"></i>
+    </div>
+    <div class="ui icon disabled button" id="next_button">
+      <i class="double right angle icon"></i>
+    </div>
+  </div>
   <table class="ui striped table">
     <thead>
       <tr>
@@ -27,23 +47,16 @@
           Saldo
         </th>
         <th class="right aligned">
-          <button class="ui tiny green circular icon button">
+          <button class="ui tiny blue circular icon button" id="refresh">
+            <i class="refresh icon"></i>
+          </button>
+          <button class="ui tiny green circular icon button" id="add">
             <i class="plus icon"></i>
           </button>
         </th>
       </tr>
     </thead>
-    <tbody id="transacciones">
+    <tbody id="transacciones"></tbody>
-      <tr>
-        <td colspan="7">
-          <div class="ui active dimmer">
-            <div class="ui indeterminate elastic text loader">
-              Buscando los datos
-            </div>
-          </div>
-        </td>
-      </tr>
-    </tbody>
   </table>
 
   <div class="ui modal">
@@ -89,6 +102,7 @@
   <script type="text/javascript">
     $(document).ready(() => {
       transacciones.cuenta_id = {{$cuenta_id}}
+      transacciones.max = {{$max_transacciones ?? 100}}
       transacciones.setup()
     })
   </script>

ui/resources/views/home.blade.php

@@ -4,6 +4,8 @@
   <h1 class="ui header">
     Contabilidad
   </h1>
+  <div id="cuentas" class="ui basic fitted segment"></div>
+  <div id="resultado" class="ui basic fitted segment"></div>
 @endsection
 
 @push('scripts')

ui/resources/views/importar.blade.php

@@ -0,0 +1,92 @@
+@extends('layout.base')
+
+@section('page_title')
+    Importar
+@endsection
+
+@section('page_content')
+    <h1>Importar</h1>
+    <form class="ui form" action="#" method="post" id="importar_form" enctype="multipart/form-data">
+        <div class="two wide field">
+            <label>Fecha</label>
+            <div class="ui date calendar">
+                <div class="ui icon input">
+                    <input type="text" name="fecha" />
+                    <i class="calendar outline icon"></i>
+                </div>
+            </div>
+        </div>
+        <div class="six wide field">
+            <label>Cuenta</label>
+            <select name="cuenta"></select>
+        </div>
+        <div class="inline field">
+            <input type="file" name="archivo" style="display: none;" />
+            <div class="ui labeled icon input" id="archivo_btn">
+                <div class="ui label">Archivo</div>
+                <input type="text" readonly="" />
+                <i class="search icon"></i>
+            </div>
+        </div>
+        <button class="ui button">Importar</button>
+    </form>
+@endsection
+
+@push('scripts')
+    <script type="text/javascript">
+        function getCuentas() {
+            sendGet(_urls.api + '/cuentas').then((data) => {
+                if (data.cuentas === null || data.cuentas.length === 0) {
+                    return
+                }
+                const select = $("select[name='cuenta']")
+                let values = []
+                $.each(data.cuentas, (i, el) => {
+                    const nombre = [el.nombre, el.categoria.nombre].join(' - ')
+                    values.push({
+                        name: nombre,
+                        value: el.id,
+                        text: nombre
+                    })
+                })
+                select.dropdown({values})
+            })
+        }
+        $(document).ready(() => {
+            getCuentas()
+            const today = new Date()
+            const start = new Date(today.getFullYear(), today.getMonth() - 1)
+            $('.ui.calendar').calendar({
+                type: 'month',
+                initialDate: start,
+                maxDate: start,
+                months: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+                monthsShort: ['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic'],
+                formatter: {
+                    date: function(date, settings) {
+                        if (!date) return ''
+                        const year = date.getFullYear()
+                        const month = date.getMonth() + 1
+                        return [year, month].join('-')
+                    }
+                }
+            })
+            $('#archivo_btn').css('cursor', 'pointer').click(() => {
+                $("[name='archivo']").trigger('click')
+            })
+            $("[name='archivo']").change((e) => {
+                const arch = $(e.currentTarget)
+                const filename = arch[0].files[0].name
+                $('#archivo_btn').find('input').val(filename)
+            })
+            $('#importar_form').submit((e) => {
+                e.preventDefault()
+                const data = new FormData(e.currentTarget)
+                sendPost(_urls.api + '/import', data, true).then((resp) => {
+                    console.debug(resp)
+                })
+                return false
+            })
+        })
+    </script>
+@endpush

ui/resources/views/layout/body/scripts.blade.php

@@ -7,7 +7,18 @@
     base: '{{$urls->base}}',
     api: '{{$urls->api}}'
   }
-  function buildAjax(url, method) {
+  function buildAjax(url, method, files=false) {
+      if (files) {
+          return {
+              url: url,
+              headers: {
+                  'Authorization': 'Bearer ' + API_KEY
+              },
+              method: method,
+              processData: false,
+              contentType: false
+          }
+      }
     return {
       url: url,
       headers: {
@@ -21,8 +32,8 @@
     let ajax_obj = buildAjax(url, 'GET')
     return $.ajax(ajax_obj)
   }
-  function sendPost(url, data) {
+  function sendPost(url, data, files=false) {
-    let ajax_obj = buildAjax(url, 'POST')
+    let ajax_obj = buildAjax(url, 'POST', files)
     ajax_obj['data'] = data
     return $.ajax(ajax_obj)
   }

ui/resources/views/uploads/base.blade.php

@@ -0,0 +1,14 @@
+@extends('config.base')
+
+@section('config_content')
+    <h1 class="ui header">
+        @hasSection('uploads_title')
+            Archivo @yield('uploads_title')
+        @else
+            Archivos
+        @endif
+    </h1>
+    <div class="ui basic fitted segment">
+        @yield('uploads_content')
+    </div>
+@endsection

ui/resources/views/uploads/list.blade.php

@@ -0,0 +1,70 @@
+@extends('uploads.base')
+
+@section('uploads_content')
+    <div id="archivos"></div>
+    <div class="ui modal" id="add_modal">
+        <i class="close icon"></i>
+        <div class="content">
+            <form class="ui form" enctype="multipart/form-data">
+                <div class="two wide field">
+                    <label>Fecha</label>
+                    <div class="ui date calendar">
+                        <div class="ui icon input">
+                            <input type="text" name="fecha" />
+                            <i class="calendar outline icon"></i>
+                        </div>
+                    </div>
+                </div>
+                <div class="six wide field">
+                    <label>Cuenta</label>
+                    <select name="cuenta"></select>
+                </div>
+                <div class="inline field">
+                    <input type="file" name="archivo" style="display: none;" />
+                    <div class="ui labeled icon input" id="archivo_btn">
+                        <div class="ui label">Archivo</div>
+                        <input type="text" readonly="" />
+                        <i class="search icon"></i>
+                    </div>
+                </div>
+                <button class="ui green icon button">
+                    <i class="plus icon"></i>
+                </button>
+            </form>
+        </div>
+    </div>
+    <div class="ui modal" id="edit_modal">
+        <i class="close icon"></i>
+        <div class="content">
+            <form class="ui form">
+                <input type="hidden" name="folder" />
+                <input type="hidden" name="old_filename" />
+                <div class="two wide field">
+                    <label>Fecha</label>
+                    <div class="ui date calendar">
+                        <div class="ui icon input">
+                            <input type="text" name="fecha" />
+                            <i class="calendar outline icon"></i>
+                        </div>
+                    </div>
+                </div>
+                <div class="six wide field">
+                    <label>Cuenta</label>
+                    <select name="cuenta"></select>
+                </div>
+                <button class="ui icon button">
+                    <i class="edit icon"></i>
+                </button>
+            </form>
+        </div>
+    </div>
+@endsection
+
+@push('scripts')
+    <script type="text/javascript" src="{{$urls->scripts}}/uploads.list.js"></script>
+    <script type="text/javascript">
+        $(document).ready(() => {
+            archivos.setup()
+        })
+    </script>
+@endpush

ui/setup/settings/03_web.php

@@ -22,5 +22,6 @@ return [
     ]);
     $arr['api'] = $_ENV['API_URL'] ?? 'http://localhost:9001';
     return (object) $arr;
-  }
+  },
+    'max_transacciones' => 100
 ];

ui/setup/setups/03_web.php

@@ -2,15 +2,23 @@
 use Psr\Container\ContainerInterface as Container;
 
 return [
-  Slim\Views\Blade::class => function(Container $c) {
+    Slim\Views\Blade::class => function(Container $c) {
-    return new Slim\Views\Blade(
+        return new Slim\Views\Blade(
-      $c->get('folders')->templates,
+            $c->get('folders')->templates,
-      $c->get('folders')->cache,
+            $c->get('folders')->cache,
-      null,
+            null,
-      [
+            [
-        'api_key' => $c->get('API_KEY'),
+                'api_key' => $c->get('API_KEY'),
-        'urls' => $c->get('urls')
+                'urls' => $c->get('urls')
-      ]
+            ]
-    );
+        );
-  }
+    },
+    GuzzleHttp\Client::class => function(Container $c) {
+        return new GuzzleHttp\Client([
+            'base_uri' => 'http://api-proxy',
+            'headers' => [
+                'Authorization' => 'Bearer ' . $c->get('API_KEY')
+            ]
+        ]);
+    }
 ];