TLD-558 Item de Selection

Player/SCORM2004/Scorm2004PlayerLogic.php

@@ -1,10 +1,9 @@
 <?php
+
 namespace Logipro\Bundle\SCORMBundle\Player\SCORM2004;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManagerInterface;
 use Logipro\Bundle\SCORMBundle\Crypto\Crypto;
-use Logipro\Bundle\SCORMBundle\Entity\Learner;
 use Logipro\Bundle\SCORMBundle\Entity\Registration;
 use Logipro\Bundle\SCORMBundle\Entity\RegistrationAttempt;
 use Logipro\Bundle\SCORMBundle\Entity\ZipFile;
@@ -33,11 +32,11 @@ class Scorm2004PlayerLogic
      * @var RouterInterface
      */
     protected $router;
-    
+
     protected $parameters;
 
     protected $em;
-    
+
     public function __construct(RouterInterface $router, ParameterBagInterface $parameters, EntityManagerInterface $em)
     {
         // Récupération des services
@@ -72,7 +71,7 @@ class Scorm2004PlayerLogic
 
         // On décrypte et désérialise les infos si fournies
         if ($data) {
-             // Décryptage des datas
+            // Décryptage des datas
             $decryptedData = Crypto::decrypt($data);
 
             // Data invalide
@@ -98,14 +97,14 @@ class Scorm2004PlayerLogic
                 return $response;
             }
         }
-            
+
 
         // Si pas de données ou pas d'organisation, cas d'une entrée dans le lecteur
         if (empty($dataArray['org'])) {
             // Récupération des différentes "Organizations"
-// NEED NEW DOM METHOD
+            // NEED NEW DOM METHOD
             // $organization = $dom->getOrganizations();
-            
+
             // Si plusieurs Orga, Affichage d'une page de sélection de l'organisation
             // if (count($organizations) {
             //     return page de choix des organization avec data pour chaque Orga
@@ -126,10 +125,10 @@ class Scorm2004PlayerLogic
                 $track = $this->createTrack($dom, $registrationKey, $attempt, $dataArray);
             }
 
-            
+
             $suspendedItem = $track->getSuspendedItemRef();
             $navigationValidator = new NavigationRequestValidator($this->parameters, $this->em, $registrationKey);
-            
+
             // Si il existe un item suspendu au niveau du track
             if ($suspendedItem) {
                 // On lance un événement 'Resume all' à partir de la racine
@@ -147,18 +146,15 @@ class Scorm2004PlayerLogic
                 } */
             } else {
                 // Aucune possibilité aux vues de l'état du system
-                // On propose la liste de sélection des items (item spécifique au moteur)
-                $track->setCurrentItemRef($track->getOrganizationId());
+                // On propose la liste de sélection des items - réponse spécifique
+                $organization = $track->getOrganizationId();
+                $track->setCurrentItemRef($organization);
                 $this->em->persist($track);
                 $this->em->flush();
-                
-// TODO SELECTION ITEM
-                // return SelectionItem;
-                $response = array(
-                    'result' => 'error',
-                    'error' => 'Selection SCO needed'
-                );
-    
+
+                $playerView = new Scorm2004PlayerView($this->router, $this->parameters, $this->em, $dom, $track, $registrationKey, $organization, $organization);
+                $response = $playerView->getSelectionResponse();
+
                 return $response;
             }
         }
@@ -236,11 +232,11 @@ class Scorm2004PlayerLogic
                 $objectiveInfo->setObjectiveIdentifier($global);
                 $objectiveInfo->setScorm2004Track($track);
                 $objectiveInfo->setIsPrimary(false);
-                
+
                 $this->em->persist($objectiveInfo);
             }
         }
-        
+
         $this->em->flush();
 
         // Définition des availableChildren pour chaque item (necessite que toutes les tables de mappage soit créées au préalable)
