- Fix ImportMedia

- Fix Upload
- Fix right click folder
This commit is contained in:
Vincent BRIDIER 2019-12-05 14:39:26 +01:00
parent fd2a0794da
commit 79f82a470a
6 changed files with 29552 additions and 58 deletions

View file

@ -99,6 +99,8 @@ class ImportMedia extends Command
}
if ($row->copyright != "") {
$record->copyright_id = $row->copyright;
}else{
$record->copyright_id = 3;
}
if ($row->codeVariante != "") {
$record->variante_id = $row->codeVariante;
@ -141,7 +143,7 @@ class ImportMedia extends Command
} else {
// on applique une image par défaut
$record->extension = "jpg";
Storage::disk('local')->move("images/default.jpg", $destinationPath . $record->uid . '.' . $record->extension);
Storage::disk('local')->copy("images/default.jpg", $destinationPath . $record->uid . '.' . $record->extension);
// calcul de la taille du média
$record->taille = $this->formatBytes($this->get_file_size("public/" . $destinationPath . $record->uid . '.' . $record->extension));
@ -150,6 +152,10 @@ class ImportMedia extends Command
$record->save();
// On ajoute dans Elasticsearch
$media = Media::find($record->id);
$media->addToIndex();
// ---- Creation des vignettes de base
$this->create_sys_thumb($record);
// ---- Creation des vignettes en lien avec le sujet du média
@ -244,8 +250,12 @@ class ImportMedia extends Command
foreach ($fileContent->mediaassomarque as $row) {
$record = Media::where('arcadia_id', $row->codeVisuel)->first();
if ($record) {
// attache la marque au média
$record->marques()->attach($row->codMarq);
if ($record->marques->contains($row->codMarq)){
$this->line("\nDAM_ASSO_MARQUE : le media n°" . $row->codeVisuel . " est déjà associé à cette marque.");
}else{
// attache la marque au média
$record->marques()->attach($row->codMarq);
}
} else {
$this->line("\nDAM_ASSO_MARQUE : le media n°" . $row->codeVisuel . " n'existe pas");
}

View file

@ -39,6 +39,7 @@ class UploadController extends Controller {
$acceptFileTypes = array('gif','jpeg', 'jpg','png','mp4','mp3','psd','ai','svg','pdf');
if ($request->hasFile('files')) {
$filesa = [];
$file = $request->file('files');
foreach($file as $files){
@ -229,21 +230,20 @@ class UploadController extends Controller {
$historique->description = "Le média a été remplacé";
}
$historique->save();
$filest = array();
$filest['name'] = $filename;
$filest['uid'] = $uid;
$filest['libelle'] = $media->libelle;
$filest['id'] = $media->id;
$filest['folder'] = $media->folder;
$filest['extension'] = $media->extension;
$filest['typemedia_id'] = $media->typemedia_id;
$filesa['files'][]=$filest;
}
$filest = array();
$filest['name'] = $filename;
$filest['uid'] = $uid;
$filest['libelle'] = $media->libelle;
$filest['id'] = $media->id;
$filest['folder'] = $media->folder;
$filest['extension'] = $media->extension;
$filest['typemedia_id'] = $media->typemedia_id;
$filesa['files'][]=$filest;
}
return $filesa;
}
}
}

15166
public/css/app.css vendored

File diff suppressed because one or more lines are too long

14313
public/js/app.js vendored

File diff suppressed because one or more lines are too long

90
resources/js/media.js vendored
View file

