From 7f08de69a154183b1a0e21eb66b9b10a34ebd125 Mon Sep 17 00:00:00 2001
From: Francisco Sandoval <francisco.sandoval@crecic.cl>
Date: Mon, 17 Jul 2023 15:43:39 -0400
Subject: [PATCH] se agrega mantenedor de personas

---
 src/assets/custom.css               | 17 +++++++-
 src/layouts/LayoutGuest.svelte      |  4 ++
 src/layouts/LayoutUser.svelte       |  4 ++
 src/layouts/Sidebar.svelte          |  5 +++
 src/lib/Counter.svelte              | 10 -----
 src/pages/comunas/Form.svelte       |  2 +-
 src/pages/personas/Admin.svelte     | 61 ++++++++++++++++++++++++++++
 src/pages/personas/Form.svelte      |  6 +--
 src/pages/personas/Lista.svelte     | 34 ----------------
 src/pages/personas/Modificar.svelte |  0
 src/pages/personas/Nueva.svelte     |  0
 src/pages/personas/Persona.svelte   | 62 +++++++++++++++++++++++++++++
 src/routes/user.routes.js           |  6 +++
 src/services/personas.js            |  8 ++--
 14 files changed, 166 insertions(+), 53 deletions(-)
 delete mode 100644 src/lib/Counter.svelte
 create mode 100644 src/pages/personas/Admin.svelte
 delete mode 100644 src/pages/personas/Lista.svelte
 delete mode 100644 src/pages/personas/Modificar.svelte
 delete mode 100644 src/pages/personas/Nueva.svelte
 create mode 100644 src/pages/personas/Persona.svelte

