front : chargement des médias

This commit is contained in:
Yann Gonidec 2019-05-23 15:09:28 +02:00
parent 4a7988567c
commit ed0038193b
10 changed files with 349 additions and 51 deletions

View file

@ -5,7 +5,7 @@ namespace App\Http\Controllers;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use App\Sujet;
use App\Dossier;
use App\Media;
class MediaController extends Controller
{
@ -22,5 +22,50 @@ class MediaController extends Controller
return view('media_manager')->with(['sujets'=> $sujets]);
}
/**
* Chargement des médias
*
*/
public function loadMedia(Request $request)
{
$response = array();
$dossier_id = $request->input('dossier_id');
$sujet_id = $request->input('sujet_id');
$offset = $request->input('offset');
$limit = $request->input('limit');
if($dossier_id == "0"){
$response['data'] = Media::where('sujet_id', $sujet_id)->whereNull('dossier_id')->offset($offset)->limit($limit)->get();
}else{
$response['data'] = Media::where('sujet_id', $sujet_id)->where('dossier_id', $dossier_id)->offset($offset)->limit($limit)->get();
}
return json_encode($response);
}
/**
* Déplacement des médias
*
*/
public function moveMedia(Request $request)
{
$response = array();
$dossier_id = $request->input('dossier_id');
$data = $request->input('data');
$data = explode(",", $data);
foreach ($data as $key => $media_id) {
$media = Media::where('id', $media_id)->first();
if($media){
if($dossier_id > 0){
$media->dossier_id = $dossier_id;
}else{
$media->dossier_id = null;
}
$media->save();
}
}
return json_encode(true);
}
}

View file