@@ -269,7 +265,7 @@ class Scorm2004PlayerLogic
         $currentItem = $data['current'];
         $navigationRequest = $data['nav'];
         $targetItem = $data['target'];
-            
+
         // Récupération du track
         $trackRepository = $this->em->getRepository(Scorm2004Track::class);
         $track = $trackRepository->findOneBy(array('registrationAttempt' => $attempt), array('track_id' => 'desc'));
@@ -337,7 +333,7 @@ class Scorm2004PlayerLogic
                     'result' => 'error',
                     'error' => $msg
                 );
-    
+
                 return $response;
             }
 
@@ -367,7 +363,7 @@ class Scorm2004PlayerLogic
                     'result' => 'error',
                     'error' => $msg
                 );
-    
+
                 return $response;
             }
 
@@ -381,7 +377,7 @@ class Scorm2004PlayerLogic
                 $response = array(
                     'result' => 'exit'
                 );
-    
+
                 return $response;
             }
 
@@ -393,13 +389,10 @@ class Scorm2004PlayerLogic
                 $this->em->persist($track);
                 $this->em->flush();
 
-// TODO
-                // Affichage du lecteur sur le Item de sélection (le Item racine)
-                /* $requestParamaters['action'] = do__ago_learner_space_training_reader_shared_sco;
-                $requestParamaters['idActivite'] = $idActivite;
-                $requestParamaters['node'] = $root;
-                $requestParamaters['isSharedSco'] = true;
-                return $requestParamaters; */
+                $playerView = new Scorm2004PlayerView($this->router, $this->parameters, $this->em, $dom, $track, $registrationKey, $organization, $organization);
+                $response = $playerView->getSelectionResponse();
+
+                return $response;
             }
 
             $deliveryItem = $processedSequencingRequest->getdeliveryItem();
@@ -422,7 +415,7 @@ class Scorm2004PlayerLogic
                     'result' => 'error',
                     'error' => $msg
                 );
-    
+
                 return $response;
             }
 

Player/SCORM2004/Scorm2004PlayerView.php

@@ -1,7 +1,7 @@
 <?php
+
 namespace Logipro\Bundle\SCORMBundle\Player\SCORM2004;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManagerInterface;
 use Logipro\Bundle\SCORMBundle\ClientAPI\ApiScorm2004;
 use Logipro\Bundle\SCORMBundle\Crypto\Crypto;
