From 18281c42c9b795502d9bf92f178f8b972bf153eb Mon Sep 17 00:00:00 2001
From: Yann Gonidec <yann.gonidec@ldc.fr>
Date: Thu, 25 Jul 2019 15:08:33 +0200
Subject: [PATCH] Affiche statut de publication

---
 app/Console/Commands/ImportArcadiaFiles.php |  2 +-
 app/Http/Controllers/DossierController.php  |  2 +-
 app/Http/Controllers/MediaController.php    |  6 +++---
 config/services.php                         |  2 +-
 public/css/app.css                          | 21 +++++++++++++++++++++
 public/js/app.js                            | 16 ++++++++++++++++
 resources/js/media.js                       | 17 ++++++++++++++++-
 resources/sass/partials/app_variables.scss  |  2 ++
 resources/sass/partials/common.scss         |  1 +
 resources/sass/partials/media.scss          | 17 +++++++++++++++++
 resources/views/home.blade.php              |  2 +-
 11 files changed, 80 insertions(+), 8 deletions(-)

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 += '<div class="imageItem" data-id="' + item.id + '" data-depot="' + result.isDepot + '" data-ext="' + item.extension + '" data-typemedia="' + item.typemedia_id + '" data-preview="' + preview + '"  data-src="' + item.folder + item.uid + "." + item.extension + '" draggable="' + draggable + '" aria-grabbed="false">';
         output += '<div class="etiquette" style="background-color:' + item.etiquette.color + '; border-color:' + item.etiquette.color + ';"  data-id="' + item.etiquette.etiquette_id + '" >' + item.etiquette.libelle + '</div>';
         output += '<div class="contextMenu"><ul>';
@@ -12932,6 +12947,7 @@ window.loadMedia = function (sujet_id) {
         output += '<div class="media  ' + itemClass + '" style="background-image:url(' + thumb + ')"></div>';
         output += '<p  class="libelle">' + item.libelle + '</p>';
         output += '<div  class="info">' + ico + item.extension + ' - ' + item.taille + detail + ' - v' + item.version + '</div>';
+        output += '<div  class="statut stat' + item.statut + '">' + statut + '</div>';
         output += '</div>';
       });
       $('.media_container .wrapper').append(output);
diff --git a/resources/js/media.js b/resources/js/media.js
index 9cea177..c59d9d6 100644
--- a/resources/js/media.js
+++ b/resources/js/media.js
@@ -1495,6 +1495,7 @@ window.loadMedia = function(sujet_id, saveSearch = 0){
 			$.each(data, function (index, item) {
 				var ico = "";
 				var detail = "";
+				var statut = "";
 				var itemClass = "";
 				var thumb = "";
 				var preview = "";
@@ -1526,9 +1527,22 @@ window.loadMedia = function(sujet_id, saveSearch = 0){
 						itemClass = "son";
 						break;
 					default:
-
 				}
 
+				switch (item.statut) {
+					case 0:
+						statut = "Brouillon"
+						break;
+					case 1:
+						statut = "Public"
+						break;
+					case 2:
+						statut = "Public étendu"
+						break;
+				}
+
+
+
 		        output += '<div class="imageItem" data-id="'+item.id+'" data-depot="'+result.isDepot+'" data-ext="'+item.extension+'" data-typemedia="'+item.typemedia_id+'" data-preview="'+preview+'"  data-src="'+item.folder+item.uid+"."+item.extension+'" draggable="'+draggable+'" aria-grabbed="false">';
 				output += '<div class="etiquette" style="background-color:'+item.etiquette.color+'; border-color:'+item.etiquette.color+';"  data-id="'+item.etiquette.etiquette_id+'" >'+item.etiquette.libelle+'</div>';
 				output += '<div class="contextMenu"><ul>';
@@ -1543,6 +1557,7 @@ window.loadMedia = function(sujet_id, saveSearch = 0){
 				output += '<div class="media  '+itemClass+'" style="background-image:url('+thumb+')"></div>';
 				output += '<p  class="libelle">'+item.libelle+'</p>';
 				output += '<div  class="info">'+ico+item.extension+' - '+item.taille+detail+' - v'+item.version+'</div>';
+				output += '<div  class="statut stat'+item.statut+'">'+statut+'</div>';
 				output += '</div>';
 		    });
 			$('.media_container .wrapper').append(output);
diff --git a/resources/sass/partials/app_variables.scss b/resources/sass/partials/app_variables.scss
index 4a5fb3a..26f1ff0 100644
--- a/resources/sass/partials/app_variables.scss
+++ b/resources/sass/partials/app_variables.scss
@@ -18,8 +18,10 @@ $pink: #f66D9b;
 $red: #e3342f;
 $orange: #f6993f;
 $lightorange: #FFAB57;
+$darkorange : #E56A1F;
 $yellow: #ffed4a;
 $green: #38c172;
+$darkgreen: #02913E;
 $teal: #4dc0b5;
 $cyan: #6cb2eb;
 
diff --git a/resources/sass/partials/common.scss b/resources/sass/partials/common.scss
index 0aaa894..2d01591 100644
--- a/resources/sass/partials/common.scss
+++ b/resources/sass/partials/common.scss
@@ -559,6 +559,7 @@
 		margin-top: 80px;
 
 		.item{
+			box-shadow: 0px 0px 4px 0px $dark;
 			width: 300px;
 			min-height: 200px;
 			background-color: $grey3;
diff --git a/resources/sass/partials/media.scss b/resources/sass/partials/media.scss
index 108851a..a2abed3 100644
--- a/resources/sass/partials/media.scss
+++ b/resources/sass/partials/media.scss
@@ -361,6 +361,23 @@
 							margin-right: 7px;
 						}
 					}
+					.statut{
+						position: absolute;
+						top: 7px;
+						right: 3px;
+						border-radius: 2px;
+						padding: 2px 2px;
+						color: $white;
+						font-size: 9px;
+						z-index: 1;
+
+						&.stat0{
+							background-color: $darkorange;
+						}
+						&.stat1, &.stat2{
+							background-color: $darkgreen;
+						}
+					}
 
 
 					&[aria-grabbed="true"] {
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 20dcccd..0714e35 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -33,7 +33,7 @@
 			</header>
 			<div class="content">
 				@foreach ($dossiers as $dossier)
-					<a href="{{ route('media_manager', ['d' => $dossier->id, 's' => $dossier->sujet->codeSujet]) }}" ><i class="far fa-search"></i> {{$dossier->sujet->libelle." - ".$dossier->libelle}}</a>
+					<a href="{{ route('media_manager', ['d' => $dossier->id, 's' => $dossier->sujet->codeSujet]) }}" ><i class="fas fa-folder"></i> {{$dossier->sujet->libelle." - ".$dossier->libelle}}</a>
 				@endforeach
 			</div>
 		</div>