wait #6214 @0.5

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php
index 87a4e4362efefc17d5e4ed32b1fcfd3b61ecdd02..dc2e1af1444ef2c414145e7dfe2dc6de58f234eb 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/CompositionOperation.php
@@ -33,7 +33,7 @@ trait CompositionOperation
 
     protected function getPageText($fluidbook_id, $type, $page)
     {
-        $types = ['texts' => FluidbookDocument::TEXT_PLAIN, 'index' => FluidbookDocument::TEXT_INDEX];
+        $types = ['texts' => FluidbookDocument::TEXT_PLAIN, 'index' => FluidbookDocument::TEXT_INDEX, 'layout' => FluidbookDocument::TEXT_LAYOUT];
         if (!isset($types[$type])) {
             abort(404, 'Text type not found');
         }
@@ -41,10 +41,15 @@ trait CompositionOperation
             abort(401);
         }
         /** @var FluidbookPublication $fb */
-        $fb = FluidbookPublication::find($fluidbook_id);
-        $document = $fb->getDocument($page);
-        $path = $document->getTextFile($page, $types[$type], $fb->textExtraction, $fb->ignoreSearchSeparators);
-        return response(Gzip::file_get_contents($path), 200, ['content-type' => 'text/plain']);
+        $fb = FluidbookPublication::withoutGlobalScopes()->find($fluidbook_id);
+        $contentType = 'text/plain';
+        if ($type == FluidbookDocument::TEXT_LAYOUT) {
+            $path = $fb->getHightlightFile($page);
+            $contentType = 'application/json';
+        } else {
+            $path = $fb->getTextFile($page, $types[$type]);
+        }
+        return response(Gzip::file_get_contents($path), 200, ['content-type' => $contentType]);
     }
 
 

diff --git a/app/Models/FluidbookDocument.php b/app/Models/FluidbookDocument.php
index 64db70bd8f51f4fa8ab04fabf442f7a903f734f3..5725777c78ae5979cda328a6f5bed7e7dda382f7 100644 (file)
--- a/app/Models/FluidbookDocument.php
+++ b/app/Models/FluidbookDocument.php
@@ -38,6 +38,7 @@ class FluidbookDocument extends ToolboxModel
     const TEXT_PLAIN = 'p';
     const TEXT_INDEX = 'i';
     const TEXT_HTML = 'h';
+    const TEXT_LAYOUT = 'layout';
 
     public function setFields()
     {

diff --git a/resources/views/fields/fluidbook_composition.blade.php b/resources/views/fields/fluidbook_composition.blade.php
index d331d00ea08ef9893d1e4a00ea8b5257075eda91..896d0a88bbe910d6a4118d2d5c6ef72f03b1a8cc 100644 (file)
--- a/resources/views/fields/fluidbook_composition.blade.php
+++ b/resources/views/fields/fluidbook_composition.blade.php
@@ -474,6 +474,12 @@
                                     callback: function (key, opt) {
                                         window.open('/fluidbook-publication/' + {{$entry->id}} + '/index/' + ($(opt.$trigger[0]).index() + 1) + '.txt');
                                     },
+                                },
+                                seelayout: {
+                                    name: "{{__('Informations pour le surlignage')}}",
+                                    callback: function (key, opt) {
+                                        window.open('/fluidbook-publication/' + {{$entry->id}} + '/layout/' + ($(opt.$trigger[0]).index() + 1) + '.txt');
+                                    },
                                 }
                             }
                         }