iptdevs-design-system 3.1.339 → 3.1.341

package/fesm2020/iptdevs-design-system.mjs

@@ -3170,8 +3170,9 @@ class CodFormStepOneComponent extends CodFormSteps {
         this.codFormStepOne.controls['course_type'].valueChanges
             .subscribe(value => this.communicatorService.setCurrentCourseType(value));
         this.communicatorService.setCurrentAgreement(this.localStorageCOD.getCodFormData(1, 'agreement_by_category'));
-        if (changes['initialData'] && this.initialData != null) {
+        if (changes['initialData'] && this.initialData != null && !this.dataPreviusCodData && !this.isEditCod && this.isRenovation === false) {
             this.processData(this.initialData);
+            this.cdRef.detectChanges();
         }
         if (changes['dataPreviusCodData'] && this.dataPreviusCodData != null && this.isEditCod && this.isRenovation === false) {
             this.processData(this.dataPreviusCodData);
@@ -3188,8 +3189,10 @@ class CodFormStepOneComponent extends CodFormSteps {
             this.cdRef.detectChanges();
         }
         else if (changes['dataPreviusCodData'] && this.dataPreviusCodData != null && !this.isEditCod && this.courseSelectRenovation && this.isRenovation === true) {
-            this.disableFormControls();
             this.setDataCodRenovationSelect();
+            this.isDisabledSel = true;
+            this.disableFormControls();
+            this.cdRef.detectChanges();
         }
     }
     disableFormControls() {
@@ -3219,30 +3222,30 @@ class CodFormStepOneComponent extends CodFormSteps {
         }
     }
     setDataFromUserHistory() {
-        this.codFormStepOne.controls['academic_plan'].setValue(this.initialData.course_type?.academic_plan.code);
-        this.codFormStepOne.controls['course_type'].setValue(this.initialData.course_type?.code);
-        this.codFormStepOne.controls['agreement_by_category'].setValue(this.initialData.agreement?.code);
-        this.codFormStepOne.controls['english_level'].setValue(this.initialData.english_level?.code);
-        this.codFormStepOne.controls['availible_courses'].setValue(this.initialData?.code);
-        this.codFormStepOne.controls['course_modality'].setValue(this.initialData.course_modality?.code);
+        this.codFormStepOne.controls['academic_plan'].setValue(this.initialData.course_type?.academic_plan.code ? this.initialData.course_type?.academic_plan.code : null);
+        this.codFormStepOne.controls['course_type'].setValue(this.initialData.course_type?.code ? this.initialData.course_type?.code : null);
+        this.codFormStepOne.controls['agreement_by_category'].setValue(this.initialData.agreement?.code ? this.initialData.agreement?.code : null);
+        this.codFormStepOne.controls['english_level'].setValue(this.initialData.english_level?.code ? this.initialData.english_level?.code : null);
+        this.codFormStepOne.controls['availible_courses'].setValue(this.initialData?.code ? this.initialData?.code : null);
+        this.codFormStepOne.controls['course_modality'].setValue(this.initialData.course_modality?.code ? this.initialData.course_modality?.code : null);
     }
     setDataFromEditCodHistory() {
-        this.codFormStepOne.controls['academic_plan'].setValue(this.dataPreviusCodData.course_type.academic_plan.code);
-        this.codFormStepOne.controls['course_type'].setValue(this.dataPreviusCodData.course_type.code);
-        this.codFormStepOne.controls['agreement_by_category'].setValue(this.dataPreviusCodData.agreement.code);
-        this.codFormStepOne.controls['english_level'].setValue(this.dataPreviusCodData.english_level.code);
-        this.codFormStepOne.controls['availible_courses'].setValue(this.dataPreviusCodData.course.code);
-        this.codFormStepOne.controls['course_modality'].setValue(this.dataPreviusCodData.course.course_modality);
+        this.codFormStepOne.controls['academic_plan'].setValue(this.dataPreviusCodData.course_type.academic_plan.code ? this.dataPreviusCodData.course_type.academic_plan.code : null);
+        this.codFormStepOne.controls['course_type'].setValue(this.dataPreviusCodData.course_type.code ? this.dataPreviusCodData.course_type.code : null);
+        this.codFormStepOne.controls['agreement_by_category'].setValue(this.dataPreviusCodData.agreement.code ? this.dataPreviusCodData.agreement.code : null);
+        this.codFormStepOne.controls['english_level'].setValue(this.dataPreviusCodData.english_level.code ? this.dataPreviusCodData.english_level.code : null);
+        this.codFormStepOne.controls['availible_courses'].setValue(this.dataPreviusCodData.course.code ? this.dataPreviusCodData.course.code : null);
+        this.codFormStepOne.controls['course_modality'].setValue(this.dataPreviusCodData.course.course_modality ? this.dataPreviusCodData.course.course_modality : null);
     }
     setDataCodRenovationSelect() {
         this.getAgreementByPlan(this.courseSelectRenovation.course_type?.academic_plan.code);
         this.getCourseType(this.courseSelectRenovation.course_type?.academic_plan.code);
-        this.codFormStepOne.controls['academic_plan'].setValue(this.courseSelectRenovation.course_type?.academic_plan.code);
-        this.codFormStepOne.controls['course_type'].setValue(this.courseSelectRenovation.course_type?.code);
-        this.codFormStepOne.controls['agreement_by_category'].setValue(this.courseSelectRenovation.agreement?.code);
-        this.codFormStepOne.controls['english_level'].setValue(this.courseSelectRenovation.english_level?.code);
-        this.codFormStepOne.controls['availible_courses'].setValue(this.courseSelectRenovation?.code);
-        this.codFormStepOne.controls['course_modality'].setValue(this.courseSelectRenovation.course_modality?.code);
+        this.codFormStepOne.controls['academic_plan'].setValue(this.courseSelectRenovation.course_type?.academic_plan.code ? this.courseSelectRenovation.course_type?.academic_plan.code : null);
+        this.codFormStepOne.controls['course_type'].setValue(this.courseSelectRenovation.course_type?.code ? this.courseSelectRenovation.course_type?.code : null);
+        this.codFormStepOne.controls['agreement_by_category'].setValue(this.courseSelectRenovation.agreement?.code ? this.courseSelectRenovation.agreement?.code : null);
+        this.codFormStepOne.controls['english_level'].setValue(this.courseSelectRenovation.english_level?.code ? this.courseSelectRenovation.english_level?.code : null);
+        this.codFormStepOne.controls['availible_courses'].setValue(this.courseSelectRenovation?.code ? this.courseSelectRenovation?.code : null);
+        this.codFormStepOne.controls['course_modality'].setValue(this.courseSelectRenovation.course_modality?.code ? this.courseSelectRenovation.course_modality?.code : null);
         this.getAvailibleCourses();
     }
     startLocalStorageWork() {