From 67775716b8196d3ef374067c7304bdac50f7fbf5 Mon Sep 17 00:00:00 2001
From: FlavioBarachino <flavio.barachino@gmail.com>
Date: Wed, 4 Oct 2023 13:41:10 +0200
Subject: [PATCH] aggiornato lista dei movimenti e inserito come test il
 fullcalendar

---
 app/Http/Controllers/DocumentiController.php  |  7 ++--
 .../Controllers/FullCalenderController.php    |  5 +++
 app/Http/Controllers/GenDocController.php     |  4 +--
 app/Http/Controllers/MovimentiController.php  |  3 +-
 app/Models/Avviso.php                         |  5 +++
 app/Models/Documenti.php                      |  2 +-
 app/Models/GenDoc.php                         |  3 +-
 config/adminlte.php                           | 25 +++++++++++--
 .../views/calendario/fullcalendar.blade.php   | 36 +++++++++++++++++++
 .../views/conti/categorie/list.blade.php      | 15 ++++----
 .../views/conti/documenti/insert.blade.php    | 16 +++++----
 .../views/conti/movimenti/list.blade.php      |  2 +-
 routes/admin.php                              |  1 +
 13 files changed, 99 insertions(+), 25 deletions(-)
 create mode 100644 resources/views/calendario/fullcalendar.blade.php

diff --git a/app/Http/Controllers/DocumentiController.php b/app/Http/Controllers/DocumentiController.php
index 88cfadc..e6b6d3b 100644
--- a/app/Http/Controllers/DocumentiController.php
+++ b/app/Http/Controllers/DocumentiController.php
@@ -22,9 +22,10 @@ class DocumentiController extends Controller
     }
     
     public function fileForm(Request $request){
-        $documenti = Documenti::getList($request->input('id'));  
-        return view('conti.documenti.insert', [
-            'id'=>$request->input('id'),
+        $documenti = Documenti::getList($request->input('entity_id'));
+       
+       return view('conti.documenti.insert', [
+            'id'=>$request->input('entity_id'),
             'documenti'=>$documenti
         ]);
     }
diff --git a/app/Http/Controllers/FullCalenderController.php b/app/Http/Controllers/FullCalenderController.php
index f4191c7..2662a6b 100644
--- a/app/Http/Controllers/FullCalenderController.php
+++ b/app/Http/Controllers/FullCalenderController.php
@@ -126,4 +126,9 @@ class FullCalenderController extends Controller
         }
 
     }
+
+    public function showDemo()
+    {
+      return view('calendario.fullcalendar');
+    }
 }
