Corrections mappingObjective

Controller/Track2004Controller.php

@@ -340,10 +340,10 @@ class Track2004Controller extends AbstractController
           //======================================================================================//
          //                                FIN                                                   //
         //======================================================================================//
+        $em->persist($primaryObjectiveInfo);
         $em->persist($track);
         $em->persist($mapTrackItem);
         $em->persist($attemptInfo);
-        $em->persist($primaryObjectiveInfo);
 
         // On flush toutes les données persistées jusqu'à maintenant
         $em->flush();

EntityListener/Scorm2004ObjectiveProgressInformationListener.php

@@ -23,14 +23,13 @@ class Scorm2004ObjectiveProgressInformationListener
     {
         $em = $event->getEntityManager();
         $uow = $uow = $em->getUnitOfWork();
-        $updates = $uow->getScheduledEntityUpdates();
 
-        // Vérifier que l'on n'est pas sur une création d'objet
-        if ($objectiveProgressInfo->getObjectiveInformationId() > 0) {
+        // On traite l'objectif uniquement si il est élligible pour une mise à jour
+        if ($uow->isScheduledForUpdate($objectiveProgressInfo)) {
             $objectives = $this->scorm2004ObjectiveProgressInfoManager->updateFromObjectiveProgressInfo($objectiveProgressInfo);
 
             foreach ($objectives as $objective) {
-                if ($objective->getObjectiveInformationId() > 0 && $manager->contains($objective)) {
+                if ($objective->getObjectiveInformationId() > 0 && $em->contains($objective)) {
                     $uow->scheduleForUpdate($objective);
                 }
             }

Repository/Scorm2004/Scorm2004ObjectiveProgressInformationRepository.php

@@ -133,6 +133,8 @@ class Scorm2004ObjectiveProgressInformationRepository extends EntityRepository
             return null;
         }
 
+        $dummyInfo = clone $localInfo;
+
         // On recherche si il existe un mappage avec un objectif global
         $mapInfos = $dom->getMapInfos($objective['item'], $objective['objective'], $objective['isPrimary']);
         
@@ -147,38 +149,36 @@ class Scorm2004ObjectiveProgressInformationRepository extends EntityRepository
                 // On remplace dans l'objet que l'on va retourner
                 // les valeurs spécifiques au mappage
                 if ($globalInfo) {
-                    if ($mapInfo['readSatisfiedStatus']) {
-                        $localInfo->setProgressStatus($globalInfo->getProgressStatus());
-                        $localInfo->setSatisfiedStatus($globalInfo->getSatisfiedStatus());
+                    if ($mapInfo['readSatisfiedStatus'] === 'true') {
+                        $dummyInfo->setProgressStatus($globalInfo->getProgressStatus());
+                        $dummyInfo->setSatisfiedStatus($globalInfo->getSatisfiedStatus());
                     }
-                    if ($mapInfo['readNormalizedMeasure']) {
-                        $localInfo->setMeasureStatus($globalInfo->getMeasureStatus());
-                        $localInfo->setNormalizedMeasure($globalInfo->getNormalizedMeasure());
+                    if ($mapInfo['readNormalizedMeasure'] === 'true') {
+                        $dummyInfo->setMeasureStatus($globalInfo->getMeasureStatus());
+                        $dummyInfo->setNormalizedMeasure($globalInfo->getNormalizedMeasure());
                     }
-                    if ($mapInfo['readCompletionStatus']) {
-                        $localInfo->setAttemptProgressStatus($globalInfo->getAttemptProgressStatus());
-                        $localInfo->setAttemptCompletionStatus($globalInfo->getAttemptCompletionStatus());
+                    if ($mapInfo['readCompletionStatus'] === 'true') {
+                        $dummyInfo->setAttemptProgressStatus($globalInfo->getAttemptProgressStatus());
+                        $dummyInfo->setAttemptCompletionStatus($globalInfo->getAttemptCompletionStatus());
                     }
-                    if ($mapInfo['readProgressMeasure']) {
-                        $localInfo->setAttemptCompletionAmountStatus($globalInfo->getAttemptCompletionAmountStatus());
-                        $localInfo->setAttemptCompletionAmount($globalInfo->getAttemptCompletionAmount());
+                    if ($mapInfo['readProgressMeasure'] === 'true') {
+                        $dummyInfo->setAttemptCompletionAmountStatus($globalInfo->getAttemptCompletionAmountStatus());
+                        $dummyInfo->setAttemptCompletionAmount($globalInfo->getAttemptCompletionAmount());
                     }
-                    if ($mapInfo['readRawScore']) {
-                        $localInfo->setScoreRaw($globalInfo->getScoreRaw());
+                    if ($mapInfo['readRawScore'] === 'true') {
+                        $dummyInfo->setScoreRaw($globalInfo->getScoreRaw());
                     }
-                    if ($mapInfo['readMinScore']) {
-                        $localInfo->setScoreMin($globalInfo->getScoreMin());
+                    if ($mapInfo['readMinScore'] === 'true') {
+                        $dummyInfo->setScoreMin($globalInfo->getScoreMin());
                     }
-                    if ($mapInfo['readMaxScore']) {
-                        $localInfo->setScoreMax($globalInfo->getScoreMax());
+                    if ($mapInfo['readMaxScore'] === 'true') {
+                        $dummyInfo->setScoreMax($globalInfo->getScoreMax());
                     }
                 }
-                
-                return $localInfo;
             }
         }
-
-        return null;
+        
+        return $dummyInfo;
     }
 
     /**

Services/Scorm2004ObjectiveProgressInfoManager.php

@@ -56,7 +56,7 @@ class Scorm2004ObjectiveProgressInfoManager
             $isPrimary = $objectiveProgressInfo->getIsPrimary();
 
             // Controle de l'existence d'un mappage avec un objectif global
-            $mapinfo = $domScorm2004->getMapInfos($item, $objective, $isPrimary);
+            $mapInfos = $domScorm2004->getMapInfos($item, $objective, $isPrimary);
 
             if (!empty($mapInfos)) {
                 $organization = $track->getOrganizationId();
@@ -64,7 +64,7 @@ class Scorm2004ObjectiveProgressInfoManager
                 $track = $attempt->getScorm2004Track();
                 
                 foreach ($mapInfos as $mapInfo) {
-                    $globalObjective = $mapInfo['targetId'];
+                    $globalObjective = $mapInfo['targetObjectiveID'];
                     
                     // récupération des infos de l'objectif global mappé
                     $globalInfo = $this->repository->getGlobalInfo($globalObjective, $track, $isGlobalToSystem);
@@ -72,29 +72,29 @@ class Scorm2004ObjectiveProgressInfoManager
                     // On remplace dans l'objet que l'on va retourner
                     // les valeurs spécifiques au mappage
                     if ($globalInfo) {
-                        if ($mapinfo['writeSatisfiedStatus']) {
+                        if ($mapInfo['writeSatisfiedStatus'] === 'true') {
                             $globalInfo->setProgressStatus($objectiveProgressInfo->getProgressStatus());
                             $globalInfo->setSatisfiedStatus($objectiveProgressInfo->getSatisfiedStatus());
                         }
-                        if ($mapinfo['writeNormalizedMeasure']) {
+                        if ($mapInfo['writeNormalizedMeasure'] === 'true') {
                             $globalInfo->setMeasureStatus($objectiveProgressInfo->getMeasureStatus());
                             $globalInfo->setNormalizedMeasure($objectiveProgressInfo->getNormalizedMeasure());
                         }
-                        if ($mapinfo['writeCompletionStatus']) {
+                        if ($mapInfo['writeCompletionStatus'] === 'true') {
                             $globalInfo->setAttemptProgressStatus($objectiveProgressInfo->getAttemptProgressStatus());
                             $globalInfo->setAttemptCompletionStatus($objectiveProgressInfo->getAttemptCompletionStatus());
                         }
-                        if ($mapinfo['writeProgressMeasure']) {
+                        if ($mapInfo['writeProgressMeasure'] === 'true') {
                             $globalInfo->setAttemptCompletionAmountStatus($objectiveProgressInfo->getAttemptCompletionAmountStatus());
                             $globalInfo->setAttemptCompletionAmount($objectiveProgressInfo->getAttemptCompletionAmount());
                         }
-                        if ($mapinfo['writeRawScore']) {
+                        if ($mapInfo['writeRawScore'] === 'true') {
                             $globalInfo->setScoreRaw($objectiveProgressInfo->getScoreRaw());
                         }
-                        if ($mapinfo['writeMinScore']) {
+                        if ($mapInfo['writeMinScore'] === 'true') {
                             $globalInfo->setScoreMin($objectiveProgressInfo->getScoreMin());
                         }
-                        if ($mapinfo['writeMaxScore']) {
+                        if ($mapInfo['writeMaxScore'] === 'true') {
                             $globalInfo->setScoreMax($objectiveProgressInfo->getScoreMax());
                         }