wip #5041 @1

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 375ed6473bc1cf0fdd94ee2d7b905dbd7f56dd8b..d73e85cba9bc311a822d070ebca02d875a685552 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,13 +22,11 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wip #5041 @0.25">
+    <list default="true" id="5d2ecd5e-a05a-4f96-a195-fa6372618165" name="Default Changelist" comment="wip #5041 @1">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/ELearningPackage/ImportOperation.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/ELearningPackage/ImportOperation.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/ELearningPackage/PreviewOperation.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Admin/Operations/ELearningPackage/PreviewOperation.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Jobs/ElearningPackageDownload.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Jobs/ElearningPackageDownload.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/ELearningPackage.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/ELearningPackage.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Models/Quiz.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Models/Quiz.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Services/ScormCloud.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Services/ScormCloud.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/elearningmedia/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/resources/elearningmedia/js/app.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/elearningpackage/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/resources/elearningpackage/index.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/resources/elearningpackage/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/resources/elearningpackage/js/app.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -681,14 +679,7 @@
       <workItem from="1644425348765" duration="2270000" />
       <workItem from="1644508187200" duration="10853000" />
       <workItem from="1644582031422" duration="8556000" />
-      <workItem from="1644828785862" duration="4855000" />
-    </task>
-    <task id="LOCAL-00196" summary="wip #4211 @0.5">
-      <created>1636131633680</created>
-      <option name="number" value="00196" />
-      <option name="presentableId" value="LOCAL-00196" />
-      <option name="project" value="LOCAL" />
-      <updated>1636131633680</updated>
+      <workItem from="1644828785862" duration="8032000" />
     </task>
     <task id="LOCAL-00197" summary="wait #4877 @0.5">
       <created>1636722382707</created>
@@ -1026,7 +1017,14 @@
       <option name="project" value="LOCAL" />
       <updated>1644602746898</updated>
     </task>
-    <option name="localTasksCounter" value="245" />
+    <task id="LOCAL-00245" summary="wip #5041 @1">
+      <created>1644836183703</created>
+      <option name="number" value="00245" />
+      <option name="presentableId" value="LOCAL-00245" />
+      <option name="project" value="LOCAL" />
+      <updated>1644836183703</updated>
+    </task>
+    <option name="localTasksCounter" value="246" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1081,9 +1079,9 @@
     <MESSAGE value="wip #5041" />
     <MESSAGE value="wip #5041 @1.5" />
     <MESSAGE value="wip #5041 @0.5" />
-    <MESSAGE value="wip #5041 @1" />
     <MESSAGE value="wip #5041 @0.25" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #5041 @0.25" />
+    <MESSAGE value="wip #5041 @1" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #5041 @1" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

