From 717e1be95d27cc2ea044164be82290c4e4b0843e Mon Sep 17 00:00:00 2001
From: FlavioBarachino <flavio.barachino@gmail.com>
Date: Thu, 27 Jul 2023 15:31:18 +0200
Subject: [PATCH] Creazione lista contratti

---
 app/Http/Controllers/ContrattiController.php |  5 ++
 app/Models/Movimenti.php                     |  4 +-
 public/js/app/contratti.js                   | 10 ++++
 public/js/app/task.js                        |  2 +-
 resources/views/components/menu.blade.php    | 11 +++-
 resources/views/contratti/lista.blade.php    | 55 ++++++++++++++++++++
 resources/views/tasks/list.blade.php         |  6 +--
 routes/admin.php                             |  6 +++
 8 files changed, 91 insertions(+), 8 deletions(-)
 create mode 100644 public/js/app/contratti.js
 create mode 100644 resources/views/contratti/lista.blade.php

diff --git a/app/Http/Controllers/ContrattiController.php b/app/Http/Controllers/ContrattiController.php
index d0bff62..7e357bf 100644
--- a/app/Http/Controllers/ContrattiController.php
+++ b/app/Http/Controllers/ContrattiController.php
@@ -3,8 +3,13 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use App\Models\Contratti;
 
 class ContrattiController extends Controller
 {
     //
+    public function contratti()
+    {
+        return view('contratti.lista',['data'=>Contratti::all()]);
+    }
 }
diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php
index a58637f..f1b3e62 100644
--- a/app/Models/Movimenti.php
+++ b/app/Models/Movimenti.php
@@ -158,7 +158,7 @@ class Movimenti extends Model
             if($line['Data valuta'])
             {
                 self::insEntrata([
-                    'mov_data'=>self::dateFormat(0,$line['Data valuta']),
+                    'mov_data'=>$line['Data valuta'],
                     'mov_fk_categoria'=>1,
                     'mov_descrizione'=>$line['Descrizione operazione'],
                     'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))),
@@ -217,7 +217,7 @@ class Movimenti extends Model
 
     private static function dateFormat($type,$string)
     {
-
+        // $string=(string)$string;
         if($type)
         {
            // $string=$string->format('Y-m-d');
diff --git a/public/js/app/contratti.js b/public/js/app/contratti.js
new file mode 100644
index 0000000..8c8feb8
--- /dev/null
+++ b/public/js/app/contratti.js
@@ -0,0 +1,10 @@
+$('#contratti').DataTable({
+    responsive: true,
+    fields: [
+        {
+            label:"Data",
+            type: "datetime"
+        }
+    ]
+});
+$(".draggable").draggable();
\ No newline at end of file
diff --git a/public/js/app/task.js b/public/js/app/task.js
index 5219114..7efb0c7 100644
--- a/public/js/app/task.js
+++ b/public/js/app/task.js
@@ -10,7 +10,7 @@ $(document).ready(function() {
 		"order": [[0, "desc"]]
 	});
 });
-
+$(".draggable").draggable();
 var d = new Date();
 
 var month = d.getMonth()+1;
diff --git a/resources/views/components/menu.blade.php b/resources/views/components/menu.blade.php
index 1c6dccd..231dab8 100644
--- a/resources/views/components/menu.blade.php
+++ b/resources/views/components/menu.blade.php
@@ -21,7 +21,13 @@
 			</ul></li>
 
 	</ul> <!-- /.nav-second-level --></li>
-@endcan @can('consumi')
+@endcan 
+@can('contratti')
+<li><a href="{{ route('contratti'); }}"><i class="fa fa-list fa-fw"></i>
+		Contratti <span class="fa arrow"></span></a>
+</li>
+@endcan
+@can('consumi')
 <li><a href="#"><i class="fa fa-industry fa-fw"></i> Consumi <span
 		class="fa arrow"></span></a>
 
@@ -31,7 +37,8 @@
 		</li>
 		<li><a href="{{ route('enel'); }}"><i class="fa fa-flash  fa-fw"></i>Energia
 				Elettrica</a></li>
-	</ul></li>
+	</ul>
+</li>
 @endcan @can('automobili')
 <li><a href="{{ route('auto_list'); }}"><i class="fa fa-car fa-fw"></i>
 		Automobili <span class="fa arrow"></span></a></li>
diff --git a/resources/views/contratti/lista.blade.php b/resources/views/contratti/lista.blade.php
new file mode 100644
index 0000000..ab4883c
--- /dev/null
+++ b/resources/views/contratti/lista.blade.php
@@ -0,0 +1,55 @@
+@extends('admin')
+@section('content')
+<div class="row">
+    <div class="col-lg-12">
+        <h1 class="page-header">Lista dei Contratti</h1>
+    </div>
+</div>
+<div class="row">
+	<div class="col-lg-12">
+    	<div class="panel panel-default">
+            <div class="panel-heading">
+                Lista contratti
+            </div>
+            <div class="panel-body">
+                <table  class="table table-striped table-bordered table-hover" id="contratti" data-page-length='25'>
+                    <thead>
+                        <tr>
+                            <th>Numero contratto</th>
+                            <th>Data Contratto</th>
+                            <th>Data Termine</th>
+                            <th>Fornitore</th>
+                            <th>Tipo contratto</th>
+                            <th>Importo</th>
+                            <th>Stato</th>
+                            <th>Documento</th>
+                            
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($data as $contratto)
+                        <tr>
+                            <td>{{$contratto->numero}}</td>
+                            <td>{{$contratto->datainizio}}</td>
+                            <td>{{$contratto->datatermine}}</td>
+                            <td>{{$contratto->fornitore}}</td>
+                            <td>{{$contratto->tipo}}</td>
+                            <td>{{$contratto->importo}}</td>
+                            <td>{{$contratto->stato}}</td>
+                            <td>{{$contratto->filename}}</td>
+                            
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+            <div class="panel-footer">
+                <!-- Footer del pannello -->
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+@section('script')
+<script src="/js/app/contratti.js"></script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/tasks/list.blade.php b/resources/views/tasks/list.blade.php
index 2db016e..5827e5b 100644
--- a/resources/views/tasks/list.blade.php
+++ b/resources/views/tasks/list.blade.php
@@ -15,7 +15,7 @@
 	</div>
 	<div class ="row">
 		<div class="col">
-			<div class="panel">
+			<div class="panel panel-default ">
 				<div class="panel-header">
 					Tutte le Attività
 				</div>
@@ -43,7 +43,7 @@
 </div>
 	<!-- HIDDEN -->
 	<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-		<div class="modal-dialog" role="document">
+		<div class="modal-dialog draggable" role="document">
 			<div class="modal-content">
 				<div class="modal-header">
 					<h4 class="modal-title">Nuova Attività</h4>
@@ -51,7 +51,7 @@
 				<div class="modal-body">
 					<div class="row">
 						<div class="col-md-10">
-							<!-- FORM INSERIMENTO NUOVA CATEGORIA -->
+							<!-- FORM INSERIMENTO NUOVA ATTIVITA -->
 							<form action="" method="POST" id="form">
 								@csrf 
 								<label for="titolo" class="form-label">Titolo:</label>
diff --git a/routes/admin.php b/routes/admin.php
index 1f042a1..692d5f3 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -17,6 +17,7 @@ use App\Http\Controllers\Utenti;
 use App\Http\Controllers\ProgettiController;
 use App\Http\Controllers\TaskController;
 use App\Http\Controllers\AvvisoController;
+use App\Http\Controllers\ContrattiController;
 use App\Mail\myTestEmail;
 
 /*
@@ -156,6 +157,11 @@ Route::group(['middleware'=>['permission:tasks']], function(){
 });
 
 
+// CONTRATTI
+Route::group(['middleware'=>['permission:contratti']], function(){
+    Route::get('contratti', [ContrattiController::class, 'Contratti'])->name('contratti');
+});
+
 Route::group(['middleware'=>['permission:avvisi']], function(){
     Route::post('avvisi/new',[AvvisoController::class,'saveAvviso'])->name('newAvviso');
 });