From: Vincent Vanwaelscappel Date: Wed, 19 Jan 2022 12:15:58 +0000 (+0100) Subject: wip #4804 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=acbf7c38ea1616ac9242d6cc8f1d3f065e4b6dbc;p=odl.git wip #4804 @0.5 --- diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php index b02bae1..db85755 100644 --- a/app/Http/Controllers/FrontController.php +++ b/app/Http/Controllers/FrontController.php @@ -115,12 +115,12 @@ class FrontController extends Controller protected function _getMediaLibraryFromCMS() { - return ['themes' => PageData::fromEntities(AssetTheme::all()), 'assets' => PageData::fromEntities(Asset::whereNotNull('theme')->whereNotIn('theme', ['[null]', '[]', ''])->orderBy('code', 'ASC')->get())]; + return ['themes' => PageData::fromEntities(AssetTheme::all()), 'assets' => PageData::fromEntities(Asset::getAssetsInMediaLibrary())]; } protected function _getResourcesPDFFromCMS() { - return PageData::fromEntities(Asset::where('type', 'pdf')->get()); + return PageData::fromEntities(Asset::getPDFInResources()); } protected function _getResourcesFromCMS() diff --git a/app/Jobs/SearchIndex.php b/app/Jobs/SearchIndex.php index 110d110..6d9f9ad 100644 --- a/app/Jobs/SearchIndex.php +++ b/app/Jobs/SearchIndex.php @@ -22,7 +22,6 @@ class SearchIndex extends Index $this->indexHome(); $this->indexLibrary(); $this->indexResources(); - $this->indexTour(); parent::handle(); } @@ -34,7 +33,7 @@ class SearchIndex extends Index public function indexLibrary() { - $assets = Asset::createdok()->whereNotNull('theme')->whereIn('type', ['audio', 'video']); + $assets = Asset::getAssetsInMediaLibrary(); foreach ($assets as $asset) { $data = $asset->getPageData(); $doc = new Document(); @@ -42,8 +41,7 @@ class SearchIndex extends Index $doc->setId('media_' . $data->get('type') . '_' . $data->get('id')); $doc->setUrl($doc->getId()); $doc->setTitle($data->get('title')); - $doc->setText(implode(' ', $data->get('keywords'))); - + $doc->setKeywords(implode(' ', $data->get('keywords'))); $this->addDocument($doc); } } @@ -53,70 +51,37 @@ class SearchIndex extends Index */ public function indexResources() { - /** @var PageData $data */ - $data = Resource::find('1')->getPageData(); - - $documents = $data->get('documents'); - foreach ($documents as $i => $document) { - if (!$document['document_pdf']) { - continue; - } - foreach ($data->getMediaPathsByCollection($document['document_pdf']) as $pdf) { - $document = new PDF($pdf); - $document->setId('resources_documents_' . $i); - $document->setUrl($document->getId()); - $document->setTitle($document['document_title']); - $document->setThumb($data->getImageURLbyCollection($document['document_image'])); - $document->setType('pdf'); - $this->addDocument($document); - break; - } - } +// /** @var PageData $data */ +// $data = Resource::find('1')->getPageData(); - $chapters = $data->get('chapters'); - foreach ($chapters as $i => $chapter) { - foreach ($chapter['subchapters'] as $j => $subchapter) { - foreach ($subchapter['subchapter_memos'] as $k => $memo) { - if (!$memo['memo_pdf']) { - continue; - } - foreach ($data->getMediaPathsByCollection($memo['memo_pdf']) as $pdf) { - $document = new PDF($pdf); - $document->setId('resources_memos_' . $i . '_' . $j . '_' . $k); - $document->setUrl($document->getId()); - $document->setTitle($memo['memo_title']); - $document->setThumb($data->getImageURLbyCollection($memo['memo_image'])); - $document->setType('pdf'); - $this->addDocument($document); - break; - } - } - } - } - } - - public function indexTour() - { - /** @var PageData $data */ - $data = Tour::find('1')->getPageData(); +// $documents = $data->get('documents'); +// foreach ($documents as $i => $document) { +// if (!$document['document_pdf']) { +// continue; +// } +// foreach ($data->getMediaPathsByCollection($document['document_pdf']) as $pdf) { +// $document = new PDF($pdf); +// $document->setId('resources_documents_' . $i); +// $document->setUrl($document->getId()); +// $document->setTitle($document['document_title']); +// $document->setThumb($data->getImageURLbyCollection($document['document_image'])); +// $document->setType('pdf'); +// $this->addDocument($document); +// break; +// } +// } - $themes = $data->get('tour_themes'); - foreach ($themes as $i => $theme) { - foreach ($theme['theme_documents'] as $j => $doc) { - if (!$doc['memo_pdf']) { - continue; - } - foreach ($data->getMediaPathsByCollection($doc['memo_pdf']) as $pdf) { - $document = new PDF($pdf); - $document->setId('tour_documents_' . $i . '_' . $j); - $document->setUrl($document->getId()); - $document->setTitle($doc['memo_title']); - $document->setThumb($data->getImageURLbyCollection($doc['memo_image'])); - $document->setType('pdf'); - $this->addDocument($document); - break; - } - } + /** @var Asset[] $pdfs */ + $pdfs=Asset::getPDFInResources(); + foreach ($pdfs as $pdf) { + $document = new PDF($pdf->getFirstMediaInField('file_upload')->getPath()); + $document->setId($pdf->id); + $document->setUrl('asset_'.$document->getId()); + $document->setTitle($pdf->title); + $document->setKeywords(implode(' ',$pdf->keywords)); + $document->setThumb($pdf->getThumbURL()); + $document->setType('pdf'); + $this->addDocument($document); } } } diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 10303d3..776e669 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -80,5 +80,28 @@ class Asset extends CubistMagicAbstractModel ->nonQueued(); } + + + public static function getAssetsInMediaLibrary() + { + return Asset::createdok()->whereNotNull('theme')->whereNotIn('theme', ['[null]', '[]', ''])->whereIn('type', ['audio', 'video'])->orderBy('code', 'ASC')->get(); + } + + public static function getPDFInResources() + { + return Asset::createdok()->where('type', 'pdf')->get(); + } + + public function getThumbURL() + { + return !$this->get('file_thumb') || !$this->getImageURLbyCollection($this->file_thumb) + ? $this->getImageURLbyCollection($this->file_upload, 'poster') + : $this->getImageURLbyCollection($this->file_thumb); + } + + public function getAssetURL() + { + return $this->getImageURLbyCollection($this->file_upload); + } } diff --git a/app/Models/Resource.php b/app/Models/Resource.php index 78dc01b..985c36b 100644 --- a/app/Models/Resource.php +++ b/app/Models/Resource.php @@ -23,7 +23,7 @@ class Resource extends CubistMagicAbstractModel $this->addField('title', Text::class, 'Titre', ['tab' => 'Intro']); $this->addField('subtitle', Textarea::class, 'Sous-titre', ['tab' => 'Intro']); - $this->addField('documents', BunchOfFieldsMultiple::class, 'Offres', ['tab' => 'Intro', 'bunch' => ResourceDocument::class, 'add_label' => 'Ajouter un document']); + //$this->addField('documents', BunchOfFieldsMultiple::class, 'Offres', ['tab' => 'Intro', 'bunch' => ResourceDocument::class, 'add_label' => 'Ajouter un document']); $this->addField('chapters', BunchOfFieldsMultiple::class, 'Chapitres', ['tab' => 'Mémos', 'bunch' => ResourceChapter::class, 'add_label' => 'Ajouter un chapitre']); } diff --git a/resources/views/front/resources.blade.php b/resources/views/front/resources.blade.php index cfa6867..66f94da 100644 --- a/resources/views/front/resources.blade.php +++ b/resources/views/front/resources.blade.php @@ -53,53 +53,53 @@ x-show="shown" x-transition:enter-start="opacity-0 translate-y-[50px]"> -{{-- --}}{{-- DOCUMENTS --}} -{{-- @if (count($resources->documents) > 0)--}} -{{--
--}} -{{-- @foreach($resources->documents as $doc)--}} -{{-- @if (!$doc['document_pdf'] || !isset($resources_pdf[$doc['document_pdf']]))--}} -{{-- @continue--}} -{{-- @endif--}} -{{-- @php--}} -{{-- /** @var \Cubist\Backpack\Magic\PageData $pdf */--}} -{{-- $pdf = $resources_pdf[$doc['document_pdf']];--}} -{{-- $pdfurl = $pdf->getImageURLbyCollection($pdf->get('file_upload'));--}} -{{-- $thumb = null === $pdf->get('file_thumb')--}} -{{-- ? $pdf->getImageURLbyCollection($pdf->get('file_upload'),'poster')--}} -{{-- : $pdf->getImageURLbyCollection($pdf->get('file_thumb'));--}} -{{-- @endphp--}} -{{-- --}}{{----}} -{{-- --}} -{{--
--}} -{{-- {{ $doc['document_title'] }}--}} -{{-- --}}{{--{{ $doc['document_title'] }}--}} -{{--
--}} -{{--

{{ $doc['document_title'] }}

--}} -{{--

{{ $doc['document_subtitle'] }}

--}} -{{-- --}} -{{-- Visualiser--}} -{{-- --}} -{{--
--}} -{{--
--}} -{{-- --}} -{{-- @endforeach--}} -{{--
--}} -{{-- @endif--}} + {{-- --}}{{-- DOCUMENTS --}} + {{-- @if (count($resources->documents) > 0)--}} + {{--
--}} + {{-- @foreach($resources->documents as $doc)--}} + {{-- @if (!$doc['document_pdf'] || !isset($resources_pdf[$doc['document_pdf']]))--}} + {{-- @continue--}} + {{-- @endif--}} + {{-- @php--}} + {{-- /** @var \Cubist\Backpack\Magic\PageData $pdf */--}} + {{-- $pdf = $resources_pdf[$doc['document_pdf']];--}} + {{-- $pdfurl = $pdf->getImageURLbyCollection($pdf->get('file_upload'));--}} + {{-- $thumb = null === $pdf->get('file_thumb')--}} + {{-- ? $pdf->getImageURLbyCollection($pdf->get('file_upload'),'poster')--}} + {{-- : $pdf->getImageURLbyCollection($pdf->get('file_thumb'));--}} + {{-- @endphp--}} + {{-- --}}{{----}} + {{-- --}} + {{--
--}} + {{-- {{ $doc['document_title'] }}--}} + {{-- --}}{{--{{ $doc['document_title'] }}--}} + {{--
--}} + {{--

{{ $doc['document_title'] }}

--}} + {{--

{{ $doc['document_subtitle'] }}

--}} + {{-- --}} + {{-- Visualiser--}} + {{-- --}} + {{--
--}} + {{--
--}} + {{-- --}} + {{-- @endforeach--}} + {{--
--}} + {{-- @endif--}} -{{-- --}}{{-- MEMOS TITLE --}} -{{--

--}} -{{-- --}} -{{-- Les mémos--}} -{{-- --}} -{{--

--}} + {{-- --}}{{-- MEMOS TITLE --}} + {{--

--}} + {{-- --}} + {{-- Les mémos--}} + {{-- --}} + {{--

--}} {{-- MAIN SECTION WITH SIDEBAR --}}
@@ -147,20 +147,16 @@ @php /** @var \Cubist\Backpack\Magic\PageData $pdf */ $pdf = $resources_pdf[$memo['memo_pdf']]; - $pdfurl = $pdf->getImageURLbyCollection($pdf->get('file_upload')); - $thumb = !$pdf->get('file_thumb') || !$pdf->getImageURLbyCollection($pdf->get('file_thumb')) - ? $pdf->getImageURLbyCollection($pdf->get('file_upload'),'poster') - : $pdf->getImageURLbyCollection($pdf->get('file_thumb')); @endphp {{----}} -
{{ $memo['memo_title'] }}
@if ($memo['memo_number'])