From 0e777445e98cb64b5b069b0b92868d2fad2ccbd5 Mon Sep 17 00:00:00 2001 From: FlavioBarachino Date: Thu, 19 Oct 2023 14:19:33 +0200 Subject: [PATCH] Creato gestione documentale generica --- app/Http/Controllers/GenDocController.php | 13 +++++++++--- app/Models/GenDoc.php | 21 ++++++++----------- config/adminlte.php | 3 ++- public/js/app/listadoc.js | 6 ++++++ .../views/conti/documenti/gendoc.blade.php | 8 +++---- resources/views/documenti/lista.blade.php | 2 +- 6 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 public/js/app/listadoc.js diff --git a/app/Http/Controllers/GenDocController.php b/app/Http/Controllers/GenDocController.php index d8d899e..b430bfc 100644 --- a/app/Http/Controllers/GenDocController.php +++ b/app/Http/Controllers/GenDocController.php @@ -9,10 +9,17 @@ class GenDocController extends Controller { // public function fileForm(Request $request){ - $documenti = GenDoc::listDocument($request->input('entity'),$request->input('entity_id')); + $entity_id=$request->input('entity_id'); + $entity=$request->input('entity'); + + if(!$request->input('entity_id')) + { + $entity_id=0; + } + $documenti = GenDoc::listDocument($entity,$entity_id); return view('conti.documenti.gendoc', [ - 'id'=>$request->input('entity_id'), - 'entity'=>$request->input('entity'), + 'id'=>$entity_id, + 'entity'=>$entity, 'documenti'=>$documenti, ]); } diff --git a/app/Models/GenDoc.php b/app/Models/GenDoc.php index e702e3f..414bdc9 100644 --- a/app/Models/GenDoc.php +++ b/app/Models/GenDoc.php @@ -5,6 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\DB; +use App\Models\Documenti; class GenDoc extends Model { @@ -18,20 +19,20 @@ class GenDoc extends Model DB::table('gen_docs') ->insert([ 'entity'=>$data['entity'], - 'entity_id'=>$data['entity_id'], + 'entity_id'=>($data['entity_id'] ?? 0 ), 'descrizione'=>$data['descrizione'], 'filename'=>$filename, ]); } - public static function listDocument($entity,$entity_id) + public static function listDocument($entity,$entity_id = 0) { // Ritorna la lista dei documenti in base all'entità e al rispettivo id return DB::table('gen_docs')->where('entity','=',$entity)->where('entity_id','=',$entity_id)->get(); //nuova funzione // return DB::table('documentis')->where('movimenti_id','=', $entity_id)->get(); } - public static function countDocument($entity,$entity_id){ + public static function countDocument($entity,$entity_id = 0){ // Conta i documenti inseriti per la determinata entità e id $quanti=DB::table('gen_docs') ->where('entity','=',$entity) @@ -40,15 +41,11 @@ class GenDoc extends Model return $quanti; } - private static function getEntityFolder($entity) + private static function getEntityFolder($id) { - $entity_resolve=[ - 0=>'Movimenti', - 1=>'Contratti', - 2=>'Automobili', - 3=>'Progetti', - 4=>'Documenti', - ]; - return $entity_resolve[$entity]; + $entita = Documenti::where('id',$id)->pluck('path'); + + return $entita[0]; + //return $entita->path; } } diff --git a/config/adminlte.php b/config/adminlte.php index 1661cdb..93ea9fb 100644 --- a/config/adminlte.php +++ b/config/adminlte.php @@ -380,8 +380,9 @@ return [ [ 'text' => 'Documenti gen.', 'url' => '/admin/documenti', - 'icon' => 'fas fa-fw fa-newspaper', + 'icon' => 'fas fa-fw fa-stop', 'can' => ['documenti'], + 'color' => 'red', ], [ 'text' => 'Contratti', diff --git a/public/js/app/listadoc.js b/public/js/app/listadoc.js new file mode 100644 index 0000000..c664e94 --- /dev/null +++ b/public/js/app/listadoc.js @@ -0,0 +1,6 @@ +$(document).ready(function() { + $('#listadoc').DataTable({ + "responsive": true, + "order": [[0, "desc"]] + }); +}); \ No newline at end of file diff --git a/resources/views/conti/documenti/gendoc.blade.php b/resources/views/conti/documenti/gendoc.blade.php index 5cbafe7..b114477 100644 --- a/resources/views/conti/documenti/gendoc.blade.php +++ b/resources/views/conti/documenti/gendoc.blade.php @@ -39,8 +39,8 @@ Lista dei documenti
-
- +
+
@@ -68,6 +68,6 @@ @endsection -@section('script') - +@section('js') + @endsection diff --git a/resources/views/documenti/lista.blade.php b/resources/views/documenti/lista.blade.php index 06ac561..d67bad2 100644 --- a/resources/views/documenti/lista.blade.php +++ b/resources/views/documenti/lista.blade.php @@ -26,7 +26,7 @@ @foreach($data as $dato) - + @endforeach
Descrizione
{{$dato->descrizione}}{{$dato->descrizione}} {{$dato->path}}