diff --git a/FrontAdmin/src/API/DatosAlumnosV2.ts b/FrontAdmin/src/API/DatosAlumnosV2.ts
deleted file mode 100644
index d63628f..0000000
--- a/FrontAdmin/src/API/DatosAlumnosV2.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import Cookies from 'js-cookie';
-
-export const FetchAlumnos = async () => {
-  try {
-    const token = Cookies.get('access_token');
-
-    const response = await fetch('http://localhost:8000/alumnos/', {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${token}`,
-      },
-    });
-
-    if (response.ok) {
-      const data = await response.json();
-      return data;
-    } else {
-      throw new Error('Error en la respuesta del servidor');
-    }
-  } catch (error) {
-    throw new Error('Network error: ' + error);
-  }
-};
diff --git a/FrontAdmin/src/API/DetalleAlumno.ts b/FrontAdmin/src/API/DetalleAlumno.ts
deleted file mode 100644
index 7c516aa..0000000
--- a/FrontAdmin/src/API/DetalleAlumno.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import Cookies from 'js-cookie';
-
-export const FetchDetalleAlumno = async (dni) => {
-  try {
-    const token = Cookies.get('access_token');
-
-    const response = await fetch(`http://localhost:8000/alumnos/${dni}/`, {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${token}`,
-      },
-    });
-
-    if (response.ok) {
-      const data = await response.json();
-      return data;
-    } else {
-      throw new Error('Error en la respuesta del servidor');
-    }
-  } catch (error) {
-    throw new Error('Network error: ' + error);
-  }
-};
diff --git a/FrontAdmin/src/API/Materias.ts b/FrontAdmin/src/API/Materias.ts
index 58c3ad5..7a641fa 100644
--- a/FrontAdmin/src/API/Materias.ts
+++ b/FrontAdmin/src/API/Materias.ts
@@ -1,4 +1,3 @@
-
 import Cookies from 'js-cookie';
 const URL= import.meta.env.VITE_URL_DEV;
 
diff --git a/FrontAdmin/src/API/Montos.ts b/FrontAdmin/src/API/Montos.ts
index ba4d0d9..2f0cf7b 100644
--- a/FrontAdmin/src/API/Montos.ts
+++ b/FrontAdmin/src/API/Montos.ts
@@ -28,9 +28,10 @@ export const FetchMontos = async (offset: number, limit:number ) => {
   }
 };
 
-export const createCompromiso = async (compromisoData: any, selectFile: any) => {
+export const createCompromiso = async (compromisoData: any) => {
   try {
     const token = Cookies.get('access_token');
+    console.log(compromisoData);
 
     const response = await fetch(`${URL}/pagos/compromisos/`, {
       method: 'POST',
@@ -43,7 +44,6 @@ export const createCompromiso = async (compromisoData: any, selectFile: any) =>
 
     if (response.ok) {
       const data = await response.json();
-      await loadPDF(data.id_comp_pago ,selectFile);
       return data;
     } else {
       const errorResponse = await response.json();
@@ -53,29 +53,3 @@ export const createCompromiso = async (compromisoData: any, selectFile: any) =>
     throw new Error('Network error: ' + error);
   }
 };
-
-export const loadPDF = async (id :string,file: File) => {
-  try {
-    const token = Cookies.get('access_token');
-
-    const formData = new FormData();
-    formData.append('archivo_pdf', file);
-
-    const response = await fetch(`${URL}/pagos/compromisos/${id}/`, {
-      method: 'PATCH',
-      headers: {
-        Authorization: `Bearer ${token}`,
-      },
-      body: formData,
-    });
-
-    if (response.ok) {
-      const data = await response.json();
-      return data;
-    } else {
-      throw new Error('Error en la respuesta del servidor');
-    }
-  } catch (error) {
-    throw new Error('Network error: ' + error);
-  }
-}
diff --git a/FrontAdmin/src/API/Sysacad.ts b/FrontAdmin/src/API/Sysacad.ts
deleted file mode 100644
index 0d342d3..0000000
--- a/FrontAdmin/src/API/Sysacad.ts
+++ /dev/null
@@ -1,401 +0,0 @@
-const data =
-{
-  "93.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": "Teléfono"
-  },
-  "97.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "98.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "240.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "241.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "242.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "274.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": "Teléfono"
-  },
-  "280.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "281.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "282.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "313.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": "Teléfono"
-  },
-  "314.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": "Teléfono"
-  },
-  "315.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": "Teléfono"
-  },
-  "316.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": "Teléfono"
-  },
-  "340.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "349.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "350.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "410.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "411.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "412.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "490.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "493.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "503.0": {
-    "Apellido y Nombres": null,
-    "Celular": "Celular",
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "504.0": {
-    "Apellido y Nombres": null,
-    "Celular": "Celular",
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "542.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "543.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "544.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "545.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "685.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "686.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "687.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "688.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "701.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "702.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "703.0": {
-    "Apellido y Nombres": "Apellido y Nombres",
-    "Celular": null,
-    "Tel. Resid": null,
-    "Teléfono": null
-  },
-  "712.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": "Teléfono"
-  },
-  "713.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": "Teléfono"
-  },
-  "714.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": "Teléfono"
-  },
-  "715.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": "Teléfono"
-  },
-  "716.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": "Teléfono"
-  },
-  "771.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "772.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "773.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "774.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "775.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "814.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "815.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "816.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-  "817.0": {
-    "Apellido y Nombres": null,
-    "Celular": null,
-    "Tel. Resid": "Tel. Resid",
-    "Teléfono": null
-  },
-        "818.0": {
-            "Apellido y Nombres": null,
-            "Celular": null,
-            "Tel. Resid": "Tel. Resid",
-            "Teléfono": "Teléfono"
-        },
-        "819.0": {
-            "Apellido y Nombres": null,
-            "Celular": null,
-            "Tel. Resid": "Tel. Resid",
-            "Teléfono": "Teléfono"
-        },
-        "820.0": {
-            "Apellido y Nombres": null,
-            "Celular": null,
-            "Tel. Resid": "Tel. Resid",
-            "Teléfono": "Teléfono"
-        },
-        "821.0": {
-            "Apellido y Nombres": null,
-            "Celular": null,
-            "Tel. Resid": "Tel. Resid",
-            "Teléfono": "Teléfono"
-        },
-        "822.0": {
-            "Apellido y Nombres": null,
-            "Celular": null,
-            "Tel. Resid": "Tel. Resid",
-            "Teléfono": "Teléfono"
-        },
-        "861.0": {
-            "Apellido y Nombres": "Apellido y Nombres",
-            "Celular": null,
-            "Tel. Resid": null,
-            "Teléfono": null
-        },
-        "862.0": {
-            "Apellido y Nombres": "Apellido y Nombres",
-            "Celular": null,
-            "Tel. Resid": null,
-            "Teléfono": null
-        },
-        "863.0": {
-            "Apellido y Nombres": "Apellido y Nombres",
-            "Celular": null,
-            "Tel. Resid": null,
-            "Teléfono": null
-        },
-        "864.0": {
-            "Apellido y Nombres": "Apellido y Nombres",
-            "Celular": null,
-            "Tel. Resid": null,
-            "Teléfono": null
-        },
-        "865.0": {
-            "Apellido y Nombres": "Apellido y Nombres",
-            "Celular": null,
-            "Tel. Resid": null,
-            "Teléfono": null
-        },
-        "873.0": {
-            "Apellido y Nombres": "Apellido y Nombres",
-            "Celular": null,
-            "Tel. Resid": null,
-            "Teléfono": null
-        },
-        "874.0": {
-            "Apellido y Nombres": "Apellido y Nombres",
-            "Celular": null,
-            "Tel. Resid": null,
-            "Teléfono": null
-        },
-        "875.0": {
-            "Apellido y Nombres": "Apellido y Nombres",
-            "Celular": null,
-            "Tel. Resid": null,
-            "Teléfono": null
-        },
-        "876.0": {
-            "Apellido y Nombres": "Apellido y Nombres",
-            "Celular": null,
-            "Tel. Resid": null,
-            "Teléfono": null
-        },
-        "882.0": {
-            "Apellido y Nombres": null,
-            "Celular": null,
-            "Tel. Resid": "Tel. Resid",
-            "Teléfono": null
-        },
-        "883.0": {
-            "Apellido y Nombres": null,
-            "Celular": null,
-            "Tel. Resid": "Tel. Resid",
-            "Teléfono": null
-        },
-        "884.0": {
-            "Apellido y Nombres": null,
-            "Celular": null,
-            "Tel. Resid": "Tel. Resid",
-            "Teléfono": null
-        }
-    }
-
-export default data;
\ No newline at end of file
diff --git a/FrontAdmin/src/Context.tsx b/FrontAdmin/src/Context.tsx
index 558beea..550a9a4 100644
--- a/FrontAdmin/src/Context.tsx
+++ b/FrontAdmin/src/Context.tsx
@@ -1,6 +1,5 @@
-import { createContext, useState, ReactNode, useContext, useEffect } from 'react';
+import { createContext, useState, ReactNode, useContext } from 'react';
 import Cookies from 'js-cookie';
