diff --git a/app/Console/Commands/ImportArcadiaFiles.php b/app/Console/Commands/ImportArcadiaFiles.php index 0a8559f..4b48f6c 100644 --- a/app/Console/Commands/ImportArcadiaFiles.php +++ b/app/Console/Commands/ImportArcadiaFiles.php @@ -232,7 +232,7 @@ class ImportArcadiaFiles extends Command $date = explode("/", $row->datePublication); $record->published_at = $date[2].'-'.$date[1].'-'.$date[0]; } - $record->statut = config('services.statut.public_etendue'); + $record->statut = config('services.statut.public_etendu'); // TODO lien avec les sites, marques et articles diff --git a/app/Http/Controllers/DossierController.php b/app/Http/Controllers/DossierController.php index a59d13d..5342cfe 100644 --- a/app/Http/Controllers/DossierController.php +++ b/app/Http/Controllers/DossierController.php @@ -210,7 +210,7 @@ class DossierController extends Controller $response['count'] = Media::where('sujet_id', $sujetId) ->whereNull('dossier_id') ->where(function ($query) use ( $userId ) { - $query->where('statut', config('services.statut.public_etendue')) + $query->where('statut', config('services.statut.public_etendu')) ->orWhere('statut', config('services.statut.public')) ->orWhere('created_by', $userId); }) diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index 107bfb5..4a43894 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -108,14 +108,14 @@ class MediaController extends Controller $query= Media::where('sujet_id', $sujet_id) ->whereNull('dossier_id') ->where(function ($query) use ( $userId ) { - $query->where('statut', config('services.statut.public_etendue')) + $query->where('statut', config('services.statut.public_etendu')) ->orWhere('statut', config('services.statut.public')) ->orWhere('created_by', $userId); }); }elseif($dossier_id == "-1"){ // recherche global $query = Media::where('sujet_id', $sujet_id) ->where(function ($query) use ( $userId ) { - $query->where('statut', config('services.statut.public_etendue')) + $query->where('statut', config('services.statut.public_etendu')) ->orWhere('created_by', $userId); }); }else{ @@ -351,7 +351,7 @@ class MediaController extends Controller $media->langue_id = $mediaUpdate->langue_id; $media->commentaire = $mediaUpdate->commentaire; $media->version = $mediaUpdate->version; - if( ($mediaUpdate->statut == config('services.statut.public') || $mediaUpdate->statut == config('services.statut.public_etendue')) && $media->statut == config('services.statut.brouillon')){ + if( ($mediaUpdate->statut == config('services.statut.public') || $mediaUpdate->statut == config('services.statut.public_etendu')) && $media->statut == config('services.statut.brouillon')){ $media->published_at = date("Y-m-d H:i:s"); } $media->statut = $mediaUpdate->statut; diff --git a/config/services.php b/config/services.php index 32d22af..671c657 100644 --- a/config/services.php +++ b/config/services.php @@ -47,6 +47,6 @@ return [ 'statut' => [ 'brouillon' => 0, 'public' => 1, - 'public_etendue' => 2, + 'public_etendu' => 2, ], ]; diff --git a/public/css/app.css b/public/css/app.css index 67e48dd..4429021 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -13346,6 +13346,7 @@ readers do not read off random characters that represent icons */ } .home .widget .item { + box-shadow: 0px 0px 4px 0px #1a1a1a; width: 300px; min-height: 200px; background-color: #333333; @@ -14109,6 +14110,26 @@ table tfoot tr:hover { margin-right: 7px; } +.media_manager .main_content .media_container .wrapper .imageItem .statut { + position: absolute; + top: 7px; + right: 3px; + border-radius: 2px; + padding: 2px 2px; + color: #ffffff; + font-size: 9px; + z-index: 1; +} + +.media_manager .main_content .media_container .wrapper .imageItem .statut.stat0 { + background-color: #E56A1F; +} + +.media_manager .main_content .media_container .wrapper .imageItem .statut.stat1, +.media_manager .main_content .media_container .wrapper .imageItem .statut.stat2 { + background-color: #02913E; +} + .media_manager .main_content .media_container .wrapper .imageItem[aria-grabbed=true]::before { content: "\F058"; font-family: "Font Awesome 5 Pro"; diff --git a/public/js/app.js b/public/js/app.js index 7df64f4..eb49e12 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -12876,6 +12876,7 @@ window.loadMedia = function (sujet_id) { $.each(data, function (index, item) { var ico = ""; var detail = ""; + var statut = ""; var itemClass = ""; var thumb = ""; var preview = ""; @@ -12916,6 +12917,20 @@ window.loadMedia = function (sujet_id) { default: } + switch (item.statut) { + case 0: + statut = "Brouillon"; + break; + + case 1: + statut = "Public"; + break; + + case 2: + statut = "Public étendu"; + break; + } + output += '
' + item.libelle + '
'; output += ''+item.libelle+'
'; output += '