@@ -21,11 +21,11 @@ use Symfony\Component\Routing\RouterInterface;
 class Scorm2004PlayerView
 {
     protected $router;
-    
+
     protected $parameters;
 
     protected $em;
-    
+
     protected $response;
 
     protected $dom;
@@ -42,8 +42,16 @@ class Scorm2004PlayerView
 
     protected $tocValidations;
 
-    public function __construct(RouterInterface $router, ParameterBagInterface $parameters, EntityManagerInterface $em, DOMSCORM2004 $dom, Scorm2004Track $track, string $registrationKey, string $organization, string $item)
-    {
+    public function __construct(
+        RouterInterface $router,
+        ParameterBagInterface $parameters,
+        EntityManagerInterface $em,
+        DOMSCORM2004 $dom,
+        Scorm2004Track $track,
+        string $registrationKey,
+        string $organization,
+        string $item
+    ) {
         // Récupération des services
         $this->router = $router;
         $this->parameters = $parameters;
@@ -54,10 +62,10 @@ class Scorm2004PlayerView
         $this->registrationKey = $registrationKey;
         $this->organization = $organization;
         $this->item = $item;
-        
+
         $this->navUIControls = null;
         $this->tocValidations = null;
-        
+
         $this->response = array(
             'result' => 'player',
             'player' => array(
@@ -93,7 +101,21 @@ class Scorm2004PlayerView
         $this->response['player']['toc'] = $this->getToc();
         $this->response['player']['previous'] = $this->getNavigationAction(SCORM2004_HIDE_LMS_UI_PREVIOUS);
         $this->response['player']['next'] = $this->getNavigationAction(SCORM2004_HIDE_LMS_UI_CONTINUE);
-        
+
+        return $this->response;
+    }
+
+    public function getSelectionResponse()
+    {
+        $this->response['result'] = 'selection';
+        $this->response['player']['current'] = $this->getCurrent();
+        $this->response['player']['toc'] = $this->getToc();
+        $this->response['player']['previous'] = $this->getNavigationAction(SCORM2004_HIDE_LMS_UI_PREVIOUS);
+        $this->response['player']['next'] = $this->getNavigationAction(SCORM2004_HIDE_LMS_UI_CONTINUE);
+        $this->response['player']['exit'] = $this->getNavigationAction(SCORM2004_HIDE_LMS_UI_EXIT);
+        $this->response['player']['content'] = null;
+        $this->response['api'] = null;
+
         return $this->response;
     }
 
@@ -105,39 +127,39 @@ class Scorm2004PlayerView
         // init des états
         $this->navUIControls = array(
             SCORM2004_HIDE_LMS_UI_PREVIOUS => array(
-                    'visible' => true,
-                    'enable' => true,
-                    'nav'=> NavigationRequest::NAVIGATION_PREVIOUS
+                'visible' => true,
+                'enable' => true,
+                'nav' => NavigationRequest::NAVIGATION_PREVIOUS
             ),
             SCORM2004_HIDE_LMS_UI_CONTINUE => array(
-                    'visible' => true,
-                    'enable' => true,
-                    'nav'=> NavigationRequest::NAVIGATION_CONTINUE
+                'visible' => true,
+                'enable' => true,
+                'nav' => NavigationRequest::NAVIGATION_CONTINUE
             ),
             SCORM2004_HIDE_LMS_UI_EXIT => array(
-                    'visible' => true,
-                    'enable' => true,
-                    'nav'=> NavigationRequest::NAVIGATION_EXIT
+                'visible' => true,
+                'enable' => true,
+                'nav' => NavigationRequest::NAVIGATION_EXIT
             ),
             SCORM2004_HIDE_LMS_UI_EXIT_ALL => array(
-                    'visible' => true,
-                    'enable' => true,
-                    'nav'=> NavigationRequest::NAVIGATION_EXIT_ALL
+                'visible' => true,
+                'enable' => true,
+                'nav' => NavigationRequest::NAVIGATION_EXIT_ALL
             ),
             SCORM2004_HIDE_LMS_UI_ABANDON => array(
-                    'visible' => true,
-                    'enable' => true,
-                    'nav'=> NavigationRequest::NAVIGATION_ABANDON
+                'visible' => true,
+                'enable' => true,
+                'nav' => NavigationRequest::NAVIGATION_ABANDON
             ),
             SCORM2004_HIDE_LMS_UI_ABANDON_ALL => array(
-                    'visible' => true,
-                    'enable' => true,
-                    'nav'=> NavigationRequest::NAVIGATION_ABANDON_ALL
+                'visible' => true,
+                'enable' => true,
+                'nav' => NavigationRequest::NAVIGATION_ABANDON_ALL
             ),
             SCORM2004_HIDE_LMS_UI_SUSPEND_ALL => array(
-                    'visible' => true,
-                    'enable' => true,
-                    'nav'=> NavigationRequest::NAVIGATION_SUSPEND_ALL
+                'visible' => true,
+                'enable' => true,
+                'nav' => NavigationRequest::NAVIGATION_SUSPEND_ALL
             )
         );
 
@@ -153,13 +175,13 @@ class Scorm2004PlayerView
         $this->navUIControls[SCORM2004_HIDE_LMS_UI_CONTINUE]['enable'] = $navigationRequestValidator->checkContinueValidity($this->item);
     }
 
-     /**
+    /**
      * Retourne l'ensemble des données necessaires pour l'affichage des infos du noeud courant
      */
     protected function getCurrent()
     {
         $response = array();
-            
+
         // Nom de l'activité
         $response['activity'] = $this->dom->getTitle($this->organization);
         // Nom de l'item
@@ -176,9 +198,9 @@ class Scorm2004PlayerView
         // Récupération de l'état des plannodes pour une requete de type 'choice' en fonction de l'état du system
         $navigationRequestValidator = new NavigationRequestValidator($this->parameters, $this->em, $this->registrationKey);
         $this->tocValidations = $navigationRequestValidator->defineTableOfContent($this->item);
-        
+
         $response = array();
-        
+
         // Récupération des enfants disponibles
         $children = $this->dom->getChildren($this->organization);
 
@@ -193,7 +215,7 @@ class Scorm2004PlayerView
                 }
             }
         }
-        
+
         return $response;
     }
 
