- Retours Blandine

This commit is contained in:
Vincent BRIDIER 2020-10-01 17:10:50 +02:00
parent 2aceab8657
commit b5999b7b84
5 changed files with 77 additions and 66 deletions

View file

@ -842,7 +842,7 @@ class MediaController extends Controller
$historique->user_id = $user_id;
$historique->media_id = $media->id;
$historique->type = "Modification";
$historique->description = "Les informations du média on été modifiées";
$historique->description = "Les informations du média ont été modifiées";
$historique->save();
}
@ -1120,28 +1120,37 @@ class MediaController extends Controller
private function getVignettesByMedia($media)
{
$vignettes = [];
$vignettes['original'] = [
'url' => config('app.url') . "/" . $media->folder . $media->uid . "." . $media->extension,
'extension' => $media->extension,
'largeur' => $media->largeur,
'hauteur' => $media->hauteur
];
if(in_array($media->extension, array("pdf", "ai", "psd")) ){
$sys_extension = "png";
}else{
$sys_extension = $media->extension;
}
$vignettes['preview'] = [
'url' => config('app.url') . "/" . $media->folder . $media->uid . "_preview" . "." . $media->extension,
'extension' => $media->extension,
'extension' => $sys_extension,
'largeur' => '1800',
'hauteur' => '1800'
];
$vignettes['thumb'] = [
'url' => config('app.url') . "/" . $media->folder . $media->uid . "_thumb" . "." . $media->extension,
'extension' => $media->extension,
'extension' => $sys_extension,
'largeur' => '200',
'hauteur' => '200'
];
$formats = $media->sujet->formats;
foreach ($formats as $format)
$vignettes[$format->libelle] = [
'url' => config('app.url') . "/" . $media->folder . $media->uid . "_" . $format->libelle . "." . $media->extension,
'url' => config('app.url') . "/" . $media->folder . $media->uid . "_" . $format->libelle . "." . $format->extension,
'extension' => $format->extension,
'largeur' => $format->largeur,
'hauteur' => $format->hauteur

2
public/js/app.js vendored

File diff suppressed because one or more lines are too long

18
resources/js/admin.js vendored
View file

@ -184,7 +184,7 @@ window.initSelector = function($selector){
var datavalue = [];
// Init du module
/*$($selector+" .selector_values li").each(function() {
$($selector+" .selector_values li").each(function() {
datavalue.push($(this).attr("data-value"));
});
$($selector+" .selector_choices li").each(function() {
@ -193,10 +193,10 @@ window.initSelector = function($selector){
$(this).addClass('selected');
}
});
$($selector+" .selector_dataValues").val(datavalue.join());*/
$($selector+" .selector_dataValues").val(datavalue.join());
// Recherche d'un élément
/*$($selector+" .selector_filter").off().on('keyup', function(event) {
$($selector+" .selector_filter").off().on('keyup', function(event) {
var options = $(this).parent($selector).find(".selector_choices li");
var search = $(this).val();
$(options).each(function() {
@ -207,10 +207,10 @@ window.initSelector = function($selector){
$(this).css("display", "none");
}
});
});*/
});
// Ajout d'un élément
/*$($selector+" .selector_choices" ).off().on( "click", "li", function() {
$($selector+" .selector_choices" ).off().on( "click", "li", function() {
if(!$(this).hasClass('selected')){
var id = $(this).attr("data-value");
var text = $(this).html();
@ -219,9 +219,9 @@ window.initSelector = function($selector){
datavalue.push(id);
$($selector+" .selector_dataValues").val(datavalue.join());
}
});*/
});
// Suppression d'un élément
/*$($selector+" .selector_values" ).off().on( "click", "li", function() {
$($selector+" .selector_values" ).off().on( "click", "li", function() {
var id = $(this).attr("data-value");
var text = $(this).html();
$(this).parent().parent().find('.selector_choices li[data-value="'+id+'"]').removeClass('selected');
@ -231,8 +231,8 @@ window.initSelector = function($selector){
datavalue.splice(index, 1);
}
$($selector+" .selector_dataValues").val(datavalue.join());
});*/
}
});
};
// --- Fct pour rechercher sur un attribut d'une ligne

View file

