From 6d6752033330e237160162f2b1f03dedda6c8227 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 21 Jul 2022 12:56:55 +0200 Subject: [PATCH] wait #5367 @1 --- app/Models/ELearningPackage.php | 2 +- composer.lock | 347 +++++++++++---------------- resources/elearningpackage/js/app.js | 7 +- 3 files changed, 145 insertions(+), 211 deletions(-) diff --git a/app/Models/ELearningPackage.php b/app/Models/ELearningPackage.php index e6dccaeda..99a8d469f 100644 --- a/app/Models/ELearningPackage.php +++ b/app/Models/ELearningPackage.php @@ -93,7 +93,7 @@ class ELearningPackage extends ToolboxModel $basePath = 'packages/' . $id . '/'; - $res = ['id' => $id, 'title' => trim($c['content_title']), 'type' => $c['content_type'], 'scorm' => !$c['complete_when_opened'], 'mandatory' => $c['mandatory'], 'path' => $basePath . 'index.html']; + $res = ['id' => $id, 'title' => trim($c['content_title']), 'type' => $c['content_type'], 'scorm' => !$c['complete_when_opened'], 'mandatory' => !!$c['mandatory'], 'path' => $basePath . 'index.html']; if ($res['type'] === 'QZ' && $res['mandatory']) { $res['lock'] = range(0, $id - 1); } diff --git a/composer.lock b/composer.lock index 9e71c2b1d..954a9e5e0 100644 --- a/composer.lock +++ b/composer.lock @@ -339,16 +339,16 @@ }, { "name": "backpack/crud", - "version": "4.1.69", + "version": "4.1.70", "source": { "type": "git", "url": "https://github.com/Laravel-Backpack/CRUD.git", - "reference": "248e2e034cedcffe01732cdce01fb3d1ecad9ffa" + "reference": "6c335a8959b82c6a830f97d0c609a7584af98f46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/248e2e034cedcffe01732cdce01fb3d1ecad9ffa", - "reference": "248e2e034cedcffe01732cdce01fb3d1ecad9ffa", + "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/6c335a8959b82c6a830f97d0c609a7584af98f46", + "reference": "6c335a8959b82c6a830f97d0c609a7584af98f46", "shasum": "" }, "require": { @@ -426,22 +426,22 @@ ], "support": { "issues": "https://github.com/Laravel-Backpack/CRUD/issues", - "source": "https://github.com/Laravel-Backpack/CRUD/tree/4.1.69" + "source": "https://github.com/Laravel-Backpack/CRUD/tree/4.1.70" }, - "time": "2022-03-30T12:20:48+00:00" + "time": "2022-07-19T07:11:32+00:00" }, { "name": "backpack/logmanager", - "version": "v4.0.7", + "version": "v4.0.8", "source": { "type": "git", "url": "https://github.com/Laravel-Backpack/LogManager.git", - "reference": "75a4e028e42f85dac0c301ebf22c83075535dc23" + "reference": "81d9a5115e3ce6c780f00dd856db5bf25b1f376f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laravel-Backpack/LogManager/zipball/75a4e028e42f85dac0c301ebf22c83075535dc23", - "reference": "75a4e028e42f85dac0c301ebf22c83075535dc23", + "url": "https://api.github.com/repos/Laravel-Backpack/LogManager/zipball/81d9a5115e3ce6c780f00dd856db5bf25b1f376f", + "reference": "81d9a5115e3ce6c780f00dd856db5bf25b1f376f", "shasum": "" }, "require": { @@ -490,9 +490,9 @@ ], "support": { "issues": "https://github.com/Laravel-Backpack/LogManager/issues", - "source": "https://github.com/Laravel-Backpack/LogManager/tree/v4.0.7" + "source": "https://github.com/Laravel-Backpack/LogManager/tree/v4.0.8" }, - "time": "2022-03-25T08:48:24+00:00" + "time": "2022-07-01T12:18:59+00:00" }, { "name": "backpack/permissionmanager", @@ -643,30 +643,29 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v3.6.7", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298" + "reference": "3372ed65e6d2039d663ed19aa699956f9d346271" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b96f9820aaf1ff9afe945207883149e1c7afb298", - "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/3372ed65e6d2039d663ed19aa699956f9d346271", + "reference": "3372ed65e6d2039d663ed19aa699956f9d346271", "shasum": "" }, "require": { - "illuminate/routing": "^6|^7|^8|^9", - "illuminate/session": "^6|^7|^8|^9", - "illuminate/support": "^6|^7|^8|^9", + "illuminate/routing": "^7|^8|^9", + "illuminate/session": "^7|^8|^9", + "illuminate/support": "^7|^8|^9", "maximebf/debugbar": "^1.17.2", - "php": ">=7.2", - "symfony/debug": "^4.3|^5|^6", - "symfony/finder": "^4.3|^5|^6" + "php": ">=7.2.5", + "symfony/finder": "^5|^6" }, "require-dev": { "mockery/mockery": "^1.3.3", - "orchestra/testbench-dusk": "^4|^5|^6|^7", + "orchestra/testbench-dusk": "^5|^6|^7", "phpunit/phpunit": "^8.5|^9.0", "squizlabs/php_codesniffer": "^3.5" }, @@ -712,7 +711,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-debugbar/issues", - "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.7" + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.7.0" }, "funding": [ { @@ -724,7 +723,7 @@ "type": "github" } ], - "time": "2022-02-09T07:52:32+00:00" + "time": "2022-07-11T09:26:42+00:00" }, { "name": "brick/math", @@ -1296,16 +1295,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.2", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640" + "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/fd5dd441932a7e10ca6e5b490e272d34c8430640", - "reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/30897edbfb15e784fe55587b4f73ceefd3c4d98c", + "reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c", "shasum": "" }, "require": { @@ -1352,7 +1351,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.2" + "source": "https://github.com/composer/ca-bundle/tree/1.3.3" }, "funding": [ { @@ -1368,7 +1367,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:56:16+00:00" + "time": "2022-07-20T07:14:26+00:00" }, { "name": "composer/package-versions-deprecated", @@ -1597,13 +1596,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "20aba8c4278aecd8dc1aa0ac87cbbcff93300dd1" + "reference": "5037fafa790b4d6a0157f38f7237c45aa69bf157" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-8b6aa6.tar", - "reference": "20aba8c4278aecd8dc1aa0ac87cbbcff93300dd1", - "shasum": "ee27854c1fc513fdcd29fe1caee97c9f304acd07" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-bc5679.tar", + "reference": "5037fafa790b4d6a0157f38f7237c45aa69bf157", + "shasum": "0bccb1ee64d0f71da2e451ced0a4c329decbe0ec" }, "require": { "backpack/backupmanager": "^3.0", @@ -1684,7 +1683,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2022-06-27T15:43:55+00:00" + "time": "2022-07-19T13:22:56+00:00" }, { "name": "cubist/cms-front", @@ -1940,13 +1939,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_pdf.git", - "reference": "8aff4c485b5adbc705fe040965f74ff54597bf74" + "reference": "dfbda143ad4963784a2251af488978d92da79d51" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-d3d4d8.tar", - "reference": "8aff4c485b5adbc705fe040965f74ff54597bf74", - "shasum": "5f3dbfa6792f7c26eaf5ea81909cb8c1e018305e" + "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-1ba061.tar", + "reference": "dfbda143ad4963784a2251af488978d92da79d51", + "shasum": "1fd430d15409cfcc232ded890019e8dcebf061db" }, "require": { "cubist/util": "dev-master", @@ -1982,7 +1981,7 @@ "cubist", "pdf" ], - "time": "2022-05-17T16:22:12+00:00" + "time": "2022-07-13T16:13:36+00:00" }, { "name": "cubist/scorm", @@ -1990,13 +1989,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_scorm.git", - "reference": "7b89b122187600b589ee26f428e0553420c47d9e" + "reference": "9d9c448cac2b58cf0a4d04ab4d8400b93371a52d" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/scorm/cubist-scorm-dev-master-4e618a.tar", - "reference": "7b89b122187600b589ee26f428e0553420c47d9e", - "shasum": "bbf8b1bc49d8e317fc31ef034da6eb22cdbff428" + "url": "https://composer.cubedesigners.com/dist/cubist/scorm/cubist-scorm-dev-master-342aa4.tar", + "reference": "9d9c448cac2b58cf0a4d04ab4d8400b93371a52d", + "shasum": "66984f6c178a8e7e7f86ee43321597f76386b43b" }, "require": { "ext-mbstring": "*", @@ -2019,7 +2018,7 @@ } ], "description": "cubist_scorm", - "time": "2022-06-28T07:27:18+00:00" + "time": "2022-06-28T10:37:24+00:00" }, { "name": "cubist/util", @@ -2027,13 +2026,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "5d26e60b3eb84408bf95757dfb60b266f69af5f9" + "reference": "1907abaa7b92788aeb43a9961bc032d8e3fc0c1d" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-2a78f9.tar", - "reference": "5d26e60b3eb84408bf95757dfb60b266f69af5f9", - "shasum": "96d8604fd2a024551d34319a460fec24526aef12" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-704a86.tar", + "reference": "1907abaa7b92788aeb43a9961bc032d8e3fc0c1d", + "shasum": "00ef028210f8303c3e7c5ce7fc670965c655383c" }, "require": { "cubist/net": "dev-master", @@ -2064,7 +2063,7 @@ } ], "description": "Utilities class", - "time": "2022-05-24T11:29:43+00:00" + "time": "2022-07-12T15:49:09+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -3257,16 +3256,16 @@ }, { "name": "fideloper/proxy", - "version": "4.4.1", + "version": "4.4.2", "source": { "type": "git", "url": "https://github.com/fideloper/TrustedProxy.git", - "reference": "c073b2bd04d1c90e04dc1b787662b558dd65ade0" + "reference": "a751f2bc86dd8e6cfef12dc0cbdada82f5a18750" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0", - "reference": "c073b2bd04d1c90e04dc1b787662b558dd65ade0", + "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/a751f2bc86dd8e6cfef12dc0cbdada82f5a18750", + "reference": "a751f2bc86dd8e6cfef12dc0cbdada82f5a18750", "shasum": "" }, "require": { @@ -3276,7 +3275,7 @@ "require-dev": { "illuminate/http": "^5.0|^6.0|^7.0|^8.0|^9.0", "mockery/mockery": "^1.0", - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^8.5.8|^9.3.3" }, "type": "library", "extra": { @@ -3309,9 +3308,9 @@ ], "support": { "issues": "https://github.com/fideloper/TrustedProxy/issues", - "source": "https://github.com/fideloper/TrustedProxy/tree/4.4.1" + "source": "https://github.com/fideloper/TrustedProxy/tree/4.4.2" }, - "time": "2020-10-22T13:48:01+00:00" + "time": "2022-02-09T13:33:34+00:00" }, { "name": "fluidbook/tools", @@ -4224,16 +4223,16 @@ }, { "name": "laravel-lang/lang", - "version": "10.9.4", + "version": "10.9.5", "source": { "type": "git", "url": "https://github.com/Laravel-Lang/lang.git", - "reference": "eeb4b38ef7aba493f3915c89b99c803ce096e996" + "reference": "e341421d40f2cd28feca24ab2cb84fa5cb5ddaf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/eeb4b38ef7aba493f3915c89b99c803ce096e996", - "reference": "eeb4b38ef7aba493f3915c89b99c803ce096e996", + "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/e341421d40f2cd28feca24ab2cb84fa5cb5ddaf6", + "reference": "e341421d40f2cd28feca24ab2cb84fa5cb5ddaf6", "shasum": "" }, "require": { @@ -4298,7 +4297,7 @@ "type": "open_collective" } ], - "time": "2022-06-22T09:43:06+00:00" + "time": "2022-06-27T01:57:27+00:00" }, { "name": "laravel-lang/publisher", @@ -4403,16 +4402,16 @@ }, { "name": "laravel/framework", - "version": "v8.83.17", + "version": "v8.83.20", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "2cf142cd5100b02da248acad3988bdaba5635e16" + "reference": "aa5908e83fccb18b135ca31aa0342cf4bd6909a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/2cf142cd5100b02da248acad3988bdaba5635e16", - "reference": "2cf142cd5100b02da248acad3988bdaba5635e16", + "url": "https://api.github.com/repos/laravel/framework/zipball/aa5908e83fccb18b135ca31aa0342cf4bd6909a8", + "reference": "aa5908e83fccb18b135ca31aa0342cf4bd6909a8", "shasum": "" }, "require": { @@ -4572,7 +4571,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-06-21T14:38:31+00:00" + "time": "2022-07-19T14:11:02+00:00" }, { "name": "laravel/serializable-closure", @@ -5729,16 +5728,16 @@ }, { "name": "nesbot/carbon", - "version": "2.58.0", + "version": "2.59.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055" + "reference": "a9000603ea337c8df16cc41f8b6be95a65f4d0f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055", - "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a9000603ea337c8df16cc41f8b6be95a65f4d0f5", + "reference": "a9000603ea337c8df16cc41f8b6be95a65f4d0f5", "shasum": "" }, "require": { @@ -5753,11 +5752,12 @@ "doctrine/orm": "^2.7", "friendsofphp/php-cs-fixer": "^3.0", "kylekatarnls/multi-tester": "^2.0", + "ondrejmirtes/better-reflection": "*", "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.54 || ^1.0", - "phpunit/php-file-iterator": "^2.0.5", - "phpunit/phpunit": "^7.5.20 || ^8.5.23", + "phpstan/phpstan": "^0.12.99 || ^1.7.14", + "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6", + "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20", "squizlabs/php_codesniffer": "^3.4" }, "bin": [ @@ -5814,15 +5814,19 @@ }, "funding": [ { - "url": "https://opencollective.com/Carbon", - "type": "open_collective" + "url": "https://github.com/sponsors/kylekatarnls", + "type": "github" + }, + { + "url": "https://opencollective.com/Carbon#sponsor", + "type": "opencollective" }, { - "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "url": "https://tidelift.com/subscription/pkg/packagist-nesbot-carbon?utm_source=packagist-nesbot-carbon&utm_medium=referral&utm_campaign=readme", "type": "tidelift" } ], - "time": "2022-04-25T19:31:17+00:00" + "time": "2022-06-29T21:43:55+00:00" }, { "name": "neutron/temporary-filesystem", @@ -6098,16 +6102,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.23.0", + "version": "1.24.1", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "21e4cf62699eebf007db28775f7d1554e612ed9e" + "reference": "69991111e05fca3ff7398e1e7fca9ebed33efec6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/21e4cf62699eebf007db28775f7d1554e612ed9e", - "reference": "21e4cf62699eebf007db28775f7d1554e612ed9e", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/69991111e05fca3ff7398e1e7fca9ebed33efec6", + "reference": "69991111e05fca3ff7398e1e7fca9ebed33efec6", "shasum": "" }, "require": { @@ -6135,15 +6139,15 @@ }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "dev-master", - "dompdf/dompdf": "^1.0", + "dompdf/dompdf": "^1.0 || ^2.0", "friendsofphp/php-cs-fixer": "^3.2", "jpgraph/jpgraph": "^4.0", - "mpdf/mpdf": "8.0.17", + "mpdf/mpdf": "8.1.1", "phpcompatibility/php-compatibility": "^9.3", "phpstan/phpstan": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^8.5 || ^9.0", - "squizlabs/php_codesniffer": "^3.6", + "squizlabs/php_codesniffer": "^3.7", "tecnickcom/tcpdf": "^6.4" }, "suggest": { @@ -6196,9 +6200,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.23.0" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.24.1" }, - "time": "2022-04-24T13:53:10+00:00" + "time": "2022-07-18T19:50:48+00:00" }, { "name": "phpoption/phpoption", @@ -7625,16 +7629,16 @@ }, { "name": "spatie/laravel-package-tools", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-package-tools.git", - "reference": "9e6c0382553f1317c02f1ae0ee71c64821eb5af0" + "reference": "09f80fa240d44fafb1c70657c74ee44ffa929357" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/9e6c0382553f1317c02f1ae0ee71c64821eb5af0", - "reference": "9e6c0382553f1317c02f1ae0ee71c64821eb5af0", + "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/09f80fa240d44fafb1c70657c74ee44ffa929357", + "reference": "09f80fa240d44fafb1c70657c74ee44ffa929357", "shasum": "" }, "require": { @@ -7672,7 +7676,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-package-tools/issues", - "source": "https://github.com/spatie/laravel-package-tools/tree/1.12.0" + "source": "https://github.com/spatie/laravel-package-tools/tree/1.12.1" }, "funding": [ { @@ -7680,20 +7684,20 @@ "type": "github" } ], - "time": "2022-06-19T20:01:24+00:00" + "time": "2022-06-28T14:29:26+00:00" }, { "name": "spatie/laravel-permission", - "version": "5.5.4", + "version": "5.5.5", "source": { "type": "git", "url": "https://github.com/spatie/laravel-permission.git", - "reference": "cb86fd87b43fcfc493c3f2b1de6fad100c078146" + "reference": "f2303a70be60919811ca8afc313e8244fda00974" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/cb86fd87b43fcfc493c3f2b1de6fad100c078146", - "reference": "cb86fd87b43fcfc493c3f2b1de6fad100c078146", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/f2303a70be60919811ca8afc313e8244fda00974", + "reference": "f2303a70be60919811ca8afc313e8244fda00974", "shasum": "" }, "require": { @@ -7754,7 +7758,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-permission/issues", - "source": "https://github.com/spatie/laravel-permission/tree/5.5.4" + "source": "https://github.com/spatie/laravel-permission/tree/5.5.5" }, "funding": [ { @@ -7762,7 +7766,7 @@ "type": "github" } ], - "time": "2022-05-16T12:09:59+00:00" + "time": "2022-06-29T23:11:42+00:00" }, { "name": "spatie/laravel-signal-aware-command", @@ -8043,16 +8047,16 @@ }, { "name": "swayok/alternative-laravel-cache", - "version": "6.1.4", + "version": "6.1.5", "source": { "type": "git", "url": "https://github.com/swayok/alternative-laravel-cache.git", - "reference": "8e052f5da722cb433f4ae7ad153a36e791eecd08" + "reference": "2c6f40b31741df519a73fc145f991a7a094ab75f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swayok/alternative-laravel-cache/zipball/8e052f5da722cb433f4ae7ad153a36e791eecd08", - "reference": "8e052f5da722cb433f4ae7ad153a36e791eecd08", + "url": "https://api.github.com/repos/swayok/alternative-laravel-cache/zipball/2c6f40b31741df519a73fc145f991a7a094ab75f", + "reference": "2c6f40b31741df519a73fc145f991a7a094ab75f", "shasum": "" }, "require": { @@ -8060,15 +8064,15 @@ "cache/hierarchical-cache": "^1.0.0", "laravel/framework": ">=6.0|>=7.0|>=8.0|>=9.0", "php": "^7.2.5|^8.0|^8.1", - "psr/cache": "^1.0.0", - "psr/simple-cache": "^1.0.0" + "psr/cache": "^1.0.0|^2.0.0|^3.0.0", + "psr/simple-cache": "^1.0.0|^2.0.0|^3.0.0" }, "require-dev": { - "cache/filesystem-adapter": "^1.0", "cache/memcached-adapter": "^1.0", "cache/predis-adapter": "^1.0", "cache/redis-adapter": "^1.0", - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^8.5", + "swayok/cache-filesystem-adapter": "^1.0.0" }, "suggest": { "cache/filesystem-adapter": "Required to use file-based cache", @@ -8109,9 +8113,9 @@ ], "support": { "issues": "https://github.com/swayok/alternative-laravel-cache/issues", - "source": "https://github.com/swayok/alternative-laravel-cache/tree/6.1.4" + "source": "https://github.com/swayok/alternative-laravel-cache/tree/6.1.5" }, - "time": "2022-04-03T21:18:12+00:00" + "time": "2022-07-20T17:08:41+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -8353,78 +8357,9 @@ ], "time": "2022-02-25T11:15:52+00:00" }, - { - "name": "symfony/debug", - "version": "v4.4.41", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/6637e62480b60817b9a6984154a533e8e64c6bd5", - "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "psr/log": "^1|^2|^3" - }, - "conflict": { - "symfony/http-kernel": "<3.4" - }, - "require-dev": { - "symfony/http-kernel": "^3.4|^4.0|^5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides tools to ease debugging PHP code", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.41" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "abandoned": "symfony/error-handler", - "time": "2022-04-12T15:19:55+00:00" - }, { "name": "symfony/deprecation-contracts", - "version": "v3.1.0", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -8471,7 +8406,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.1.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.1.1" }, "funding": [ { @@ -8645,7 +8580,7 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.1.0", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", @@ -8704,7 +8639,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.1.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.1.1" }, "funding": [ { @@ -10087,16 +10022,16 @@ }, { "name": "symfony/service-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", "shasum": "" }, "require": { @@ -10150,7 +10085,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" }, "funding": [ { @@ -10166,7 +10101,7 @@ "type": "tidelift" } ], - "time": "2022-03-13T20:07:29+00:00" + "time": "2022-05-30T19:17:29+00:00" }, { "name": "symfony/string", @@ -10351,16 +10286,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v3.1.0", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "bfddd2a1faa271b782b791c361cc16e2dd49dfaa" + "reference": "606be0f48e05116baef052f7f3abdb345c8e02cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/bfddd2a1faa271b782b791c361cc16e2dd49dfaa", - "reference": "bfddd2a1faa271b782b791c361cc16e2dd49dfaa", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/606be0f48e05116baef052f7f3abdb345c8e02cc", + "reference": "606be0f48e05116baef052f7f3abdb345c8e02cc", "shasum": "" }, "require": { @@ -10412,7 +10347,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.1.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.1.1" }, "funding": [ { @@ -10428,7 +10363,7 @@ "type": "tidelift" } ], - "time": "2022-04-22T07:30:54+00:00" + "time": "2022-06-27T17:24:16+00:00" }, { "name": "symfony/var-dumper", @@ -11289,16 +11224,16 @@ }, { "name": "facade/ignition", - "version": "2.17.5", + "version": "2.17.6", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "1d71996f83c9a5a7807331b8986ac890352b7a0c" + "reference": "6acd82e986a2ecee89e2e68adfc30a1936d1ab7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/1d71996f83c9a5a7807331b8986ac890352b7a0c", - "reference": "1d71996f83c9a5a7807331b8986ac890352b7a0c", + "url": "https://api.github.com/repos/facade/ignition/zipball/6acd82e986a2ecee89e2e68adfc30a1936d1ab7c", + "reference": "6acd82e986a2ecee89e2e68adfc30a1936d1ab7c", "shasum": "" }, "require": { @@ -11363,7 +11298,7 @@ "issues": "https://github.com/facade/ignition/issues", "source": "https://github.com/facade/ignition" }, - "time": "2022-02-23T18:31:24+00:00" + "time": "2022-06-30T18:26:59+00:00" }, { "name": "facade/ignition-contracts", @@ -12669,16 +12604,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.5", + "version": "v0.11.7", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "c23686f9c48ca202710dbb967df8385a952a2daf" + "reference": "77fc7270031fbc28f9a7bea31385da5c4855cb7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/c23686f9c48ca202710dbb967df8385a952a2daf", - "reference": "c23686f9c48ca202710dbb967df8385a952a2daf", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/77fc7270031fbc28f9a7bea31385da5c4855cb7a", + "reference": "77fc7270031fbc28f9a7bea31385da5c4855cb7a", "shasum": "" }, "require": { @@ -12739,9 +12674,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.5" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.7" }, - "time": "2022-05-27T18:03:49+00:00" + "time": "2022-07-07T13:49:11+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", diff --git a/resources/elearningpackage/js/app.js b/resources/elearningpackage/js/app.js index ec990fc5a..9afe801d1 100644 --- a/resources/elearningpackage/js/app.js +++ b/resources/elearningpackage/js/app.js @@ -52,9 +52,6 @@ function initState() { window.savedState = JSON.parse(currentLocation); } - console.log(currentLocation, window.savedState); - - if (window.savedState === undefined || window.savedState === null || window.savedState === 'null') { window.savedState = {}; } @@ -71,6 +68,8 @@ function initState() { window.savedState[id] = $.extend(true, defaultState, clone[id]); } }); + + saveStatus(); } function initEvents() { @@ -205,7 +204,7 @@ function setContents() { lockCol = getSpriteIcon('lock-unlocked'); for (var i = 0; i < v.lock.length; i++) { var ss = window.savedState[v.lock[i].toString()]; - if (ss.completion_status !== 'completed' && ss.completion_status !== 'passed') { + if (ss.mandatory && ss.completion_status !== 'completed' && ss.completion_status !== 'passed') { lockstatus = 'locked'; lockCol = getSpriteIcon('lock-locked'); break; -- 2.39.5