From 50a0d07d56a7d313d0fec80729095fb70cb0c4ee Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 18 Jul 2022 17:48:07 +0200 Subject: [PATCH] wip #4209 @5 --- app/Fields/FluidbookChapters.php | 10 +- .../CompositionOperation.php | 5 - app/Models/FluidbookPublication.php | 14 +++ .../fields/fluidbook_composition.blade.php | 96 ++++++++++++++++++- 4 files changed, 116 insertions(+), 9 deletions(-) diff --git a/app/Fields/FluidbookChapters.php b/app/Fields/FluidbookChapters.php index 1f2966bd5..6a8f057c6 100644 --- a/app/Fields/FluidbookChapters.php +++ b/app/Fields/FluidbookChapters.php @@ -22,12 +22,16 @@ class FluidbookChapters extends BunchOfFieldsMultiple if (!$value) { return $value; } - $v = json_decode($value, true); + if (is_string($value)) { + $v = json_decode($value, true); + } else { + $v = $value; + } if (!$v) { return $value; } $res = []; - foreach ($v as $k=>$chapter) { + foreach ($v as $k => $chapter) { $chapter['type'] = 'regular'; $chapter['label'] = trim($chapter['label']); if ($chapter['label'] === '----') { @@ -43,7 +47,7 @@ class FluidbookChapters extends BunchOfFieldsMultiple $chapter['label'] = substr($chapter['label'], 3); $chapter['type'] = 'column_head'; } - $res[$k]=$chapter; + $res[$k] = $chapter; } diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php index 2ba979823..a01d8d848 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php @@ -25,9 +25,4 @@ trait CompositionOperation $path = $doc->getFile($doc_page, 'jpg', 'thumb', true, true, ''); return response(null)->header('Content-Type', Files::_getMimeType($path))->header('X-Sendfile', $path); } - - protected function getComposition() - { - $res = []; - } } diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index fe18c7507..adbb93657 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -12,6 +12,8 @@ use App\Http\Controllers\Admin\Operations\FluidbookPublication\CompositionOperat use App\Models\Base\ToolboxModel; use App\Models\Traits\PublicationSettings; use App\Models\Traits\SCORMVersionTrait; +use App\Widgets; +use Backpack\CRUD\app\Library\Widget; use Cubist\Backpack\Magic\Fields\Datetime; use Cubist\Backpack\Magic\Fields\FormBigSection; use Cubist\Backpack\Magic\Fields\FormSuperSection; @@ -178,4 +180,16 @@ class FluidbookPublication extends ToolboxModel $compo = $this->composition[$page]; return self::_getDocument($compo[0])->getFile($compo[1], $format, $resolution, $withText, $withGraphics, $version, $force); } + + public function addWidgets() + { + Widget::add([ + 'type' => 'alert', + 'class' => 'alert alert-danger mb-2', + 'heading' => __('En cours de développement'), + 'content' => __('Les données et interfaces présentées dans cette section ne sont pas synchronisées avec les données en production. Toutes les modifications effectuées ici peuvent dont disparaître à tout moment.') . '

' . __('Retour en production') . '

', + 'close_button' => false, // show close button or not + ]); + + } } diff --git a/resources/views/fields/fluidbook_composition.blade.php b/resources/views/fields/fluidbook_composition.blade.php index be3104764..996a11e77 100644 --- a/resources/views/fields/fluidbook_composition.blade.php +++ b/resources/views/fields/fluidbook_composition.blade.php @@ -1,6 +1,7 @@ @if (!isset($seenFluidbookComposition)) @php $seenFluidbookComposition=true;@endphp @push('crud_fields_scripts') + + + @endpush @push('crud_fields_styles') @endpush @endif -- 2.39.5