diff --git a/app/Console/Commands/ArcadiaLink.php b/app/Console/Commands/ArcadiaLink.php
index c1f2914..dec0767 100644
--- a/app/Console/Commands/ArcadiaLink.php
+++ b/app/Console/Commands/ArcadiaLink.php
@@ -57,6 +57,11 @@ class ArcadiaLink extends Command
$media->isLocked = 0;
$media->save();
+ // Suppression dans la supervision Arcadia Link
+ $a = \App\Models\ArcadiaLink::where('media_id', $fileContent->code_DAM)->first();
+ if ($a)
+ $a->delete();
+
// ---- Index dans Elasticsearch
$media = Media::withTrashed()->find($media->id);
$esExist = Media::searchByQuery(array('match' => array('arcadia_id' => "$media->arcadia_id")));
diff --git a/app/Http/Controllers/ArcadiaLinkController.php b/app/Http/Controllers/ArcadiaLinkController.php
new file mode 100644
index 0000000..0ed0733
--- /dev/null
+++ b/app/Http/Controllers/ArcadiaLinkController.php
@@ -0,0 +1,27 @@
+authorizeRoles(config('roles.const.ADMIN'));
+ $dt = Carbon::now('Europe/Paris')->subMinutes(15)->toDateTimeString();
+ $ano = ArcadiaLink::where('created_at', '<', $dt)->orderBy('id', 'DESC')->get();
+ return view('arcadialink.index', ['ano' => $ano]);
+ }
+
+ public function delete(Request $request)
+ {
+ $id = $request->id;
+ $a = ArcadiaLink::find($id);
+ $a->delete();
+ return redirect()->route('arcadialink.index');
+ }
+}
diff --git a/app/Http/Traits/ArcadiaLink.php b/app/Http/Traits/ArcadiaLink.php
index fa44441..be837d6 100644
--- a/app/Http/Traits/ArcadiaLink.php
+++ b/app/Http/Traits/ArcadiaLink.php
@@ -34,17 +34,6 @@ trait ArcadiaLink {
$media->isLocked = 1;
$media->save();
self::convert(self::getXML($media, "S"), $media);
-
- /*$dom = new DOMDocument('1.0','UTF-8');
- $dom->formatOutput = true;
- $root = $dom->createElement('MEDIA_VISUEL');
- $dom->appendChild($root);
- $root->appendChild($dom->createElement('codeArcadia'))->appendChild($dom->createCDATASection( "$media->arcadia_id"));
- $root->appendChild($dom->createElement('code_DAM'))->appendChild($dom->createCDATASection( "$media->id"));
- $root->appendChild( $dom->createElement('TypeMouvement'))->appendChild($dom->createCDATASection( "S"));
- $xml = $dom->saveXML();
-
- self::convert($xml, $media);*/
}
public static function reactivate($media)
@@ -55,53 +44,36 @@ trait ArcadiaLink {
$media->isLocked = 1;
$media->save();
self::convert(self::getXML($media, "R"), $media);
-
- /*$dom = new DOMDocument('1.0','UTF-8');
- $dom->formatOutput = true;
- $root = $dom->createElement('MEDIA_VISUEL');
- $dom->appendChild($root);
- $root->appendChild($dom->createElement('codeArcadia'))->appendChild($dom->createCDATASection( "$media->arcadia_id"));
- $root->appendChild($dom->createElement('code_DAM'))->appendChild($dom->createCDATASection( "$media->id"));
- $root->appendChild( $dom->createElement('TypeMouvement'))->appendChild($dom->createCDATASection( "R"));
- $xml = $dom->saveXML();
-
- self::convert($xml, $media);*/
}
private static function convert($xml, $media)
{
$uid = sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0x0fff) | 0x4000, mt_rand(0, 0x3fff) | 0x8000, mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
Storage::disk('arcadia_link_s')->put("$uid.xml", $xml);
- self::compress($media->folder, $media->uid, $media->extension, $uid, $media->id);
+ self::compress($uid, $media);
}
- private static function compress($folder, $name, $extension, $uid, $media_id)
+ private static function compress($uid, $media)
{
try {
- $zip_file = storage_path('arcadia_link/send') ."/$media_id-$uid.zip";
+ $zip_file = storage_path('arcadia_link/send') ."/$media->id-$uid.zip";
$zip = new \ZipArchive();
$zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
$zip->addFile(storage_path('arcadia_link/send') . "/$uid.xml", 'media.xml');
- $zip->addFile(public_path() . "/$folder$name.$extension", "$name.$extension");
+ $zip->addFile(public_path() . "/$media->folder$media->uid.$media->extension", "$media->uid.$media->extension");
$zip->close();
unset($zip);
unlink(storage_path('arcadia_link/send') . "/$uid.xml");
- /* Pour faire la meme chose en .tar (CDC Initial)
- $a = new \PharData( storage_path('arcadia_link/send') ."/$uid.tmp");
+ // On insert dans la table de supervision
+ $s = new \App\Models\ArcadiaLink();
+ $s->media_id = $media->id;
+ if ($media->arcadia_id !== NULL) {
+ $s->arcadia_id = $media->arcadia_id;
+ }
+ $s->filename = "$media->id-$uid.zip";
+ $s->save();
- // ADD FILES TO archive.tar FILE
- $a->addFile(storage_path('arcadia_link/send') . "/$uid.xml", 'media.xml');
- $a->addFile(public_path() . "/$folder$name.$extension", "$name.$extension");
-
- // COMPRESS archive.tar FILE. COMPRESSED FILE WILL BE archive.tar.gz
- $a->compress(\Phar::NONE);
-
- // NOTE THAT BOTH FILES WILL EXISTS. SO IF YOU WANT YOU CAN UNLINK archive.tar
- unset($a);
- unlink(storage_path('arcadia_link/send') . "/$uid.tmp");
- unlink(storage_path('arcadia_link/send') . "/$uid.xml");
- */
} catch (Exception $e) {
//echo "Exception : " . $e;
// TODO : Envoi mail Log
diff --git a/app/Models/ArcadiaLink.php b/app/Models/ArcadiaLink.php
new file mode 100644
index 0000000..372143f
--- /dev/null
+++ b/app/Models/ArcadiaLink.php
@@ -0,0 +1,21 @@
+created_at)->format('d/m/Y H:i:s');
+ }
+
+ public function getMediaUuidAttribute() {
+ $m = Media::find($this->media_id);
+ return $m->uid;
+ }
+
+}
diff --git a/resources/views/arcadialink/index.blade.php b/resources/views/arcadialink/index.blade.php
new file mode 100644
index 0000000..61b7116
--- /dev/null
+++ b/resources/views/arcadialink/index.blade.php
@@ -0,0 +1,69 @@
+@extends('layouts.app')
+@include('layouts.header')
+@section('content')
+
+
+
+ @if ($errors->any())
+
+
+
+ @foreach ($errors->all() as $error)
+ - {{ __($error) }}
+ @endforeach
+
+
+ @endif
+ @if (session()->has('error'))
+
+
+
+ - {{ Session::get('error') }}
+
+
+ @endif
+ @if (session()->has('message'))
+
+
+
+ - {{ Session::get('message') }}
+
+
+ @endif
+
+
Anomalies du lien Arcadia
+
+
+
+
+ | ID |
+ Media ID (DAM ID) |
+ Arcadia ID |
+ Filename |
+ Date création ZIP |
+ |
+ |
+
+
+ @foreach ($ano as $line)
+
+ | {{$line->id}} |
+ {{$line->media_id}} |
+ {{$line->arcadia_id}} |
+ {{$line->filename}} |
+ {{$line->date_f}} |
+ Ouvrir la fiche média |
+ |
+
+ @endforeach
+
+
+
+@endsection
diff --git a/resources/views/dossiers/create.blade.php b/resources/views/dossiers/create.blade.php
index d8c32ad..1765fd6 100644
--- a/resources/views/dossiers/create.blade.php
+++ b/resources/views/dossiers/create.blade.php
@@ -6,6 +6,7 @@
Gestion des utilisateurs
Gestion des dossiers
Récupération des médias
+ Anomalies du lien Arcadia
@if ($errors->any())
diff --git a/resources/views/dossiers/edit.blade.php b/resources/views/dossiers/edit.blade.php
index f5f969d..2c72ea3 100644
--- a/resources/views/dossiers/edit.blade.php
+++ b/resources/views/dossiers/edit.blade.php
@@ -6,6 +6,7 @@
Gestion des utilisateurs
Gestion des dossiers
Récupération des médias
+
Anomalies du lien Arcadia
@if ($errors->any())
diff --git a/resources/views/dossiers/index.blade.php b/resources/views/dossiers/index.blade.php
index b241d86..d9573b8 100644
--- a/resources/views/dossiers/index.blade.php
+++ b/resources/views/dossiers/index.blade.php
@@ -6,6 +6,7 @@
Gestion des utilisateurs
Gestion des dossiers
Récupération des médias
+
Anomalies du lien Arcadia
@if ($errors->any())
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index 0e55aa1..c3b8756 100644
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -6,6 +6,7 @@
Gestion des utilisateurs
Gestion des dossiers
Récupération des médias
+
Anomalies du lien Arcadia
@if ($errors->any())
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index b9838c8..78a99c3 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -6,6 +6,7 @@
Gestion des utilisateurs
Gestion des dossiers
Récupération des médias
+
Anomalies du lien Arcadia
@if ($errors->any())
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 5f7ec4b..413bbca 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -6,6 +6,7 @@
Gestion des utilisateurs
Gestion des dossiers
Récupération des médias
+
Anomalies du lien Arcadia
diff --git a/routes/web.php b/routes/web.php
index 01f2f3e..241984c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -64,6 +64,8 @@ Route::group(['middleware' => ['auth']], function(){
Route::resource('dossier', 'DossierController');
Route::get('/recovery', 'RecoveryController@index')->name('recovery.index');
Route::post('/check-arcadia-id', 'RecoveryController@checkArcadiaId');
+ Route::get('/arcadia-link', 'ArcadiaLinkController@index')->name('arcadialink.index');
+ Route::get('/arcadia-link/{id}/delete', 'ArcadiaLinkController@delete')->name('arcadialink.delete');
});
Auth::routes([