.gitignore

@@ -76,7 +76,7 @@ config/bundles.local.php
 ###< fin dossier command
 
 # contenu du dossier templates/temp
-/templates/temp/
+/templates/temp/*
 # fichier readme pour créer le dossier
 !/templates/temp/readme
 

assets/exclusive/js/back-office/init_back_office.js

@@ -33,24 +33,6 @@ $(document).ready(function ()
 	removeOutlineOnClick();
 });
 
-function initscrollDatepicker(container)
-{
-	// initialise les datepicker
-	var lastScrollTop = 0;
-	container.scroll(function (event)
-	{
-		container.find('[data-airpicker]').each(function()
-		{
-			let picker = $(this).data('datepicker');
-			if (picker)
-			{
-				picker.hide();
-			}
-		});
-	});
-}
-
-
 function initscrollDatepicker(container)
 {
 	// initialise les datepicker

assets/exclusive/js/back-office/learning_path/learning_path_editor.js

@@ -1374,7 +1374,7 @@ function initAirDatePicker(container) {
         let dateEndSession = fieldDate.attr('data-phx-end-session');
         let dataAltField = fieldDate.attr('data-alt-field');
 
-        let myDatepicker = fieldDate.datepicker({
+        let options = {
             minDate: new Date(dateStartSession),
             maxDate: new Date(dateEndSession),
             offset: 0,
@@ -1384,17 +1384,11 @@ function initAirDatePicker(container) {
             position: 'top left',
             classes: 'ali-EditorSequence-datePicker',
             timepicker: true,
-            language: {
-                days: ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'],
-                daysShort: ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'],
-                daysMin: ['Di', 'Lu', 'Ma', 'Me', 'Je', 'Ve', 'Sa'],
-                months: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Decembre'],
-                monthsShort: ['Jan', 'Fév', 'Mars', 'Avr', 'Mai', 'Juin', 'Juil', 'Août', 'Sep', 'Oct', 'Nov', 'Dec'],
-                clear: 'Effacer'
-            },
             startDate: start,
             minHours: 0
-        }).data('datepicker');
+        };
+        let utility = require('../utilities/utility');
+        let myDatepicker = utility.initDatepicker(container,options).first().datepicker().data('datepicker');
 
         let valueDate = $(dataAltField).val();
         if (valueDate != '') {
@@ -1405,7 +1399,7 @@ function initAirDatePicker(container) {
         // Si on scroll le calendrier disparait
         // C'est la seule solution rapide trouvé pour régler le problème de calendrier positionné toujours en bas
         var lastScrollTop = 0;
-        $('.ali-EditorContentRightPanelContent').scroll(function (event) {
+        $('.ali-EditorContentRightPanelContent').parent().scroll(function (event) {
             myDatepicker.hide();
         });
     }

assets/exclusive/js/back-office/utilities/utility.js

@@ -22,12 +22,62 @@ module.exports = {
             clearButton: true,
             autoClose: true,
             language: {
-                days: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
-                daysShort: ['Dim','Lun','Mar','Mer','Jeu','Ven','Sam'],
-                daysMin: ['Di','Lu','Ma','Me','Je','Ve','Sa'],
-                months: ['Janvier','Février','Mars','Avril','Mai','Juin','Juillet','Août','Septembre','Octobre','Novembre','Decembre'],
-                monthsShort: ['Jan','Fév','Mars','Avr','Mai','Juin','Juil','Août','Sep','Oct','Nov','Dec'],
-                clear: 'Effacer',
+                days: [
+                    Translator.trans('sunday_long'),
+                    Translator.trans('monday_long'),
+                    Translator.trans('tuesday_long'),
+                    Translator.trans('wednesday_long'),
+                    Translator.trans('thursday_long'),
+                    Translator.trans('friday_long'),
+                    Translator.trans('saturday_long')
+                ],
+                daysShort: [
+                    Translator.trans('sunday_long').substring(0,3),
+                    Translator.trans('monday_long').substring(0,3),
+                    Translator.trans('tuesday_long').substring(0,3),
+                    Translator.trans('wednesday_long').substring(0,3),
+                    Translator.trans('thursday_long').substring(0,3),
+                    Translator.trans('friday_long').substring(0,3),
+                    Translator.trans('saturday_long').substring(0,3)
+                ],
+                daysMin: [
+                    Translator.trans('sunday_long').substring(0,2),
+                    Translator.trans('monday_long').substring(0,2),
+                    Translator.trans('tuesday_long').substring(0,2),
+                    Translator.trans('wednesday_long').substring(0,2),
+                    Translator.trans('thursday_long').substring(0,2),
+                    Translator.trans('friday_long').substring(0,2),
+                    Translator.trans('saturday_long').substring(0,2)
+                ],
+                months: [
+                    Translator.trans('january_long'),
+                    Translator.trans('february_long'),
+                    Translator.trans('march_long'),
+                    Translator.trans('april_long'),
+                    Translator.trans('may_long'),
+                    Translator.trans('june_long'),
+                    Translator.trans('july_long'),
+                    Translator.trans('august_long'),
+                    Translator.trans('september_long'),
+                    Translator.trans('october_long'),
+                    Translator.trans('november_long'),
+                    Translator.trans('december_long')
+                ],
+                monthsShort: [
+                    Translator.trans('january_long').substring(0,3),
+                    Translator.trans('february_long').substring(0,3),
+                    Translator.trans('march_long').substring(0,3),
+                    Translator.trans('april_long').substring(0,3),
+                    Translator.trans('may_long').substring(0,3),
+                    Translator.trans('june_long').substring(0,3),
+                    Translator.trans('july_long').substring(0,3),
+                    Translator.trans('august_long').substring(0,3),
+                    Translator.trans('september_long').substring(0,3),
+                    Translator.trans('october_long').substring(0,3),
+                    Translator.trans('november_long').substring(0,3),
+                    Translator.trans('december_long').substring(0,3)
+                ],
+                clear: Translator.trans('clear_button'),
             },
             clearButton: true
         };
@@ -35,7 +85,8 @@ module.exports = {
         defaultOptions = $.extend(defaultOptions, options);
 
         //Datepicker DATE
-        container.find('[data-airpicker="date"]').each(function() {
+        console.log( container.find('[data-airpicker]'));
+        container.find('[data-airpicker]').each(function() {
 
             var myDatepicker = $(this).datepicker(defaultOptions).data('datepicker');
     
@@ -48,5 +99,6 @@ module.exports = {
                 $('#'+myDatepicker.el.id+':invalid').css('box-shadow','none','border','0 none','outline','0');
             }
         });
+        return container.find('[data-airpicker]');
     }),
 }

assets/exclusive/js/init_activity-player.js

@@ -14,8 +14,8 @@ $(document).ready(function() {
 
 function initMenu() {
 	$(".ali-PlayerNavListe-element").click(function () {
-		if (!$(this).hasClass('select')) {
-			var elem = $(this);
+		var elem = $(this);
+		if (!elem.hasClass('select')) {
 			if ($(".ali-PlayerNavListe-element.select").hasClass('ali-PlayerNavListe-forum')) {
 				$(".ali-LSForum").removeClass('active');
 			}
@@ -32,13 +32,18 @@ function initMenu() {
 				'height': elem.height(),
 				'width': elem.width()
 			}, 200);
+
+			// Garder en mémoire qu'on a fermé le menu
+			if (elem.attr('id') == 'ali-PlayerNavListe-menu') {
+				sessionStorage.setItem('menuOpen','true');
+			}
 		} 
 		else
 		{
-			$(this).removeClass('select');
+			elem.removeClass('select');
 
-			if ($(this).is('[aria-controls]')) {
-				$('#' + $(this).attr('aria-controls')).removeClass('select');
+			if (elem.is('[aria-controls]')) {
+				$('#' + elem.attr('aria-controls')).removeClass('select');
 			}
 
 			$('.ali-PlayerNavSecondaire').removeClass('active');
@@ -54,9 +59,15 @@ function initMenu() {
 					'height': 0
 				}, 200);
 			}
+
+			// Garder en mémoire qu'on a ouvert le menu
+			if (elem.attr('id') == 'ali-PlayerNavListe-menu') {
+				sessionStorage.setItem('menuOpen','false');
+			}
 		}
 	});
 
+
 	var doit;
 	$(window).resize(function(){
 		clearTimeout(doit);
@@ -76,8 +87,13 @@ function initMenu() {
 		}
 	}
 
+	// Si en mémoire le menu est ouvert alors l'ouvrir
+	if (sessionStorage.getItem('menuOpen') == 'true') {
+		$('#ali-PlayerNavListe-menu:not(.select)').click();
+	}
+	
 	// Selectionner l'élément du menu s'il y en a un à selectionner 
-	$(".ali-PlayerNavListe-element.autoSelect").click();
+	$(".ali-PlayerNavListe-element.autoSelect:not(.select)").click();
 }
 
 class PHXActivityPlayer {

assets/shared/js/init/init.js

@@ -50,74 +50,18 @@ console.log('slinky');
 	});
 
 	// Datepicker DATE
-	$('[data-airpicker="date"]').each(function() {
-		var myDatepicker = $(this).datepicker({
-			startDate: start,
-			offset: 0,
-			firstDay: 1,
-			clearButton: true,
-			autoClose: true,
-			language: {
-				days: [
-					'Dimanche',
-					'Lundi',
-					'Mardi',
-					'Mercredi',
-					'Jeudi',
-					'Vendredi',
-					'Samedi',
-				],
-				daysShort: [
-					'Dim',
-					'Lun',
-					'Mar',
-					'Mer',
-					'Jeu',
-					'Ven',
-					'Sam',
-				],
-				daysMin: [
-					'Di',
-					'Lu',
-					'Ma',
-					'Me',
-					'Je',
-					'Ve',
-					'Sa',
-				],
-				months: [
-					'Janvier',
-					'Février',
-					'Mars',
-					'Avril',
-					'Mai',
-					'Juin',
-					'Juillet',
-					'Août',
-					'Septembre',
-					'Octobre',
-					'Novembre',
-					'Decembre',
-				],
-				monthsShort: [
-					'Jan',
-					'Fév',
-					'Mars',
-					'Avr',
-					'Mai',
-					'Juin',
-					'Juil',
-					'Août',
-					'Sep',
-					'Oct',
-					'Nov',
-					'Dec',
-				],
-				clear: 'Effacer'
-			},
-			clearButton: true,
-		}).data('datepicker');
-
+	let utility = require('../../../exclusive/js/back-office/utilities/utility');
+	let options = {
+		startDate: start,
+		offset: 0,
+		firstDay: 1,
+		clearButton: true,
+		autoClose: true,
+		clearButton: true,
+	};
+	utility.initDatepicker($('[data-airpicker="date"]'),options).each(function()
+	{
+		let myDatepicker = $(this).datepicker().data('datepicker');
 		var valueDate = myDatepicker.$altField[0].defaultValue;
 
 		if (valueDate != '') {
@@ -125,8 +69,7 @@ console.log('slinky');
 		}
 	});
 
-	// Datepicker DATE TIME
-	$('[data-airpicker="date time"]').datepicker({
+	options = {
 		startDate: start,
 		offset: 0,
 		dateFormat: 'DD d MM yyyy',
@@ -135,67 +78,19 @@ console.log('slinky');
 		timepicker: true,
 		dateTimeSeparator: ", à ",
 		timeFormat: 'hh:ii',
-		minutesStep: 15,
-		language: {
-			days: [
-				'Dimanche',
-				'Lundi',
-				'Mardi',
-				'Mercredi',
-				'Jeudi',
-				'Vendredi',
-				'Samedi',
-			],
-			daysShort: [
-				'Dim',
-				'Lun',
-				'Mar',
-				'Mer',
-				'Jeu',
-				'Ven',
-				'Sam',
-			],
-			daysMin: [
-				'Di',
-				'Lu',
-				'Ma',
-				'Me',
-				'Je',
-				'Ve',
-				'Sa',
-			],
-			months: [
-				'Janvier',
-				'Février',
-				'Mars',
-				'Avril',
-				'Mai',
-				'Juin',
-				'Juillet',
-				'Août',
-				'Septembre',
-				'Octobre',
-				'Novembre',
-				'Decembre',
-			],
-			monthsShort: [
-				'Jan',
-				'Fév',
-				'Mars',
-				'Avr',
-				'Mai',
-				'Juin',
-				'Juil',
-				'Août',
-				'Sep',
-				'Oct',
-				'Nov',
-				'Dec',
-			],
-			clear: 'Effacer'
-		},
+		minutesStep: 15
+	};
+	utility.initDatepicker($('[data-airpicker="date"]'),options).each(function()
+	{
+		let myDatepicker = $(this).datepicker().data('datepicker');
+		var valueDate = myDatepicker.$altField[0].defaultValue;
+
+		if (valueDate != '') {
+			myDatepicker.selectDate(new Date(valueDate));
+		}
 	});
 
+
 	const Toastr = require('toastr');
 	/**
 	 * Feedbacks Toastr

assets/shared/js/init/init_create-from-library.js

@@ -106,24 +106,19 @@ function phxSetupAirpicker()
 	start.setMinutes(0);
 
 	//Datepicker DATE
-	$('#modalCreateNewElementFromLibrary [data-airpicker="date"]').each(function() {
-		var myDatepicker = $(this).datepicker({
-			startDate: start,
-			offset: 0,
-			firstDay: 1,
-			clearButton: true,
-			autoClose: true,
-			language: {
-				days: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
-				daysShort: ['Dim','Lun','Mar','Mer','Jeu','Ven','Sam'],
-				daysMin: ['Di','Lu','Ma','Me','Je','Ve','Sa'],
-				months: ['Janvier','Février','Mars','Avril','Mai','Juin','Juillet','Août','Septembre','Octobre','Novembre','Decembre'],
-				monthsShort: ['Jan','Fév','Mars','Avr','Mai','Juin','Juil','Août','Sep','Oct','Nov','Dec'],
-				clear: 'Effacer',
-			},
-			clearButton: true
-		}).data('datepicker');
-
+	let options = {
+		startDate: start,
+		offset: 0,
+		firstDay: 1,
+		clearButton: true,
+		autoClose: true,
+		clearButton: true
+	};
+
+	let utility = require('../utilities/utility');
+	utility.initDatepicker($('#modalCreateNewElementFromLibrary [data-airpicker="date"]'),options).each(function()
+	{
+		let myDatepicker = $(this).datepicker().data('datepicker');
 		var valueDate = myDatepicker.$altField[0].defaultValue;
 
 		if (valueDate != '') {

assets/shared/scss/theme-phx/back-office/global.scss

@@ -1501,6 +1501,7 @@ img {
     padding: 10px;
     text-align: center;
     width: 90px;
+    max-width: 100%;
 
 @extend .ali-shadow-box;
 

assets/shared/scss/theme-phx/learning-space/activity-page.scss

@@ -591,7 +591,9 @@ $case-width: 70px;
     height: 100%;
     width: 100%;
     margin: 0 auto;
-    background: $ls-activity-viewer-background;   
+    background: $ls-activity-viewer-background;
+	overflow: auto;
+	-webkit-overflow-scrolling: touch; 
 }
 
 .ali-ViewerScorm iframe {

assets/shared/scss/theme-phx/learning-space/forum.scss

@@ -7,7 +7,7 @@
     right:0;
     top:0;
     bottom:0;
-    z-index: 3;
+    z-index: 57;
 
     &.active {
         width: 70%;

assets/shared/scss/theme-phx/learning-space/session-page.scss

@@ -9,10 +9,14 @@
     display: flex;
     width: 100%;
     position: relative;
-    padding-right: 50px;
-    
-    @media #{$ls-break-xl} {
-        padding-right: 0px;
+
+    &.ali-withForum
+    {
+        padding-right: 50px;
+        
+        @media #{$ls-break-xl} {
+            padding-right: 0px;
+        }
     }
 }
 

config/packages/security.yaml

@@ -68,23 +68,24 @@ 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] }
     
     # Partie commune aux Onwer et Admin
-    - { path: ^/learning-path-builder, roles: [ROLE_ADMIN, ROLE_TRAINER_AND_AUTHOR, ROLE_AUTHOR] }
-    - { path: ^/users/searchTrainer, roles: [ROLE_ADMIN, ROLE_TRAINER_AND_AUTHOR, ROLE_AUTHOR] }
-    - { path: ^/forum, roles: [ROLE_ADMIN, ROLE_TRAINER_AND_AUTHOR, ROLE_TRAINER] }
+    - { path: ^/learning-path-builder, roles: [ROLE_ADMIN, ROLE_COWORKER, ROLE_TRAINER_AND_AUTHOR, ROLE_AUTHOR] }
+    - { path: ^/users/searchTrainer, roles: [ROLE_ADMIN, ROLE_COWORKER, ROLE_TRAINER_AND_AUTHOR, ROLE_AUTHOR] }
     
     # Le reste pour l'admin
-    - { path: ^/, roles: [ROLE_ADMIN] }
+    - { path: ^/, roles: [ROLE_ADMIN, ROLE_COWORKER] }
 
   role_hierarchy:
     ROLE_AUTHOR : [ROLE_VIEW_HIS_DATA, ROLE_MANAGE_LEARNING_PATH, ROLE_VIEW_HIS_INFORMATION]

config/routes.yaml

@@ -538,9 +538,9 @@ nbo_session_list:
   path: /sessions/
   controller: Logipro\Phoenix\Controller\NewBackOffice\Admin\Session\Create\SessionController::list  
 
-nbo_session_export_csv:
-  path: /sessions/export/csv
-  controller: Logipro\Phoenix\Controller\NewBackOffice\Admin\Session\Create\SessionController::exportCSV
+nbo_session_export_xls:
+  path: /sessions/export/xls
+  controller: Logipro\Phoenix\Controller\NewBackOffice\Admin\Session\Create\SessionController::exportXLS
 
 #-------------------------------------------------------------------------------
 # Parcours d'apprentissage
@@ -635,13 +635,13 @@ nbo_os_learning_path_editor:
     id: \d+
     
 # Admin
-nbo_learning_path_export_csv:
-  path: learning-paths/export/csv
-  controller: Logipro\Phoenix\Controller\NewBackOffice\Admin\LearningPathController::exportCSV
+nbo_learning_path_export_xls:
+  path: learning-paths/export/xls
+  controller: Logipro\Phoenix\Controller\NewBackOffice\Admin\LearningPathController::exportXLS
 # Owner
-nbo_os_learning_path_export_csv:
-  path: /owner-space/learning-paths/export/csv
-  controller: Logipro\Phoenix\Controller\NewBackOffice\Owner\LearningPathController::exportCSV
+nbo_os_learning_path_export_xls:
+  path: /owner-space/learning-paths/export/xls
+  controller: Logipro\Phoenix\Controller\NewBackOffice\Owner\LearningPathController::exportXLS
 
     
 nbo_sequence_set_order:
@@ -1043,9 +1043,9 @@ nbo_offer_delete:
   requirements:
     id: \d+ 
     
-nbo_offer_export_csv:
-  path: /offers/export/csv
-  controller: Logipro\Phoenix\Controller\NewBackOffice\Admin\OfferController::exportCSV
+nbo_offer_export_xls:
+  path: /offers/export/xls
+  controller: Logipro\Phoenix\Controller\NewBackOffice\Admin\OfferController::exportXLS
   
 nbo_offer_create:
   path: /offer/create
@@ -1211,7 +1211,7 @@ nbo_settings_learning_space:
  # scorm (temporaire)
 nbo_settings_scorm:
   path: /settings/scorm
-  controller: Logipro\Phoenix\Controller\NewBackOffice\Settings\SettingsController::manageScorm
+  controller: Logipro\Phoenix\Controller\NewBackOffice\Admin\Settings\SettingsController::manageScorm
 
 
 #-------------------------------------------------------------------------------