From 3934519a7769ee1737c8876e676e661ca534a9e4 Mon Sep 17 00:00:00 2001 From: Francisco Sandoval Date: Wed, 1 Nov 2023 09:53:29 -0300 Subject: [PATCH] se agrega mantenedor de rutas y paradero-servicios en mapa --- src/layouts/Sidebar.svelte | 6 +- src/pages/lineas/Home.svelte | 35 ---- src/pages/mapas/FormParadero.svelte | 2 - .../mapas/FormParaderoDispositivos.svelte | 2 +- src/pages/mapas/FormParaderoServicios.svelte | 95 +++++++++- src/pages/mapas/OffcanvasParadero.svelte | 2 +- src/pages/rutas/FormRuta.svelte | 164 ++++++++++++++++++ src/pages/rutas/Home.svelte | 39 +++++ src/pages/rutas/ModalFormRuta.svelte | 62 +++++++ src/pages/rutas/ModalRutas.svelte | 19 ++ src/pages/rutas/TableRutas.svelte | 102 +++++++++++ src/routes/user.routes.js | 4 +- src/services/letreros_lur.js | 2 +- src/services/lineas.js | 2 +- src/services/paraderos.js | 30 ++++ 15 files changed, 515 insertions(+), 51 deletions(-) delete mode 100644 src/pages/lineas/Home.svelte create mode 100644 src/pages/rutas/FormRuta.svelte create mode 100644 src/pages/rutas/Home.svelte create mode 100644 src/pages/rutas/ModalFormRuta.svelte create mode 100644 src/pages/rutas/ModalRutas.svelte create mode 100644 src/pages/rutas/TableRutas.svelte diff --git a/src/layouts/Sidebar.svelte b/src/layouts/Sidebar.svelte index 760db18..6098186 100644 --- a/src/layouts/Sidebar.svelte +++ b/src/layouts/Sidebar.svelte @@ -49,9 +49,9 @@ Aplicaciones - - - Rutas de Buses + + + Servicios de Buses diff --git a/src/pages/lineas/Home.svelte b/src/pages/lineas/Home.svelte deleted file mode 100644 index 684b55f..0000000 --- a/src/pages/lineas/Home.svelte +++ /dev/null @@ -1,35 +0,0 @@ - - -Rutas de Buses - -
-
- -
-
- - - - ID - Operador - LUR - Dirección - - - - - - - - - - - -
-
-
\ No newline at end of file diff --git a/src/pages/mapas/FormParadero.svelte b/src/pages/mapas/FormParadero.svelte index 4b29bef..9a12709 100644 --- a/src/pages/mapas/FormParadero.svelte +++ b/src/pages/mapas/FormParadero.svelte @@ -1,6 +1,4 @@

Servicios