@ -95,6 +95,7 @@
if (toSelectId !== false) {
this.selectedBasket = this.storeBaskets.find(e => e.id === toSelectId);
} else {
this.selectedBasket = {};
if (this.storeBaskets.length >= 1) {
this.selectedBasket = this.storeBaskets[0];
}
@ -125,6 +126,7 @@
$.fancybox.close();
},
saveBasketProperties() {
const _this2 = this;
if (this.selectedBasket.libelle.length === 0) {
$.fancyMessage({
title: "Propriétés d'un dossier",
@ -139,7 +141,7 @@
description: this.selectedBasket.description,
statut: this.selectedBasket.statut,
}).then(response => {
this.$loading.hide();
_this2.$loading.hide();
$.fancybox.close();
$.fancyMessage({
title: "Propriétés du panier",
@ -147,7 +149,7 @@
type: "info"
});
}).catch(error => {
this.$loading.hide();
_this2.$loading.hide();
$.fancybox.close();
$.fancyMessage({
title: "Attention",
@ -174,12 +176,12 @@
noButton: 'Annuler',
callback: function (value) {
if (value) {
this.$loading.show({delay:0});
_this2.$loading.show({delay:0});
axios.post('/ajax/remove-basket', {
basket_id: _this2.selectedBasket.id,
}).then(response => {
_this2.init();
this.$loading.hide();
_this2.$loading.hide();
$.fancybox.close();
$.fancyMessage({
title: "Suppression de panier",
@ -187,7 +189,7 @@
type: "info"
});
}).catch(error => {
this.$loading.hide();
_this2.$loading.hide();
$.fancybox.close();
$.fancyMessage({
title: "Suppression de panier",
@ -213,14 +215,14 @@
title: title,
}).then(response => {
_this2.init(response.data.id);
this.$loading.hide();
_this2.$loading.hide();
$.fancyMessage({
title: "Ajout de panier",
message: "Panier ajouté !",
type: "info"
});
}).catch(error => {
this.$loading.hide();
_this2.$loading.hide();
$.fancybox.close();
$.fancyMessage({
title: "Attention",
@ -246,14 +248,14 @@
}).then(response => {
if (response.data === true){
_this2.init(this.selectedBasket.id);
this.$loading.hide();
_this2.$loading.hide();
}else{
this.$loading.hide();
_this2.$loading.hide();
$.fancybox.close();
$.fancyMessage({title : "Attention", message : "Erreur lors de la suppression du média, merci d'actualiser la page.", type : "error"});
}
}).catch(error => {
this.$loading.hide();
_this2.$loading.hide();
$.fancybox.close();
$.fancyMessage({title : "Attention", message : "Erreur lors de la suppression du média, merci d'actualiser la page.", type : "error"});
console.log(error);
@ -278,9 +280,9 @@
type: 'updateGrabbed',
grabbed: []
});
this.$loading.hide();
_this2.$loading.hide();
}).catch(error => {
this.$loading.hide();
_this2.$loading.hide();
console.log(error);
$.fancybox.close();
$.fancyMessage({title : "Attention", message : "Erreur lors de l'ajout de média au panier, merci d'actualiser la page.", type : "error"});

View file

@ -81,11 +81,50 @@
</div>
</form>
</div>
<div v-if="this.oMedia.sujet_id === 1" class="row_xl article_form">
<label>Articles associées</label>
<div class="article_selector">
<table>
<thead>
<tr>
<th>No Article</th>
<th>Famille Vente</th>
<th>Marque</th>
<th>Gencod Administratif</th>
<th>Gencod Symbolise</th>
<th>Gencod Poids</th>
<th></th>
</tr>
</thead>
<tbody>
<tr v-for="item in oMedia.articles">
<td class="col_lib">{{item.noArt}} : {{item.libCcial}}</td>
<td class="col_famVente">{{item.codFamVte}}</td>
<td class="col_marque">{{item.codMarq}}</td>
<td class="col_gencodAdm">{{item.codGencodAdm}}</td>
<td class="col_gencodSymb">{{item.codGencodSymb}}</td>
<td class="col_gencodPds">{{item.codGencodPds}}</td>
<td><a @click="DeleteArticles(item.id)" href="#" class="remove_article"><i
class="far fa-times"></i></a></td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="7"></td>
</tr>
</tfoot>
</table>
<br/>
<button class="add_article btn btn-black btn-square floatr" type="button" name="button"
@click="AddArticles"><i class="far fa-plus"></i> Ajouter
</button>
</div>
</div>
<div class="wrapper">
<h3>Tags & étiquettes</h3>
<div class="row">
<label>Nuage de tags</label>
<v-select :options="[]" label="libelle" :create-option="item => ({ id: 0, libelle: item })"
<v-select :options="[]" label="libelle" :create-option="item => ({ id: new Date().getTime(), libelle: item })"
v-model="oMedia.tags" taggable multiple></v-select>
</div>
<div class="row">
@ -137,45 +176,6 @@
</div>
</div>
</div>
<div v-if="this.oMedia.sujet_id === 1" class="row_xl article_form">
<label>Articles associées</label>
<div class="article_selector">
<table>
<thead>
<tr>
<th>No Article</th>
<th>Famille Vente</th>
<th>Marque</th>
<th>Gencod Administratif</th>
<th>Gencod Symbolise</th>
<th>Gencod Poids</th>
<th></th>
</tr>
</thead>
<tbody>
<tr v-for="item in oMedia.articles">
<td class="col_lib">{{item.noArt}} : {{item.libCcial}}</td>
<td class="col_famVente">{{item.codFamVte}}</td>
<td class="col_marque">{{item.codMarq}}</td>
<td class="col_gencodAdm">{{item.codGencodAdm}}</td>
<td class="col_gencodSymb">{{item.codGencodSymb}}</td>
<td class="col_gencodPds">{{item.codGencodPds}}</td>
<td><a @click="DeleteArticles(item.id)" href="#" class="remove_article"><i
class="far fa-times"></i></a></td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="7"></td>
</tr>
</tfoot>
</table>
<br/>
<button class="add_article btn btn-black btn-square floatr" type="button" name="button"
@click="AddArticles"><i class="far fa-plus"></i> Ajouter
</button>
</div>
</div>
</div>
<div class="wrapper">
<h3>Informations techniques</h3>