diff --git a/src/assets/custom.css b/src/assets/custom.css
index 9f2abfa..ae0eaee 100644
--- a/src/assets/custom.css
+++ b/src/assets/custom.css
@@ -27,6 +27,7 @@ footer>.container>.row { display: block; }
 
 .navbar-bg {
     position: relative;
+    background: #cce0ef;
 }
 .navbar-bg::after {
     position: absolute;
@@ -56,4 +57,18 @@ footer::after {
 }
 
 footer.footer { background: #0A132D; }
-.text-muted { color: #fff !important; }
\ No newline at end of file
+.text-muted { color: #fff !important; }
+
+input:required:invalid,
+select:required:invalid,
+textarea:required:invalid
+{
+    border-color: var(--bs-danger);
+}
+
+input:required:valid,
+select:required:valid,
+textarea:required:valid
+{
+    border-color: var(--bs-success);
+}
diff --git a/src/layouts/LayoutGuest.svelte b/src/layouts/LayoutGuest.svelte
index 394cf1a..853316d 100644
--- a/src/layouts/LayoutGuest.svelte
+++ b/src/layouts/LayoutGuest.svelte
@@ -1,3 +1,7 @@
+<svelte:head>
+    <title>Transporte: Acceso</title>
+</svelte:head>
+
 <script>
     import { routes } from '$/routes/guest.routes'
     import { Router, Route, createHistory } from 'svelte-navigator'
diff --git a/src/layouts/LayoutUser.svelte b/src/layouts/LayoutUser.svelte
index 34d9792..63bafc5 100644
--- a/src/layouts/LayoutUser.svelte
+++ b/src/layouts/LayoutUser.svelte
@@ -1,3 +1,7 @@
+<svelte:head>
+    <title>Transporte: Usuario</title>
+</svelte:head>
+
 <script>
     import 'bootstrap/dist/css/bootstrap.min.css'
     import '@adminkit/core/dist/css/app.css'
diff --git a/src/layouts/Sidebar.svelte b/src/layouts/Sidebar.svelte
index a81e713..354a69a 100644
--- a/src/layouts/Sidebar.svelte
+++ b/src/layouts/Sidebar.svelte
@@ -42,6 +42,11 @@
                 <span class="align-middle">Usuarios</span>
             </SideLink>
 
+            <SideLink to="/personas">
+                <i class="align-middle bi bi-people fs-4" />
+                <span class="align-middle">Personas</span>
+            </SideLink>
+
         </ul>
 
     </div>
diff --git a/src/lib/Counter.svelte b/src/lib/Counter.svelte
deleted file mode 100644
index e45f903..0000000
--- a/src/lib/Counter.svelte
+++ /dev/null
@@ -1,10 +0,0 @@
-<script>
-  let count = 0
-  const increment = () => {
-    count += 1
-  }
-</script>
-
-<button on:click={increment}>
-  count is {count}
-</button>
diff --git a/src/pages/comunas/Form.svelte b/src/pages/comunas/Form.svelte
index ababa2f..433295d 100644
--- a/src/pages/comunas/Form.svelte
+++ b/src/pages/comunas/Form.svelte
@@ -28,7 +28,7 @@
 
 <div class="input-group mb-3">
     <div class="input-group-text">Región</div>
-    <select bind:value={form.id_region} class="form-control" required>
+    <select bind:value={form.id_region} class="form-select" required>
         <option value=""></option>
         {#each regiones as region}
             <option value={region.id_region}>{region.nombre_region}</option>
diff --git a/src/pages/personas/Admin.svelte b/src/pages/personas/Admin.svelte
new file mode 100644
index 0000000..fd3e179
--- /dev/null
+++ b/src/pages/personas/Admin.svelte
@@ -0,0 +1,61 @@
+<script>
+    import { Link } from 'svelte-navigator'
+    import Paginate from '$/components/Paginate.svelte'
+    import { getPersonas } from '$/services/personas';
+    let page = 1;
+    let limit = 15;
+    let personas = { results: [], count: 0 };
+
+    $: onPage(page)
+
+    async function onPage(page) {
+        try {
+            const offset = (page - 1) * limit;
+            personas = await getPersonas({ offset, limit })
+        } catch (error) {
+            alert(error.detail || error)
+        }
+    }
+</script>
+
+<h2 class="h3 mb-3">Personas</h2>
+
+<div class="card">
+    <div class="card-header">
+        <Link to='/personas/nuevo' class="btn btn-primary">
+            <i class="bi bi-plus-lg"></i> Nuevo
+        </Link>
+    </div>
+    <div class="card-body">
+        <table class="table table-sm">
+            <thead>
+                <tr>
+                    <th>RUT</th>
+                    <th>Nombres</th>
+                    <th>Apellido 1</th>
+                    <th>Apellido 2</th>
+                    <th>Teléfono</th>
+                </tr>
+            </thead>
+            <tbody>
+                {#each personas.results as p}
+                <tr>
+                    <td><Link to={'/personas/' + p.rut}>{p.rut}-{p.dv}</Link></td>
+                    <td>{p.nombres}</td>
+                    <td>{p.apellido_a}</td>
+                    <td>{p.apellido_b}</td>
+                    <td>{p.fono}</td>
+                </tr>
+                {/each}
+            </tbody>
+        </table>
+    </div>
+    <div class="card-footer">
+        <Paginate
+            offset={(page - 1) / limit}
+            {limit}
+            count={personas.count}
+            on:page={ev => page = ev.detail}
+        />
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/pages/personas/Form.svelte b/src/pages/personas/Form.svelte
index 0bc0074..81a3d36 100644
--- a/src/pages/personas/Form.svelte
+++ b/src/pages/personas/Form.svelte
@@ -27,11 +27,11 @@
 <div class="row">
     <div class="col-md mb-3">
         RUT
-        <input type="text" value={rut} class="form-control" disabled={!es_nuevo} required on:input={onChangeRut}>
+        <input type="text" value={rut} class="form-control" required disabled={!es_nuevo} on:input={onChangeRut}>
     </div>
     <div class="col-md mb-3">
         Tipo Tratamiento
-        <select bind:value={form.id_tipo_tratamiento} class="form-control">
+        <select bind:value={form.id_tipo_tratamiento} class="form-select">
             <option value=""></option>
             {#each tipos_tratamiento as tipo}
             <option value={tipo.id_tipo_tratamiento}>{tipo.tratamiento}</option>
@@ -73,7 +73,7 @@
 <div class="row">
     <div class="col-md mb-3">
         Comuna
-        <select bind:value={form.id_comuna} class="form-control">
+        <select bind:value={form.id_comuna} class="form-select">
             <option value=""></option>
         </select>
     </div>
diff --git a/src/pages/personas/Lista.svelte b/src/pages/personas/Lista.svelte
deleted file mode 100644
index db9ca87..0000000
--- a/src/pages/personas/Lista.svelte
+++ /dev/null
@@ -1,34 +0,0 @@
-<script>
-    import Paginate from '$/components/Paginate.svelte'
-    let page = 1;
-    let limit = 15;
-    let count = 0;
-    let personas = [];
-</script>
-
-<h2 class="h3 mb-3">Personas</h2>
-
-<div class="card">
-    <div class="card-header"><button class="btn btn-outline-primary">Nuevo</button></div>
-    <div class="card-body">
-        <table class="table table-sm">
-            <thead>
-                <tr>
-                    <th>RUT</th>
-                    <th>Nombres</th>
-                    <th>Apellido 1</th>
-                    <th>Apellido 2</th>
-                    <th>Teléfono</th>
-                </tr>
-            </thead>
-        </table>
-    </div>
-    <div class="card-footer">
-        <Paginate
-            offset={(page - 1) / limit}
-            {limit}
-            {count}
-            on:page={ev => page = ev.detail}
-        />
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/pages/personas/Modificar.svelte b/src/pages/personas/Modificar.svelte
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/personas/Nueva.svelte b/src/pages/personas/Nueva.svelte
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/personas/Persona.svelte b/src/pages/personas/Persona.svelte
new file mode 100644
index 0000000..d9b4e92
--- /dev/null
+++ b/src/pages/personas/Persona.svelte
@@ -0,0 +1,62 @@
+<script>
+    import { onMount } from 'svelte'
+    import { storeLayout } from '$/stores/global'
+    import FormPersona from './Form.svelte'
+    import { Link, useParams, useNavigate } from 'svelte-navigator';
+    import { getPersona, createPersona, updatePersona } from '$/services/personas';
+
+    onMount(() => {
+        $storeLayout.showSidebar = false;
+        return () => {
+            $storeLayout.showSidebar = true;
+        }
+    })
+
+    const params = useParams()
+    const navigate = useNavigate()
+    let es_nuevo = true;
+    let form = {}
+
+    $: es_nuevo = !$params.rut
+    $: begin($params)
+
+    async function begin({ rut = null }) {
+        try {
+            if (!rut) return; // si es nuevo, no busco informacion
+            form = await getPersona(rut)
+        } catch (error) {
+            alert(error.detail || error)
+        }
+    }
+
+    async function onSave() {
+        try {
+            if (es_nuevo) {
+                // para crear un usuario, es requerido enviar los datos de la persona ademas.
+                await createPersona(form)
+            } else {
+                await updatePersona(form)
+            }
+            alert('Datos guardados con exito!')
+            navigate('/personas')
+        } catch (error) {
+            alert(error.detail || error)
+        }
+    }
+</script>
+
+<h3 class="h3 mb-3">{es_nuevo ? 'Nuevo Persona': 'Editar Persona'}</h3>
+
+<form action="" on:submit|preventDefault={onSave}>
+    <div class="card">
+        <div class="card-header d-flex">
+            <button type="submit" class="btn btn-primary"><i class="bi bi-save"></i> Guardar</button>
+            <div class="m-auto"></div>
+            <Link to="/personas" class="btn btn-outline-secondary">Volver</Link>
+        </div>
+        <div class="card-body">
+            <h4 class="h4 mb-3">Datos de la persona</h4>
+            <FormPersona bind:form={form} {es_nuevo} />
+        </div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/src/routes/user.routes.js b/src/routes/user.routes.js
index 88203ad..fa52403 100644
--- a/src/routes/user.routes.js
+++ b/src/routes/user.routes.js
@@ -6,6 +6,9 @@ import PageUsuarios from '$/pages/usuarios/Admin.svelte'
 import PageUsuarioCreate from '$/pages/usuarios/Usuario.svelte'
 import PageUsuarioModifica from '$/pages/usuarios/Usuario.svelte'
 import PageComunas from '$/pages/comunas/Admin.svelte'
+import PagePersonas from '$/pages/personas/Admin.svelte'
+import PagePersonaCreate from '$/pages/personas/Persona.svelte'
+import PagePersonaModifica from '$/pages/personas/Persona.svelte'
 
 export const routes = [
     { path: '/', component: PageHome },
@@ -15,5 +18,8 @@ export const routes = [
     { path: '/usuarios/nuevo', component: PageUsuarioCreate },
     { path: '/usuarios/:login', component: PageUsuarioModifica },
     { path: '/comunas', component: PageComunas },
+    { path: '/personas', component: PagePersonas },
+    { path: '/personas/nuevo', component: PagePersonaCreate },
+    { path: '/personas/:rut', component: PagePersonaModifica },
     { path: '*', component: PageError },
 ]
\ No newline at end of file
diff --git a/src/services/personas.js b/src/services/personas.js
index f716d04..cff1cf7 100644
--- a/src/services/personas.js
+++ b/src/services/personas.js
@@ -6,7 +6,7 @@ export async function getPersonas(params) {
     const res = await fetch(`${base}/personas/${query}`, {
         headers: { "Authorization": `Bearer ${getToken()}`, "Content-Type": "application/json" }
     })
-    if (!res.ok) throw await res.json()
+    if (!res.ok) throw await res.text()
     return res.json()
 }
 
@@ -14,7 +14,7 @@ export async function getPersona(rut) {
     const res = await fetch(`${base}/personas/${rut}/`, {
         headers: { "Authorization": `Bearer ${getToken()}`, "Content-Type": "application/json" }
     })
-    if (!res.ok) throw await res.json()
+    if (!res.ok) throw await res.text()
     return res.json()
 }
 
@@ -24,7 +24,7 @@ export async function createPersona(data) {
         body: JSON.stringify(data),
         headers: { "Authorization": `Bearer ${getToken()}`, "Content-Type": "application/json" }
     })
-    if (!res.ok) throw await res.json()
+    if (!res.ok) throw await res.text()
     return res.json()
 }
 
@@ -34,6 +34,6 @@ export async function updatePersona({ rut: id = null,  ...data }) {
         body: JSON.stringify(data),
         headers: { "Authorization": `Bearer ${getToken()}`, "Content-Type": "application/json" }
     })
-    if (!res.ok) throw await res.json()
+    if (!res.ok) throw await res.text()
     return res.json()
 }
\ No newline at end of file