From 0ec7b39e8d86b72e0a30befd467194d6d03bf3a7 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 17 Nov 2023 09:50:26 +0100 Subject: [PATCH] wip #5990 @0.5 --- .../FluidbookPublication/LinksOperation.php | 2 +- app/Models/FluidbookHealthIssues.php | 27 ++++++++++++++++--- app/Models/FluidbookPublication.php | 4 +++ .../packages/fluidbook/toolbox/css/audit.css | 10 +++++++ .../fluidbook/toolbox/css/audit.css.map | 2 +- .../packages/fluidbook/toolbox/css/audit.less | 14 +++++++++- .../fluidbook_publication/audit.blade.php | 11 +++++++- 7 files changed, 62 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php index 5c7e3036b..e83e2975d 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php @@ -18,7 +18,7 @@ trait LinksOperation protected function setupLinksRoutes($segment, $routeName, $controller) { - Route::match(['get'], $segment . '/{id}/edit/links', $controller . '@links'); + Route::match(['get'], $segment . '/{id}/edit/links', $controller . '@links')->name('fluidbook_linkeditor');; Route::match(['get'], $segment . '/{id}/edit/links/versions', $controller . '@getLinkVersions'); Route::match(['get'], $segment . '/{id}/edit/links/versions/export/{version}', $controller . '@exportLinks'); Route::match(['post'], $segment . '/{id}/edit/links/import/merge', $controller . '@importLinksMerge'); diff --git a/app/Models/FluidbookHealthIssues.php b/app/Models/FluidbookHealthIssues.php index 4a236d37a..8ba729ba9 100644 --- a/app/Models/FluidbookHealthIssues.php +++ b/app/Models/FluidbookHealthIssues.php @@ -56,21 +56,40 @@ class FluidbookHealthIssues extends ToolboxModel */ $d = [ - static::TYPE_MISSING_FILE => ['summary' => __('Erreur 404'), 'criticality' => self::CRIT_ERROR, 'text' => 'Le chemin ":path" est introuvable'], - static::TYPE_QRCODE_NOT_READABLE => ['summary' => __('QRcode illisible'), 'criticality' => self::CRIT_ERROR, 'text' => 'Le QRcode du lien :uid (page :page) n\'a pas pu être décodé'], + static::TYPE_MISSING_FILE => + [ + 'summary' => __('Erreur 404'), + 'criticality' => self::CRIT_ERROR, 'text' => 'Le chemin ":path" est introuvable', + + ], + static::TYPE_QRCODE_NOT_READABLE => + [ + 'summary' => __('QRcode illisible'), + 'criticality' => self::CRIT_ERROR, + 'text' => 'Le QRcode du lien :uid (page :page) n\'a pas pu être décodé', + 'fixText' => __('Aller sur l\'éditeur de liens'), + 'fixURL' => route('fluidbook_linkeditor', ['id' => $fluidbookId]) . '#:page', + ], ]; - $issues = static::withoutGlobalScopes()->where('fluidbook', $fluidbookId)->get(); + $issues = static::withoutGlobalScopes()->where('fluidbook', $fluidbookId)->orderBy('updated_at', 'DESC')->get(); $res = []; foreach ($issues as $issue) { $data = $d[$issue->type]; $replace = json_decode($issue->data, true); + $replaceRaw = $replace; foreach ($replace as $k => $r) { $replace[$k] = '' . $r . ''; } - $line = ['type' => $issue->type, 'criticality' => $data['criticality'], 'summary' => $data['summary'], 'text' => __($data['text'], $replace), 'count' => $issue->count, 'last' => $issue->updated_at]; + if(!isset($data['fixText'])){ + $fix=''; + }else{ + $fix='' . $data['fixText'] . ''; + } + + $line = ['type' => $issue->type, 'criticality' => $data['criticality'], 'summary' => $data['summary'], 'text' => __($data['text'], $replace), 'count' => $issue->count, 'last' => $issue->updated_at, 'fix' => $fix]; $res[] = $line; } return $res; diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index b98331ce9..a90166995 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -1085,4 +1085,8 @@ class FluidbookPublication extends ToolboxSettingsModel rsort($list); return $list; } + + public function hasIssue(){ + + } } diff --git a/public/packages/fluidbook/toolbox/css/audit.css b/public/packages/fluidbook/toolbox/css/audit.css index bf31f35f4..161d1991a 100644 --- a/public/packages/fluidbook/toolbox/css/audit.css +++ b/public/packages/fluidbook/toolbox/css/audit.css @@ -1,4 +1,14 @@ h2 { margin-top: 30px; } +.la-exclamation-circle, +.la-exclamation-triangle { + font-size: 20px; +} +.la-exclamation-circle { + color: #c00; +} +.la-exclamation-triangle { + color: #F74D07; +} /*# sourceMappingURL=audit.css.map */ \ No newline at end of file diff --git a/public/packages/fluidbook/toolbox/css/audit.css.map b/public/packages/fluidbook/toolbox/css/audit.css.map index f70400439..c6026795a 100644 --- a/public/packages/fluidbook/toolbox/css/audit.css.map +++ b/public/packages/fluidbook/toolbox/css/audit.css.map @@ -1 +1 @@ -{"version":3,"sources":["audit.less"],"names":[],"mappings":"AAAA;EACI,gBAAA","file":"audit.css"} \ No newline at end of file +{"version":3,"sources":["audit.less"],"names":[],"mappings":"AAAA;EACI,gBAAA;;AAGJ;AAAwB;EACpB,eAAA;;AAGJ;EACI,WAAA;;AAGJ;EACI,cAAA","file":"audit.css"} \ No newline at end of file diff --git a/public/packages/fluidbook/toolbox/css/audit.less b/public/packages/fluidbook/toolbox/css/audit.less index 0a7adf585..235140764 100644 --- a/public/packages/fluidbook/toolbox/css/audit.less +++ b/public/packages/fluidbook/toolbox/css/audit.less @@ -1,3 +1,15 @@ -h2{ +h2 { margin-top: 30px; } + +.la-exclamation-circle, .la-exclamation-triangle { + font-size: 20px; +} + +.la-exclamation-circle { + color: #c00; +} + +.la-exclamation-triangle { + color: #F74D07; +} diff --git a/resources/views/fluidbook_publication/audit.blade.php b/resources/views/fluidbook_publication/audit.blade.php index dc462f770..9b6fa0782 100644 --- a/resources/views/fluidbook_publication/audit.blade.php +++ b/resources/views/fluidbook_publication/audit.blade.php @@ -7,6 +7,13 @@ @endsection +@php + $icons=[ + \App\Models\FluidbookHealthIssues::CRIT_ERROR=>'', + \App\Models\FluidbookHealthIssues::CRIT_WARNING=>'' + ]; +@endphp + @section('content')

{{__('Audit du fluidbook :title - #:id',['title'=>$fluidbook->title,'id'=>$id])}}

{{__('Détails')}} + @foreach($issues as $issue) - + + @endforeach -- 2.39.5
{{__('Nombre')}} {{__('Date')}}{{__('Corriger le problème')}}
{!! $icons[$issue['criticality']] !!} {{$issue['summary']}} {!! $issue['text'] !!} {{$issue['count']}} {{$issue['last']}}{!! $issue['fix'] !!}