forge-joniko/ldc-dam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Affiche statut de publication

Browse source
This commit is contained in:
Yann Gonidec 2019-07-25 15:08:33 +02:00
parent 01c1d91e40
commit 18281c42c9
11 changed files with 80 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Console/Commands/ImportArcadiaFiles.php
View file

@ -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

2
app/Http/Controllers/DossierController.php
View file

@ -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);
})

6
app/Http/Controllers/MediaController.php
View file

@ -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;

2
config/services.php
View file

@ -47,6 +47,6 @@ return [
'statut' => [
'brouillon' => 0,
'public' => 1,
'public_etendue' => 2,
'public_etendu' => 2,
],
];

21
public/css/app.css vendored
View file

@ -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";

16
public/js/app.js vendored
View file

@ -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);

17
resources/js/media.js vendored
View file

@ -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);

2
resources/sass/partials/app_variables.scss vendored
View file

@ -18,8 +18,10 @@ $pink: #f66D9b;
$red: #e3342f;
$orange: #f6993f;
$lightorange: #FFAB57;
$darkorange : #E56A1F;
$yellow: #ffed4a;
$green: #38c172;
$darkgreen: #02913E;
$teal: #4dc0b5;
$cyan: #6cb2eb;

1
resources/sass/partials/common.scss vendored
View file

@ -559,6 +559,7 @@
margin-top: 80px;
.item{
box-shadow: 0px 0px 4px 0px $dark;
width: 300px;
min-height: 200px;
background-color: $grey3;

17
resources/sass/partials/media.scss vendored
View file

@ -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"] {

2
resources/views/home.blade.php
View file

@ -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>