From ed0038193b4416f37b47b1fadb7fa805899006cd Mon Sep 17 00:00:00 2001 From: Yann Gonidec Date: Thu, 23 May 2019 15:09:28 +0200 Subject: [PATCH] =?UTF-8?q?front=20:=20chargement=20des=20m=C3=A9dias?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/MediaController.php | 47 +++++- app/Http/Controllers/UserController.php | 7 +- config/ldap.php | 4 +- public/css/app.css | 42 +++++- public/js/app.js | 134 +++++++++++++++--- resources/js/media.js | 113 +++++++++++++-- .../sass/partials/fontawesome/_animated.scss | 2 +- resources/sass/partials/media.scss | 37 ++++- resources/views/media_manager.blade.php | 13 +- routes/web.php | 1 + 10 files changed, 349 insertions(+), 51 deletions(-) diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index 2b24f08..b3f3691 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -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); + } } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 3639e15..1d36444 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -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); diff --git a/config/ldap.php b/config/ldap.php index 4cfcd8b..a778249 100644 --- a/config/ldap.php +++ b/config/ldap.php @@ -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'), /* |-------------------------------------------------------------------------- diff --git a/public/css/app.css b/public/css/app.css index 0edfa1f..0ea5a63 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -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 { diff --git a/public/js/app.js b/public/js/app.js index 61aed35..c99d66f 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -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 += 'Mon image'; + output += item.libelle; + output += ''; }); + $('.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 diff --git a/resources/js/media.js b/resources/js/media.js index a3545f5..9c55551 100644 --- a/resources/js/media.js +++ b/resources/js/media.js @@ -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 += 'Mon image'; + output += item.libelle; + output += ''; + }); + $('.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); } }); } diff --git a/resources/sass/partials/fontawesome/_animated.scss b/resources/sass/partials/fontawesome/_animated.scss index 7c7c0e1..5ce6c49 100644 --- a/resources/sass/partials/fontawesome/_animated.scss +++ b/resources/sass/partials/fontawesome/_animated.scss @@ -2,7 +2,7 @@ // -------------------------- .#{$fa-css-prefix}-spin { - animation: fa-spin 2s infinite linear; + animation: fa-spin 1s infinite linear; } .#{$fa-css-prefix}-pulse { diff --git a/resources/sass/partials/media.scss b/resources/sass/partials/media.scss index a5f0546..341029e 100644 --- a/resources/sass/partials/media.scss +++ b/resources/sass/partials/media.scss @@ -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; diff --git a/resources/views/media_manager.blade.php b/resources/views/media_manager.blade.php index 4fd824e..88399b3 100644 --- a/resources/views/media_manager.blade.php +++ b/resources/views/media_manager.blade.php @@ -35,10 +35,19 @@
+
+
+ + Rechercher +
+ +
+
- Mon image - +
diff --git a/routes/web.php b/routes/web.php index afaa23e..12bb348 100644 --- a/routes/web.php +++ b/routes/web.php @@ -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');