From 9752ccce6bfd6fbe18580e58fcbd2058abea11e0 Mon Sep 17 00:00:00 2001 From: IO <320154041@pcpuma.acatlan.unam.mx> Date: Wed, 4 Mar 2026 18:53:49 -0600 Subject: [PATCH] fixed table againd --- app/(private)/AsignacionMesas/TableMesas.tsx | 10 +++++++++- app/(private)/AsignacionMesas/page.tsx | 2 +- app/Components/AsignacionMesas.tsx | 4 +++- app/Components/CheckBoxEquipo.tsx | 2 +- app/Components/CheckBoxMesa.tsx | 15 ++++++++++----- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/app/(private)/AsignacionMesas/TableMesas.tsx b/app/(private)/AsignacionMesas/TableMesas.tsx index eeaf1aa..c6edf40 100644 --- a/app/(private)/AsignacionMesas/TableMesas.tsx +++ b/app/(private)/AsignacionMesas/TableMesas.tsx @@ -37,7 +37,15 @@ export default function TableMesas() { }, []); if (loading) { - return

Cargando mesas...

; + return
+ + + + + + +
Cargando mesas...
+
} return ( diff --git a/app/(private)/AsignacionMesas/page.tsx b/app/(private)/AsignacionMesas/page.tsx index 6cb4a08..abc75b3 100644 --- a/app/(private)/AsignacionMesas/page.tsx +++ b/app/(private)/AsignacionMesas/page.tsx @@ -100,7 +100,7 @@ export default async function Page(props: { ]} />
- +
diff --git a/app/Components/AsignacionMesas.tsx b/app/Components/AsignacionMesas.tsx index ad57293..07149c7 100644 --- a/app/Components/AsignacionMesas.tsx +++ b/app/Components/AsignacionMesas.tsx @@ -4,10 +4,11 @@ import { useEffect, useState } from "react"; import { envConfig } from "@/app/lib/config"; import { getEquipoByCount } from "../lib/getEquipoByCount"; import { getMesaByCount } from "../lib/getMesaByCount"; +import { useRouter } from "next/navigation"; + import Swal from "sweetalert2"; import axios from "axios"; import Cookies from "js-cookie"; -import { useRouter } from "next/navigation"; type Props = { inscripcion: any[]; @@ -130,6 +131,7 @@ export default function AsignacionMesas({ idCuenta, inscripcion }: Props) { setBitacora([]); router.refresh(); + setError("Mesa") Swal.fire({ title: "Mesa asignada correctamente!", icon: "success", diff --git a/app/Components/CheckBoxEquipo.tsx b/app/Components/CheckBoxEquipo.tsx index aaf80ef..a66b2de 100644 --- a/app/Components/CheckBoxEquipo.tsx +++ b/app/Components/CheckBoxEquipo.tsx @@ -37,7 +37,7 @@ interface Props { } export default function CheckBoxEquipo({ numAcount, machine }: Props) { - const [modo, setModo] = useState<"Equipo" | "Cuenta">("Cuenta"); + const [modo, setModo] = useState<"Equipo" | "Cuenta">("Equipo"); const [bitacoraCuenta, setBitacoraCuenta] = useState(null); const [bitacoraEquipo, setBitacoraEquipo] = useState(null); diff --git a/app/Components/CheckBoxMesa.tsx b/app/Components/CheckBoxMesa.tsx index 9999675..ccf38b2 100644 --- a/app/Components/CheckBoxMesa.tsx +++ b/app/Components/CheckBoxMesa.tsx @@ -12,6 +12,7 @@ import SearchMesa from "./SearchMesa"; import axios from "axios"; import Swal from "sweetalert2"; import Cookies from "js-cookie"; +import { error } from "console"; interface props { numAcount: string | null; @@ -19,7 +20,7 @@ interface props { } export default function CheckBoxMesa({ numAcount, table }: props) { - const [modo, setModo] = useState<"Mesa" | "Cuenta" | null>("Cuenta"); + const [modo, setModo] = useState<"Mesa" | "Cuenta" | null>("Mesa"); const [bitacoraMesa, setBitacoraMesa] = useState(null); const [bitacoraCuenta, setBitacoraCuenta] = useState(null); const [tiempoRestante, setTiempoRestante] = useState(""); @@ -33,6 +34,7 @@ export default function CheckBoxMesa({ numAcount, table }: props) { const router = useRouter(); const pathname = usePathname(); const searchParams = useSearchParams(); + const params = new URLSearchParams(searchParams.toString()); const fetchByCuenta = async (idCuenta: number) => { const result = await getMesaByCount(idCuenta); @@ -64,9 +66,11 @@ export default function CheckBoxMesa({ numAcount, table }: props) { if (isNaN(idCuenta)) return; fetchByCuenta(idCuenta); - }, [numAcount]); + }, [numAcount, modo]); useEffect(() => { + params.delete("numAcount"); + router.push(`${pathname}?${params.toString()}`); if (modo !== "Mesa" || !table) return; const idEquipo = parseInt(table); if (isNaN(idEquipo)) return; @@ -132,8 +136,6 @@ export default function CheckBoxMesa({ numAcount, table }: props) { icon: "success", }); - const params = new URLSearchParams(searchParams.toString()); - if (modo === "Cuenta" && numAcount) { fetchByCuenta(parseInt(numAcount)); params.delete("numAcount"); @@ -150,6 +152,8 @@ export default function CheckBoxMesa({ numAcount, table }: props) { setBitacoraMesa(null); setBitacoraCuenta(null); + setErrorMesa('Alumno sin mesa'); + } catch (error) { Swal.fire({ title: "Error al cancelar tiempo", @@ -211,9 +215,10 @@ export default function CheckBoxMesa({ numAcount, table }: props) { )} } + {modo === "Mesa" && <> - +

{errorMesa}

{bitacoraMesa && tiempoRestante !== "agotado" && (