Merge pull request #51 from No-Country-simulation/deyvicz

--someUpdates

Author: DVTecno

FrontEnd/react-app/src/assets/enviar_notificaciones.webp

@@ -22,10 +22,10 @@ import logo from "../assets/logoDonorinoSchoolBlack.webp";
 import btnHistorial from "../assets/tu_historial_academico.webp";
 import btnRendimiento from "../assets/tu_rendimiento.webp";
 import btnMensajes from "../assets/tus_mensajes.webp";
-import ViewEvaluations from "./student/ViewEvaluations";
 import ViewNotifications from "./student/ViewNotifications";
 import "./Dashboard.css";
 import AcademicRecord from "./student/ViewAcademicRecord";
+import ViewEvaluationsByStudent from "./student/ViewEvaluationsByStudent";
 
 const TeacherDashboard = () => {
   const [name, setName] = useState("");
@@ -164,7 +164,7 @@ const TeacherDashboard = () => {
             <ModalCloseButton />
             <ModalBody overflowY="auto">
               {/* Contenido del modal de Rendimiento */}
-              <ViewEvaluations />
+              <ViewEvaluationsByStudent />
             </ModalBody>
             <ModalFooter>
               <Button colorScheme="orange" onClick={onRendimientoClose}>

FrontEnd/react-app/src/assets/historial_academico.webp

@@ -20,13 +20,14 @@ import {
 import React, { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import logo from "../assets/logoDonorinoSchoolBlack.webp";
-import btnHistorial from "../assets/tu_historial_academico.webp";
-import btnRendimiento from "../assets/tu_rendimiento.webp";
-import btnMensajes from "../assets/tus_mensajes.webp";
+import btnHistorial from "../assets/historial_academico.webp";
+import btnRendimiento from "../assets/rendimiento.webp";
+import btnEnviar from "../assets/enviar_notificaciones.webp";
+import btnRecibir from "../assets/recibir_notificaciones.webp";
 import "./Dashboard.css";
-import RegisterEvaluations from "./teacher/RegisterEvaluations";
-import SendNotifications from "./teacher/sendNotifications";
 import AcademicRecord from "./teacher/AcademicRecord";
+import RegisterEvaluations from "./teacher/RegisterEvaluations";
+import SendNotifications from "./teacher/SendNotifications";
 
 const TeacherDashboard = () => {
   const [name, setName] = useState("");
@@ -110,8 +111,16 @@ const TeacherDashboard = () => {
           </a>
           <a href="#" onClick={onMensajesOpen}>
             <Image
-              src={btnMensajes}
-              alt="Mensajes y Notificaciones"
+              src={btnEnviar}
+              alt="Enviar Notificaciones"
+              className="option-img"
+            />
+          </a>
+          {/* Agregar evento OnClick */}
+          <a href="#">
+            <Image
+              src={btnRecibir}
+              alt="Recibir Notificaciones"
               className="option-img"
             />
           </a>

FrontEnd/react-app/src/assets/recibir_notificaciones.webp

@@ -13,7 +13,7 @@ import {
   Flex,
   useBreakpointValue,
 } from "@chakra-ui/react";
-import { verifyChildByDni } from "../../services/adminService";
+import { verifyStudentByParentDni } from "../../services/teacherService"; // Importa el nuevo servicio
 
 const AcademicRecord = () => {
   const [studentInfo, setStudentInfo] = useState({
@@ -55,17 +55,17 @@ const AcademicRecord = () => {
   useEffect(() => {
     const dni = sessionStorage.getItem("dni");
     if (dni) {
-      verifyChildByDni(dni)
+      verifyStudentByParentDni(dni) // Usa el nuevo servicio
         .then((data) => {
           // Suponiendo que la respuesta contiene firstName y lastName
           setStudentInfo({
             firstName: data.firstName || "No disponible",
             lastName: data.lastName || "No disponible",
-            dni: dni,
+            dniStudent: data.dni,
           });
         })
         .catch((err) => {
-          console.error("Error al verificar el DNI:", err);
+          console.error("Error al verificar el estudiante:", err);
         });
     }
   }, []);
@@ -79,7 +79,7 @@ const AcademicRecord = () => {
         boxShadow="0 4px 8px rgba(0, 0, 0, 0.9)"
       >
         <Heading as="h1" mb={6} textAlign="center" color="orange.500">
-          Historial Academico
+          Historial Académico
         </Heading>
 
         <Box mb={6} p={4} borderWidth={1} borderRadius="md">
@@ -91,7 +91,7 @@ const AcademicRecord = () => {
               <strong>Apellido:</strong> {studentInfo.lastName}
             </Text>
             <Text>
-              <strong>DNI:</strong> {studentInfo.dni}
+              <strong>DNI:</strong> {studentInfo.dniStudent}
             </Text>
           </Flex>
         </Box>

FrontEnd/react-app/src/assets/rendimiento.webp

@@ -14,7 +14,7 @@ import {
   Flex,
   useBreakpointValue,
 } from "@chakra-ui/react";
-import { verifyChildByDni } from "../../services/adminService";
+import { verifyStudentByParentDni } from "../../services/teacherService"; // Asegúrate de que la ruta sea correcta
 
 const ViewEvaluations = () => {
   const [evaluations, setEvaluations] = useState([]);
@@ -23,23 +23,26 @@ const ViewEvaluations = () => {
   const [studentInfo, setStudentInfo] = useState({
     firstName: "",
     lastName: "",
-    dni: "",
+    studentDni: "", // Cambiado el nombre de dni a studentDni
   });
 
   const isMobile = useBreakpointValue({ base: true, md: false });
 
   useEffect(() => {
-    const dni = sessionStorage.getItem("dni");
+    const dniParent = sessionStorage.getItem("dni"); // Cambiado a dniParent
 
-    if (dni) {
-      verifyChildByDni(dni)
+    if (dniParent) {
+      // Verificando dniParent
+      verifyStudentByParentDni(dniParent) // Usando dniParent aquí
         .then((data) => {
+          console.log("Datos del estudiante:", data); // Consola para verificar los datos
           setStudentInfo({
             firstName: data.firstName || "No disponible",
             lastName: data.lastName || "No disponible",
-            dni: dni,
+            studentDni: data.dni || "No disponible", // Suponiendo que el DNI del estudiante está aquí
           });
-          fetchEvaluations(dni);
+          // Aquí usamos el DNI del estudiante
+          fetchEvaluations(data.dni); // Usando el DNI del estudiante
         })
         .catch((err) => {
           console.error("Error al verificar el DNI:", err);
@@ -52,10 +55,11 @@ const ViewEvaluations = () => {
     }
   }, []);
 
-  const fetchEvaluations = async (dni) => {
+  const fetchEvaluations = async (studentDni) => {
+    // Cambiado a studentDni
     setLoading(true);
     try {
-      const data = await getEvaluationsByDni(dni);
+      const data = await getEvaluationsByDni(studentDni); // Usando studentDni aquí
       console.log("Data received:", data);
       setEvaluations(data);
     } catch (error) {
@@ -87,7 +91,8 @@ const ViewEvaluations = () => {
               <strong>Apellido:</strong> {studentInfo.lastName}
             </Text>
             <Text>
-              <strong>DNI:</strong> {studentInfo.dni}
+              <strong>DNI:</strong> {studentInfo.studentDni}{" "}
+              {/* Usando el nuevo nombre */}
             </Text>
           </Flex>
         </Box>

FrontEnd/react-app/src/pages/StudentDashboard.jsx

@@ -16,10 +16,12 @@ import {
 } from "@chakra-ui/react";
 import { verifyChildByDni } from "../../services/adminService";
 
-const ViewEvaluations = () => {
-  const [evaluations, setEvaluations] = useState([]);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState(null);
+const ViewEvaluationsByStudent = () => {
+  const [state, setState] = useState({
+    evaluations: [],
+    loading: true,
+    error: null,
+  });
   const [studentInfo, setStudentInfo] = useState({
     firstName: "",
     lastName: "",
@@ -43,26 +45,33 @@ const ViewEvaluations = () => {
         })
         .catch((err) => {
           console.error("Error al verificar el DNI:", err);
-          setError("Error al verificar el DNI.");
-          setLoading(false);
+          setState({
+            evaluations: [],
+            loading: false,
+            error: "Error al verificar el DNI.",
+          });
         });
     } else {
-      setError("DNI no encontrado en sessionStorage.");
-      setLoading(false);
+      setState({
+        evaluations: [],
+        loading: false,
+        error: "DNI no encontrado en sessionStorage.",
+      });
     }
   }, []);
 
   const fetchEvaluations = async (dni) => {
-    setLoading(true);
+    setState((prevState) => ({ ...prevState, loading: true }));
     try {
       const data = await getEvaluationsByDni(dni);
-      console.log("Data received:", data);
-      setEvaluations(data);
+      setState({ evaluations: data, loading: false, error: null });
     } catch (error) {
       console.error("Error fetching evaluations:", error);
-      setError(error.message || "Error al obtener las evaluaciones");
-    } finally {
-      setLoading(false);
+      setState({
+        evaluations: [],
+        loading: false,
+        error: error.message || "Error al obtener las evaluaciones",
+      });
     }
   };
 
@@ -92,14 +101,16 @@ const ViewEvaluations = () => {
           </Flex>
         </Box>
 
-        {loading && <Text textAlign="center">Cargando evaluaciones...</Text>}
-        {error && (
+        {state.loading && (
+          <Text textAlign="center">Cargando evaluaciones...</Text>
+        )}
+        {state.error && (
           <Text color="red.500" textAlign="center">
-            {error}
+            {state.error}
           </Text>
         )}
 
-        {!loading && !error && evaluations.length > 0 && (
+        {!state.loading && !state.error && state.evaluations.length > 0 && (
           <Table
             variant="simple"
             size={isMobile ? "sm" : "md"}
@@ -110,15 +121,17 @@ const ViewEvaluations = () => {
           >
             <Thead bg="orange.400">
               <Tr>
-                <Th>Año</Th>
-                <Th>Trimestre</Th>
-                <Th>Materia</Th>
-                <Th>Retroalimentación</Th>
+                <Th colorScheme="whiteAlpha">Año</Th>
+                <Th colorScheme="whiteAlpha">Trimestre</Th>
+                <Th colorScheme="whiteAlpha">Materia</Th>
+                <Th colorScheme="whiteAlpha">Retroalimentación</Th>
               </Tr>
             </Thead>
             <Tbody bg="white">
-              {evaluations.map((evaluation, index) => (
-                <Tr key={index}>
+              {state.evaluations.map((evaluation) => (
+                <Tr key={evaluation.id}>
+                  {" "}
+                  {/* Cambia 'evaluation.id' por el campo único real */}
                   <Td>{evaluation.year}</Td>
                   <Td>{evaluation.trimester}</Td>
                   <Td>{evaluation.subject}</Td>
@@ -128,12 +141,12 @@ const ViewEvaluations = () => {
             </Tbody>
           </Table>
         )}
-        {!loading && !error && evaluations.length === 0 && (
+        {!state.loading && !state.error && state.evaluations.length === 0 && (
           <Text textAlign="center">No hay evaluaciones para mostrar.</Text>
         )}
       </Box>
     </Container>
   );
 };
 
-export default ViewEvaluations;
+export default ViewEvaluationsByStudent;