From 4fb75b11c4ac5bca5449fa1e463df6f858380917 Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvialb@incoviba.cl>
Date: Tue, 13 Feb 2024 12:08:25 -0300
Subject: [PATCH] Mejora en look de depositos y vencidos

---
 .../views/contabilidad/depositos.blade.php    | 106 +++++++++++-------
 app/src/Controller/Contabilidad.php           |  11 +-
 2 files changed, 77 insertions(+), 40 deletions(-)

diff --git a/app/resources/views/contabilidad/depositos.blade.php b/app/resources/views/contabilidad/depositos.blade.php
index d090039..26d8f17 100644
--- a/app/resources/views/contabilidad/depositos.blade.php
+++ b/app/resources/views/contabilidad/depositos.blade.php
@@ -3,47 +3,72 @@
 @section('page_content')
     <div class="ui container">
         <h1 class="ui header">Depósitos a Plazo</h1>
-
-        <table class="ui table" id="depositos">
-            <thead>
-            <tr>
-                <th>Inmobiliaria</th>
-                <th>Banco</th>
-                <th>N° Depósito</th>
-                <th>Capital</th>
-                <th>Inicio</th>
-                <th>Plazo</th>
-                <th>Vencimiento</th>
-                <th>Monto al Vencimiento</th>
-                <th>Tasa</th>
-                <th>
-                    <button class="ui green icon button" id="add_button">
-                        <i class="plus icon"></i>
-                    </button>
-                </th>
-            </tr>
-            </thead>
-            <tbody>
-            @foreach ($depositos as $deposito)
+    </div>
+    <div class="ui grid">
+        <div class="two wide column"></div>
+        <div class="twelve wide column">
+            <table class="ui table" id="depositos">
+                <thead>
                 <tr>
-                    <td>{{$deposito->cuenta->inmobiliaria->razon}}</td>
-                    <td>{{$deposito->cuenta->banco->nombre}}</td>
-                    <td>{{$deposito->id}}</td>
-                    <td>{{$format->pesos($deposito->capital)}}</td>
-                    <td>{{$deposito->inicio->format('d-m-Y')}}</td>
-                    <td>{{$deposito->plazo()}}</td>
-                    <td>{{$deposito->termino->format('d-m-Y')}}</td>
-                    <td>{{$format->pesos($deposito->futuro)}}</td>
-                    <td>{{$format->percent($deposito->tasa() * 100, 4)}}</td>
-                    <td>
-                        <button class="ui red icon button remove_button" data-deposito="{{$deposito->id}}">
-                            <i class="remove icon"></i>
+                    <th>Inmobiliaria</th>
+                    <th>Banco</th>
+                    <th>N° Depósito</th>
+                    <th>Capital</th>
+                    <th>Inicio</th>
+                    <th>Plazo</th>
+                    <th>Vencimiento</th>
+                    <th>Vencimiento ISO</th>
+                    <th>Monto al Vencimiento</th>
+                    <th>Tasa</th>
+                    <th>
+                        <button class="ui green icon button" id="add_button">
+                            <i class="plus icon"></i>
                         </button>
-                    </td>
+                    </th>
                 </tr>
-            @endforeach
-            </tbody>
-        </table>
+                </thead>
+                <tbody>
+                @foreach ($activos as $deposito)
+                    <tr>
+                        <td>{{$deposito->cuenta->inmobiliaria->razon}}</td>
+                        <td>{{$deposito->cuenta->banco->nombre}}</td>
+                        <td>{{$deposito->id}}</td>
+                        <td>{{$format->pesos($deposito->capital)}}</td>
+                        <td>{{$deposito->inicio->format('d-m-Y')}}</td>
+                        <td>{{$deposito->plazo()}}</td>
+                        <td>{{$deposito->termino->format('d-m-Y')}}</td>
+                        <td>{{$deposito->termino->format('Y-m-d')}}</td>
+                        <td>{{$format->pesos($deposito->futuro)}}</td>
+                        <td>{{$format->percent($deposito->tasa() * 100, 4)}}</td>
+                        <td>
+                            <button class="ui red icon button remove_button" data-deposito="{{$deposito->id}}">
+                                <i class="remove icon"></i>
+                            </button>
+                        </td>
+                    </tr>
+                @endforeach
+                @foreach ($vencidos as $deposito)
+                    <tr class="yellow">
+                        <td>{{$deposito->cuenta->inmobiliaria->razon}}</td>
+                        <td>{{$deposito->cuenta->banco->nombre}}</td>
+                        <td>{{$deposito->id}}</td>
+                        <td>{{$format->pesos($deposito->capital)}}</td>
+                        <td>{{$deposito->inicio->format('d-m-Y')}}</td>
+                        <td>{{$deposito->plazo()}}</td>
+                        <td>{{$deposito->termino->format('d-m-Y')}}</td>
+                        <td>{{$deposito->termino->format('Y-m-d')}}</td>
+                        <td>{{$format->pesos($deposito->futuro)}}</td>
+                        <td>{{$format->percent($deposito->tasa() * 100, 4)}}</td>
+                        <td>
+                            <button class="ui red icon button remove_button" data-deposito="{{$deposito->id}}">
+                                <i class="remove icon"></i>
+                            </button>
+                        </td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
     </div>
     <div class="ui modal" id="add_modal">
         <div class="content">
@@ -208,7 +233,10 @@
                 $(this.ids.forms.add.inicio).calendar(calendar_date_options)
                 $(this.ids.forms.add.termino).calendar(calendar_date_options)
 
-                $(this.ids.table).dataTable()
+                $(this.ids.table).dataTable({
+                    columnDefs: [{target: 7, visible: false, searchable: false}],
+                    order: [[7, 'desc'], [0, 'asc']]
+                })
             }
         }
         $(document).ready(() => {
diff --git a/app/src/Controller/Contabilidad.php b/app/src/Controller/Contabilidad.php
index 221ee87..e4d3ede 100644
--- a/app/src/Controller/Contabilidad.php
+++ b/app/src/Controller/Contabilidad.php
@@ -8,6 +8,7 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Incoviba\Common\Alias\View;
 use Incoviba\Common\Implement\Exception\{EmptyResult, EmptyRedis};
+use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
 
@@ -50,7 +51,15 @@ class Contabilidad extends Controller
         try {
             $depositos = $dapRepository->fetchAll();
         } catch (EmptyResult) {}
-        return $view->render($response, 'contabilidad.depositos', compact('inmobiliarias', 'depositos'));
+        $fecha = new DateTimeImmutable('today');
+        $activos = array_filter($depositos, function(Model\Deposito $deposito) use ($fecha) {
+            return $deposito->termino >= $fecha;
+        });
+        $mes = $fecha->sub(new DateInterval('P1M'));
+        $vencidos = array_filter($depositos, function(Model\Deposito $deposito) use ($fecha, $mes) {
+            return $deposito->termino < $fecha and $deposito->termino >= $mes;
+        });
+        return $view->render($response, 'contabilidad.depositos', compact('inmobiliarias', 'activos', 'vencidos'));
     }
     public function tesoreria(ServerRequestInterface $request, ResponseInterface $response, View $view,
                               Service\Contabilidad\Informe\Tesoreria   $contabilidadService,