fix/merge-issues

Author: ddi4z

apps/api/src/assistance-applications/assistance-applications.controller.ts

@@ -71,7 +71,7 @@ export class AssistanceApplicationsController {
 
   @Get(':id/document')
   findOneDocument(@Param('id') id: string) {
-    return this.assistanceApplicationsService.findOne(id, true);
+    return this.assistanceApplicationsService.findOneDocument(id);
   }
 
   @Patch(':id')

apps/api/src/assistance-applications/assistance-applications.service.ts

@@ -69,15 +69,15 @@ export class AssistanceApplicationsService {
     return results;
   }
 
-  async findOne(id: string, withDocument: boolean = false) {
+  async findOne(id: string) {
     const application = await this.assistanceApplicationRepository.findOne({
       where: { id },
       relations: {
         graduatedAssistance: {
           professor: true,
         },
         student: true,
-        document: withDocument,
+        document: true,
       },
     });
     if (!application) {
@@ -89,7 +89,7 @@ export class AssistanceApplicationsService {
   }
 
   async findOneDocument(id: string) {
-    const application = await this.findOne(id, true);
+    const application = await this.findOne(id);
     const graduatedAssistanceId = application.graduatedAssistance.id;
 
     const applications = await this.assistanceApplicationRepository
@@ -138,4 +138,4 @@ export class AssistanceApplicationsService {
   remove(id: number) {
     return `This action removes a #${id} assistanceApplication`;
   }
-}
+}

apps/web/src/app/inicio/coordinador/programas/lista/ProgramColumns.tsx

@@ -34,7 +34,7 @@ export const getProgramColumns = (handleDetail: (id: string) => void): ColumnDef
     header: "Profesor",
     cell: ({ row }) => (
       <span className="text-primary">
-        {row.original.mainProfessor?.user?.name || "No professor assigned"}
+        {row.original.mainProfessor?.user?.name || "Profesor no asignado"}
       </span>
     ),
   },

apps/web/src/app/inicio/estudiante/asistencia/lista/[id]/page.tsx

@@ -156,7 +156,6 @@ function AssistanceInscription({
           </div>
         </div>
         <Button
-          className="w-40 mx-auto block"
           onClick={() => setIsApplying(true)}
         >
           Aplicar
@@ -423,7 +422,6 @@ function AssistanceApplying({ assistance, setIsApplying }: AssistanceProps) {
             <Button
               type="button"
               onClick={handleApplyClick}
-              className="bg-core hover:bg-core-highlight text-card px-10 py-5 rounded-xl text-lg font-semibold transition-colors shadow-lg hover:shadow-core-soft"
             >
               Aplicar
             </Button>

apps/web/src/app/inicio/estudiante/asistencia/lista_aplicadas/[id]/page.tsx

@@ -5,7 +5,7 @@ import { StatusInformation } from "@/app/types/entities/graduated-assistance.typ
 import TabStatus, { SectionProps } from "@/components/shared/tab-status";
 import { useRouter } from "next/navigation";
 import SpinnerPage from "@/components/shared/spinner-page";
-import { getAssistanceStatusByIdWithDocument } from "@/app/services/assistance.service";
+import { getAssistanceStatusById } from "@/app/services/assistance.service";
 
 /**
  * AssistanceStatus Component
@@ -78,7 +78,7 @@ export default function AssistanceStatus({
     const fetchData = async () => {
       if (!id) return router.push("/404");
       try {
-        const data = await getAssistanceStatusByIdWithDocument(id);
+        const data = await getAssistanceStatusById(id);
         setStatusInformation(data);
         setIsLoading(false);
       } catch {

apps/web/src/app/inicio/posgrado/tesis/lista/[id]/page.tsx

@@ -193,7 +193,7 @@ function ThesisApplying({ thesis }: { readonly thesis: Thesis }) {
           />
 
           <div className="flex justify-center pt-3.5">
-            <Button type="button" onClick={() => setIsConfirmed(true)}>
+            <Button onClick={() => setIsConfirmed(true)}>
               Aplicar
             </Button>
             <ConfirmationModal

apps/web/src/app/inicio/pregrado/tesis/estado/page.tsx

@@ -28,7 +28,7 @@ export default function ProjectStatus() {
     isFetching,
     error,
   } = useQuery({
-    queryKey: ["student-thesis-status"],
+    queryKey: ["student-project-status"],
     queryFn: async () => {
       const userData = await getUserInfo();
       const thesisStatus = await getUndergraduateThesisStatusInformation(userData.user.id);

apps/web/src/app/inicio/profesor/asistencias/lista/manejar/[id]/[applicationId]/page.tsx

@@ -162,22 +162,22 @@ function StudentProfileCard({
 }: StudentProfileProps) {
   return (
     <div className="w-full">
-      <div className="bg-white rounded-3xl shadow-lg p-6 mb-4">
+      <div className="bg-card rounded-3xl shadow-lg p-6 mb-4">
         <div className="mb-6">
-          <p className="text-lg font-medium mb-1">Nombre estudiante:</p>
+          <p className="text-lg font-medium mb-1 text-foreground">Nombre estudiante:</p>
           <p className="text-xl mb-4 font-semibold text-foreground">{name}</p>
 
-          <p className="text-lg font-medium mb-1">Correo:</p>
+          <p className="text-lg font-medium mb-1 text-foreground">Correo:</p>
           <p className="text-xl mb-4 font-semibold text-foreground">{email}</p>
 
-          <p className="text-lg font-medium mb-1">Estado:</p>
+          <p className="text-lg font-medium mb-1 text-foreground">Estado:</p>
           <p className="text-xl mb-4 font-semibold text-foreground">{status}</p>
 
           <a
             href={pdfUrl}
             target="_blank"
             rel="noopener noreferrer"
-            className="flex items-center justify-center gap-2 w-full py-3 bg-gray-100 text-foreground font-medium rounded-lg hover:bg-gray-200 transition-colors mb-4"
+            className="flex items-center justify-center gap-2 w-full py-3 bg-gray-100 text-black font-medium rounded-lg hover:bg-gray-200 transition-colors mb-4"
           >
             <FileText className="w-5 h-5" />
             Ver PDF en nueva pestaña
@@ -186,12 +186,12 @@ function StudentProfileCard({
           <div className="border-b border-gray-300 mb-6"></div>
 
           <div className="space-y-3">
-            <Button onClick={onAccept} className="w-full py-3 text-white font-medium rounded-lg transition-colors">
+            <Button onClick={onAccept} className="w-full py-3 font-medium rounded-lg transition-colors">
               Aceptar solicitud
             </Button>
             <Button
               onClick={onReject}
-              className="w-full py-3 bg-[#e56b6b] text-white font-medium rounded-lg hover:bg-[#d45c5c] transition-colors"
+              className="w-full py-3 bg-[#e56b6b] font-medium rounded-lg hover:bg-[#d45c5c] transition-colors"
             >
               Rechazar solicitud
             </Button>

apps/web/src/components/shared/breadcrumb-detail.tsx

@@ -36,6 +36,7 @@ const EXCLUDED_ROUTES = undergraduateData
     "aplicantes",
     "manejar",
     "programas",
+    "asistencias"
   ]);
 
 function getBreadcrumbText(pathname: string) {

apps/web/src/components/shared/tab-applicants.tsx

@@ -189,7 +189,7 @@ function ApplicantsTable({ applicants, handleDetails }: { readonly applicants: G
               className="h-9 px-3 bg-core text-card hover:bg-core-highlight"
               onClick={() => setSortAscending(!sortAscending)}
             >
-              <span className="mr-1">A - Z</span>
+              <span className="mr-1 text-foreground">A - Z</span>
               <ChevronDown
                 className={`h-4 w-4 transform ${sortAscending ? "" : "rotate-180"}`}
               />