diff --git a/app/Services/ScormCloud.php b/app/Services/ScormCloud.php
index dd7827f05039b0c331a269778717903204d79316..35232cd754cf8bd2510e2954240430b31c18c3b0 100644 (file)
--- a/app/Services/ScormCloud.php
+++ b/app/Services/ScormCloud.php
@@ -7,7 +7,7 @@ use InvalidArgumentException;
 
 class ScormCloud
 {
-    public static function send($url,$courseId)
+    public static function send($url,$courseId,$delete=false)
     {
         $config = new V2\Configuration();
         $appId = env('SCORM_CLOUD_APP_ID');
@@ -17,10 +17,12 @@ class ScormCloud
 
         $courseAPI = new V2\Api\CourseApi();
 
-        try {
-            $courseAPI->deleteCourse($courseId);
-        } catch (\Exception $e) {
+        if($delete) {
+            try {
+                $courseAPI->deleteCourse($courseId);
+            } catch (\Exception $e) {
 
+            }
         }
 
         $request = new V2\Model\ImportFetchRequestSchema(['url' => $url, 'content_type' => 'application/zip']);

diff --git a/resources/elearningmedia/js/app.js b/resources/elearningmedia/js/app.js
index 7d6ada4c795eee7d66a9442df2e7135b38de03d9..2d11dba4e2ea68b6c70669bffc65ff974ce3df6a 100644 (file)
--- a/resources/elearningmedia/js/app.js
+++ b/resources/elearningmedia/js/app.js
@@ -6,18 +6,24 @@ window.openTime = Date.now();
 
 document.addEventListener("DOMContentLoaded", function () {
     var media = document.getElementById('player');
-    window.player = new Plyr(media);
     if (media.tagName.toLowerCase() === 'audio') {
         window.spectrum = new Spectrum(media);
     }
+    window.player = new Plyr(media);
 
     var audiobigplay = document.getElementById('audiobigplay');
-    if(audiobigplay) {
+    if (audiobigplay) {
         audiobigplay.addEventListener('click', function () {
             player.play();
             audiobigplay.style.display = 'none';
             return false;
         });
+        player.on('pause', function () {
+            audiobigplay.style.display = 'block';
+        });
+        player.on('playing', function () {
+            audiobigplay.style.display = 'none';
+        });
     }
 
     SCORM.init();
@@ -36,6 +42,10 @@ document.addEventListener("DOMContentLoaded", function () {
             clearInterval(interval);
         }
     }, 1000);
+
+    player.on('ready', function () {
+        player.play();
+    });
 });
 
 function setSessionTime() {

diff --git a/resources/elearningpackage/index.html b/resources/elearningpackage/index.html
index eaf6f1ef36ca555a50b8af7616a5bd56998f6a4b..be577b32ece907d374d0b9763c7bc218c04e858b 100644 (file)
--- a/resources/elearningpackage/index.html
+++ b/resources/elearningpackage/index.html
@@ -207,7 +207,7 @@
     <div id="scobar">
         <div id="scoicon"></div>
         <h2></h2><a href="#" class="close"></a></div>
-    <iframe id="sco" frameborder="0"></iframe>
+    <iframe id="sco" frameborder="0" allow="autoplay;fullscreen"></iframe>
 </div>
 
 <script src="data.js"></script>

diff --git a/resources/elearningpackage/js/app.js b/resources/elearningpackage/js/app.js
index edb60c479202dceb5f5c46e09416b585ad7da40e..33d1ee0b96ad3726994f8eeaff67cfcfced39fbb 100644 (file)
--- a/resources/elearningpackage/js/app.js
+++ b/resources/elearningpackage/js/app.js
@@ -59,7 +59,7 @@ function resize() {
 
 function _cmi(key) {
     var res = null;
-    switch (pipwerks.SCORM.version) {
+    switch (SCORM.version) {
         case "1.2" :
             res = _CMI12[key];
             break;
@@ -80,7 +80,7 @@ function initScorm() {
 
     SCORM_INITED = true;
     try {
-        if (pipwerks.SCORM.init()) {
+        if (SCORM.init()) {
             SCORM_OK = true;
         }
     } catch (e) {
@@ -159,8 +159,8 @@ function finishScorm() {
         return;
     }
     setSessionTime();
-    pipwerks.SCORM.save();
-    pipwerks.SCORM.quit();
+    SCORM.save();
+    SCORM.quit();
 }
 
 function scormExit() {
@@ -401,7 +401,7 @@ function initScormEvents() {
     });
 
     setInterval(function () {
-        pipwerks.SCORM.save();
+        SCORM.save();
     }, 5000);
 }
 
@@ -428,7 +428,7 @@ function getScormValue(elementName) {
     if (cmi == '') {
         return null;
     }
-    var result = pipwerks.SCORM.get(cmi);
+    var result = SCORM.get(cmi);
     return result;
 }
 
@@ -440,7 +440,7 @@ function setScormValue(elementName, value) {
     if (cmi == '') {
         return false;
     }
-    var result = pipwerks.SCORM.set(cmi, value);
+    var result = SCORM.set(cmi, value);
     return result;
 }
 
@@ -495,7 +495,7 @@ function setSessionTime() {
     var endTime = currentTime.getTime()
     var calculatedTime = endTime - SCORM_START_TIME;
 
-    if (pipwerks.SCORM.version == '1.2') {
+    if (SCORM.version == '1.2') {
         var totalHours = Math.floor(calculatedTime / 1000 / 60 / 60);
         calculatedTime = calculatedTime - totalHours * 1000 * 60 * 60
         if (totalHours < 1000 && totalHours > 99) {