-const URL= import.meta.env.VITE_URL_DEV;
 
 interface AuthContextType {
   isAuthenticated: boolean;
@@ -16,59 +15,10 @@ const AuthProvider = ({ children }: { children: ReactNode }) => {
     !Cookies.get('access_token') ? false : true
   );
   const [rolUser, setRolUser] = useState(Cookies.get('username') === 'admin' ? true : false);
-  let refreshTimeout: NodeJS.Timeout;
-
-  const refreshToken = async () => {
-    const refresh = Cookies.get('refresh_token');
-    if (!refresh) {
-      onLogout();
-      return;
-    }
-
-    try {
-      const response = await fetch(`${URL}/users/token/refresh/`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ refresh }),
-      });
-
-      if (response.ok) {
-        console.log('Token refreshed');
-        const data = await response.json();
-        console.log(data);
-        Cookies.set('access_token', data.access);
-        Cookies.set('refresh_token', data.refresh);
-        Cookies.set('access_expiration', data.access_expiration);
-        Cookies.set('refresh_expiration', data.refresh_expiration);
-        TokenRefresh(data.access_expiration);
-      } else {
-        onLogout();
-      }
-    } catch (error) {
-      console.error('Error refreshing token:', error);
-      onLogout();
-    }
-  };
-
-  const TokenRefresh = (accessExpiration: string) => {
-    const expirationTime = new Date(accessExpiration).getTime();
-    const currentTime = new Date().getTime();
-    const timeout = expirationTime - currentTime - 30000; 
-
-    if (timeout > 0) {
-      refreshTimeout = setTimeout(refreshToken, timeout);
-    }
-  };
 
   const onLogin = () => {
     setRolUser(Cookies.get('username') === 'admin' ? true : false);
     setIsAuthenticated(true);
-    const accessExpiration = Cookies.get('access_expiration');
-    if (accessExpiration) {
-      TokenRefresh(accessExpiration);
-    }
     
   };
 
@@ -80,25 +30,9 @@ const AuthProvider = ({ children }: { children: ReactNode }) => {
     Cookies.remove('username');
     console.log('logout');
     setIsAuthenticated(false);
-    if (refreshTimeout) {
-      clearTimeout(refreshTimeout);
-    }
+    
   };
 
-  useEffect(() => {
-    if (isAuthenticated) {
-      const accessExpiration = Cookies.get('access_expiration');
-      if (accessExpiration) {
-        TokenRefresh(accessExpiration);
-      }
-    }
-    return () => {
-      if (refreshTimeout) {
-        clearTimeout(refreshTimeout);
-      }
-    };
-  }, [isAuthenticated]);
-
   return (
     <AuthContext.Provider value={{ isAuthenticated, onLogin, onLogout, rolUser }}>
       {children}
diff --git a/FrontAdmin/src/components/Modal/ModalAgregarMateria.tsx b/FrontAdmin/src/components/Modal/ModalAgregarMateria.tsx
index 701f17a..9796bb8 100644
--- a/FrontAdmin/src/components/Modal/ModalAgregarMateria.tsx
+++ b/FrontAdmin/src/components/Modal/ModalAgregarMateria.tsx
@@ -9,13 +9,9 @@ import {
     Input,
     Button,
     Stack,
-    RadioGroup,
-    Radio,
-    Text,
   } from '@chakra-ui/react';
     import React, { useState } from 'react';
   
-
   interface ModalComponentProps {
     isOpen: boolean;
     onClose: () => void;
@@ -52,47 +48,39 @@ import {
             <ModalCloseButton />
             <ModalBody>
               <Stack gap={2}>
-                <Stack direction="row">
-                  <Input
-                    placeholder='ID Materia'
-                    size='md'
-                    variant="flushed"
-                    value={idMateria}
-                    onChange={(e) => setIdMateria(e.target.value)}
-                  />
-                  <Input
-                    placeholder='Nombre'
-                    size='md'
-                    variant="flushed"
-                    value={nombre}
-                    onChange={(e) => setNombre(e.target.value)}
-                  />
-                </Stack>
-                < Stack direction="row" mt={5} alignItems="center">
-                  <Input
-                    placeholder='Año'
-                    size='md'
-                    w="50%"
-                    variant="flushed"
-                    value={anio_cursada}
-                    onChange={(e) => setAnioCursada(e.target.value)}
-                  />
-                  <Stack direction="column">
-                  <Text>Cuatrimestre</Text>
-                  <RadioGroup  onChange={(value) => setCuatrimestre(value.toString())}>
-                    <Stack direction="row">
-                      <Radio value="1">1</Radio>
-                      <Radio value="2">2</Radio>
-                    </Stack>
-                  </RadioGroup> 
-                  </Stack>
-                </Stack>
+                <Input
+                  placeholder='ID Materia'
+                  size='md'
+                  variant="flushed"
+                  value={idMateria}
+                  onChange={(e) => setIdMateria(e.target.value)}
+                />
+                <Input
+                  placeholder='Nombre'
+                  size='md'
+                  variant="flushed"
+                  value={nombre}
+                  onChange={(e) => setNombre(e.target.value)}
+                />
+                <Input
+                  placeholder='Año'
+                  size='md'
+                  variant="flushed"
+                  value={anio_cursada}
+                  onChange={(e) => setAnioCursada(e.target.value)}
+                />
+                <Input
+                  placeholder='Cuatrimestre'
+                  size='md'
+                  variant="flushed"
+                  value={cuatrimestre}
+                  onChange={(e) => setCuatrimestre(e.target.value)}
+                />  
                 <Input
                   placeholder='Plan'
                   size='md'
                   variant="flushed"
                   value={plan}
-                  mt={5}
                   onChange={(e) => setPlan(e.target.value)}
                 />
               </Stack>
@@ -120,5 +108,4 @@ import {
         </Modal>
       </>
     );
-  }
-
+  }
\ No newline at end of file
diff --git a/FrontAdmin/src/components/Modal/ModalEditarMateria.tsx b/FrontAdmin/src/components/Modal/ModalEditarMateria.tsx
index 0b16976..9edaf99 100644
--- a/FrontAdmin/src/components/Modal/ModalEditarMateria.tsx
+++ b/FrontAdmin/src/components/Modal/ModalEditarMateria.tsx
@@ -11,8 +11,6 @@ import {
     Stack,
     Text,
     Flex,
-    RadioGroup,
-    Radio,
   } from '@chakra-ui/react';
   import React, { useState, useEffect } from 'react';
   
@@ -57,8 +55,7 @@ import {
             <ModalHeader>Editar {materia.nombre}</ModalHeader>
             <ModalCloseButton />
             <ModalBody>
-                <Stack spacing={4}>
-                <Stack direction="row" alignItems="center">
+                <Stack spacing={3}>
                 <Flex direction="column">
                     <Text>ID Materia</Text>
                     <Input
@@ -70,19 +67,17 @@ import {
                         ml={1}
                     />
                 </Flex>
-                <Flex direction="column">
-                  <Text mb={0}>Nombre</Text>
-                  <Input
-                      value={nombre}
-                      placeholder="Nombre"
-                      size='md'
-                      onChange={(e) => setNombre(e.target.value)}
-                      variant = "flushed"
-                      ml={1}
-                  />
+                <Flex direction="column" mt="10px">
+                <Text mb={0}>Nombre</Text>
+                <Input
+                    value={nombre}
+                    placeholder="Nombre"
+                    size='md'
+                    onChange={(e) => setNombre(e.target.value)}
+                    variant = "flushed"
+                    ml={1}
+                />
                 </Flex>
-                </Stack>
-                <Stack direction="row" alignItems="center">
                 <Flex direction="column" mt="10px">
                 <Text mb={0}>Año</Text>
                 <Input
@@ -94,50 +89,51 @@ import {
                     ml={1}
                 />
                 </Flex>
-                <Stack direction="column">
-                  <Text>Cuatrimestre</Text>
-                  <RadioGroup value={cuatrimestre.toString()} onChange={(value) => setCuatrimestre(value)}>
-                    <Stack direction="row">
-                      <Radio value="1">1</Radio>
-                      <Radio value="2">2</Radio>
-                    </Stack>
-                  </RadioGroup> 
-                  </Stack>
-                </Stack>
+                <Flex direction="column" mt="10px">
+                <Text mb={0}>Cuatrimestre</Text>
+                <Input
+                    value={cuatrimestre}
+                    placeholder="Cuatrimestre"
+                    size='md'
+                    onChange={(e) => setCuatrimestre(e.target.value)}
+                    variant = "flushed"
+                    ml={1}
+                />
+                </Flex>
                 <Flex direction="column" mt="10px">
                 <Text  mb={0}>Plan</Text>
                 <Input
-                  value={plan}
-                  placeholder="Plan"
-                  size="md"
-                  onChange={(e) => setPlan(e.target.value)}
-                  variant="flushed"
-                  ml={1}
+                    value={plan}
+                    placeholder="Plan"
+                    size='md'
+                    onChange={(e) => setPlan(e.target.value)}
+                    variant = "flushed"
+                    ml={1}
                 />
-              </Flex>
-            </Stack>
-          </ModalBody>
-          <ModalFooter>
-            <Button
-              colorScheme="blue"
-              mr={3}
-              onClick={handleconfirmar}
-              size="sm"
-            >
-              Aceptar
-            </Button>
-            <Button
-              colorScheme="blue"
-              mr={3}
-              onClick={onClose}
-              variant="light"
-              size="sm"
-            >
-              Cancelar
-            </Button>
-          </ModalFooter>
-        </ModalContent>
-      </Modal>
-    </>
-  );
-}
+                </Flex>
+                </Stack>
+            </ModalBody>
+            <ModalFooter>
+              <Button
+                colorScheme="blue"
+                mr={3}
+                onClick={handleconfirmar}
+                size="sm"
+              >
+                Aceptar
+              </Button>
+              <Button
+                colorScheme="blue"
+                mr={3}
+                onClick={onClose}
+                variant="light"
+                size="sm"
+              >
+                Cancelar
+              </Button>
+            </ModalFooter>
+          </ModalContent>
+        </Modal>
+      </>
+    );
+  }
\ No newline at end of file
diff --git a/FrontAdmin/src/components/Pages/Alumnos/Alumnos.tsx b/FrontAdmin/src/components/Pages/Alumnos/Alumnos.tsx
index 04a4a1a..3a6a73d 100644
--- a/FrontAdmin/src/components/Pages/Alumnos/Alumnos.tsx
+++ b/FrontAdmin/src/components/Pages/Alumnos/Alumnos.tsx
@@ -2,7 +2,6 @@ import { Flex, Box } from '@chakra-ui/react';
 import { createTheme, ThemeProvider } from '@mui/material';
 import Table from '../../Table/Table';
 import { esES } from '@mui/material/locale';