@ -237,14 +237,13 @@ class UserController extends Controller
{
Auth::user()->authorizeRoles([config('roles.const.ADMIN'), config('roles.const.REDACTEUR')]);
$dossier_id = $request->input('dossier_id');
$favoris = (bool) $request->input('favoris');
$favoris = $request->input('favoris');
$dossierFav = Auth::user()->dossiers()->where('id', $dossier_id)->first();
if($favoris == false && $dossierFav){
if($favoris == "false" && $dossierFav){
Auth::user()->dossiers()->detach($dossier_id);
}elseif ($favoris == true && !$dossierFav) {
}elseif ($favoris == "true" && !$dossierFav) {
Auth::user()->dossiers()->attach($dossier_id);
}
return json_encode(true);

View file

@ -198,8 +198,8 @@ return [
|
*/
'username' => env('LDAP_USERNAME', 'uid=tr0113942,ou=Users,dc=Comptes,dc=com'),
'password' => env('LDAP_PASSWORD', 'Temari7274!!'),
'username' => env('LDAP_USERNAME', 'uid=tp9900153,ou=Users,dc=Comptes,dc=com'),
'password' => env('LDAP_PASSWORD', 'EH3Un2ah2019'),
/*
|--------------------------------------------------------------------------

42
public/css/app.css vendored
View file

@ -4046,8 +4046,8 @@ table {
}
.fa-spin {
-webkit-animation: fa-spin 2s infinite linear;
animation: fa-spin 2s infinite linear;
-webkit-animation: fa-spin 1s infinite linear;
animation: fa-spin 1s infinite linear;
}
.fa-pulse {
@ -13021,13 +13021,49 @@ table tfoot tr {
.media_manager .main_content {
height: 100%;
padding: 0;
position: relative;
overflow: hidden;
}
.media_manager .main_content header .search_wrapper {
padding: 30px 5px 10px 40px;
min-height: 129px;
}
.media_manager .main_content header .action_wrapper {
background-color: #3b3b3b;
width: 100%;
min-height: 45px;
}
.media_manager .main_content .scrollLoader {
position: absolute;
border-bottom: 0;
bottom: 0;
left: 50%;
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
z-index: 1;
}
.media_manager .main_content .scrollLoader > div {
background-color: #1a1a1a;
font-size: 14px;
padding: 13px;
border-radius: 3px 3px 0 0;
-webkit-animation-duration: 200ms;
animation-duration: 200ms;
}
.media_manager .main_content .scrollLoader > div i {
margin-right: 5px;
}
.media_manager .main_content .media_container {
overflow-y: auto;
overflow-x: hidden;
position: relative;
height: 100%;
height: calc(100% - 174px);
}
.media_manager .main_content .media_container .loader {

134
public/js/app.js vendored
View file

@ -11094,13 +11094,13 @@ $(document).ready(function () {
}); // ---- Gestion des média : sélectionner un dossier et favoris
$(".folder_container").on('click', '.dd3-content', function (e) {
event.preventDefault();
e.preventDefault();
var target = e.target,
$target = $(target);
var dossier_id = $target.parents(".dd3-item").attr("data-id");
if ($target.hasClass('fa-star')) {
// Gestion des favoris
var dossier_id = $target.parents(".dd3-item").attr("data-id");
var favoris = false;
if ($target.hasClass("fas")) {
@ -11124,6 +11124,10 @@ $(document).ready(function () {
$(".folder_container .dd3-content").removeClass('selected');
$(".folder_container .root_folder").removeClass('selected');
$(this).addClass('selected');
var sujet_id = $("#sujet_selector").val();
$(".currentFolder").val(dossier_id);
$(window).data('offset', 0);
loadMedia(dossier_id, sujet_id);
}
}); // ---- Gestion des média : sélectionner la racine
@ -11131,6 +11135,10 @@ $(document).ready(function () {
event.preventDefault();
$(".folder_container .dd3-content").removeClass('selected');
$(this).addClass('selected');
$(".currentFolder").val(0);
var sujetId = $("#sujet_selector").val();
$(window).data('offset', 0);
loadMedia(0, sujetId);
}); // ---- Gestion des média : menu contextuel des dossiers
$(".folder_container").on('contextmenu', '.dd3-content', function (event) {
@ -11434,15 +11442,67 @@ $(document).ready(function () {
$(".folder_container .root_folder").removeClass('dragged'); // ---- Cible
if ($(this).hasClass("root_folder")) {
var id = $(this).attr("data-id");
var dossier_id = $(this).attr("data-id");
} else {
var id = $(this).parent("li").attr("data-id");
}
var dossier_id = $(this).parent("li").attr("data-id");
} // ---- source
console.log("Dossier cible id n°" + id); // ---- source
var data = event.originalEvent.dataTransfer.getData("Text");
console.log("Id des éléments sources " + data);
if ($(".currentFolder").val() != dossier_id) {
$.ajax({
url: '/ajax/move-media',
method: 'POST',
dataType: 'json',
data: {
dossier_id: dossier_id,
data: data
},
success: function success(result) {
var currentFolderId = $(".currentFolder").val();
var arrayMediaId = data.split(',');
if (currentFolderId == 0) {
var $countCurrentFolder = $(".folder_container .root_folder .count");
} else {
var $countCurrentFolder = $(".folder_container .dd3-item[data-id='" + currentFolderId + "'] > .dd3-content .count");
}
if (dossier_id == 0) {
var $countTargetFolder = $(".folder_container .root_folder .count");
} else {
var $countTargetFolder = $(".folder_container .dd3-item[data-id='" + dossier_id + "'] > .dd3-content .count");
}
$.each(arrayMediaId, function (index, media_id) {
$(".media_container .imageItem[data-id='" + media_id + "']").remove(); // supprime les éléments déplacés
$countCurrentFolder.html(parseInt($countCurrentFolder.html()) - 1); // MAJ du compteur du dossier actuel
$countTargetFolder.html(parseInt($countTargetFolder.html()) + 1); // MAJ du compteur du dossier cible
});
},
error: function error(jqXHR, textStatus, errorThrown) {
$.fancyMessage({
title: "Attention",
message: "Erreur lors du déplacement, merci d'actualiser la page.",
type: "error"
});
}
});
}
});
$(".main_content .media_container").on("scroll resize", function () {
if ($(window).data('ajaxready') == false) return;
if ($(window).data('noMedia') == true) return;
if ($(".media_container").scrollTop() + $(".media_container").height() == $(".media_container .wrapper").height()) {
$(window).data('ajaxready', false);
var sujet_id = $("#sujet_selector").val();
var dossier_id = $(".currentFolder").val();
loadMedia(dossier_id, sujet_id);
}
});
}); // ---- Gestion des média : init des dossiers
@ -11521,13 +11581,18 @@ function initFolderManager(sujetId) {
return false;
}
}
});
$('.dd').nestable('collapseAll');
}); //('.dd').nestable('collapseAll');
$(".folder_container .dd-empty").remove();
$(".folder_container .loader").hide(); //---- Chargement des médias
var currentFolder = $(".currentFolder").val();
loadMedia(currentFolder);
if (currentFolder == 0 || currentFolder == "") {
$(".root_folder").trigger("click");
} else {
$('.dd .dd-item[data-id="' + currentFolder + '"] > .dd3-content').trigger("click");
}
},
error: function error(jqXHR, textStatus, errorThrown) {
$(".folder_container .loader").hide();
@ -11540,25 +11605,52 @@ function initFolderManager(sujetId) {
});
}
function loadMedia(dossier_id) {
$(".media_container .loader").show();
$(window).data('offset', 0);
$(window).data('limit', 50);
function loadMedia(dossier_id, sujet_id) {
var output = '';
if ($(window).data('offset') == 0) {
$(window).data('noMedia', false);
$('.media_container .wrapper').html("");
$(".media_container .loader").show();
} else {
$(".main_content .scrollLoader").show();
}
$.ajax({
url: '/ajax/load-media',
method: 'POST',
dataType: 'json',
data: {
dossier_id: dossier_id
dossier_id: dossier_id,
sujet_id: sujet_id,
offset: $(window).data('offset'),
limit: $(window).data('limit')
},
success: function success(result) {
$(".folder_container .loader").hide();
},
error: function error(jqXHR, textStatus, errorThrown) {
$(".folder_container .loader").hide();
$.fancyMessage({
title: "Attention",
message: "Erreur lors du déplacement du dossier. Merci d'actualiser la page.",
type: "error"
var data = result.data;
if (data.length == 0) {
$(window).data('noMedia', true);
}
$.each(data, function (index, item) {
output += '<a class="imageItem" data-id="' + item.id + '" href="#" draggable="true" aria-grabbed="false">Mon image';
output += item.libelle;
output += '</a>';
});
$('.media_container .wrapper').append(output);
if ($(window).data('offset') == 0) {
$(".media_container .loader").hide();
} else {
$(".main_content .scrollLoader").hide();
}
$(window).data('offset', $(window).data('offset') + $(window).data('limit'));
$(window).data('ajaxready', true);
}
});
} // ---- Gestion des média : contruction de l'arborescence des dossiers

113
resources/js/media.js vendored
View file

@ -33,11 +33,12 @@ $(document).ready(function() {
// ---- Gestion des média : sélectionner un dossier et favoris
$(".folder_container").on('click', '.dd3-content', function(e) {
event.preventDefault();
e.preventDefault();
var target = e.target, $target = $(target);
var dossier_id = $target.parents(".dd3-item").attr("data-id");
if($target.hasClass('fa-star')){
// Gestion des favoris
var dossier_id = $target.parents(".dd3-item").attr("data-id");
var favoris = false;
if($target.hasClass("fas")){
$target.removeClass("fas").addClass("fal");
@ -59,6 +60,10 @@ $(document).ready(function() {
$(".folder_container .dd3-content").removeClass('selected');
$(".folder_container .root_folder").removeClass('selected');
$(this).addClass('selected');
var sujet_id = $("#sujet_selector").val();
$(".currentFolder").val(dossier_id);
$(window).data('offset', 0);
loadMedia(dossier_id, sujet_id);
}
});
@ -69,6 +74,10 @@ $(document).ready(function() {
event.preventDefault();
$(".folder_container .dd3-content").removeClass('selected');
$(this).addClass('selected');
$(".currentFolder").val(0);
var sujetId = $("#sujet_selector").val();
$(window).data('offset', 0);
loadMedia(0, sujetId);
});
// ---- Gestion des média : menu contextuel des dossiers
@ -351,16 +360,61 @@ $(document).ready(function() {
$(".folder_container .root_folder").removeClass('dragged');
// ---- Cible
if($(this).hasClass("root_folder")){
var id = $(this).attr("data-id");
var dossier_id = $(this).attr("data-id");
}else{
var id = $(this).parent("li").attr("data-id");
var dossier_id = $(this).parent("li").attr("data-id");
}
console.log("Dossier cible id n°"+id);
// ---- source
var data = event.originalEvent.dataTransfer.getData("Text");
console.log("Id des éléments sources "+data);
if($(".currentFolder").val() != dossier_id){
$.ajax({
url: '/ajax/move-media',
method: 'POST',
dataType : 'json',
data: {
dossier_id: dossier_id,
data: data,
},
success: function(result){
var currentFolderId = $(".currentFolder").val();
var arrayMediaId = data.split(',');
if(currentFolderId == 0){
var $countCurrentFolder = $(".folder_container .root_folder .count");
}else{
var $countCurrentFolder = $(".folder_container .dd3-item[data-id='"+currentFolderId+"'] > .dd3-content .count");
}
if(dossier_id == 0){
var $countTargetFolder = $(".folder_container .root_folder .count");
}else{
var $countTargetFolder = $(".folder_container .dd3-item[data-id='"+dossier_id+"'] > .dd3-content .count");
}
$.each(arrayMediaId, function(index, media_id) {
$(".media_container .imageItem[data-id='"+media_id+"']").remove(); // supprime les éléments déplacés
$countCurrentFolder.html(parseInt($countCurrentFolder.html())-1); // MAJ du compteur du dossier actuel
$countTargetFolder.html(parseInt($countTargetFolder.html())+1); // MAJ du compteur du dossier cible
});
},
error: function(jqXHR, textStatus, errorThrown) {
$.fancyMessage({title : "Attention", message : "Erreur lors du déplacement, merci d'actualiser la page.", type : "error"});
}
});
}
});
$(".main_content .media_container").on("scroll resize", function() {
if ($(window).data('ajaxready') == false) return;
if ($(window).data('noMedia') == true) return;
if( ($(".media_container").scrollTop() + $(".media_container").height() ) == $(".media_container .wrapper").height() ) {
$(window).data('ajaxready', false);
var sujet_id = $("#sujet_selector").val();
var dossier_id = $(".currentFolder").val();
loadMedia(dossier_id, sujet_id);
}
});
});
// ---- Gestion des média : init des dossiers
@ -429,12 +483,16 @@ function initFolderManager(sujetId){
}
}
});
$('.dd').nestable('collapseAll');
//('.dd').nestable('collapseAll');
$(".folder_container .dd-empty").remove();
$(".folder_container .loader").hide();
//---- Chargement des médias
var currentFolder = $(".currentFolder").val();
loadMedia(currentFolder);
if(currentFolder == 0 || currentFolder == ""){
$(".root_folder").trigger("click");
}else{
$('.dd .dd-item[data-id="'+currentFolder+'"] > .dd3-content').trigger("click");
}
},
error: function(jqXHR, textStatus, errorThrown) {
$(".folder_container .loader").hide();
@ -443,21 +501,46 @@ function initFolderManager(sujetId){
});
}
function loadMedia(dossier_id){
$(".media_container .loader").show();
$(window).data('offset', 0);
$(window).data('limit', 50);
function loadMedia(dossier_id, sujet_id){
var output = '';
if($(window).data('offset') == 0){
$(window).data('noMedia', false);
$('.media_container .wrapper').html("");
$(".media_container .loader").show();
}else{
$(".main_content .scrollLoader").show();
}
$.ajax({
url: '/ajax/load-media',
method: 'POST',
dataType : 'json',
data: {
dossier_id : dossier_id,
sujet_id : sujet_id,
offset : $(window).data('offset'),
limit : $(window).data('limit'),
},
success: function(result){
$(".folder_container .loader").hide();
},
error: function(jqXHR, textStatus, errorThrown) {
$(".folder_container .loader").hide();
$.fancyMessage({title : "Attention", message : "Erreur lors du déplacement du dossier. Merci d'actualiser la page.", type : "error"});
var data = result.data;
if(data.length == 0){
$(window).data('noMedia', true);
}
$.each(data, function (index, item) {
output += '<a class="imageItem" data-id="'+item.id+'" href="#" draggable="true" aria-grabbed="false">Mon image';
output += item.libelle;
output += '</a>';
});
$('.media_container .wrapper').append(output);
if($(window).data('offset') == 0){
$(".media_container .loader").hide();
}else{
$(".main_content .scrollLoader").hide();
}
$(window).data('offset', $(window).data('offset')+$(window).data('limit'));
$(window).data('ajaxready', true);
}
});
}

View file

@ -2,7 +2,7 @@
// --------------------------
.#{$fa-css-prefix}-spin {
animation: fa-spin 2s infinite linear;
animation: fa-spin 1s infinite linear;
}
.#{$fa-css-prefix}-pulse {

View file

@ -6,13 +6,46 @@
.main_content{
height: 100%;
padding: 0;
position: relative;
overflow: hidden;
header{
.search_wrapper{
padding: 30px 5px 10px 40px;
min-height: 129px;
}
.action_wrapper{
background-color: $grey;
width: 100%;
min-height: 45px;
}
}
.scrollLoader{
position: absolute;
border-bottom: 0;
bottom: 0;
left: 50%;
transform: translateX(-50%);
z-index: 1;
>div{
background-color: $dark;
font-size: 14px;
padding: 13px;
border-radius: 3px 3px 0 0;
animation-duration: 200ms;
i{
margin-right: 5px;
}
}
}
.media_container{
overflow-y: auto;
overflow-x: hidden;
position: relative;
height: 100%;
height: calc(100% - 174px);
.loader{
position: sticky;

View file

@ -35,10 +35,19 @@
</div>
</div>
<div class="main_content">
<header>
<div class="search_wrapper">
<input type="text" value="" placeholder="rechercher un média...">
<a href="#" class="btn btn-square btn-black">Rechercher</a>
</div>
<div class="action_wrapper">
<a href="#" class="action_add_media"><i class="fas fa-file-upload"></i> Ajouter</a>
</div>
</header>
<div style="display:none;" class="scrollLoader"><div class="animated slideInUp"><i class="fal fa-circle-notch fa-spin"></i> Chargements des médias</div></div>
<div class="media_container">
<div style="display:none;" class="loader"><i class="fal fa-circle-notch fa-spin"></i></div>
<a class="imageItem" data-id="1" href="#" draggable="true" aria-grabbed="false">Mon image</a>
<div class="wrapper"></div>
</div>
</main>

View file

@ -25,6 +25,7 @@ Route::group(['middleware' => ['auth']], function(){
Route::post('/ajax/get-folder-property', 'DossierController@getFolderProperty');
Route::post('/ajax/save-folder-property', 'DossierController@saveFolderProperty');
Route::post('/ajax/load-media', 'MediaController@loadMedia');
Route::post('/ajax/move-media', 'MediaController@moveMedia');
Route::resource('user', 'UserController');
Route::post('/check-matricule', 'UserController@checkMatricule');