wip #5566 @0.75

diff --git a/app/Models/ELearningMedia.php b/app/Models/ELearningMedia.php
index c7b406fcf9dfafac281d378d5ab154e4d0208d45..7a06b94508d5f9a8b3cf1387157b0dce591fdba3 100644 (file)
--- a/app/Models/ELearningMedia.php
+++ b/app/Models/ELearningMedia.php
@@ -2,10 +2,12 @@
 
 namespace App\Models;
 
+use App\Fields\SCORMVersion;
 use App\Http\Controllers\Admin\Operations\ELearningMedia\ImportOperation;
 use App\Http\Controllers\Admin\Operations\ELearningMedia\PreviewOperation;
 use App\Http\Controllers\Admin\Operations\ELearningMedia\DownloadOperation;
 use App\Models\Base\ToolboxModel;
+use App\Models\Traits\SCORMVersionTrait;
 use Cubist\Backpack\Magic\Fields\Files;
 use Cubist\Backpack\Magic\Fields\Hidden;
 use Cubist\Backpack\Magic\Fields\Percent;
@@ -18,6 +20,8 @@ use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 class ELearningMedia extends ToolboxModel
 {
+    use SCORMVersionTrait;
+
     protected $table = 'elearning_media';
 
     protected $_options = ['name' => 'elearning-media',
@@ -36,6 +40,14 @@ class ELearningMedia extends ToolboxModel
 
         $this->addField('type', Hidden::class, __('Type'), ['column' => true]);
         $this->addField('title', Text::class, __('Titre'), ['column' => true]);
+        $this->addField(['name' => 'scorm_version',
+                'label' => __('Version SCORM'),
+                'column' => true,
+                'type' => SCORMVersion::class,
+                'default' => Version::SCORM_1_2,
+                'database_default' => Version::SCORM_1_2,
+            ]
+        );
 
         $this->addOwnerField();
         $this->addColumnDateFields();

diff --git a/app/Models/Traits/SCORMVersionTrait.php b/app/Models/Traits/SCORMVersionTrait.php
index 73040d8a2ec36ac012001875f74ca0d8614541b6..251b1ad8bcd657840c1624f284ba06c969e21e26 100644 (file)
--- a/app/Models/Traits/SCORMVersionTrait.php
+++ b/app/Models/Traits/SCORMVersionTrait.php
@@ -15,6 +15,6 @@ trait SCORMVersionTrait
 
     public function isSCORMEnabled()
     {
-        return (isset($this->scorm_enable) && $this->scorm_enable) && $this->scorm_version;
+        return ((isset($this->scorm_enable) && $this->scorm_enable) || (isset($this->scorm) && $this->scorm) || (!isset($this->scorm) && !isset($this->scorm_enable))) && $this->scorm_version;
     }
 }