-import { Outlet } from 'react-router-dom';
 
 export default function Alumnos() {
   const lightTheme = createTheme({
@@ -12,7 +11,7 @@ export default function Alumnos() {
   });
   return (
     <ThemeProvider theme={lightTheme}>
-      <Table boolEnableRowSelection={true} />
+      <Table />
     </ThemeProvider>
   );
 }
diff --git a/FrontAdmin/src/components/Pages/Alumnos/SubPages/FichaAlumno.tsx b/FrontAdmin/src/components/Pages/Alumnos/SubPages/FichaAlumno.tsx
deleted file mode 100644
index 6a69303..0000000
--- a/FrontAdmin/src/components/Pages/Alumnos/SubPages/FichaAlumno.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import { useParams } from 'react-router-dom';
-import {
-  Flex,
-  Box,
-  Image,
-  Heading,
-  Text,
-  Spacer,
-  useColorModeValue,
-  Button,
-} from '@chakra-ui/react';
-import { createTheme, ThemeProvider } from '@mui/material';
-import logoUser from '../../../icons/logo-user.png';
-import { useNavigate } from 'react-router-dom';
-import { FetchDetalleAlumno } from '../../../../API/DetalleAlumno.ts';
-import React, { useState, useEffect, useMemo } from 'react';
-import { ArrowLeftIcon, ChevronLeftIcon } from '@chakra-ui/icons';
-
-function FichaAlumno() {
-  const { dni } = useParams();
-  const [alumno, setAlumno] = useState(null); // Define el estado con un valor inicial de null
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState(null);
-  const navigate = useNavigate();
-
-  const handleBackClick = () => {
-    navigate(-1); // Retrocede en el historial de navegación
-  };
-
-  useEffect(() => {
-    const fetchData = async () => {
-      try {
-        const data = await FetchDetalleAlumno(dni);
-        setAlumno(data); // Asegúrate de que `data.results` sea el formato correcto
-      } catch (error) {
-        setError(error);
-        console.error('Error al obtener los datos', error);
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    if (dni) {
-      fetchData();
-    }
-  }, [dni]); // Incluye `dni` como dependencia
-
-  if (loading) {
-    return <Text>Cargando...</Text>;
-  }
-
-  if (error) {
-    return <Text>Error al cargar los datos.</Text>;
-  }
-
-  if (!alumno) {
-    return <Text>No se encontraron datos.</Text>;
-  }
-
-  return (
-    <Flex mt="20px">
-      <Button
-        position="absolute"
-        right="10"
-        color="white"
-        size="sm"
-        onClick={handleBackClick}
-      >
-        <ArrowLeftIcon mr="10px" /> Volver{' '}
-      </Button>
-      <Box borderRight="1px solid #cbd5e0" w="20%" minH="80vh" p="20px">
-        <Flex justifyContent="center" m="20px">
-          <Image src={logoUser} w="120px" />
-        </Flex>
-        <Text color="gray">Apellido y nombre</Text>
-        <Text
-          size="sm"
-          alingText="center"
-          pl="8px"
-          fontWeight="Bold"
-        >{`${alumno.apellido}, ${alumno.nombre}`}</Text>
-        <Text color="gray" mt="10px">
-          Número DNI:
-        </Text>
-        <Text size="sm" pl="8px" fontWeight="semibold">
-          {alumno.dni}
-        </Text>
-        <Text color="gray" mt="10px">
-          Legajo:
-        </Text>
-        <Text size="sm" pl="8px" fontWeight="semibold">
-          {alumno.legajo}
-        </Text>
-        <Text color="gray" mt="10px">
-          Email:
-        </Text>
-        <Text size="sm" pl="8px" fontWeight="semibold">
-          {alumno.email}
-        </Text>
-        <Text color="gray" mt="10px">
-          Celular
-        </Text>
-        <Text size="sm" pl="8px" fontWeight="semibold" mb="20px">
-          {alumno.telefono}
-        </Text>
-
-        <hr></hr>
-
-        <Text color="gray" mt="20px">
-          Compromiso de Pago:{' '}
-        </Text>
-        <Text size="sm" alingText="center" pl="8px" fontWeight="Bold">
-          Firmado
-        </Text>
-        <Text color="gray" mt="10px">
-          Estado:
-        </Text>
-        <Text size="sm" pl="8px" fontWeight="semibold" mb="20px">
-          {alumno.estado}
-        </Text>
-        <Text color="gray" mt="10px">
-          Deuda:
-        </Text>
-        <Text size="sm" pl="8px" fontWeight="semibold" mb="20px">
-          -
-        </Text>
-      </Box>
-    </Flex>
-  );
-}
-
-export default FichaAlumno;
diff --git a/FrontAdmin/src/components/Pages/Configuracion/Configuracion.tsx b/FrontAdmin/src/components/Pages/Configuracion/Configuracion.tsx
index ceddc5e..e13c5d4 100644
--- a/FrontAdmin/src/components/Pages/Configuracion/Configuracion.tsx
+++ b/FrontAdmin/src/components/Pages/Configuracion/Configuracion.tsx
@@ -1,4 +1,4 @@
-import { Grid, GridItem, Flex, Button, Text, Box } from '@chakra-ui/react';
+import { Grid, GridItem, Flex, Button, Text } from '@chakra-ui/react';
 import Montos from './Montos/Montos';
 import { FetchMontos } from '../../../API/Montos';
 import { useEffect, useState } from 'react';
@@ -12,24 +12,24 @@ function Configuracion() {
   const [limit] = useState(10);
   const [totalCount, setTotalCount] = useState(0);
 
-  const fetchMontos = async (offset: number, limit: number) => {
-    try {
-      const data = await FetchMontos(offset, limit);
-      setMontos(data.results);
-      setTotalCount(data.count);
-    } catch (error) {
-      if (error instanceof Error) {
-        setError(error.message);
-      } else {
-        setError('An unknown error occurred');
+  useEffect(() => {
+    const getMontos = async (offset: number, limit: number) => {
+      try {
+        const data = await FetchMontos(offset, limit);
+        setMontos(data.results);
+        setTotalCount(data.count);
+      } catch (error) {
+        if (error instanceof Error) {
+          setError(error.message);
+        } else {
+          setError('An unknown error occurred');
+        }
+      } finally {
+        setLoading(false);
       }
-    } finally {
-      setLoading(false);
-    }
-  };
+    };
 
-  useEffect(() => {
-    fetchMontos(offset, limit);
+    getMontos(offset, limit);
   }, [offset, limit]);
 
   const handleNextPage = () => {
@@ -45,24 +45,24 @@ function Configuracion() {
   };
 
   return (
-    <Grid templateColumns={{ base: '1fr', md: 'repeat(2, 1fr)' }} pb="80px">
+    <Grid templateColumns={{ base: '1fr', md: 'repeat(2, 1fr)' }}>
       <GridItem colSpan={2} mt="20px"> 
-          <Montos compromisos={montos}  fetchMontos={() => fetchMontos(offset, limit)} />
+          <Montos compromisos={montos} />
       </GridItem>
       <GridItem colSpan={{ base: 1, md: 2 }}>
         <NewInterfaz compromisos={montos} />
       </GridItem>
-      <Box position="fixed" bottom="0" width="90%" bg="white" p="10px" boxShadow="md">
+      <GridItem colSpan={2} mt="20px">
         <Flex justifyContent="space-between">
-          <Button onClick={handlePreviousPage} isDisabled={offset === 0} color="white">
+          <Button onClick={handlePreviousPage} isDisabled={offset === 0? true : false } color={"white"}>
             Anterior
           </Button>
           <Text>Página {Math.ceil(offset / limit) + 1} de {Math.ceil(totalCount / limit)}</Text>
-          <Button onClick={handleNextPage} isDisabled={offset + limit >= totalCount} color="white">
+          <Button onClick={handleNextPage} isDisabled={offset + limit >= totalCount} color={"white"}>
             Siguiente
           </Button>
         </Flex>
-      </Box>
+      </GridItem>
     </Grid>
   );
 }
diff --git a/FrontAdmin/src/components/Pages/Sysacad/Materias/TablaMaterias.tsx b/FrontAdmin/src/components/Pages/Configuracion/Materias/TablaMaterias.tsx
similarity index 84%
rename from FrontAdmin/src/components/Pages/Sysacad/Materias/TablaMaterias.tsx
rename to FrontAdmin/src/components/Pages/Configuracion/Materias/TablaMaterias.tsx
index 270d80d..ae32bf1 100644
--- a/FrontAdmin/src/components/Pages/Sysacad/Materias/TablaMaterias.tsx
+++ b/FrontAdmin/src/components/Pages/Configuracion/Materias/TablaMaterias.tsx
@@ -33,43 +33,33 @@ export default function TablaMaterias() {
 
     useEffect(() => {
         const fetchData = async () => {
-          try {
             const data = await FetchMaterias();
             setMaterias(data);
             console.log(data);
-          } catch (error) {
-            console.error('Network error', error);
-            showToast('Error', 'No se pudieron cargar las materias', 'error');
-          }
           };
         fetchData();
     }, []);
 
-  const handleBorrar = (materia: any) => {
-    setSelectedMateria(materia);
-    onOpen1();
-  };
+    const handleBorrar = (materia: any) => {
+        setSelectedMateria(materia);
+        onOpen1();
+    };
 
-  const handleConfirmarBorrado = async () => {
-    try {
-      await FetchDeleteMateria(selectedMateria.codigo_materia);
-      showToast('Exito', 'Materia eliminada con exito', 'success');
-      setMaterias((prevMaterias) =>
-        prevMaterias.filter((m) => m.codigo_materia !== selectedMateria.codigo_materia)
-      ); // Elimina del estado
-    } catch (error) {
-      console.error('Network error', error);
-      showToast('Error', 'No se pudo eliminar la materia', 'error');
-    }
-    onClose1();
-  };
+    const handleConfirmarBorrado = () => {
+        // Aca la solicitud DELETE para eliminar la materia
+        try {
+            const Data = FetchDeleteMateria(selectedMateria.codigo_materia);
+            showToast('Exito', 'Materia eliminada con exito', 'success');
+            setMaterias(materias.filter(m => m.codigo_materia !== selectedMateria.codigo_materia)); // Elimina del estado
+          } catch (error) {
+            console.error('Network error', error);
+            showToast('Error', 'No se pudo eliminar la materia', 'error');
+        }
+
+        onClose1();
+    };
 
     const handleAgregar = (codigo_materia: string, anio_cursada: string, nombre: string, anio_plan: string, cuatrimestre:string) => {
-         // Validar si todos los campos están completos
-      if (!codigo_materia || !anio_cursada || !nombre || !anio_plan || !cuatrimestre) {
-        showToast('Error', 'No se pudo agregar la materia, todos los campos deben ser completados', 'error');
-        return;
-    }
         // Aca la solicitud POST para agregar la materia
         try {
             console.log({ codigo_materia, anio_plan, nombre });
@@ -90,10 +80,6 @@ export default function TablaMaterias() {
     };
 
     const handleConfirmarEditar = (codigo_materia:string, anio_cursado:string, nombre: string, cuatrimestre:string, anio_plan: string) => {
-      if (!codigo_materia || !anio_cursado || !nombre || !anio_plan || !cuatrimestre) {
-        showToast('Error', 'No se pudo editar la materia, todos los campos deben ser completados', 'error');
-        return;
-      }
         // Aca la solicitud PUT para editar la materia
         try {
             const Data = FetchPutMateria(parseInt(codigo_materia), parseInt(anio_cursado), parseInt(anio_plan), nombre, parseInt(cuatrimestre));
@@ -122,10 +108,7 @@ export default function TablaMaterias() {
         onClose3();
     }
 
-   // onClose3();
-  //};
-
-  return (
+    return (
         <Box>
                 <Box>
                 <Flex justifyContent="center" mb={4}>
@@ -190,8 +173,6 @@ export default function TablaMaterias() {
                 confirmar={handleConfirmarEditar}
                 materia={selectedMateriaEditar}
             />
-      </Box>
-      
-  );
-  
-}
+        </Box>
+    );
+}
\ No newline at end of file
diff --git a/FrontAdmin/src/components/Pages/Configuracion/Montos/ModalVerHistorial.tsx b/FrontAdmin/src/components/Pages/Configuracion/Montos/ModalVerHistorial.tsx
new file mode 100644
index 0000000..515442e
--- /dev/null
+++ b/FrontAdmin/src/components/Pages/Configuracion/Montos/ModalVerHistorial.tsx
@@ -0,0 +1,189 @@
+import {
+  Modal,
+  ModalOverlay,
+  ModalContent,
+  ModalHeader,
+  ModalFooter,
+  ModalBody,
+  ModalCloseButton,
+  Text,
+  Button,
+  Table,
+  Thead,
+  Tbody,
+  Tr,
+  Th,
+  Td,
+  Box,
+  Input,
+  Flex,
+} from '@chakra-ui/react';
+import { useEffect, useState } from 'react';
+import { FetchMontos } from '../../../../API/Montos';
+import { CloseIcon } from '@chakra-ui/icons';
+import Cookies from 'js-cookie';
+
+interface ModalComponentProps {
+  isOpen: boolean;
+  onClose: () => void;
+}
+
+export default function VerHistorial({ isOpen, onClose }: ModalComponentProps) {
+  const [montos, setMontos] = useState<any[]>([]);
+  const [pdfUrl, setPdfUrl] = useState<string | null>(null);
+  const [startDate, setStartDate] = useState<string>('');
+  const [endDate, setEndDate] = useState<string>('');
+  const [filteredMontos, setFilteredMontos] = useState<boolean>(false);
+
+  useEffect(() => {
+    if (isOpen) {
+      const fetchData = async () => {
+        const data = await FetchMontos();
+        setMontos(data.results);
+      };
+      fetchData();
+    }
+  }, [isOpen]);
+
+  useEffect(() => {
+    console.log(montos);
+  }, [montos]);
+
+  const handleViewPdf = async (url: string) => {
+    try {
+      const token = Cookies.get('access_token');
+      const response = await fetch(url, {
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
+      });
+      const blob = await response.blob();
+      const pdfUrl = URL.createObjectURL(blob);
+      setPdfUrl(pdfUrl);
+    } catch (error) {
+      console.error('Error al obtener el PDF:', error);
+    }
+  };
+
+  const handleFilter = () => {
+    const filteredMontos = montos.filter((monto) => {
+      const fecha = new Date(monto.fecha_carga_comp_pdf);
+      const start = new Date(startDate);
+      const end = new Date(endDate);
+      start.setDate(start.getDate() + 1);
+      start.setHours(0, 0, 0, 0);
+      end.setDate(end.getDate() + 1);
+      end.setHours(23, 59, 59, 999);
+      return fecha >= start && fecha <= end;
+    });
+    setMontos(filteredMontos);
+    setFilteredMontos(true);
+  };
+
+  const handleClearFilter = async () => {
+    const data = await FetchMontos();
+    setMontos(data);
+    setStartDate('');
+    setEndDate('');
+    setFilteredMontos(false);
+  };
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose} size="full">
+      <ModalOverlay />
+      <ModalContent maxWidth="100vw" maxHeight="100vh">
+        <ModalHeader>Historial</ModalHeader>
+        <ModalCloseButton />
+        <ModalBody overflowY="auto">
+          {pdfUrl ? (
+            <iframe src={pdfUrl} width="100%" height="600px" />
+          ) : (
+            <>
+              <Flex mb={4}>
+                <Input
+                  type="date"
+                  placeholder="Fecha de inicio"
+                  value={startDate}
+                  onChange={(e) => setStartDate(e.target.value)}
+                  mr={2}
+                />
+                <Input
+                  type="date"
+                  placeholder="Fecha de fin"
+                  value={endDate}
+                  onChange={(e) => setEndDate(e.target.value)}
+                  mr={2}
+                />
+                <Button
+                  colorScheme="blue"
+                  onClick={filteredMontos ? handleClearFilter : handleFilter}
+                  mr={2}
+                  width="150px"
+                >
+                  {filteredMontos ? <CloseIcon /> : 'Filtrar'}
+                </Button>
+              </Flex>
+              {montos.length > 0 ? (
+                <Table variant="simple">
+                  <Thead>
+                    <Tr>
+                      <Th>Cuatrimestre</Th>
+                      <Th>Matrícula</Th>
+                      <Th>Monto Completo</Th>
+                      <Th>Monto Completo 2 Venc</Th>
+                      <Th>Monto Completo 3 Venc</Th>
+                      <Th>Cuota Reducida</Th>
+                      <Th>Cuota Reducida 2 Venc</Th>
+                      <Th>Cuota Reducida 3 Venc</Th>
+                      <Th>Fecha Carga Comp PDF</Th>
+                      <Th>Acciones</Th>
+                    </Tr>
+                  </Thead>
+                  <Tbody>
+                    {montos.map((monto, index) => (
+                      <Tr key={index}>
+                        <Td>{monto.cuatrimestre}</Td>
+                        <Td>{monto.matricula}</Td>
+                        <Td>{monto.monto_completo}</Td>
+                        <Td>{monto.monto_completo_2venc}</Td>
+                        <Td>{monto.monto_completo_3venc}</Td>
+                        <Td>{monto.cuota_reducida}</Td>
+                        <Td>{monto.cuota_reducida_2venc}</Td>
+                        <Td>{monto.cuota_reducida_3venc}</Td>
+                        <Td>
+                          {new Date(
+                            monto.fecha_carga_comp_pdf
+                          ).toLocaleDateString()}
+                        </Td>
+                        <Td>
+                          <Button
+                            colorScheme="blue"
+                            onClick={() => handleViewPdf(monto.archivo_pdf_url)}
+                          >
+                            Ver PDF
+                          </Button>
+                        </Td>
+                      </Tr>
+                    ))}
+                  </Tbody>
+                </Table>
+              ) : (
+                <Text>No hay datos disponibles</Text>
+              )}
+            </>
+          )}
+        </ModalBody>
+        <ModalFooter>
+          <Button colorScheme="blue" mr={3} onClick={onClose}>
+            Cerrar
+          </Button>
+          {pdfUrl && (
+            <Button colorScheme="red" onClick={() => setPdfUrl(null)}>
+              Volver
+            </Button>
+          )}
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+}
diff --git a/FrontAdmin/src/components/Pages/Configuracion/Montos/Montos.tsx b/FrontAdmin/src/components/Pages/Configuracion/Montos/Montos.tsx
index 8503482..a06c7d0 100644
--- a/FrontAdmin/src/components/Pages/Configuracion/Montos/Montos.tsx
+++ b/FrontAdmin/src/components/Pages/Configuracion/Montos/Montos.tsx
@@ -1,4 +1,4 @@
-import { Dispatch, SetStateAction, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import {
   Box,
   Flex,
@@ -18,7 +18,6 @@ import { AddIcon } from '@chakra-ui/icons';
 import { createCompromiso } from '../../../../API/Montos';
 import ModalCargarDocumento from '../ModalCargarDocumento';
 import { CheckIcon } from '@chakra-ui/icons';
-import { useToast } from '@chakra-ui/react';
 
 
 interface Compromiso {
@@ -38,7 +37,6 @@ interface Compromiso {
 
 interface CardCargaProps {
   compromisos: Compromiso[];
-  fetchMontos: () => void;
 }
 
 const MontoInput = ({
@@ -65,7 +63,7 @@ const MontoInput = ({
   </Flex>
 );
 
-const Montos = ({ compromisos, fetchMontos }: CardCargaProps) => {
+const Montos = ({ compromisos }: CardCargaProps) => {
   const { isOpen, onOpen, onClose } = useDisclosure();
   const {
     isOpen: isModalCargarOpen,
@@ -84,14 +82,8 @@ const Montos = ({ compromisos, fetchMontos }: CardCargaProps) => {
     sortedMontos[0]? setTempMonto(sortedMontos[0]): null;
   }, [compromisos]);
 
-  const getCurrentDateTime = () => {
-    const now = new Date();
-    return now.toISOString(); 
-  };
-  
-
   const [tempMonto, setTempMonto] = useState<Compromiso>({
-    anio: getCurrentDateTime(),
+    anio: '',
     fecha_carga_comp_pdf: '',
     cuatrimestre: '',
     archivo_pdf_url: '',
@@ -105,8 +97,6 @@ const Montos = ({ compromisos, fetchMontos }: CardCargaProps) => {
     cuota_reducida_3venc: 0,
   });
 
-  const toast = useToast();
-
   const handleChange = (e: { target: { name: string; value: string } }) => {
     const { name, value } = e.target;
     setTempMonto({
@@ -115,53 +105,6 @@ const Montos = ({ compromisos, fetchMontos }: CardCargaProps) => {
     });
   };
 
-  const handleSave = async () => {
-    if (!selectedFile) {
-      toast({
-        title: 'Error',
-        description: 'Por favor, selecciona un archivo PDF antes de guardar.',
-        status: 'error',
-        duration: 5000,
-        isClosable: true,
-      });
-      return;
-    }
-    
-    if (tempMonto.cuatrimestre === '') {
-      toast({
-        title: 'Error',
-        description: 'Por favor, selecciona un cuatrimestre antes de guardar.',
-        status: 'error',
-        duration: 5000,
-        isClosable: true,
-      });
-      return;
-    }
-    try {
-      await createCompromiso(tempMonto, selectedFile);
-     
-      onClose();
-      toast({
-        title: 'Éxito',
-        description: 'Compromiso creado exitosamente.',
-        status: 'success',
-        duration: 5000,
-        isClosable: true,
-      });
-      fetchMontos();
-    } catch (error) {
-      toast({
-        title: 'Error',
-        description: 'Error al crear el compromiso.',
-        status: 'error',
-        duration: 5000,
-        isClosable: true,
-      });
-      console.error(error);
-    }
-  };
-
-
   return (
     <>
       <Button colorScheme="blue" onClick={onOpen} leftIcon={<AddIcon />}>
@@ -186,7 +129,7 @@ const Montos = ({ compromisos, fetchMontos }: CardCargaProps) => {
                 Cuatrimestre
               </Text>
               <Select
-                placeholder= 'Selecciona un cuatrimestre'
+                placeholder="Selecciona un cuatrimestre"
                 name="cuatrimestre"
                 mb="20px"
                 bg="white"
@@ -248,7 +191,7 @@ const Montos = ({ compromisos, fetchMontos }: CardCargaProps) => {
               </SimpleGrid>
 
               <Flex justify="flex-end" gap="4" pt={{ base: '30px', sm: '20px', md: '10px', lg: '5px', }}>
-                <Button color="white" size="sm" onClick={()=>{handleSave()}}>
+                <Button color="white" size="sm">
                   Guardar Cambios
                 </Button>
                 <Button
diff --git a/FrontAdmin/src/components/Pages/Configuracion/Montos/NewInterfaz.tsx b/FrontAdmin/src/components/Pages/Configuracion/Montos/NewInterfaz.tsx
index 7335906..f579ecd 100644
--- a/FrontAdmin/src/components/Pages/Configuracion/Montos/NewInterfaz.tsx
+++ b/FrontAdmin/src/components/Pages/Configuracion/Montos/NewInterfaz.tsx
@@ -94,7 +94,7 @@ const NewInterfaz = ({ compromisos }: CardCargaProps) => {
     >
       <SimpleGrid mt="15px">
         {montos.length > 0 ? (
-          <Table variant="striped" colorScheme="gray.700">
+          <Table variant="simple">
             <Thead>
               <Tr>
                 <Th p={1}>Año/ Cuatrimestre</Th>
@@ -111,7 +111,7 @@ const NewInterfaz = ({ compromisos }: CardCargaProps) => {
             </Thead>
             <Tbody>
               {montos.map((monto, index) => (
-                <Tr key={index} borderColor="gray.100">
+                <Tr key={index}>
                   <Td p={1}>{new Date(monto.anio).getFullYear() + " / " + monto.cuatrimestre}</Td>
                   <Td p={2}>{" $ " + monto.matricula}</Td>
                   <Td p={1}>{" $ " + monto.monto_completo}</Td>
diff --git a/FrontAdmin/src/components/Pages/Sysacad/ExcelSysacad/CargaExcel.tsx b/FrontAdmin/src/components/Pages/Sysacad/ExcelSysacad/CargaExcel.tsx
deleted file mode 100644
index a8a5d4f..0000000
--- a/FrontAdmin/src/components/Pages/Sysacad/ExcelSysacad/CargaExcel.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import {Stack, Text, Button, Flex} from '@chakra-ui/react';
-import ZonaCarga from './ZonaCarga';
-import { useState } from 'react';
-import Resultado from './Resultado';
-
-function CargaExcel () {
-    const [fileUploaded, setFileUploaded] = useState(false);
-    const [reset, setReset] = useState(false);
-    const [file, setFile] = useState<File>();  //para mandar como parametro al fetch
-    const [data, setData] = useState<any[]>([]); //para guardar la data del fetch
-
-    const handleFileUpload = (fileName: string) => {
-        setFileUploaded(true);
-    };
-
-    const handleReset = () => {
-        setFileUploaded(false);
-        setReset(true);
-        console.log("reset");
-    };
-
-    const handleFile = (file: File) => {
-        //aca hago el fecth, esta funcion paso como parametro a ZonaCarga
-        setFile(file);   //nose esto. creo que no va
-        //const data = fecth
-        //setData(data);
-        // Pasar data a Resultado
-        // Renderizar Resultado solo cuando data tiene algo
-
-        
-    // const handleFile = async (file: File) => {
-    //     const result = await fetchData('URL_DEL_SERVIDOR', file);
-    //     if (result.statusCode === 200) {
-    //         setData(result.data);
-    //         setFileUploaded(true);
-    //     } else {
-    //         console.error('Error en la solicitud:', result.statusCode);
-    //     }
-    // };
-    }
-
-    return (
-        <Stack direction="column" align="center">
-        <Stack direction="column" spacing={4} align="center" bg="secundaryBg" padding={5} borderRadius={10} w={550}>
-        <Text fontSize="xl" >Procesar Excel de Sysacad</Text>
-        <ZonaCarga onFileUpload={handleFileUpload} reset={reset}/>
-        <Stack direction="row" padding={2} gap={4}>
-            <Button color="white" isDisabled={!fileUploaded} _hover={{bg:"secundaryHover"}}>Cargar</Button>
-            <Button onClick={handleReset} variant="light">Volver a Intentar</Button>
-        </Stack>
-        </Stack>
-        {/* <Stack>
-            { fileUploaded && <Resultado />}
-        </Stack> */}
-        </Stack>
-    )
-}
-
-export default CargaExcel;
-
diff --git a/FrontAdmin/src/components/Pages/Sysacad/ExcelSysacad/Resultado.tsx b/FrontAdmin/src/components/Pages/Sysacad/ExcelSysacad/Resultado.tsx
deleted file mode 100644
index 65871a0..0000000
--- a/FrontAdmin/src/components/Pages/Sysacad/ExcelSysacad/Resultado.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import datos from '../../../../API/Sysacad.ts';
-import { useState, useEffect } from 'react';
-import {Stack, Flex, Text} from '@chakra-ui/react';
-interface DataItem {
-    "id": string;
-    "Apellido y Nombres": string | null;
-    "Celular": string | null;
-    "Tel. Resid"?: string | null;
-    "Teléfono": string | null;
-  }
-  
-  //recibe los datos como parametros y los muestra en pantalla
-  function Resultado() {
-    const [data, setData] = useState<DataItem[]>([]);
-  
-    useEffect(() => {
-        //mapear a array de objetos pq viene un diccionario
-      const dataArray = Object.entries(datos).map(([key, value]) => ({
-        id: key,
-        ...value
-      })) as DataItem[];
-      //setData(dataArray);
-    }, []);
-  
-    return (
-        <Stack mt={7}>
-            <Text fontSize="xl" fontWeight="bold">Errores de formato encontrados. Por favor, revisar:</Text>
-            {data.map((item, index) => (
-                <Flex key={index} direction="column" p={3} borderRadius="8px" mb={2} bg="#F8C0BB" w={800}>
-                    <Text fontWeight={500}> Error en la linea {item.id}, en el/los campo/s: {item["Apellido y Nombres"] && "Apellido y Nombres"} {item["Celular"] && "Celular"} {item["Tel. Resid"] && "Tel. Resid"} {item["Teléfono"] && "Teléfono"} 
-                    </Text>
-                </Flex>
-            ))}
-        </Stack>
-    );
-  }
-  
-  export default Resultado;
\ No newline at end of file
diff --git a/FrontAdmin/src/components/Pages/Sysacad/ExcelSysacad/ZonaCarga.tsx b/FrontAdmin/src/components/Pages/Sysacad/ExcelSysacad/ZonaCarga.tsx
deleted file mode 100644
index b1cfb08..0000000
--- a/FrontAdmin/src/components/Pages/Sysacad/ExcelSysacad/ZonaCarga.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import { useDropzone, FileRejection } from 'react-dropzone';
-import { Flex, Box, VStack, useToast, Image, Stack, Text } from '@chakra-ui/react';
-import { useState, useEffect } from 'react';
-import iconUpload from '../../../icons/subir.png';
-import { HiOutlineDocumentAdd } from "react-icons/hi";
-
-const ZonaCarga = ({ onFileUpload, reset }: { onFileUpload: (fileName: string) => void, reset: boolean }) => {
-    const toast = useToast();
-    const [fileName, setFileName] = useState('');
-    const [isUploadDisabled, setIsUploadDisabled] = useState(false);
-    
-    useEffect(() => {
-        if (reset) {
-            setFileName('');
-            setIsUploadDisabled(false);
-        }
-    }, [reset]);
-
-    const onDrop = (acceptedFiles: File[], rejectedFiles: FileRejection[]) => {
-        if (rejectedFiles.length > 0) {
-        toast({
-            title: 'Error',
-            description: 'Solo se aceptan archivos .xlsx',
-            status: 'error',
-            duration: 5000,
-            isClosable: true,
-        });
-        return;
-        }
-        if (acceptedFiles.length > 0) {
-            const file = acceptedFiles[0];
-            setFileName(acceptedFiles[0].name);
-            setIsUploadDisabled(true); // Desactiva la zona de carga
-            onFileUpload(file.name); // Notifica al componente padre que se subió un archivo
-            //llamar a la funcion que hace el fetch
-        }
-    };
-
-
-    const { getRootProps, getInputProps, acceptedFiles, isDragActive } = useDropzone({
-        onDrop,
-        disabled: isUploadDisabled,
-        accept: {
-        'application/xlsx': ['.xlsx'],
-        },
-    });
-    //const files = acceptedFiles.map(file => <li key={file.path}>{file.path}</li>);
-    
-    return (
-        <Stack direction="column">
-        <Flex
-        borderRadius="10px"
-        w={500}
-        justifyContent="center"
-        alignItems="center"
-        border="2px solid #6f6f6f"
-        borderStyle="dashed"
-        cursor={isUploadDisabled ? 'not-allowed' : 'pointer'}
-        {...getRootProps()}
-        style={{
-          background: isUploadDisabled ? '#d3d3d3' : '#e3e3e3',
-          padding: '40px',
-        }}
-        >
-        <VStack spacing={4}>
-            <Box>
-                <HiOutlineDocumentAdd size={40}/>
-            </Box>
-            <input {...getInputProps()} />
-            {isDragActive ? (
-            <p>Soltar para cargar...</p>
-            ) : (
-            <p>Arrastrar y soltar archivo aquí</p>
-             )}
-        </VStack>
-        </Flex>
-        {fileName && <Stack direction="column">
-        <Text fontWeight="bold">Archivo cargado:</Text> 
-        <Flex ml={4}><li>{fileName}</li> </Flex>
-        </Stack>}
-        </Stack>
-    );
-
-
-
-}
-
-export default ZonaCarga;
\ No newline at end of file
diff --git a/FrontAdmin/src/components/Pages/Sysacad/Sysacad.tsx b/FrontAdmin/src/components/Pages/Sysacad/Sysacad.tsx
index 8193167..236467d 100644
--- a/FrontAdmin/src/components/Pages/Sysacad/Sysacad.tsx
+++ b/FrontAdmin/src/components/Pages/Sysacad/Sysacad.tsx
@@ -1,21 +1,19 @@
 import { Grid, Text, Stack } from '@chakra-ui/react';
-import { Tabs, TabList, TabPanels, Tab, TabPanel, Box } from '@chakra-ui/react'
-import TablaMaterias from './Materias/TablaMaterias';
-import CargaExcel from './ExcelSysacad/CargaExcel';
+import { Tabs, TabList, TabPanels, Tab, TabPanel } from '@chakra-ui/react'
+import Dropzone from 'react-dropzone';
+import TablaMaterias from '../Configuracion/Materias/TablaMaterias';
 
 function Sysacad() {
   return (
     <Tabs>
-      <TabList>
-        <Tab>Sysacad</Tab>
-        <Tab>Materias</Tab>
-      </TabList>
+  <TabList>
+    <Tab>Sysacad</Tab>
+    <Tab>Materias</Tab>
+  </TabList>
 
   <TabPanels>
     <TabPanel>
-      <Stack direction="column" spacing={4} align="center">
-          <CargaExcel/>
-      </Stack>
+      <p>Aca se carga el excel proveniente de Sysacad</p>
     </TabPanel>
     <TabPanel>
       <Stack direction="column" spacing={4} align="center">
diff --git a/FrontAdmin/src/components/Table/Table.tsx b/FrontAdmin/src/components/Table/Table.tsx
index 9a227ae..195f863 100644
--- a/FrontAdmin/src/components/Table/Table.tsx
+++ b/FrontAdmin/src/components/Table/Table.tsx
@@ -1,81 +1,61 @@
-import React, { useState, useEffect, useMemo } from 'react';
-import { Flex, FlexProps } from '@chakra-ui/react';
+import { useMemo } from 'react';
+import { Flex, Image, FlexProps, Tooltip } from '@chakra-ui/react';
 import {
   MaterialReactTable,
   MRT_ColumnDef,
   useMaterialReactTable,
 } from 'material-react-table';
-import { FetchAlumnos } from '../../API/DatosAlumnosV2.ts';
+import { data } from '../../API/DatosAlumnos';
+//Import Material React Table Translations
 import { MRT_Localization_ES } from 'material-react-table/locales/es';
-import { useNavigate } from 'react-router-dom';
-
-let tableHeaders = [
-  {
-    accessorKey: 'apellido',
-    header: 'APELLIDO',
-    enableHiding: true,
-  },
-  {
-    accessorKey: 'nombre',
-    header: 'NOMBRES',
-    enableHiding: true,
-  },
-  {
-    accessorKey: 'legajo',
-    header: 'LEGAJO',
-    enableHiding: true,
-  },
-  {
-    accessorKey: 'dni',
-    header: 'DNI',
-    enableHiding: true,
-  },
-  {
-    accessorKey: 'estado',
-    header: 'SITUACIÓN',
-    enableHiding: true,
-  },
-  {
-    accessorKey: 'anio_ingreso',
-    header: 'AÑO INGRESO',
-    muiTableHeadCellProps: { style: { color: '#fffff' } },
-    enableHiding: true,
-  },
-];
 
+console.log(data);
 interface PropsTable extends FlexProps {
   nombre: string;
   legajo: number;
   dni: number;
-  estado: string;
-  anio_ingreso: number;
-  boolEnableRowSelection: bool;
-  tableHeaders: array;
+  situacion: string;
+  anioIngreso: number;
 }
 
-function Table({ boolEnableRowSelection }: PropsTable) {
-  const [alumnos, setAlumnos] = useState<PropsTable[]>([]);
-  const navigate = useNavigate();
-
-  useEffect(() => {
-    const fetchData = async () => {
-      try {
-        const data = await FetchAlumnos();
-        setAlumnos(data.results);
-      } catch (error) {
-        console.error('Error al obtener los datos', error);
-      }
-    };
-
-    fetchData();
-  }, []);
-
-  const columns = useMemo<MRT_ColumnDef<PropsTable>[]>(() => tableHeaders, []);
+function Table() {
+  const columns = useMemo<MRT_ColumnDef<PropsTable>[]>(
+    () => [
+      {
+        accessorKey: 'nombre',
+        header: 'NOMBRE',
+        enableHiding: true,
+      },
+      {
+        accessorKey: 'legajo',
+        header: 'LEGAJO',
+        enableHiding: true,
+      },
+      {
+        accessorKey: 'dni',
+        header: 'DNI',
+        enableHiding: true,
+      },
+      {
+        accessorKey: 'situacion',
+        header: 'SITUACIÓN',
+        enableHiding: true,
+      },
+      {
+        accessorKey: 'anioIngreso',
+        header: 'AÑO INGRESO',
+        muiTableHeadCellProps: { style: { color: '#fffff' } },
+        enableHiding: true,
+      },
+    ],
+    []
+  );
 
   const table = useMaterialReactTable({
     columns,
-    data: alumnos,
-    enableRowSelection: boolEnableRowSelection,
+    data,
+
+    enableRowSelection: true,
     enableColumnOrdering: true,
     enableGlobalFilter: true,
     initialState: {
@@ -85,15 +65,6 @@ function Table({ boolEnableRowSelection }: PropsTable) {
       },
     },
     localization: MRT_Localization_ES,
-
-    muiTableBodyRowProps: ({ row }) => ({
-      onClick: (event) => {
-        navigate(`${row.original.dni}`);
-      },
-      sx: {
-        cursor: 'pointer',
-      },
-    }),
   });
 
   return <MaterialReactTable table={table} />;
diff --git a/backend/administrador/migrations/0001_initial.py b/backend/administrador/migrations/0001_initial.py
index 6123318..7c45df0 100644
--- a/backend/administrador/migrations/0001_initial.py
+++ b/backend/administrador/migrations/0001_initial.py
@@ -1,6 +1,5 @@
-# Generated by Django 5.1 on 2024-09-02 09:08
+# Generated by Django 5.1 on 2024-08-17 22:16
 
-import django.contrib.auth.models
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
@@ -11,25 +10,10 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('users', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='Administrador',
-            fields=[
-                ('genericuser_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
-                'abstract': False,
-            },
-            bases=('users.genericuser',),
-            managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
-            ],
-        ),
         migrations.CreateModel(
             name='Permisos',
             fields=[
@@ -46,6 +30,14 @@ class Migration(migrations.Migration):
                 ('descripcion', models.TextField()),
             ],
         ),
+        migrations.CreateModel(
+            name='Administrador',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('dni', models.IntegerField()),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
         migrations.CreateModel(
             name='AdminRol',
             fields=[
diff --git a/backend/administrador/models.py b/backend/administrador/models.py
index 861e0a1..9703b0a 100644
--- a/backend/administrador/models.py
+++ b/backend/administrador/models.py
@@ -3,10 +3,8 @@
 # django imports
 from django.conf import settings
 from django.db import models
-from users.models import GenericUser
 
-
-class Administrador(GenericUser):
+class Administrador(models.Model):
     """
     Represents an administrator.
 
@@ -19,7 +17,8 @@ class Administrador(GenericUser):
             of the administrator.
     """
 
-    # dni = models.IntegerField()
+    user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+    dni = models.IntegerField()
 
 
 class Rol(models.Model):
diff --git a/backend/alumnos/migrations/0001_initial.py b/backend/alumnos/migrations/0001_initial.py
index 8646870..bc4131c 100644
--- a/backend/alumnos/migrations/0001_initial.py
+++ b/backend/alumnos/migrations/0001_initial.py
@@ -1,6 +1,5 @@
-# Generated by Django 5.1 on 2024-09-02 09:08
+# Generated by Django 5.1 on 2024-08-31 00:56
 
-import django.contrib.auth.models
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
@@ -11,48 +10,40 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('users', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Alumno',
+            name='TipoEstado',
             fields=[
-                ('genericuser_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, to=settings.AUTH_USER_MODEL)),
-                ('apellido', models.CharField(max_length=255)),
+                ('id_tipo_estado', models.AutoField(primary_key=True, serialize=False)),
                 ('nombre', models.CharField(max_length=255)),
-                ('legajo', models.IntegerField()),
-                ('dni', models.IntegerField(primary_key=True, serialize=False)),
-                ('estado', models.CharField(max_length=255)),
-                ('cuil', models.IntegerField()),
-                ('anio_ingreso', models.IntegerField()),
-                ('telefono', models.IntegerField(blank=True, null=True)),
-                ('celular', models.IntegerField(blank=True, null=True)),
-            ],
-            options={
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
-                'abstract': False,
-            },
-            bases=('users.genericuser',),
-            managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
+                ('descripcion', models.TextField()),
             ],
         ),
         migrations.CreateModel(
-            name='TipoEstado',
+            name='TipoInhabilitacion',
             fields=[
-                ('id_tipo_estado', models.AutoField(primary_key=True, serialize=False)),
+                ('id_tipo_inhabilitacion', models.AutoField(default='Activo', primary_key=True, serialize=False)),
                 ('nombre', models.CharField(max_length=255)),
                 ('descripcion', models.TextField()),
             ],
         ),
         migrations.CreateModel(
-            name='TipoInhabilitacion',
+            name='Alumno',
             fields=[
-                ('id_tipo_inhabilitacion', models.AutoField(primary_key=True, serialize=False)),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('apellido', models.CharField(max_length=255)),
                 ('nombre', models.CharField(max_length=255)),
-                ('descripcion', models.TextField()),
+                ('cuil', models.IntegerField()),
+                ('legajo', models.IntegerField()),
+                ('dni', models.IntegerField()),
+                ('estado', models.CharField(max_length=255)),
+                ('anio_ingreso', models.IntegerField()),
+                ('telefono', models.IntegerField(blank=True, null=True)),
+                ('celular', models.IntegerField(blank=True, null=True)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.CreateModel(
diff --git a/backend/alumnos/migrations/0002_alter_tipoinhabilitacion_id_tipo_inhabilitacion.py b/backend/alumnos/migrations/0002_alter_tipoinhabilitacion_id_tipo_inhabilitacion.py
new file mode 100644
index 0000000..5f3d89c
--- /dev/null
+++ b/backend/alumnos/migrations/0002_alter_tipoinhabilitacion_id_tipo_inhabilitacion.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1 on 2024-08-31 23:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("alumnos", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tipoinhabilitacion",
+            name="id_tipo_inhabilitacion",
+            field=models.AutoField(primary_key=True, serialize=False),
+        ),
+    ]
diff --git a/backend/alumnos/models.py b/backend/alumnos/models.py
index 8e6b1f4..84608d2 100644
--- a/backend/alumnos/models.py
+++ b/backend/alumnos/models.py
@@ -3,12 +3,11 @@
 # django imports
 from django.conf import settings
 from django.db import models
-from users.models import GenericUser
 
 # Create your models here.
 
 
-class Alumno(GenericUser):
+class Alumno(models.Model):
     """
     Represents a student.
 
@@ -23,14 +22,14 @@ class Alumno(GenericUser):
 
     """
 
-    # user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+    user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     apellido = models.CharField(max_length=255)
     nombre = models.CharField(max_length=255)
     cuil = models.IntegerField()
     legajo = models.IntegerField()
-    dni = models.IntegerField(primary_key=True)
+    dni = models.IntegerField()
     estado = models.CharField(max_length=255)
-    # estado = models.ForeignKey("TipoEstado", on_delete=models.CASCADE)
+    #estado = models.ForeignKey("TipoEstado", on_delete=models.CASCADE)
     cuil = models.IntegerField()
     anio_ingreso = models.IntegerField()
     telefono = models.IntegerField(blank=True, null=True)
diff --git a/backend/create_superuser.py b/backend/create_superuser.py
index f2fb77b..ba05b47 100644
--- a/backend/create_superuser.py
+++ b/backend/create_superuser.py
@@ -1,24 +1,21 @@
 import os
-
 import django
 from django.core.exceptions import AppRegistryNotReady
 
 # Establece la configuración de Django
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "server.settings.base")
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'server.settings.base')
 django.setup()
 
 # Verifica si Django está completamente configurado
 try:
-    from users.models import GenericUser
+    from users.models import CustomUser
 except AppRegistryNotReady:
     print("Django no está completamente configurado.")
     exit(1)
 
 # Código para crear el superusuario
-if not GenericUser.objects.filter(username="admin").exists():
-    GenericUser.objects.create_superuser(
-        username="admin", email="admin@example.com", password="1234"
-    )
+if not CustomUser.objects.filter(username='admin').exists():
+    CustomUser.objects.create_superuser(username='admin', email='admin@example.com', password='1234')
     print("Superusuario creado exitosamente")
 else:
     print("El superusuario ya existe")
diff --git a/backend/excel_sysadmin/migrations/0001_initial.py b/backend/excel_sysadmin/migrations/0001_initial.py
index 5ad3ff4..e962e4c 100644
--- a/backend/excel_sysadmin/migrations/0001_initial.py
+++ b/backend/excel_sysadmin/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.1 on 2024-09-02 09:08
+# Generated by Django 5.1 on 2024-08-17 21:30
 
 from django.db import migrations, models
 
diff --git a/backend/materias/migrations/0001_initial.py b/backend/materias/migrations/0001_initial.py
index 669d17b..e2fb2da 100644
--- a/backend/materias/migrations/0001_initial.py
+++ b/backend/materias/migrations/0001_initial.py
@@ -1,5 +1,6 @@
-# Generated by Django 5.1 on 2024-09-02 09:08
+# Generated by Django 5.1 on 2024-08-31 00:58
 
+import django.db.models.deletion
 from django.db import migrations, models
 
 
@@ -8,6 +9,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('alumnos', '0001_initial'),
     ]
 
     operations = [
@@ -28,6 +30,11 @@ class Migration(migrations.Migration):
                 ('anio', models.IntegerField()),
                 ('offrc', models.IntegerField()),
                 ('atendnc', models.IntegerField()),
+                ('id_alumno', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='alumnos.alumno')),
+                ('id_materia', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materias.materia')),
             ],
+            options={
+                'unique_together': {('id_materia', 'id_alumno', 'anio')},
+            },
         ),
     ]
diff --git a/backend/materias/migrations/0002_initial.py b/backend/materias/migrations/0002_initial.py
deleted file mode 100644
index 15c1d65..0000000
--- a/backend/materias/migrations/0002_initial.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Generated by Django 5.1 on 2024-09-02 09:08
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('alumnos', '0001_initial'),
-        ('materias', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='materiaalumno',
-            name='id_alumno',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='alumnos.alumno'),
-        ),
-        migrations.AddField(
-            model_name='materiaalumno',
-            name='id_materia',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materias.materia'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='materiaalumno',
-            unique_together={('id_materia', 'id_alumno', 'anio')},
-        ),
-    ]
diff --git a/backend/mensajeria/migrations/0001_initial.py b/backend/mensajeria/migrations/0001_initial.py
index 87cb19c..24b1e65 100644
--- a/backend/mensajeria/migrations/0001_initial.py
+++ b/backend/mensajeria/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.1 on 2024-09-02 09:08
+# Generated by Django 5.1 on 2024-08-17 22:16
 
 from django.db import migrations, models
 
diff --git a/backend/pagos/migrations/0001_initial.py b/backend/pagos/migrations/0001_initial.py
index 0ee16fe..2166d9e 100644
--- a/backend/pagos/migrations/0001_initial.py
+++ b/backend/pagos/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.1 on 2024-09-02 09:08
+# Generated by Django 5.1 on 2024-08-31 00:57
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -9,6 +9,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('alumnos', '0001_initial'),
     ]
 
     operations = [
@@ -32,18 +33,29 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
-            name='FirmaCompPagoAlumno',
+            name='Cuota',
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('fecha_firmado', models.DateTimeField(auto_now_add=True, null=True)),
-                ('firmado', models.BooleanField(blank=True, default=True, null=True)),
+                ('id_cuota', models.AutoField(primary_key=True, serialize=False)),
+                ('nro_cuota', models.IntegerField()),
+                ('recargo', models.FloatField()),
+                ('estado', models.CharField(max_length=255)),
+                ('vencimiento', models.DateField()),
+                ('fecha_pago', models.DateField()),
+                ('fecha_vencimiento', models.DateField()),
+                ('fecha_pago_devengado', models.DateField()),
+                ('fecha_pedido', models.DateField()),
+                ('tipo_puesto', models.CharField(max_length=255)),
+                ('compdepago', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pagos.compromisodepago')),
             ],
         ),
         migrations.CreateModel(
-            name='LineaDePago',
+            name='FirmaCompPagoAlumno',
             fields=[
-                ('id_linea_pago', models.AutoField(primary_key=True, serialize=False)),
-                ('monto_aplicado', models.FloatField()),
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('fecha_firmado', models.DateTimeField(auto_now_add=True, null=True)),
+                ('firmado', models.BooleanField(blank=True, default=True, null=True)),
+                ('alumno', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='alumnos.alumno')),
+                ('compromiso_de_pago', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pagos.compromisodepago')),
             ],
         ),
         migrations.CreateModel(
@@ -57,22 +69,17 @@ class Migration(migrations.Migration):
                 ('estado', models.BooleanField()),
                 ('fecha', models.DateField()),
                 ('comprobante', models.CharField(max_length=255)),
+                ('alumno', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='alumnos.alumno')),
+                ('cuota', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pagos.cuota')),
             ],
         ),
         migrations.CreateModel(
-            name='Cuota',
+            name='LineaDePago',
             fields=[
-                ('id_cuota', models.AutoField(primary_key=True, serialize=False)),
-                ('nro_cuota', models.IntegerField()),
-                ('recargo', models.FloatField()),
-                ('estado', models.CharField(max_length=255)),
-                ('vencimiento', models.DateField()),
-                ('fecha_pago', models.DateField()),
-                ('fecha_vencimiento', models.DateField()),
-                ('fecha_pago_devengado', models.DateField()),
-                ('fecha_pedido', models.DateField()),
-                ('tipo_puesto', models.CharField(max_length=255)),
-                ('compdepago', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pagos.compromisodepago')),
+                ('id_linea_pago', models.AutoField(primary_key=True, serialize=False)),
+                ('monto_aplicado', models.FloatField()),
+                ('cuota', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pagos.cuota')),
+                ('pago', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pagos.pago')),
             ],
         ),
     ]
diff --git a/backend/pagos/migrations/0002_initial.py b/backend/pagos/migrations/0002_initial.py
deleted file mode 100644
index 94f3638..0000000
--- a/backend/pagos/migrations/0002_initial.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# Generated by Django 5.1 on 2024-09-02 09:08
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('alumnos', '0001_initial'),
-        ('pagos', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='firmacomppagoalumno',
-            name='alumno',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='alumnos.alumno'),
-        ),
-        migrations.AddField(
-            model_name='firmacomppagoalumno',
-            name='compromiso_de_pago',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pagos.compromisodepago'),
-        ),
-        migrations.AddField(
-            model_name='lineadepago',
-            name='cuota',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pagos.cuota'),
-        ),
-        migrations.AddField(
-            model_name='pago',
-            name='alumno',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='alumnos.alumno'),
-        ),
-        migrations.AddField(
-            model_name='pago',
-            name='cuota',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pagos.cuota'),
-        ),
-        migrations.AddField(
-            model_name='lineadepago',
-            name='pago',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pagos.pago'),
-        ),
-    ]
diff --git a/backend/server/__init__.py b/backend/server/__init__.py
index e69de29..9db8127 100644
--- a/backend/server/__init__.py
+++ b/backend/server/__init__.py
@@ -0,0 +1,7 @@
+from django.conf import settings
+
+if settings.DATABASES["default"]["ENGINE"] == "django.db.backends.mysql":
+    # import pymysql
+
+    # pymysql.install_as_MySQLdb()
+    pass
diff --git a/backend/server/settings/base.py b/backend/server/settings/base.py
index c179854..0322458 100644
--- a/backend/server/settings/base.py
+++ b/backend/server/settings/base.py
@@ -47,19 +47,19 @@
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
-    # "django.contrib.sessions",
+    "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    # "django.contrib.sites",
+    "django.contrib.sites",
     # third party apps
     "rest_framework",
-    # "rest_framework.authtoken",  # not needed since we are using jwt in dj-rest-auth
+    "rest_framework.authtoken",  # not needed since we are using jwt in dj-rest-auth
     "dj_rest_auth",
     "allauth",
     "allauth.account",
     "dj_rest_auth.registration",
-    # "allauth.socialaccount",
-    # "allauth.socialaccount.providers.google",
+    "allauth.socialaccount",
+    "allauth.socialaccount.providers.google",
     "drf_spectacular",
     "drf_spectacular_sidecar",
     "rest_framework_simplejwt",
@@ -186,7 +186,7 @@
 
 # CUSTOM USER MODEL SETTINGS
 # https://docs.djangoproject.com/en/5.0/ref/settings/#auth-user-model
-AUTH_USER_MODEL: str = "users.GenericUser"
+AUTH_USER_MODEL: str = "users.CustomUser"
 
 
 # dj-rest-auth settings (with Registration & JWT enabled)
@@ -246,16 +246,16 @@
 ACCOUNT_AUTHENTICATION_METHOD = "username_email"
 ACCOUNT_EMAIL_VERIFICATION = "optional"
 ACCOUNT_EMAIL_REQUIRED = True
-# SOCIALACCOUNT_EMAIL_AUTHENTICATION_AUTO_CONNECT = True
-# SOCIALACCOUNT_PROVIDERS = {
-#     "google": {
-#         "EMAIL_AUTHENTICATION": True,
-#         "SCOPE": ["email", "profile"],
-#         "AUTH_PARAMS": {"access_type": "offline"},
-#     },
-# }
+SOCIALACCOUNT_EMAIL_AUTHENTICATION_AUTO_CONNECT = True
+SOCIALACCOUNT_PROVIDERS = {
+    "google": {
+        "EMAIL_AUTHENTICATION": True,
+        "SCOPE": ["email", "profile"],
+        "AUTH_PARAMS": {"access_type": "offline"},
+    },
+}
 LOGIN_REDIRECT_URL = "/"
-# SOCIALACCOUNT_ONLY = True
+SOCIALACCOUNT_ONLY = True
 AUTHENTICATION_BACKENDS: list[str] = [
     "django.contrib.auth.backends.ModelBackend",
     "allauth.account.auth_backends.AuthenticationBackend",
diff --git a/backend/users/admin.py b/backend/users/admin.py
index fb7ff42..e6c5b4e 100644
--- a/backend/users/admin.py
+++ b/backend/users/admin.py
@@ -9,5 +9,8 @@
     admin.site.register(CustomUser)
 """
 from django.contrib import admin
+from users.models import CustomUser
 
 # Register your models here.
+
+admin.site.register(model_or_iterable=CustomUser)
diff --git a/backend/users/migrations/0001_initial.py b/backend/users/migrations/0001_initial.py
index c48510b..0f848d5 100644
--- a/backend/users/migrations/0001_initial.py
+++ b/backend/users/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.1 on 2024-09-02 09:08
+# Generated by Django 5.0.6 on 2024-07-08 21:24
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
@@ -16,24 +16,26 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='GenericUser',
+            name='CustomUser',
             fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('password', models.CharField(max_length=128, verbose_name='password')),
                 ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
                 ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
                 ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
                 ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
                 ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
                 ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
                 ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('email', models.EmailField(db_index=True, max_length=254, primary_key=True, serialize=False, unique=True, verbose_name='email address')),
                 ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
             ],
             options={
-                'db_table': 'usuario',
-                'ordering': ['-date_joined'],
+                'verbose_name': 'user',
+                'verbose_name_plural': 'users',
+                'abstract': False,
             },
             managers=[
                 ('objects', django.contrib.auth.models.UserManager()),
diff --git a/backend/users/migrations/0002_alter_customuser_email.py b/backend/users/migrations/0002_alter_customuser_email.py
new file mode 100644
index 0000000..c663140
--- /dev/null
+++ b/backend/users/migrations/0002_alter_customuser_email.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.7 on 2024-07-10 02:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='customuser',
+            name='email',
+            field=models.EmailField(max_length=254, unique=True, verbose_name='email address'),
+        ),
+    ]
diff --git a/backend/users/migrations/0002_alter_genericuser_table.py b/backend/users/migrations/0002_alter_genericuser_table.py
deleted file mode 100644
index 15b59db..0000000
--- a/backend/users/migrations/0002_alter_genericuser_table.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 5.1 on 2024-09-02 09:17
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelTable(
-            name='genericuser',
-            table='Usuario',
-        ),
-    ]
diff --git a/backend/users/migrations/0003_alter_customuser_options.py b/backend/users/migrations/0003_alter_customuser_options.py
new file mode 100644
index 0000000..7f733b4
--- /dev/null
+++ b/backend/users/migrations/0003_alter_customuser_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.7 on 2024-07-23 07:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_alter_customuser_email'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='customuser',
+            options={'ordering': ['-date_joined']},
+        ),
+    ]
diff --git a/backend/users/models.py b/backend/users/models.py
index 76fa5a0..52a5662 100644
--- a/backend/users/models.py
+++ b/backend/users/models.py
@@ -21,17 +21,45 @@
 from django.utils.translation import gettext_lazy as _
 
 
-class GenericUser(AbstractUser):
-    email = models.EmailField(
-        primary_key=True,
-        verbose_name=_(message="email address"),
-        unique=True,
-        blank=False,
-        null=False,
-        db_index=True,
-    )
+class CustomUser(AbstractUser):
+    """
+    A custom user model that extends the default Django User model.
+
+    Attributes:
+        email (EmailField): The email address of the user.
+        USERNAME_FIELD (str): The field used as the unique identifier for\
+            authentication (default is 'username').
+        EMAIL_FIELD (str): The field used as the unique identifier for email (default is 'email').
+        REQUIRED_FIELDS (list[str]): The fields required when creating a user.
+
+    Methods:
+        __str__(): Returns the username of the user.
+
+    Meta:
+        ordering (list[str]): The ordering of the CustomUser model.
+    """
+
+    email = models.EmailField(_(message="email address"), unique=True)
+
+    USERNAME_FIELD = "username"
+    EMAIL_FIELD = "email"
+    REQUIRED_FIELDS: list[str] = ["email"]
+
+    def __str__(self) -> str:
+        """
+        Returns the username of the user.
+
+        Returns:
+            str: The username of the user.
+        """
+        return str(object=self.username)
 
     class Meta:
-        # abstract: bool = True
-        db_table: str = "Usuario"
+        """
+        Meta class for the CustomUser model.
+
+        Attributes:
+            ordering (list[str]): The ordering of the CustomUser model.
+        """
+
         ordering: list[str] = ["-date_joined"]
diff --git a/mysql_schema.pdf b/mysql_schema.pdf
index 0aae25a..1af0be9 100644
Binary files a/mysql_schema.pdf and b/mysql_schema.pdf differ