diff --git a/app/Http/Controllers/GenDocController.php b/app/Http/Controllers/GenDocController.php
index 96b904e..834eb61 100644
--- a/app/Http/Controllers/GenDocController.php
+++ b/app/Http/Controllers/GenDocController.php
@@ -9,9 +9,9 @@ class GenDocController extends Controller
 {
     //
     public function fileForm(Request $request){
-        $documenti = GenDoc::listDocument($request->input('entity'),$request->input('id'));  
+        $documenti = GenDoc::listDocument($request->input('entity'),$request->input('entity_id'));   
         return view('conti.documenti.insert', [
-            'id'=>$request->input('id'),
+            'id'=>$request->input('entity_id'),
             'entity'=>$request->input('entity'),
             'documenti'=>$documenti,
         ]);
diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php
index 9b31378..5a4cc3f 100644
--- a/app/Http/Controllers/MovimentiController.php
+++ b/app/Http/Controllers/MovimentiController.php
@@ -47,7 +47,8 @@ class MovimentiController extends Controller
         $saldo=Movimenti::getSaldoTot();
         $mieiTasks=Task::getTaskAssignedToUser(Auth::id());
         // $TasksAssegnati=Task::getTaskAssignedByUser(Auth::id());
-        $avvisi=Avviso::getAvvisi();
+       // $avvisi=Avviso::getAvvisi();
+       $avvisi=Avviso::getActualAvvisi();
 
         return view('layouts.dashboard',[
             'entrate'=>$entrate,
diff --git a/app/Models/Avviso.php b/app/Models/Avviso.php
index 8fd32be..e77a1e5 100644
--- a/app/Models/Avviso.php
+++ b/app/Models/Avviso.php
@@ -27,6 +27,11 @@ class Avviso extends Model
         return self::all();
     }
 
+    public static function getActualAvvisi()
+    {
+        return self::where('creato_il','>=', now()->subMonth())->get();
+    }
+
     public static function getHAstatus()
     {
         /*$response = Http::withHeaders([
diff --git a/app/Models/Documenti.php b/app/Models/Documenti.php
index ae80cb1..b0d9a3b 100644
--- a/app/Models/Documenti.php
+++ b/app/Models/Documenti.php
@@ -53,7 +53,7 @@ class Documenti extends Model
     public static function getList($id)
     {
         return DB::table('documentis')
-        ->where('movimenti_id','=',$id)
+        ->where('movimenti_id','=', $id)
         ->get();
     }
 
diff --git a/app/Models/GenDoc.php b/app/Models/GenDoc.php
index 5d2590c..913676e 100644
--- a/app/Models/GenDoc.php
+++ b/app/Models/GenDoc.php
@@ -27,7 +27,8 @@ class GenDoc extends Model
     public static function listDocument($entity,$entity_id)
     {
         // Ritorna la lista dei documenti in base all'entità e al rispettivo id
-        return DB::table('gen_docs')->where('entity','=',$entity)->andWere('entity_id','=',$entity_id)->get();
+       // 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){
diff --git a/config/adminlte.php b/config/adminlte.php
index 1a1330c..55a073a 100644
--- a/config/adminlte.php
+++ b/config/adminlte.php
@@ -323,7 +323,7 @@ return [
                 ],
                 [
                     'text' => 'Categorie',
-                    'url'  => '#',
+                    'route'  => 'categorie',
                 ],
                 [
                     'text' => 'Tags',
@@ -394,7 +394,7 @@ return [
         ],
         [
             'text' => 'Appuntamenti',
-            'url'  => '#',
+            'url'  => '/admin/test/calendar',
             'icon' => 'fas fa-fw fa-calendar',
         ],
 
@@ -516,6 +516,27 @@ return [
                 ],
             ],
         ],
+        'Fullcalendar' => [
+            'active' => false,
+            'files' => [
+                [
+                    'type' => 'css',
+                    'asset' => true,
+                    'location' => '/vendor/fullcalendar/main.min.css',
+                ],
+                [
+                    'type' => 'js',
+                    'asset' => true,
+                    'location' => '/vendor/fullcalendar/main.min.js',
+                ],
+                [
+                    'type' => 'js',
+                    'asset' => true,
+                    'location' => '/vendor/fullcalendar/locales-all.min.js',
+                ],
+
+            ],
+        ],
     ],
 
     /*
diff --git a/resources/views/calendario/fullcalendar.blade.php b/resources/views/calendario/fullcalendar.blade.php
new file mode 100644
index 0000000..b84844e
--- /dev/null
+++ b/resources/views/calendario/fullcalendar.blade.php
@@ -0,0 +1,36 @@
+@extends('adminlte::page')
+@section('plugins.Fullcalendar', true)
+@section('content')
+<div id="calendar"></div>
+@endsection
+@section('js')
+<script>
+
+    document.addEventListener('DOMContentLoaded', function() {
+      var calendarEl = document.getElementById('calendar');
+  
+      var calendar = new FullCalendar.Calendar(calendarEl, {
+        timeZone: 'UTC',
+        initialView: 'dayGridMonth',
+        events: '/api/demo-feeds/events.json',
+        editable: true,
+        selectable: true,
+        // plugins: [dayGridPlugin],
+        // initialView: 'dayGridWeek',
+        headerToolbar: {
+            left: 'prev,next',
+            center: 'title',
+            right: 'dayGridMonth,timeGridWeek,timeGridDay' // user can switch between the two
+        },
+        dateClick: function(info) {
+          alert('Clicked on: ' + info.dateStr);
+        }
+      });
+      calendar.setOption('locale', 'it');
+      calendar.render();
+    });
+
+    
+  
+  </script>
+@endsection
diff --git a/resources/views/conti/categorie/list.blade.php b/resources/views/conti/categorie/list.blade.php
index 64b6280..049b480 100644
--- a/resources/views/conti/categorie/list.blade.php
+++ b/resources/views/conti/categorie/list.blade.php
@@ -1,10 +1,11 @@
-@extends('admin')
+@extends('adminlte::page')
+
+@section('content_header')
+<h1>Lista categorie</h1>
+@endsection
+
 @section('content')
-<div class="row">
-    <div class="col-lg-12">
-        <h1 class="page-header">Lista categorie</h1>
-    </div>
-</div>
+
 <div class="container">
 	<!-- Content here -->
 	<button class="btn btn-warning btn-detail open_modal_new">Nuova
@@ -150,6 +151,6 @@
 
 @endsection
 
-@section('script')
+@section('js')
 <script src="/js/app/conti_categorie.js"></script>
 @endsection
diff --git a/resources/views/conti/documenti/insert.blade.php b/resources/views/conti/documenti/insert.blade.php
index ab2305e..484bb0d 100644
--- a/resources/views/conti/documenti/insert.blade.php
+++ b/resources/views/conti/documenti/insert.blade.php
@@ -1,10 +1,12 @@
-@extends('admin')
+@extends('adminlte::page')
+
+@section('content_header')
+<h1>Lista Documenti</h1>
+@endsection
+
+
 @section('content')
-<div class="row">
-    <div class="col-lg-12">
-        <h1 class="page-header">Lista Documenti</h1>
-    </div>
-</div>                          
+                   
 	<div class="container">
     	<!-- Content here -->
     	<div class="row">
@@ -48,7 +50,7 @@
     					<tbody>
     					@foreach($documenti as $documento)
     					<tr>
-    						<td><a href="/storage/{{ $documento->filename }}">{{ $documento->descrizione; }}</a></td>
+    						<td><a href="/storage/{{ $documento->filename; }}">{{ $documento->descrizione; }}</a></td>
     						<td>
                 				<a class="btn btn-primary" href="/admin/doc_update?id={{ $documento->id; }}"><i class="fa fa-pencil-square-o fw"></i></a>&nbsp;
                 				<a class="btn btn-danger" href="/admin/doc_delete?id={{ $documento->id; }}"><i class="fa fa-trash-o fa-fw"></i></a>&nbsp;
diff --git a/resources/views/conti/movimenti/list.blade.php b/resources/views/conti/movimenti/list.blade.php
index e1ee76e..b839f83 100644
--- a/resources/views/conti/movimenti/list.blade.php
+++ b/resources/views/conti/movimenti/list.blade.php
@@ -135,7 +135,7 @@
 
 @endsection
 @section('js')
-@parent
+
 <script src="/js/app/movimenti.js"></script>
 @endsection
 
diff --git a/routes/admin.php b/routes/admin.php
index 185f246..65ec176 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -180,6 +180,7 @@ Route::group(['middleware'=>['permission:avvisi']], function(){
     Route::get('test/err403',[CondominioController::class,'err403'])->name('errore-403');
     Route::get('test/user_role',[CondominioController::class,'user_role']);
     Route::get('test/userclass',[Utenti::class,'userClass']);
+    Route::get('test/calendar',[FullCalenderController::class,'showDemo']);
 
     Route::get('testmail',function(){
         $name='Flavio';