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

Merge branch '32-new-columns' into 'develop'

Browse source 
feat: ✨ Added AnglePriseVue + NatureFichier + TypeContenu

See merge request ldc-web/projets/dam!12
This commit is contained in:
Noix 2026-05-13 15:28:17 +00:00
commit 4f5fea4436
14 changed files with 433 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,9 @@ use App\Http\Requests\Bo\LoadMediaRequest;
use App\Http\Requests\Bo\ShowInterfaceRequest;
use App\Lib\ArcadiaLinkUtilities;
use App\Lib\ToolboxHelper;
use App\Models\ArcadiaAnglePriseVue;
use App\Models\ArcadiaNatureFichier;
use App\Models\ArcadiaTypeContenu;
use App\Models\Article;
use App\Models\Copyright;
use App\Models\Dossier;
@ -73,11 +76,14 @@ class MediaController extends Controller
/** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Societe> */
$societes = Societe::orderBy('libelle')->get();
$typesmedia = TypeMedia::all();
$langues = Langue::all();
$copyrights = Copyright::all();
$etiquettes = Etiquette::all();
$marques = Marque::all();
$typesmedia = TypeMedia::all();
$langues = Langue::all();
$copyrights = Copyright::all();
$etiquettes = Etiquette::all();
$marques = Marque::all();
$naturesfichier = ArcadiaNatureFichier::all();
$typescontenu = ArcadiaTypeContenu::all();
$anglesprisevue = ArcadiaAnglePriseVue::all();
/** @var int|null */
$dossier_id = $request->d;
@ -122,6 +128,9 @@ class MediaController extends Controller
return view('media_manager')->with([
'sujets' => $sujets,
'typesmedia' => $typesmedia,
'naturesfichier' => $naturesfichier,
'typescontenu' => $typescontenu,
'anglesprisevue' => $anglesprisevue,
'langues' => $langues,
'copyrights' => $copyrights,
'etiquettes' => $etiquettes,

10
app/Http/Requests/Bo/Ajax/UpdateMediaRequest.php
View file

@ -61,9 +61,13 @@ class UpdateMediaRequest extends FormRequest
// Article.
if ($this->sujet_id == 1) {
$rules['articles'] = 'present|array|min:0';
$rules['articles.*'] = 'array';
$rules['articles.*.id'] = 'exists:articles,id';
$rules['articles'] = 'present|array|min:0';
$rules['articles.*'] = 'array';
$rules['articles.*.id'] = 'exists:articles,id';
$rules['arcadia_angle_prise_vue_id'] = 'required|exists:arcadia_angle_prise_vues,id';
$rules['arcadia_nature_fichier_id'] = 'required|exists:arcadia_nature_fichiers,id';
$rules['arcadia_type_contenu_id'] = 'required|exists:arcadia_type_contenus,id';
}
// Marque.
if ($this->sujet_id == 2) {

6
app/Lib/ArcadiaLinkUtilities.php
View file

@ -217,6 +217,12 @@ class ArcadiaLinkUtilities
->appendChild($dom->createCDATASection("$media->copyright_id"));
$root->appendChild($dom->createElement('codeVariante'))
->appendChild($dom->createCDATASection("$media->variante_id"));
$root->appendChild($dom->createElement('codeAnglePriseVue'))
->appendChild($dom->createCDATASection($media->arcadiaAngleprisevue->value));
$root->appendChild($dom->createElement('codeNatureFichier'))
->appendChild($dom->createCDATASection($media->arcadiaNaturefichier->value));
$root->appendChild($dom->createElement('codeTypeContenu'))
->appendChild($dom->createCDATASection($media->arcadiaTypecontenu->value));
$root->appendChild($dom->createElement('dateCreation'))
->appendChild($dom->createCDATASection("$media->created_at"));
$root->appendChild($dom->createElement('dateModification'))

27
app/Models/ArcadiaAnglePriseVue.php Normal file
View file

@ -0,0 +1,27 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class ArcadiaAnglePriseVue extends Model
{
protected $fillable = [
'value',
'label'
];
// * RELATIONSHIPS
/**
* HasMany variantes relation
*
* Get the media for the ArcadiaAnglePriseVue.
*
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function mediaList()
{
return $this->hasMany(Media::class);
}
}

27
app/Models/ArcadiaNatureFichier.php Normal file
View file

@ -0,0 +1,27 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class ArcadiaNatureFichier extends Model
{
protected $fillable = [
'value',
'label'
];
// * RELATIONSHIPS
/**
* HasMany variantes relation
*
* Get the media for the ArcadiaNatureFichier.
*
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function mediaList()
{
return $this->hasMany(Media::class);
}
}

27
app/Models/ArcadiaTypeContenu.php Normal file
View file

@ -0,0 +1,27 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class ArcadiaTypeContenu extends Model
{
protected $fillable = [
'value',
'label'
];
// * RELATIONSHIPS
/**
* HasMany variantes relation
*
* Get the media for the ArcadiaTypeContenu.
*
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function mediaList()
{
return $this->hasMany(Media::class);
}
}

36
app/Models/Media.php
View file

@ -76,6 +76,9 @@ class Media extends Model
'copyright_id',
'etiquette_id',
'langue_id',
'arcadia_angle_prise_vue_id',
'arcadia_nature_fichier_id',
'arcadia_type_contenu_id',
'commentaire',
'version',
'statut',
@ -461,6 +464,39 @@ class Media extends Model
return $this->belongsTo(User::class, 'created_by');
}
/**
* BelongsTo ArcadiaTypeContenu relation
* Get the ArcadiaTypeContenu that belongs to the media.
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function arcadiaTypecontenu()
{
return $this->belongsTo(ArcadiaTypeContenu::class, 'arcadia_type_contenu_id');
}
/**
* BelongsTo ArcadiaAnglePriseVue relation
* Get the ArcadiaAnglePriseVue that belongs to the media.
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function arcadiaAngleprisevue()
{
return $this->belongsTo(ArcadiaAnglePriseVue::class, 'arcadia_angle_prise_vue_id');
}
/**
* BelongsTo ArcadiaNatureFichier relation
* Get the ArcadiaNatureFichier that belongs to the media.
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function arcadiaNaturefichier()
{
return $this->belongsTo(ArcadiaNatureFichier::class, 'arcadia_nature_fichier_id');
}
/**
* HasMany historiques relation
* Get the historiques for the media.

51
database/migrations/2026_05_06_144656_create_nature_fichiers_table.php Normal file
View file

@ -0,0 +1,51 @@
<?php
use App\Models\ArcadiaNatureFichier;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('arcadia_nature_fichiers', function (Blueprint $table) {
$table->id();
$table->string('value');
$table->string('label');
$table->timestamps();
});
ArcadiaNatureFichier::query()->create([
'value' => 'Undefined',
'label' => 'Non défini'
]);
ArcadiaNatureFichier::query()->create([
'value' => 'A',
'label' => 'Photographie d\'un produit en definition standard'
]);
ArcadiaNatureFichier::query()->create([
'value' => 'C',
'label' => 'Photographie d\'un produit en Haute Definition'
]);
ArcadiaNatureFichier::query()->create([
'value' => 'H',
'label' => 'Mobile Ready Hero Image = autre (dessin, illustration, logotype, pictogramme)'
]);
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('arcadia_nature_fichiers');
}
};

55
database/migrations/2026_05_06_144713_create_angle_prise_vues_table.php Normal file
View file

@ -0,0 +1,55 @@
<?php
use App\Models\ArcadiaAnglePriseVue;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('arcadia_angle_prise_vues', function (Blueprint $table) {
$table->id();
$table->string('value');
$table->string('label');
$table->timestamps();
});
ArcadiaAnglePriseVue::query()->create([
'value' => 'Undefined',
'label' => 'Non défini'
]);
ArcadiaAnglePriseVue::query()->create([
'value' => 'C',
'label' => 'Centre, angle de plongee 15 degres'
]);
ArcadiaAnglePriseVue::query()->create([
'value' => 'L',
'label' => '3/4 gauche'
]);
ArcadiaAnglePriseVue::query()->create([
'value' => 'N',
'label' => 'Centre, sans angle de plongee'
]);
ArcadiaAnglePriseVue::query()->create([
'value' => 'R',
'label' => '3/4 droit'
]);
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('arcadia_angle_prise_vues');
}
};

55
database/migrations/2026_05_06_144729_create_type_contenus_table.php Normal file
View file

@ -0,0 +1,55 @@
<?php
use App\Models\ArcadiaTypeContenu;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('arcadia_type_contenus', function (Blueprint $table) {
$table->id();
$table->string('value');
$table->string('label');
$table->timestamps();
});
ArcadiaTypeContenu::query()->create([
'value' => 'Undefined',
'label' => 'Non défini'
]);
ArcadiaTypeContenu::query()->create([
'value' => 'D',
'label' => 'Produit prepare (monte, pour les produits a assembler)'
]);
ArcadiaTypeContenu::query()->create([
'value' => 'G',
'label' => 'Mise en situation (produits emballes ou deballes, suggestion de presentation)'
]);
ArcadiaTypeContenu::query()->create([
'value' => '0',
'label' => 'Produit nu/deballe'
]);
ArcadiaTypeContenu::query()->create([
'value' => '1',
'label' => 'produit emballe/packshot'
]);
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('arcadia_type_contenus');
}
};

55
database/migrations/2026_05_06_153355_add_new_relations_to_media.php Normal file
View file

@ -0,0 +1,55 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('media', function (Blueprint $table) {
$table->unsignedBigInteger('arcadia_angle_prise_vue_id')
->after('variante_id')
->default(1);
$table->foreign('arcadia_angle_prise_vue_id')
->references('id')
->on('arcadia_angle_prise_vues');
$table->unsignedBigInteger('arcadia_nature_fichier_id')
->after('arcadia_angle_prise_vue_id')
->default(1);
$table->foreign('arcadia_nature_fichier_id')
->references('id')
->on('arcadia_nature_fichiers');
$table->unsignedBigInteger('arcadia_type_contenu_id')
->after('arcadia_nature_fichier_id')
->default(1);
$table->foreign('arcadia_type_contenu_id')
->references('id')
->on('arcadia_type_contenus');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('media', function (Blueprint $table) {
$table->dropColumn([
'arcadia_angle_prise_vue_id',
'arcadia_nature_fichier_id',
'arcadia_type_contenu_id',
]);
});
}
};

9
resources/js/components/media-manager/media-editor/MmEditComponent.vue
View file

@ -89,6 +89,9 @@
:marques="marques"
:etiquettes="etiquettes"
:copyrights="copyrights"
:naturesfichier="naturesfichier"
:typescontenu="typescontenu"
:anglesprisevue="anglesprisevue"
@closeEdit="close"
/>
<MeLinksComponent :currentTab="currentTab" />
@ -125,6 +128,9 @@ export default {
this.marques = data.marques;
this.etiquettes = data.etiquettes;
this.copyrights = data.copyrights;
this.naturesfichier = data.naturesfichier;
this.typescontenu = data.typescontenu;
this.anglesprisevue = data.anglesprisevue;
if (this.open !== undefined) {
this.$store.commit({
type: "updateMedia",
@ -163,6 +169,9 @@ export default {
marques: [],
etiquettes: [],
copyrights: [],
naturesfichier: [],
typescontenu: [],
anglesprisevue: [],
};
},
watch: {

62
resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue
View file

@ -98,6 +98,66 @@
</option>
</select>
</div>
<div
class="row"
v-if="this.oMedia.sujet_id === 1"
>
<label>Nature du fichier <span>*</span></label>
<select
id="naturefichier"
name="naturefichier"
required
v-model="oMedia.arcadia_nature_fichier_id"
:disabled="oMedia.isLocked || oMedia.arcadia_id !== null"
>
<option :value="null" selected disabled>
Sélectionnez une nature de fichier
</option>
<option v-for="item in naturesfichier" :value="item.id">
{{ item.label }}
</option>
</select>
</div>
<div
class="row"
v-if="this.oMedia.sujet_id === 1"
>
<label>Type de contenu <span>*</span></label>
<select
id="typecontenu"
name="typecontenu"
required
v-model="oMedia.arcadia_type_contenu_id"
:disabled="oMedia.isLocked || oMedia.arcadia_id !== null"
>
<option :value="null" selected disabled>
Sélectionnez un type de contenu
</option>
<option v-for="item in typescontenu" :value="item.id">
{{ item.label }}
</option>
</select>
</div>
<div
class="row"
v-if="this.oMedia.sujet_id === 1"
>
<label>Angle prise de vue <span>*</span></label>
<select
id="angleprisevue"
name="angleprisevue"
required
v-model="oMedia.arcadia_angle_prise_vue_id"
:disabled="oMedia.isLocked || oMedia.arcadia_id !== null"
>
<option :value="null" selected disabled>
Sélectionnez un type de contenu
</option>
<option v-for="item in anglesprisevue" :value="item.id">
{{ item.label }}
</option>
</select>
</div>
<div class="row">
<label>Langue <span>*</span></label>
<select
@ -380,7 +440,7 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
export default {
name: "MeEditComponent",
components: { FontAwesomeIcon },
props: ["currentTab", "langues", "societes", "marques", "etiquettes", "copyrights"],
props: ["currentTab", "langues", "societes", "marques", "etiquettes", "copyrights", "naturesfichier", "typescontenu", "anglesprisevue"],
computed: {
storeMedia() {
return this.$store.state.media;

3
resources/views/layouts/media_edit.blade.php
View file

@ -7,6 +7,9 @@
'marques' => $marques,
'etiquettes' => $etiquettes,
'copyrights' => $copyrights,
'naturesfichier' => $naturesfichier,
'typescontenu' => $typescontenu,
'anglesprisevue' => $anglesprisevue,
];
if(session('autoOpen')) {
$dataVue['open'] = session('autoOpen');