Merge branch 'hotfix' of https://git.logipro.com/raphael/Phoenix into hotfix

config/packages/security.yaml

@@ -68,12 +68,14 @@ security:
     - { path: ^/learning-space, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
     - { path: ^/catalog, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
     - { path: ^/settings, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
+
     # ressource cache (mignature image)
     - { path: ^/media/cache/resolve/my_thumb, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
 
     # Zone de telechargmement de document accessible à toute personne connectée
     - { path: ^/file, roles: [IS_AUTHENTICATED_REMEMBERED] }
     - { path: ^/upload/download, roles: [IS_AUTHENTICATED_REMEMBERED] }
+    - { path: ^/scorm, roles: [IS_AUTHENTICATED_REMEMBERED] }
 
     # Espace reserver aux Owner
     - { path: ^/owner-space, roles: [ROLE_TRAINER, ROLE_TRAINER_AND_AUTHOR, ROLE_AUTHOR] }

src/Phoenix/Service/Monitoring/MonitoringExportHandler.php

@@ -547,7 +547,7 @@ class MonitoringExportHandler
         $learner = $data['learner'];
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_learner_sessions_list', array(
             '%learnerName%' => $learner->getFullName()
-        )))->mergeCells('A1:H1');
+        )))->mergeCells('A1:I1');
 
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
 
@@ -662,14 +662,14 @@ class MonitoringExportHandler
         // Cellules informative
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_learner_activities_list', array(
             '%learnerName%' => $learner->getFullName()
-        )))->mergeCells('A1:E1');
+        )))->mergeCells('A1:F1');
 
 
         $sheet->setCellValue('A2', $this->translator->trans($i18nTitle, array(
             '%sessionTitle%' => $session->getTitle(),
             '%startDate%' => $datesSession['startDate'],
             '%endDate%' => $datesSession['endDate']
-        )))->mergeCells('A2:E2');
+        )))->mergeCells('A2:F2');
 
         // Formatage des Cellules
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
@@ -1036,7 +1036,7 @@ class MonitoringExportHandler
             '%sessionTitle%' => $session->getTitle(),
             '%startDate%' => $datesSession['startDate'],
             '%endDate%' => $datesSession['endDate']
-        )))->mergeCells('A1:G1');
+        )))->mergeCells('A1:H1');
 
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
 
@@ -1139,7 +1139,7 @@ class MonitoringExportHandler
 
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_activity', array(
             '%activityTitle%' => $activity->getTitle()
-        )))->mergeCells('A1:E1');
+        )))->mergeCells('A1:F1');
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
 
 
@@ -1265,7 +1265,7 @@ class MonitoringExportHandler
 
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_learner', array(
             '%learnerName%' => $learner->getFullName()
-        )))->mergeCells('A1:E1');
+        )))->mergeCells('A1:F1');
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
 
 

templates/back-office/admin/monitoring/sessions/single/learner/single_learner.html.twig

@@ -15,7 +15,7 @@
 			{# / breadcrumb #}
 			{# Action supplementaire (...) #}
 			<div class="ali-ContentNavAction col-md-7 col-xl-5">
-                <a href="{{ path('nbo_os_sessions_monitoring_export_global', { 'sessionId': session.sessionId }) }}" class="btn btn-primary">
+                <a href="{{ path('nbo_sessions_monitoring_export_global', { 'sessionId': session.sessionId }) }}" class="btn btn-primary">
                 	<i class="icons">import_export</i>
                 	<span class="ali-ContentNavAction-libBtn">{{ 'action_global_export'|trans }}</span>
                 </a>