Merge branch 'fix/retours-tests' into 'V2.0'

fix: retours tests

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!351

src/app/models/structure.model.ts

@@ -187,11 +187,12 @@ export class Structure {
   }
 
   public getLabelTypeStructure(): StructureTypeEnum | '' {
-    return StructureTypeEnum[this.structureType.value] || '';
+    if (this.structureType) return StructureTypeEnum[this.structureType.value] || '';
+    return '';
   }
 
   public getTypeStructureIcon(): StructureCategoryIconEnum {
-    switch (this.structureType.category) {
+    switch (this.structureType?.category) {
       case StructureCategoryEnum.public:
         return StructureCategoryIconEnum['public'];
       case StructureCategoryEnum.private:

src/app/services/structure.service.ts

@@ -35,9 +35,6 @@ export class StructureService {
 
   public editStructure(structure: Partial<Structure>, structureId?: string): Observable<Structure> {
     structure.updatedAt = new Date().toString();
-    if (structure.dataShareConsentDate) {
-      structure.dataShareConsentDate = new Date().toString();
-    }
     if (!structureId) structureId = structure._id;
     delete structure._id; // id should not be provided for update
     return this.http

src/app/shared/components/data-share-consent/data-share-consent.component.ts

@@ -78,9 +78,17 @@ export class DataShareConsentComponent implements OnInit {
     this.submitted = true;
     this.loading = true;
     for (let structure of this.dataConsentPendingStructures) {
-      this.structureService.editStructure(structure).subscribe((_s: Structure) => {});
+      this.structureService
+        .editStructure(
+          {
+            dataShareConsentDate: structure.dataShareConsentDate,
+          },
+          structure._id
+        )
+        .subscribe((_s: Structure) => {
+          this.loading = false;
+          this.openned = false;
+        });
     }
-    this.loading = false;
-    this.openned = false;
   }
 }

src/app/utils/formUtils.ts

@@ -125,7 +125,7 @@ export class formUtils {
         handicaps: this.loadArrayForCheckbox(structure.categories.handicaps, false),
         age: this.loadArrayForCheckbox(structure.categories.age, true),
         languageAndIlliteracy: this.loadArrayForCheckbox(structure.categories.languageAndIlliteracy, false),
-        selfServiceMaterial: this.loadArrayForCheckbox(structure.categories.selfServiceMaterial, true),
+        selfServiceMaterial: this.loadArrayForCheckbox(structure.categories.selfServiceMaterial, false),
         publicOthers: this.loadArrayForCheckbox(structure.categories.publicOthers, false),
         equipmentsAndServices: this.loadArrayForCheckbox(structure.categories.equipmentsServices, false),
         baseSkills: new UntypedFormControl(structure.categories.baseSkills),