Browse Source

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

raphael 3 years ago
parent
commit
1ddd99f6bc

+ 2
- 0
config/packages/security.yaml View File

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

+ 6
- 6
src/Phoenix/Service/Monitoring/MonitoringExportHandler.php View File

@@ -547,7 +547,7 @@ class MonitoringExportHandler
547 547
         $learner = $data['learner'];
548 548
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_learner_sessions_list', array(
549 549
             '%learnerName%' => $learner->getFullName()
550
-        )))->mergeCells('A1:H1');
550
+        )))->mergeCells('A1:I1');
551 551
 
552 552
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
553 553
 
@@ -662,14 +662,14 @@ class MonitoringExportHandler
662 662
         // Cellules informative
663 663
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_learner_activities_list', array(
664 664
             '%learnerName%' => $learner->getFullName()
665
-        )))->mergeCells('A1:E1');
665
+        )))->mergeCells('A1:F1');
666 666
 
667 667
 
668 668
         $sheet->setCellValue('A2', $this->translator->trans($i18nTitle, array(
669 669
             '%sessionTitle%' => $session->getTitle(),
670 670
             '%startDate%' => $datesSession['startDate'],
671 671
             '%endDate%' => $datesSession['endDate']
672
-        )))->mergeCells('A2:E2');
672
+        )))->mergeCells('A2:F2');
673 673
 
674 674
         // Formatage des Cellules
675 675
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
@@ -1036,7 +1036,7 @@ class MonitoringExportHandler
1036 1036
             '%sessionTitle%' => $session->getTitle(),
1037 1037
             '%startDate%' => $datesSession['startDate'],
1038 1038
             '%endDate%' => $datesSession['endDate']
1039
-        )))->mergeCells('A1:G1');
1039
+        )))->mergeCells('A1:H1');
1040 1040
 
1041 1041
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
1042 1042
 
@@ -1139,7 +1139,7 @@ class MonitoringExportHandler
1139 1139
 
1140 1140
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_activity', array(
1141 1141
             '%activityTitle%' => $activity->getTitle()
1142
-        )))->mergeCells('A1:E1');
1142
+        )))->mergeCells('A1:F1');
1143 1143
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
1144 1144
 
1145 1145
 
@@ -1265,7 +1265,7 @@ class MonitoringExportHandler
1265 1265
 
1266 1266
         $sheet->setCellValue('A1', $this->translator->trans('title_monitoring_title_learner', array(
1267 1267
             '%learnerName%' => $learner->getFullName()
1268
-        )))->mergeCells('A1:E1');
1268
+        )))->mergeCells('A1:F1');
1269 1269
         $sheet->getStyle('A1')->applyFromArray($this->exportHandler->getStyleTitle());
1270 1270
 
1271 1271
 

+ 1
- 1
templates/back-office/admin/monitoring/sessions/single/learner/single_learner.html.twig View File

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

Loading…
Cancel
Save