@@ -205,13 +227,13 @@ class Scorm2004PlayerView
         // si l'item est visible
         if ($isVisible) {
             $response = array();
-            
+
             // Nom du noeud
             $response['name'] = $this->dom->getTitle($item);
             $response['current'] = $validations['is-Active'];
             $response['state'] = $validations['state'];
             $response['enable'] = $validations['enable'];
-            
+
             // Enable/Disable
             $data = null;
             if ($validations['enable']) {
@@ -222,7 +244,7 @@ class Scorm2004PlayerView
                     'nav' => NavigationRequest::NAVIGATION_CHOICE,
                     'target' => $item
                 );
-        
+
                 $serialize = \serialize($dataArray);
                 $data = Crypto::crypt($serialize);
             }
@@ -287,7 +309,7 @@ class Scorm2004PlayerView
     protected function getNavigationAction(string $action)
     {
         $information = $this->navUIControls[$action];
-        
+
         $dataArray = array(
             'regKey' => $this->registrationKey,
             'org' => $this->organization,
@@ -311,7 +333,7 @@ class Scorm2004PlayerView
     /**
      * Retourne les données necessaires pour l'affichage du contenu
      */
-    protected function getContent() : string
+    protected function getContent(): string
     {
         // Récupérer l'url de la ressource liée à l'item
         $href = $this->dom->getHref($this->item);
@@ -322,7 +344,7 @@ class Scorm2004PlayerView
     /**
      * Retourne l'API SCORM2004 paramétrée pour l'item courant
      */
-    protected function getApi() : string
+    protected function getApi(): string
     {
         $apiScorm2004 = new ApiScorm2004($this->router, $this->parameters, $this->em);
         $api = $apiScorm2004->getAPI($this->dom, $this->registrationKey, $this->organization, $this->item);

Services/ScormEngine.php

@@ -1,7 +1,6 @@
 <?php
 namespace Logipro\Bundle\SCORMBundle\Services;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManagerInterface;
 use Logipro\Bundle\SCORMBundle\Entity\Course;
 use Logipro\Bundle\SCORMBundle\Entity\Learner;
@@ -15,13 +14,10 @@ use Logipro\Bundle\SCORMBundle\Entity\Scorm2004\Scorm2004AttemptProgressInformat
 use Logipro\Bundle\SCORMBundle\Entity\Scorm2004\Scorm2004Interaction;
 use Logipro\Bundle\SCORMBundle\LearningModels\DOMSCORM12;
 use Logipro\Bundle\SCORMBundle\LearningModels\DOMSCORM2004;
-use Logipro\Bundle\SCORMBundle\Package\Common\PackageTypeDetector;
 use Logipro\Bundle\SCORMBundle\Player\SCORM2004\Scorm2004PlayerLogic;
 use Logipro\Bundle\SCORMBundle\Package\PackageValidator;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpFoundation\Cookie;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\RouterInterface;
@@ -493,7 +489,7 @@ class ScormEngine
     /**
      * retourne la règle de versionnig
      */
-    public function getCourseVersionRule()
+    public function getCourseVersionRule(string $courseKey)
     {
         $course = $this->requireCourse($courseKey);