From e22868bef543771dcb226147c704524a37aabf85 Mon Sep 17 00:00:00 2001
From: FlavioBarachino <flavio.barachino@gmail.com>
Date: Sat, 30 Sep 2023 09:20:40 +0200
Subject: [PATCH] Modifiche effettuate per gestione documentale

---
 app/Http/Controllers/GenDocController.php        | 9 +++++++++
 app/Models/GenDoc.php                            | 8 ++++----
 app/Models/Movimenti.php                         | 5 ++++-
 resources/views/conti/documenti/insert.blade.php | 8 ++++----
 resources/views/conti/movimenti/list.blade.php   | 2 +-
 routes/admin.php                                 | 7 +++++--
 6 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/GenDocController.php b/app/Http/Controllers/GenDocController.php
index 89d633c..96b904e 100644
--- a/app/Http/Controllers/GenDocController.php
+++ b/app/Http/Controllers/GenDocController.php
@@ -3,8 +3,17 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use App\Models\GenDoc;
 
 class GenDocController extends Controller
 {
     //
+    public function fileForm(Request $request){
+        $documenti = GenDoc::listDocument($request->input('entity'),$request->input('id'));  
+        return view('conti.documenti.insert', [
+            'id'=>$request->input('id'),
+            'entity'=>$request->input('entity'),
+            'documenti'=>$documenti,
+        ]);
+    }
 }
diff --git a/app/Models/GenDoc.php b/app/Models/GenDoc.php
index 92a7d7e..5d2590c 100644
--- a/app/Models/GenDoc.php
+++ b/app/Models/GenDoc.php
@@ -12,14 +12,14 @@ class GenDoc extends Model
 
     // DocumentiGenerali
 
-    public static function saveDocument($entity,$entity_id,$data){
+    public static function saveDocument($data){
         
         $filename=$data->file('filename')->store('Documenti');
         DB::table('gen_docs')
         ->insert([
-            'entity'=>$entity,
-            'entity_id'=>$data->input('id'),
-            'descrizione'=>$data->input('descrizione'),
+            'entity'=>$data['entity'],
+            'entity_id'=>$data['entity_id'],
+            'descrizione'=>$data['descrizione'],
             'filename'=>$filename,
         ]);
     }
diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php
index f1b3e62..86b4b8a 100644
--- a/app/Models/Movimenti.php
+++ b/app/Models/Movimenti.php
@@ -17,8 +17,11 @@ class Movimenti extends Model
         return DB::table('movimentis')
         ->join('categories','movimentis.mov_fk_categoria','=','categories.id')
         ->join('tags','movimentis.mov_fk_tags','=','tags.id')
-        ->leftJoin('documentis', 'movimenti_id','=','movimentis.id')
+        //->leftJoin('gen_docs', 'entity_id','=','movimentis.id')
+        ->leftJoin('documentis', 'movimenti_id','=','movimentis.id') // #issue 5
+       // ->where('gen_docs.entity','=',1)
         ->select('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name', DB::raw('Count(movimenti_id) as quanti'))
+        //->select('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name', DB::raw('Count(entity_id) as quanti'))
         ->groupBy('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name')
         ->get();
     }
diff --git a/resources/views/conti/documenti/insert.blade.php b/resources/views/conti/documenti/insert.blade.php
index 8dc7f8a..ab2305e 100644
--- a/resources/views/conti/documenti/insert.blade.php
+++ b/resources/views/conti/documenti/insert.blade.php
@@ -21,10 +21,10 @@
                 	</div>
                 	<div class="mb-3">
                 		<input type="hidden" name="movimenti_id" value="{{ $id }}">
-						<!-- {issue #5}
-						<input type="hidden" name="entita" value="Movimenti">
-						<input type="hidden" name="entita_id" value="{{$id}}">
-						-->
+						<!-- {issue #5} -->
+						<input type="hidden" name="entity" value="{{$entity}}">
+						<input type="hidden" name="entity_id" value="{{$id}}">
+						<!-- {issue #5} END -->
                 		<button type="submit" class="btn btn-primary">Submit</button>
                 	</div>
             	</form>
diff --git a/resources/views/conti/movimenti/list.blade.php b/resources/views/conti/movimenti/list.blade.php
index dc7f7d9..4e47739 100644
--- a/resources/views/conti/movimenti/list.blade.php
+++ b/resources/views/conti/movimenti/list.blade.php
@@ -39,7 +39,7 @@
             			<td>
             				<button class="btn btn-warning btn-detail open_modal_modifica" value="{{ $movimento->id; }}"><i class="fa fa-pencil-square-o fw"></i></button>&nbsp;
             				<a class="btn btn-danger" href="/admin/movimenti/delete?id={{ $movimento->id; }}"><i class="fa fa-trash-o fa-fw"></i></a>&nbsp;
-            				<a class="btn btn-warning" href="/admin/movimenti/docs?id={{ $movimento->id; }}"><i class="fa fa-files-o fa-fw"></i></a>&nbsp;
+            				<a class="btn btn-warning" href="/admin/movimenti/docs?entity=1&entity_id={{ $movimento->id; }}"><i class="fa fa-files-o fa-fw"></i></a>&nbsp;
             				<!-- Definisce quanti documenti sono presenti per il record -->
             				( {{ $movimento->quanti ?? ''; }} )
             			</td>
diff --git a/routes/admin.php b/routes/admin.php
index 9e89a7e..185f246 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -51,10 +51,13 @@ Route::group(['middleware'=>['permission:conti']], function(){
     Route::get('movimenti/filter/tags',[MovimentiController::class,'filterByTag']);
     Route::get('movimenti/report/movimenti_categoria', [MovimentiController::class,'listMovPerCateg']);
     Route::get('movimenti/report/movimentibycat', [MovimentiController::class,'listMovbyCat']);
-    Route::get('movimenti/docs', [DocumentiController::class,'fileForm'])->name('documenti');
+    // Route::get('movimenti/docs', [DocumentiController::class,'fileForm'])->name('documenti');
+    // Route::post('movimenti/docs', [DocumentiController::class,'storeFile']);
+    Route::get('movimenti/docs', [App\Http\Controllers\GenDocController::class,'fileForm'])->name('documenti');
+    Route::post('movimenti/docs', [App\Http\Controllers\GenDocController::class,'storeFile']);
     // {issue #5}
     // Route::get('movimenti/docs', [DocumentiController::class,'fileMovimentiForm'])->name('documenti');
-    Route::post('movimenti/docs', [DocumentiController::class,'storeFile']);
+    
     Route::get('movimenti/import', [MovimentiController::class,'importFile'])->name('importING');
     Route::post('movimenti/import', [MovimentiController::class,'importEC_ING']);
     Route::get('movimenti/importcr', [MovimentiController::class,'importFileCR'])->name('importCR');