iptdevs-design-system 3.1.873 → 3.1.875

package/fesm2020/iptdevs-design-system.mjs

@@ -28,7 +28,7 @@ import * as i4 from 'primeng/skeleton';
 import { SkeletonModule } from 'primeng/skeleton';
 import * as i6$1 from 'primeng/button';
 import { ButtonModule } from 'primeng/button';
-import { BehaviorSubject, map } from 'rxjs';
+import { BehaviorSubject, finalize, map } from 'rxjs';
 import * as i11 from 'primeng/table';
 import { TableModule } from 'primeng/table';
 import * as i5$1 from '@angular/material/checkbox';
@@ -3842,10 +3842,7 @@ class CodFormStepOneComponent extends CodFormSteps {
         const planNumber = typeof plan === 'string' ? parseInt(plan) : plan;
         if (this.parametersAll && this.parametersAll?.courseType) {
             this.course_type = this.parametersAll.courseType.filter((course) => {
-                const academicPlan = typeof course.academic_plan === 'string'
-                    ? parseInt(course.academic_plan)
-                    : course.academic_plan;
-                return academicPlan === planNumber;
+                return course.academic_plan === planNumber;
             });
         }
         else {
@@ -3855,11 +3852,8 @@ class CodFormStepOneComponent extends CodFormSteps {
     getAgreementByPlan(plan) {
         const planNumber = typeof plan === 'string' ? parseInt(plan) : plan;
         if (this.parametersAll && this.parametersAll?.agreement) {
-            this.agreements = this.parametersAll.agreement.filter((course) => {
-                const academicPlan = typeof course.category === 'string'
-                    ? parseInt(course.category)
-                    : course.category;
-                return academicPlan === planNumber;
+            this.agreements = this.parametersAll.agreement.filter((agreement) => {
+                return agreement.category === planNumber;
             });
         }
         else {
@@ -3911,54 +3905,110 @@ class CodFormStepOneComponent extends CodFormSteps {
             this.codFormStepOne.controls['english_level'].setValue(null);
         }
     }
+    // private validRequest(): boolean {
+    //   return (
+    //     this.codFormStepOne.controls['english_level'].value != '' &&
+    //     this.codFormStepOne.controls['agreement_by_category'].value != '' &&
+    //     this.codFormStepOne.controls['course_type'].value != ''
+    //   );
+    // }
     validRequest() {
-        return (this.codFormStepOne.controls['english_level'].value != '' &&
-            this.codFormStepOne.controls['agreement_by_category'].value != '' &&
-            this.codFormStepOne.controls['course_type'].value != '');
-    }
+        const form = this.codFormStepOne;
+        return !!(form.get('english_level')?.value &&
+            form.get('agreement_by_category')?.value &&
+            form.get('course_type')?.value);
+    }
+    // getAvailibleCourses() {
+    //   if (this.validRequest()) {
+    //     this.isLoading = true;
+    //     let request_availibleCourses: GetAvailibleCoursesRq = {
+    //       token: this.baseService.getUserToken(),
+    //       english_level: this.codFormStepOne.controls['english_level'].value,
+    //       agreement: this.codFormStepOne.controls['agreement_by_category'].value,
+    //       course_type: this.codFormStepOne.controls['course_type'].value,
+    //     };
+    //     this.courseService.getAvailableCoursesByLevAgreeCType(request_availibleCourses).subscribe((response) => {
+    //       if (response.data) {
+    //         this.availibleCourses = [];
+    //         let courses: any[] = response.data;
+    //         this.hasAvailableCourse = true;
+    //         courses.forEach(course => {
+    //           let scheduleParts = course.course_schedule[0].split(" ");
+    //           let startTime = scheduleParts[2];
+    //           this.availibleCourses.push({
+    //             code: course.code,
+    //             name: `${course.code} Curso ${course.course_modality.name === 'Presencial' ? 'Presencial' : 'Virtual'} - Teacher ${course.teacher} -  Fecha de inicio: ${course.to_start}, Hora de inicio: ${startTime}, Cupos disp: ${course.available_capacity}`,
+    //             modality: course.course_modality.code
+    //           });
+    //         })
+    //         this.isLoading = false;
+    //         console.log("availibleCourses",this.availibleCourses);
+    //         console.log("Valores del formulario:", {
+    //           academic_plan: this.codFormStepOne.controls['academic_plan'].value,
+    //           course_type: this.codFormStepOne.controls['course_type'].value,
+    //           agreement_by_category: this.codFormStepOne.controls['agreement_by_category'].value,
+    //           english_level: this.codFormStepOne.controls['english_level'].value,
+    //           availible_courses: this.codFormStepOne.controls['availible_courses'].value,
+    //           course_modality: this.codFormStepOne.controls['course_modality'].value,
+    //           agreement: this.codFormStepOne.controls['agreement'].value,
+    //         });
+    //       } else {  
+    //         this.hasAvailableCourse = false;
+    //         this.codFormStepOne.controls['availible_courses'].setValue("");
+    //         this.setValueStepFour();
+    //         this.isLoading = false;
+    //       }
+    //       });
+    //   }
+    // }
     getAvailibleCourses() {
         if (this.validRequest()) {
             this.isLoading = true;
+            // Guarda los valores actuales antes de la llamada
+            const currentValues = {
+                academic_plan: this.codFormStepOne.get('academic_plan')?.value,
+                course_type: this.codFormStepOne.get('course_type')?.value,
+                agreement_by_category: this.codFormStepOne.get('agreement_by_category')?.value,
+                english_level: this.codFormStepOne.get('english_level')?.value
+            };
+            console.log('Before request:', this.codFormStepOne.value);
             let request_availibleCourses = {
                 token: this.baseService.getUserToken(),
-                english_level: this.codFormStepOne.controls['english_level'].value,
-                agreement: this.codFormStepOne.controls['agreement_by_category'].value,
-                course_type: this.codFormStepOne.controls['course_type'].value,
+                english_level: currentValues.english_level,
+                agreement: currentValues.agreement_by_category,
+                course_type: currentValues.course_type,
             };
-            this.courseService.getAvailableCoursesByLevAgreeCType(request_availibleCourses).subscribe((response) => {
-                if (response.data) {
-                    this.availibleCourses = [];
-                    let courses = response.data;
-                    this.hasAvailableCourse = true;
-                    courses.forEach(course => {
-                        let scheduleParts = course.course_schedule[0].split(" ");
-                        let startTime = scheduleParts[2];
-                        this.availibleCourses.push({
-                            code: course.code,
-                            name: `${course.code} Curso ${course.course_modality.name === 'Presencial' ? 'Presencial' : 'Virtual'} - Teacher ${course.teacher} -  Fecha de inicio: ${course.to_start}, Hora de inicio: ${startTime}, Cupos disp: ${course.available_capacity}`,
-                            modality: course.course_modality.code
+            this.courseService.getAvailableCoursesByLevAgreeCType(request_availibleCourses)
+                .pipe(finalize(() => this.isLoading = false))
+                .subscribe({
+                next: (response) => {
+                    if (response.data) {
+                        this.availibleCourses = response.data.map((course) => {
+                            let scheduleParts = course.course_schedule[0]?.split(" ") || [];
+                            let startTime = scheduleParts[2] || '';
+                            return {
+                                code: course.code,
+                                name: `${course.code} Curso ${course.course_modality?.name === 'Presencial' ? 'Presencial' : 'Virtual'} - Teacher ${course.teacher} - Fecha de inicio: ${course.to_start}, Hora de inicio: ${startTime}, Cupos disp: ${course.available_capacity}`,
+                                modality: course.course_modality?.code
+                            };
                         });
-                    });
-                    this.isLoading = false;
-                    console.log("availibleCourses", this.availibleCourses);
-                    console.log("Valores del formulario:", {
-                        academic_plan: this.codFormStepOne.controls['academic_plan'].value,
-                        course_type: this.codFormStepOne.controls['course_type'].value,
-                        agreement_by_category: this.codFormStepOne.controls['agreement_by_category'].value,
-                        english_level: this.codFormStepOne.controls['english_level'].value,
-                        availible_courses: this.codFormStepOne.controls['availible_courses'].value,
-                        course_modality: this.codFormStepOne.controls['course_modality'].value,
-                        agreement: this.codFormStepOne.controls['agreement'].value,
-                    });
-                }
-                else {
+                        this.hasAvailableCourse = true;
+                    }
+                    else {
+                        this.hasAvailableCourse = false;
+                        this.codFormStepOne.get('availible_courses')?.setValue(null);
+                        this.setValueStepFour();
+                    }
+                    this.cdRef.detectChanges();
+                },
+                error: (err) => {
+                    console.error('Error loading courses:', err);
                     this.hasAvailableCourse = false;
-                    this.codFormStepOne.controls['availible_courses'].setValue("");
-                    this.setValueStepFour();
-                    this.isLoading = false;
+                    this.cdRef.detectChanges();
                 }
             });
         }
+        console.log('After response:', this.codFormStepOne.value);
     }
     setValueStepFour() {
         this.setDataInLocalStorage(4, 'program_price', null);