+ +
+ + {#if loading} +
+ + Cargando información +
+ {/if} +
    -
  • Servicio 1
    • -
  • Servicio 2
    • -
  • Servicio 3
    • -
  • Servicio 4
    • + {#each servicios as servicio} +
  • + onEliminarRuta(servicio)}> + + +
    +
    {servicio.nombre_operador}
    + Destino: {servicio.route_long_name} +
    + {servicio.route_short_name} +
    • + {/each}
-
\ No newline at end of file + + + onAgregarRuta(ev.detail)} + on:close={() => showModalRutas = false} +/> \ No newline at end of file diff --git a/src/pages/mapas/OffcanvasParadero.svelte b/src/pages/mapas/OffcanvasParadero.svelte index 3e8e903..96254c4 100644 --- a/src/pages/mapas/OffcanvasParadero.svelte +++ b/src/pages/mapas/OffcanvasParadero.svelte @@ -35,7 +35,7 @@
Icono de Paradero - Paradero + Paradero #{parada?.id_paradero} {parada?.location}
+ + + \ No newline at end of file diff --git a/src/pages/rutas/ModalRutas.svelte b/src/pages/rutas/ModalRutas.svelte new file mode 100644 index 0000000..f32d74d --- /dev/null +++ b/src/pages/rutas/ModalRutas.svelte @@ -0,0 +1,19 @@ + + +
+ dispatch('close')}> + onSelect(ev.detail)} /> + +
\ No newline at end of file diff --git a/src/pages/rutas/TableRutas.svelte b/src/pages/rutas/TableRutas.svelte new file mode 100644 index 0000000..34632b9 --- /dev/null +++ b/src/pages/rutas/TableRutas.svelte @@ -0,0 +1,102 @@ + + +
+
+
+
+ +
+
+
+
Operador
+ +
+
+
+
+
+ + + + ID + Operador + LUR + Dirección + + + + {#each lineas.results as linea} + + onSelect(linea)}>{linea.id_linea} + {getNombreOperador(linea.id_operador)} + {linea.route_short_name} + {linea.route_long_name} + + {/each} + + +
+
+ offset = (ev.detail - 1) * limit} + /> +
+
\ No newline at end of file diff --git a/src/routes/user.routes.js b/src/routes/user.routes.js index 6b14036..537f90b 100644 --- a/src/routes/user.routes.js +++ b/src/routes/user.routes.js @@ -14,7 +14,7 @@ import PageMapaRutas from '$/pages/mapas/Rutas.svelte' import PageRoles from '$/pages/roles/Admin.svelte' import PageRolesyAplicaciones from '$/pages/rolesaplicaciones/Admin.svelte' import PageParaderos from '$/pages/paraderos/Home.svelte' -import PageLineas from "$/pages/lineas/Home.svelte"; +import PageRutas from "$/pages/rutas/Home.svelte"; export const routes = [ { path: '/', component: PageHome }, @@ -32,6 +32,6 @@ export const routes = [ { path: '/mapas/paraderos', component: PageMapaParaderos }, { path: '/mapas/rutas', component: PageMapaRutas }, { path: '/paraderos', component: PageParaderos }, - { path: '/lineas', component: PageLineas }, + { path: '/rutas', component: PageRutas }, { path: '*', component: PageError }, ] \ No newline at end of file diff --git a/src/services/letreros_lur.js b/src/services/letreros_lur.js index 69e249e..accb4db 100644 --- a/src/services/letreros_lur.js +++ b/src/services/letreros_lur.js @@ -44,5 +44,5 @@ export async function deleteLetreroLUR(id) { headers: { "Authorization": `Bearer ${getToken()}`, "Content-Type": "application/json" } }) if (!res.ok) throw await res.text() - return res.json() + return res.text() } diff --git a/src/services/lineas.js b/src/services/lineas.js index 66fd3ac..c536415 100644 --- a/src/services/lineas.js +++ b/src/services/lineas.js @@ -28,7 +28,7 @@ export async function createLinea(data) { return res.json() } -export async function updateLinea({ id_paradero: id = null, ...data }) { +export async function updateLinea({ id_linea: id = null, ...data }) { const res = await fetch(`${base}/lineas/${id}/`, { method: 'PATCH', body: JSON.stringify(data), diff --git a/src/services/paraderos.js b/src/services/paraderos.js index 600f607..f943043 100644 --- a/src/services/paraderos.js +++ b/src/services/paraderos.js @@ -81,4 +81,34 @@ export async function deleteParaderoImagen(id_paradero_imagen) { }) if (!res.ok) throw await res.text() return res.text() +} + + + +export async function getLineasParadero(id_paradero) { + const res = await fetch(`${base}/paraderos-linea/?id_paradero=${id_paradero}`, { + headers: { "Authorization": `Bearer ${getToken()}` } + }) + if (!res.ok) throw await res.text() + return res.json() +} + + +export async function createLineaParadero(id_paradero, id_linea) { + const res = await fetch(`${base}/paraderos-linea/`, { + method: 'POST', + body: JSON.stringify({ id_paradero, id_linea }), + headers: { "Authorization": `Bearer ${getToken()}`, "Content-Type": "application/json" } + }) + if (!res.ok) throw await res.text() + return res.json() +} + +export async function deleteLineaParadero(id_paradero_linea) { + const res = await fetch(`${base}/paraderos-linea/${id_paradero_linea}/`, { + method: 'DELETE', + headers: { "Authorization": `Bearer ${getToken()}` } + }) + if (!res.ok) throw await res.text() + return res.text() } \ No newline at end of file