Added carbon

3 files changed, 7 insertions, 8 deletions

diff --git a/composer.json b/composer.json
index a686dc2..641d05a 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,8 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "doctrine/common": "^3.1"
+        "doctrine/common": "^3.1",
+        "nesbot/carbon": "^2.42"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Entity/ScoTracking.php b/src/Entity/ScoTracking.php
index aa58fe5..f15231f 100644
--- a/src/Entity/ScoTracking.php
+++ b/src/Entity/ScoTracking.php
@@ -4,6 +4,8 @@
 namespace Peopleaps\Scorm\Entity;
 
 
+use Carbon\Carbon;
+
 class ScoTracking
 {
     public $userId;
@@ -244,7 +246,7 @@ class ScoTracking
         return $this->latestDate;
     }
 
-    public function setLatestDate(\DateTime $latestDate = null)
+    public function setLatestDate(Carbon $latestDate = null)
     {
         $this->latestDate = $latestDate;
     }
diff --git a/src/Manager/ScormManager.php b/src/Manager/ScormManager.php
index 055d3be..ae2e827 100644
--- a/src/Manager/ScormManager.php
+++ b/src/Manager/ScormManager.php
@@ -285,7 +285,7 @@ class ScormManager
         $scoTracking->setLessonMode($storeTracking->lesson_mode);
         $scoTracking->setIsLocked($storeTracking->is_locked);
         $scoTracking->setDetails($storeTracking->details);
-        $scoTracking->setLatestDate($storeTracking->latest_date);
+        $scoTracking->setLatestDate(Carbon::parse($storeTracking->latest_date));
 
         return $scoTracking;
     }
@@ -293,7 +293,7 @@ class ScormManager
     public function updateScoTracking($scoUuid, $userId, $data)
     {
         $tracking = $this->createScoTracking($scoUuid, $userId);
-        $tracking->setLatestDate(new \DateTime());
+        $tracking->setLatestDate(Carbon::now());
         $sco    =   $tracking->getSco();
         $scorm  =   ScormModel::where('id', $sco['id'])->firstOrFail();
 
@@ -338,10 +338,6 @@ class ScormManager
                 $bestStatus = $tracking->getLessonStatus();
 
                 // Update best score if the current score is better than the previous best score
-                if (empty($bestScore) || (!is_null($scoreRaw) && $scoreRaw > $bestScore)) {
-                    $tracking->setScoreRaw($scoreRaw);
-                    $bestScore = $scoreRaw;
-                }
 
                 if (empty($bestScore) || (!is_null($scoreRaw) && $scoreRaw > $bestScore)) {
                     $tracking->setScoreRaw($scoreRaw);