@ -123,11 +123,13 @@ $(document).ready(function() {
// ---- menu contextuel des dossiers
$(".folder_container").on('contextmenu', '.dd3-content', function(event) {
event.preventDefault();
console.log($(this).offset().top)
console.log($('.dd').offset().top)
// placement du menu
$(".folder_container .folder_menu").css({
left: event.pageX,
top:event.pageY-180
})
top:$(this).offset().top - $('.dd').offset().top + 50
});
// memo l'id du dossier cible
var id = $(this).parent("li").attr("data-id");
$(".folder_container .folder_menu").attr('data-id', id);
@ -582,6 +584,8 @@ $(document).ready(function() {
e.preventDefault();
if ( confirm( "En cliquant sur OK, vous confirmez que vous avez édité tous vos fichiers." ) ) {
$.fancybox.close();
$(window).data('offset', 0);
loadMedia($("#sujet_selector").val());
}
});
@ -1081,7 +1085,7 @@ $(document).ready(function() {
$('.add_media_without_file').on('click',function(event){
event.preventDefault();
$.fancybox.close();
$('body').css('cursor', 'progress');
$(".media_container .loader").show();
$.ajax({
url: '/ajax/add-media',
method: 'POST',
@ -1102,8 +1106,6 @@ $(document).ready(function() {
$(".reinit_search_btn").trigger("click");
$('body').css('cursor', 'default');
openEditor({
id: result.id,
preview: result.folder + result.uid + "_preview." + result.extension,
@ -1113,6 +1115,8 @@ $(document).ready(function() {
ext: result.extension,
}, drPlugin, viewer);
$(".media_container .loader").hide();
},
error: function(jqXHR, textStatus, errorThrown) {
$(".folder_container .loader").hide();
@ -1123,6 +1127,13 @@ $(document).ready(function() {
// ---- Initialisation du module d'upload
if($('#fileupload').length){
var currentfiles = [];
var maxFiles = 100;
var counter = 0;
var replaceMediaId = 0;
var uploadedFiles = [];
var isDrop = false;
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
@ -1142,7 +1153,7 @@ $(document).ready(function() {
$.fancyMessage({title : "Ajout de média", message : "Pour ajouter des médias, veuillez d'abord sélectionner un dossier de destination.", type : "error"});
return false;
}
if(counter ==0){
if(counter == 0){
return false;
}
$("#submit").html('<i class="fal fa-circle-notch fa-spin"></i> Transférer');
@ -1152,20 +1163,15 @@ $(document).ready(function() {
});
$('#cancel').on('click',function(event){
event.preventDefault();
$('.cancel').click() //click cancel buttons and remove all files in the queue
$('.cancel').click(); //click cancel buttons and remove all files in the queue
$("#upload_errors").html("");
});
$(".uploader-window").on("dragleave", function(){
$(this).stop().fadeOut( "fast");
isDrop = false;
});
var currentfiles = [];
var maxFiles = 100;
var counter = 0;
var replaceMediaId = 0;
var uploadedFiles = [];
$('#fileupload').fileupload({
url: "/ajax/upload-media",
dataType: 'json',
@ -1174,8 +1180,9 @@ $(document).ready(function() {
maxNumberOfFiles: 2,
dragover: function (e, data) {
$(".uploader-window").fadeIn( "fast");
isDrop = true;
},
add: function (e, data) {
add: function (e, data) {
if(counter < maxFiles){
counter++;
@ -1225,25 +1232,33 @@ $(document).ready(function() {
replaceMediaId: replaceMediaId,
};
data.submit();
})
});
$('.cancel').eq(-1).on('click',function(){
$(this).parent().parent().remove();
currentfiles = arrayRemove(currentfiles, $.trim(file.name));
})
});
});
if (isDrop) {
setTimeout(function() {
$('.upload').click();
}, 500);
isDrop = false;
}
},
start: function (e, data) {
$('#progress').show();
},
drop: function (e, data) {
$(".uploader-window").stop().fadeOut( "fast");
$(".media_container .loader").show();
},
done: function (e, data) {
uploadedFiles.push(data.result.files[0]);
$.each(data.files, function (index, file) {
currentfiles = arrayRemove(currentfiles, $.trim(file.name));
//currentfiles = arrayRemove(currentfiles, $.trim(file.name));
});
//---- Chargement des médias
var currentFolder = $(window).data('currentFolder');
@ -1256,7 +1271,6 @@ $(document).ready(function() {
// Si c'est une modification d'image d'un média
if (replaceMediaId != 0){
openEditor({
id: data.result.files[0].id,
preview: data.result.files[0].folder + data.result.files[0].uid + "_preview." + data.result.files[0].extension,
@ -1266,27 +1280,33 @@ $(document).ready(function() {
ext: data.result.files[0].extension,
}, drPlugin, viewer);
}else{
$.fancybox.close();
console.log(currentfiles.length)
console.log(uploadedFiles.length)
if (currentfiles.length === uploadedFiles.length){
$.fancybox.close();
$('.list_uploaded_files').empty();
$.each(uploadedFiles, function (index, file) {
$('.list_uploaded_files').append('<p class="list_uploaded_files_p">'+ file.libelle + '.' + file.extension +'<button class="btn btn-sm btn-primary open-editor" data-id="'+ file.id +'">Editer</button></p>');
});
uploadedFiles = [];
$('.list_uploaded_files').empty();
$.each(uploadedFiles, function (index, file) {
$('.list_uploaded_files').append('<p class="list_uploaded_files_p">'+ file.libelle + '.' + file.extension +'<button class="btn btn-sm btn-primary open-editor" data-id="'+ file.id +'">Editer</button></p>');
});
$.fancybox.open({
src : '#ListUploadedFiles',
type : 'inline',
opts : {
modal: true,
animationDuration : 350,
animationEffect : 'material',
beforeShow : function( instance, current ) {
uploadedFiles = [];
}
}
});
$.fancybox.open({
src : '#ListUploadedFiles',
type : 'inline',
opts : {
modal: true,
animationDuration : 350,
animationEffect : 'material',
beforeShow : function( instance, current ) {
}
}
});
}
}
$(".media_container .loader").hide();
loadMedia($("#sujet_selector").val());
},
stop: function (e) {

View file

@ -167,6 +167,7 @@
width: 209px;
overflow: hidden;
height: 20px;
pointer-events: none;
}
.count{
float: right;