From 461459e1fb6de2f356c480bbfc1b87d15e4ed7e2 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 25 Jul 2024 13:39:20 +0200 Subject: [PATCH] wait #7018 @3 --- .docker/alpha/update.sh | 1 + .docker/dev/update.sh | 1 + .docker/docker-compose.yml | 4 +- .docker/update.sh | 1 + app/Console/Commands/ActiveScore.php | 44 +++++++++++++++++++ .../Admin/BadgeAssertionCrudController.php | 26 +++++++++++ .../Admin/BadgeClassCrudController.php | 25 +++++++++++ .../Admin/BadgeIssuerCrudController.php | 25 +++++++++++ .../Admin/CompanyCrudController.php | 1 - app/Http/Controllers/Admin/CrudController.php | 1 - .../Admin/ElearningMediaCrudController.php | 1 - .../Admin/ElearningPackageCrudController.php | 1 - .../FluidbookCollectionCrudController.php | 1 - .../Admin/FluidbookDocumentCrudController.php | 1 - ...ookExternalInstallServerCrudController.php | 1 - .../Admin/FluidbookHealthCrudController.php | 1 - .../Admin/FluidbookIconsetCrudController.php | 1 - .../FluidbookPublicationCrudController.php | 2 - .../Admin/FluidbookQuoteCrudController.php | 1 - .../FluidbookReferenceUrlCrudController.php | 1 - .../Admin/FluidbookThemeCrudController.php | 1 - .../Admin/LocaleCrudController.php | 1 - .../Admin/Operations/Quiz/EditOperation.php | 26 +++++++++++ .../Controllers/Admin/PageCrudController.php | 1 - .../Controllers/Admin/QuizCrudController.php | 1 - .../Admin/QuizThemeCrudController.php | 1 - .../Admin/QuizatttemptCrudController.php | 1 - .../Admin/SettingsCrudController.php | 1 - .../Admin/SignatureCrudController.php | 1 - .../Admin/TeamEmailsCrudController.php | 1 - .../Admin/TeamLeaveCrudController.php | 1 - .../Admin/TeamOvertimeCrudController.php | 1 - .../Admin/TeamServersCrudController.php | 1 - .../Admin/ToolSpriteCrudController.php | 1 - .../Admin/ToolWebflowCrudController.php | 29 ++++++++++++ .../Admin/ToolboxTranslateCrudController.php | 1 - .../Admin/TranslateCrudController.php | 1 - .../Controllers/Admin/UsersCrudController.php | 1 - 38 files changed, 180 insertions(+), 31 deletions(-) create mode 100644 app/Console/Commands/ActiveScore.php create mode 100644 app/Http/Controllers/Admin/BadgeAssertionCrudController.php create mode 100644 app/Http/Controllers/Admin/BadgeClassCrudController.php create mode 100644 app/Http/Controllers/Admin/BadgeIssuerCrudController.php create mode 100644 app/Http/Controllers/Admin/Operations/Quiz/EditOperation.php create mode 100644 app/Http/Controllers/Admin/ToolWebflowCrudController.php diff --git a/.docker/alpha/update.sh b/.docker/alpha/update.sh index af43b568e..24b5f6b0a 100644 --- a/.docker/alpha/update.sh +++ b/.docker/alpha/update.sh @@ -6,3 +6,4 @@ docker compose down -v docker compose up -d docker exec -it fluidbook-toolbox-alpha /application/scripts/update.sh find /data/toolbox/alpha/ -type d \( -path /data/toolbox/alpha/.docker \) -prune -o -exec chown -R toolbox:www-data {} \; +ufw-docker allow fluidbook-toolbox-alpha diff --git a/.docker/dev/update.sh b/.docker/dev/update.sh index 95f910599..8f039d026 100644 --- a/.docker/dev/update.sh +++ b/.docker/dev/update.sh @@ -8,3 +8,4 @@ docker compose down -v docker compose up -d docker exec -it fluidbook-toolbox-dev /application/scripts/update.sh /home/toolbox/dev/scripts/fixrights.sh +ufw-docker allow fluidbook-toolbox-dev diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index cf2b523ea..03622c264 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -94,7 +94,7 @@ services: - '/home/toolbox/www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf' # External volume - 'sshfsusstorage:/application/usstorage:ro' - - 'docs1:/application/protected/fluidbookpublication/docs:ro' + - 'docs:/application/protected/fluidbookpublication/docs:ro' ports: - '37126:80' environment: @@ -179,7 +179,7 @@ volumes: allow_other: "" password: "Qu2E9uq48bBzsqGiZA" - docs1: + docs: driver: ucphhpc/sshfs:latest driver_opts: sshcmd: "fluidbook@dracula.cubedesigners.com:/data/fluidbook/docs" diff --git a/.docker/update.sh b/.docker/update.sh index 9b54f061f..3dffaa41e 100644 --- a/.docker/update.sh +++ b/.docker/update.sh @@ -8,3 +8,4 @@ docker compose down -v docker compose up -d docker exec -it fluidbook-toolbox /application/scripts/update.sh /home/toolbox/www/scripts/fixrights.sh +ufw-docker allow fluidbook-toolbox diff --git a/app/Console/Commands/ActiveScore.php b/app/Console/Commands/ActiveScore.php new file mode 100644 index 000000000..9c72eeaf7 --- /dev/null +++ b/app/Console/Commands/ActiveScore.php @@ -0,0 +1,44 @@ +get(); + foreach ($q as $q_) { + $quiz = $q_->get('questions')->toArray(); + + $n = array_map(function ($n) { + return $n['questions']; + }, $quiz); + $n = array_values($n); + foreach ($n as &$o) { + //$o['count_for_score'] = '0'; + if ($o) { + foreach ($o as &$p) { + $p['count_for_score'] = "1"; + /* + if(in_array($p['type'], ['multiple','draganddrop','match'])){ + $p['count_for_score'] = "1"; + }*/ + } + } + } + dd($n[0]); + } + + //$nn['questions'] = $n[0]["questions"]["questions"]; + + + //$q->update(['questions'=>$n[0]]); + } + +} diff --git a/app/Http/Controllers/Admin/BadgeAssertionCrudController.php b/app/Http/Controllers/Admin/BadgeAssertionCrudController.php new file mode 100644 index 000000000..01d927f55 --- /dev/null +++ b/app/Http/Controllers/Admin/BadgeAssertionCrudController.php @@ -0,0 +1,26 @@ +name('editQuiz'); + } + + protected function changeStatus($quiz_id) + { + if (!can('quiz:admin')) { + abort(401); + } + if (!Quiz::hasPermission($quiz_id)) { + abort(401); + } + $quiz = Quiz::find($quiz_id); + } +} diff --git a/app/Http/Controllers/Admin/PageCrudController.php b/app/Http/Controllers/Admin/PageCrudController.php index 891d28320..772ffcabd 100644 --- a/app/Http/Controllers/Admin/PageCrudController.php +++ b/app/Http/Controllers/Admin/PageCrudController.php @@ -12,7 +12,6 @@ class PageCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicN use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation; - use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; diff --git a/app/Http/Controllers/Admin/QuizCrudController.php b/app/Http/Controllers/Admin/QuizCrudController.php index 5f4d3130c..d424edf57 100644 --- a/app/Http/Controllers/Admin/QuizCrudController.php +++ b/app/Http/Controllers/Admin/QuizCrudController.php @@ -9,7 +9,6 @@ class QuizCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicC use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; - use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; use \App\Http\Controllers\Admin\Operations\Quiz\PreviewOperation; use \App\Http\Controllers\Admin\Operations\Quiz\DownloadOperation; use \App\Http\Controllers\Admin\Operations\Quiz\LogOperation; diff --git a/app/Http/Controllers/Admin/QuizThemeCrudController.php b/app/Http/Controllers/Admin/QuizThemeCrudController.php index 39f3d9c58..b0410a663 100644 --- a/app/Http/Controllers/Admin/QuizThemeCrudController.php +++ b/app/Http/Controllers/Admin/QuizThemeCrudController.php @@ -9,7 +9,6 @@ class QuizThemeCrudController extends \Cubist\Backpack\Magic\Controllers\CubistM use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; - use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; use \App\Http\Controllers\Admin\Operations\QuizTheme\PreviewOperation; use \App\Http\Controllers\Admin\Operations\ChangeownerOperation; diff --git a/app/Http/Controllers/Admin/QuizatttemptCrudController.php b/app/Http/Controllers/Admin/QuizatttemptCrudController.php index b51304619..f4ea8d6bb 100644 --- a/app/Http/Controllers/Admin/QuizatttemptCrudController.php +++ b/app/Http/Controllers/Admin/QuizatttemptCrudController.php @@ -12,7 +12,6 @@ class QuizatttemptCrudController extends \Cubist\Backpack\Magic\Controllers\Cubi use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation; - use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; diff --git a/app/Http/Controllers/Admin/SettingsCrudController.php b/app/Http/Controllers/Admin/SettingsCrudController.php index cd4182492..b962ca2a9 100644 --- a/app/Http/Controllers/Admin/SettingsCrudController.php +++ b/app/Http/Controllers/Admin/SettingsCrudController.php @@ -12,7 +12,6 @@ class SettingsCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMa use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation; - use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; diff --git a/app/Http/Controllers/Admin/SignatureCrudController.php b/app/Http/Controllers/Admin/SignatureCrudController.php index a3c10695c..bb62259db 100644 --- a/app/Http/Controllers/Admin/SignatureCrudController.php +++ b/app/Http/Controllers/Admin/SignatureCrudController.php @@ -9,7 +9,6 @@ class SignatureCrudController extends \Cubist\Backpack\Magic\Controllers\CubistM use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; - use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; diff --git a/app/Http/Controllers/Admin/TeamEmailsCrudController.php b/app/Http/Controllers/Admin/TeamEmailsCrudController.php index 6d05c6485..e310aab89 100644 --- a/app/Http/Controllers/Admin/TeamEmailsCrudController.php +++ b/app/Http/Controllers/Admin/TeamEmailsCrudController.php @@ -12,7 +12,6 @@ class TeamEmailsCrudController extends \Cubist\Backpack\Magic\Controllers\Cubist use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation; - use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; diff --git a/app/Http/Controllers/Admin/TeamLeaveCrudController.php b/app/Http/Controllers/Admin/TeamLeaveCrudController.php index 1ea8207f2..f9065562e 100644 --- a/app/Http/Controllers/Admin/TeamLeaveCrudController.php +++ b/app/Http/Controllers/Admin/TeamLeaveCrudController.php @@ -10,7 +10,6 @@ class TeamLeaveCrudController extends \Cubist\Backpack\Magic\Controllers\CubistM use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation; - use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; use \App\Http\Controllers\Admin\Operations\TeamLeave\ICSOperation; diff --git a/app/Http/Controllers/Admin/TeamOvertimeCrudController.php b/app/Http/Controllers/Admin/TeamOvertimeCrudController.php index cc2da0cf6..d2ed365c5 100644 --- a/app/Http/Controllers/Admin/TeamOvertimeCrudController.php +++ b/app/Http/Controllers/Admin/TeamOvertimeCrudController.php @@ -10,7 +10,6 @@ class TeamOvertimeCrudController extends \Cubist\Backpack\Magic\Controllers\Cubi use \Cubist\Backpack\Http\Controllers\Operations\BulkPublishOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation; - use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; diff --git a/app/Http/Controllers/Admin/TeamServersCrudController.php b/app/Http/Controllers/Admin/TeamServersCrudController.php index 629e05c8d..b591d8edb 100644 --- a/app/Http/Controllers/Admin/TeamServersCrudController.php +++ b/app/Http/Controllers/Admin/TeamServersCrudController.php @@ -12,7 +12,6 @@ class TeamServersCrudController extends \Cubist\Backpack\Magic\Controllers\Cubis use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation; - use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; diff --git a/app/Http/Controllers/Admin/ToolSpriteCrudController.php b/app/Http/Controllers/Admin/ToolSpriteCrudController.php index cbb619309..218ad89a9 100644 --- a/app/Http/Controllers/Admin/ToolSpriteCrudController.php +++ b/app/Http/Controllers/Admin/ToolSpriteCrudController.php @@ -12,7 +12,6 @@ class ToolSpriteCrudController extends \Cubist\Backpack\Magic\Controllers\Cubist use \Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation; use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation; - use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation; use \App\Http\Controllers\Admin\Operations\Tools\SVGSpriteDownload; diff --git a/app/Http/Controllers/Admin/ToolWebflowCrudController.php b/app/Http/Controllers/Admin/ToolWebflowCrudController.php new file mode 100644 index 000000000..6abe5b6db --- /dev/null +++ b/app/Http/Controllers/Admin/ToolWebflowCrudController.php @@ -0,0 +1,29 @@ +