Merge pull request #442 from dbarzin/dev

Dev

Author: dbarzin

app/Exports/ControlsExport.php

@@ -22,6 +22,7 @@ public function headings(): array
             trans('cruds.control.fields.attributes'),
             trans('cruds.control.fields.model'),
             trans('cruds.control.fields.indicator'),
+            trans('cruds.control.fields.plan_date'),
             trans('cruds.control.fields.realisation_date'),
             trans('cruds.control.fields.observations'),
             trans('cruds.control.fields.score'),
@@ -58,13 +59,14 @@ public function columnWidths(): array
             'E' => 50,  // Attibuts
             'F' => 50,  // Modele
             'G' => 50,  // Indicateur
-            'H' => 15,  // Date
-            'I' => 50,  // Observation
-            'J' => 15,  // Score
-            'K' => 15,  // Note
-            'L' => 50,  // Responsibles
-            'M' => 15,  // Status
-            'N' => 50,  // Plan d'action
+            'H' => 15,  // Plan date
+            'I' => 15,  // Realisation date
+            'J' => 50,  // Observation
+            'K' => 15,  // Score
+            'L' => 15,  // Note
+            'M' => 50,  // Responsibles
+            'N' => 15,  // Status
+            'O' => 50,  // Plan d'action
         ];
     }
 
@@ -82,6 +84,7 @@ public function map($control): array
                 $control->input,
                 $control->model,
                 $control->indicator,
+                $control->plan_date,
                 $control->realisation_date,
                 $control->observations,
                 $control->score,

app/Exports/MeasuresExport.php

@@ -40,7 +40,7 @@ public function styles(Worksheet $sheet)
                     'wrapText' => true,
                     'vertical' => 'top',
                 ],
-²            ],
+            ],
         ];
     }
 

storage/app/repository/ISO22301-2019.fr.xlsx

@@ -4,6 +4,7 @@
 |--------------------------------------|--------------------------------------------------------------------------------|
 | DORA.en.xlsx                         | Digital Operational Resilience Act                                             |
 | HDS.fr.xlsx                          | Hébergeur de Données de Santé (https://esante.gouv.fr/services/hebergeurs-de-donnees-de-sante/les-referentiels-de-la-procedure-| HDS-V2.fr.xlsx                       | Hébergeur de Données de Santé (https://esante.gouv.fr/services/hebergeurs-de-donnees-de-sante/les-referentiels-de-la-procedure-de-certification) |
+| ISO22301-2019.fr.xlsx                | ISO/IEC 22301, 2019, in French                                                 |
 | ISO27001-2013.fr.xlsx                | ISO/IEC 27001, 2013, in French                                                 |
 | ISO27001-2022.en.xlsx                | [ISO/IEC 27001, 2022, in English](https://www.iso.org/standard/27001)          |
 | ISO27001-2022.fr.xlsx                | [ISO/IEC 27001, 2022, in French](https://www.iso.org/fr/standard/27001)        |