diff --git a/package.json b/package.json index 1949780..11147f5 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "history": "^5.3.0", "svelte-navigator": "^3.2.2", "svelte-pagination": "^0.0.1", - "svelte-qrcode": "^1.0.0" + "svelte-qrcode": "^1.0.0", + "chart.js": "^3.7.0" } } diff --git a/src/layouts/Footer.svelte b/src/layouts/Footer.svelte index 04476da..dea5356 100644 --- a/src/layouts/Footer.svelte +++ b/src/layouts/Footer.svelte @@ -3,16 +3,16 @@

- - . - © + +

diff --git a/src/layouts/Sidebar.svelte b/src/layouts/Sidebar.svelte index 6710986..a66a6b1 100644 --- a/src/layouts/Sidebar.svelte +++ b/src/layouts/Sidebar.svelte @@ -48,6 +48,13 @@ Listado Archivos GTFS + +
  • Reportes
    • + + + + Itinerario +
  • Mantenedores
    • diff --git a/src/pages/gtfs_archivo/Admin.svelte b/src/pages/gtfs_archivo/Admin.svelte index 40109c7..8ae8d54 100644 --- a/src/pages/gtfs_archivo/Admin.svelte +++ b/src/pages/gtfs_archivo/Admin.svelte @@ -123,6 +123,12 @@ {#if ordering === '-status'}{/if} + + onOrderBy('valid_from')}>Inico Vigencia + {#if ordering === 'status'}{/if} + {#if ordering === '-status'}{/if} + + onOrderBy('vigente')}>Vigente {#if ordering === 'vigente'}{/if} @@ -144,6 +150,7 @@ {app.created} {app.status} + {app.valid_from} {app.vigente ? '✅':'🚫'} {/each} diff --git a/src/pages/mapas/FiltroRutas copy.svelte b/src/pages/mapas/FiltroRutas copy.svelte new file mode 100644 index 0000000..31a5556 --- /dev/null +++ b/src/pages/mapas/FiltroRutas copy.svelte @@ -0,0 +1,104 @@ + + +
    +
    + +
    +
    Operador
    + +
    + +
    +
    Linea
    + +
    + +
    +
    + +
    + + +
    + +
    + + +
    + + {#if loading} + + {/if} + +
    +
    diff --git a/src/pages/reportes/Itinerario.svelte b/src/pages/reportes/Itinerario.svelte new file mode 100644 index 0000000..5bc35d0 --- /dev/null +++ b/src/pages/reportes/Itinerario.svelte @@ -0,0 +1,63 @@ + + +
    +
    +
    +
    Operador
    + +
    +
    +
    + {#if loading} + + {/if} +
    +
    + +
    + + +
    +
    + + +
    diff --git a/src/pages/site/BarChartParaderoComuna.svelte b/src/pages/site/BarChartParaderoComuna.svelte new file mode 100644 index 0000000..fe0fc17 --- /dev/null +++ b/src/pages/site/BarChartParaderoComuna.svelte @@ -0,0 +1,32 @@ + + + diff --git a/src/pages/site/CantidadBusesLinea.svelte b/src/pages/site/CantidadBusesLinea.svelte index 5aabe88..949a8cc 100644 --- a/src/pages/site/CantidadBusesLinea.svelte +++ b/src/pages/site/CantidadBusesLinea.svelte @@ -74,7 +74,7 @@
    -
    Buses en recorrido por línea
    +
    Buses en recorrido por ruta
    diff --git a/src/pages/site/CantidadLineas.svelte b/src/pages/site/CantidadLineas.svelte index 909dacc..df11d7e 100644 --- a/src/pages/site/CantidadLineas.svelte +++ b/src/pages/site/CantidadLineas.svelte @@ -18,7 +18,7 @@
    -
    Cantidad de Líneas
    +
    Cantidad de Rutas
    diff --git a/src/pages/site/CantidadParaderosComuna.svelte b/src/pages/site/CantidadParaderosComuna.svelte index efa5a74..32645f3 100644 --- a/src/pages/site/CantidadParaderosComuna.svelte +++ b/src/pages/site/CantidadParaderosComuna.svelte @@ -1,32 +1,47 @@ + +
    -
    -
    -
    Paraderos por comuna
    -
    - -
    -
    - -
    +
    Paraderos por Comuna
    +
    +
    +
    -

    2.382

    - +
    + + + + + + - - - - - - - - - - - - + {#each comunasCounts as { id_comuna__nombre_comuna, total }} + + + + + {/each}
    ComunaTotal Paraderos
    Chrome4306
    Firefox3801
    IE1689
    {id_comuna__nombre_comuna}{total}
    -
    \ No newline at end of file +
    diff --git a/src/pages/site/Home.svelte b/src/pages/site/Home.svelte index bacdfc9..c612d85 100644 --- a/src/pages/site/Home.svelte +++ b/src/pages/site/Home.svelte @@ -15,7 +15,7 @@ Análisis de datos +>Resumen de datos
    diff --git a/src/routes/user.routes.js b/src/routes/user.routes.js index 8c19f43..77a8120 100644 --- a/src/routes/user.routes.js +++ b/src/routes/user.routes.js @@ -21,6 +21,7 @@ import PageRutas from "$/pages/rutas/Home.svelte"; import { getPermisosApp } from '$/services/usuarios' import { storePermisos } from '$/stores/global' import PageTipoCargo from '$/pages/tipo_cargo/Admin.svelte' +import PageReporteItinerario from '$/pages/reportes/Itinerario.svelte' export const routes_base = [ { path: '/', component: PageHome, public: true }, @@ -43,6 +44,7 @@ export const routes_base = [ { path: '/paraderos', component: PageParaderos }, { path: '/rutas', component: PageRutas }, { path: '/tipo-cargo', component: PageTipoCargo }, + { path: '/reporte/itinerario', component: PageReporteItinerario }, { path: '*', component: PageError, public: true }, ]; diff --git a/src/services/paraderos.js b/src/services/paraderos.js index 269e489..9112a17 100644 --- a/src/services/paraderos.js +++ b/src/services/paraderos.js @@ -132,4 +132,14 @@ export async function getCount(params) { }) if (!res.ok) throw await res.text() return res.json() +} + + +export async function getCountByComuna(params) { + const query = !params ? '' : '?' + (new URLSearchParams(params).toString()); + const res = await fetch(`${base}/paraderos/count_by_comuna/${query}`, { + headers: { "Authorization": `Bearer ${getToken()}`, "Content-Type": "application/json" } + }); + if (!res.ok) throw new Error(await res.text()); + return res.json(); } \ No newline at end of file