modifiche varie

app/Http/Controllers/ContrattiController.php

@@ -10,6 +10,13 @@ class ContrattiController extends Controller
     //
     public function contratti()
     {
-        return view('contratti.lista',['data'=>Contratti::all()]);
+        return view('contratti.lista',['data'=>Contratti::getAllContratto()]);
     }
+
+    public function newContratto(Request $request)
+    {
+        Contratti::storeContratto($request);
+        return redirect()->back();
+    }
+
 }

app/Models/Avviso.php

@@ -4,6 +4,7 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Http;
 
 class Avviso extends Model
 {
@@ -25,4 +26,25 @@ class Avviso extends Model
     {
         return self::all();
     }
+
+    public static function getHAstatus()
+    {
+        /*$response = Http::withHeaders([
+            'Authorization'=>' Bearer '.env('HA_TOKEN'),
+            'Content-Type'=>' application/json',
+        ])->get('https://ha.lavorain.cloud/api/services',['domain']);
+        return $response;
+       // return dd($response);*/
+    }
+
+    public static function getAnsaNews()
+    {
+       /*$xmlstring = Http::get('https://www.ansa.it/trentino/notizie/trentino_rss.xml');
+       $xml_file = simplexml_load_string($xmlstring);
+       $json = json_encode($xml_file );
+       $array = json_decode($json,TRUE);
+       dd($array); // return $array;*/
+       
+      
+    }
 }

app/Models/Contratti.php

@@ -8,4 +8,28 @@ use Illuminate\Database\Eloquent\Model;
 class Contratti extends Model
 {
     use HasFactory;
+    protected $fillable=['numero','nome','datainizio','datatermine','fornitore','tipo','importo','scadenzapagamento','stato','note','filename'];
+    public static function storeContratto($req){
+         $filename=$req->file('filename')->store('Contratti');
+         
+            self::create([
+                'numero'=>$req['numero'],
+                'nome'=>$req['nome'],
+                'datainizio'=>$req['datainizio'],
+                'datatermine'=>$req['datatermine'],
+                'fornitore'=>$req['fornitore'],
+                'tipo'=>$req['tipo'],
+                'importo'=>$req['importo'],
+                'scadenzapagamento'=>$req['scadenzapagamento'],
+                'stato'=>$req['stato'],
+                'note'=>$req['note'],
+                'filename'=>$filename
+            ]);
+            
+    }
+
+    public static function getAllContratto(){
+        return self::all();
+    }
+   
 }

app/Models/contatto.php

@@ -30,4 +30,5 @@ class contatto extends Model
     }
     
     
+    
 }

config/filesystems.php

@@ -74,6 +74,7 @@ return [
 
     'links' => [
         public_path('storage') => storage_path('app/public'),
+        public_path('contratti') => storage_path('app/Contratti'),
     ],
 
 ];

public/contratti

@@ -0,0 +1 @@
+/var/www/html/bubofamily/storage/app/Contratti

public/js/app/contratti.js

@@ -7,4 +7,11 @@ $('#contratti').DataTable({
         }
     ]
 });
+
+$(document).on('click','.open_modal_new',function(){
+    console.log('richiesto apertura form');
+    $('#myModal_new').modal('show');
+
+});
+
 $(".draggable").draggable();

public/js/app/dashboard.js

@@ -1,8 +1,13 @@
-
-$(document).ready(function() {
-
-});
 // Rende spostabili le varie finestre
-$(".draggable").draggable();
 
-	
+$( function() {
+    $( ".resizable" ).resizable({
+      handles: "se"
+    });
+  } );
+$(".draggable").draggable();	
+/*$.get('https://www.ansa.it/trentino/notizie/trentino_rss.xml', function(content) {
+  // Insert the content into the specified element
+  $('#contenuto').html(content);
+});*/
+// Load the RSS feed

resources/views/contratti/lista.blade.php

@@ -6,6 +6,7 @@
     </div>
 </div>
 <div class="row">
+    <button class="btn btn-warning btn-detail open_modal_new">Nuovo Contratto</button>
 	<div class="col-lg-12">
     	<div class="panel panel-default">
             <div class="panel-heading">
@@ -30,13 +31,13 @@
                         @foreach($data as $contratto)
                         <tr>
                             <td>{{$contratto->numero}}</td>
-                            <td>{{$contratto->datainizio}}</td>
-                            <td>{{$contratto->datatermine}}</td>
+                            <td>{{date_format(date_create($contratto->datainizio),'d/m/Y')}}</td>
+                            <td>{{date_format(date_create($contratto->datatermine),'d/m/Y')}}</td>
                             <td>{{$contratto->fornitore}}</td>
                             <td>{{$contratto->tipo}}</td>
                             <td>{{$contratto->importo}}</td>
                             <td>{{$contratto->stato}}</td>
-                            <td>{{$contratto->filename}}</td>
+                            <td><a href="/storage/{{$contratto->filename}}" target="new">{{$contratto->filename}}</a></td>
                             
                         </tr>
                         @endforeach
@@ -49,6 +50,86 @@
         </div>
     </div>
 </div>
+
+<!-- MODAL -->
+<div class="modal fade" id="myModal_new" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog draggable" role="document">
+        <div class="modal-content">
+            <form action="" method="POST" enctype="multipart/form-data">
+                @csrf 
+            <div class="modal-header">
+                <h4 class="modal-title">Nuovo contratto</h4>
+            </div> 
+           
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-md-6">
+                        <label for="numero" class="form-label">Numero</label>
+                        <input type="text" class="form-control" id="numero" name="numero" size="50">
+                    </div>
+                    <div class="col-md-6">
+                        <label for="nome" class="form-label">Nome Contratto</label>
+                        <input type="text" class="form-control" id="nome" name="nome" size="50">
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-6">
+                        <label for="datainizio" class="form-label">Data Inizio</label>
+                        <input type="date" class="form-control" id="datainizio" name="datainizio" size="50">
+                    </div>
+                    <div class="col-md-6">
+                        <label for="datatermine" class="form-label">Data Termine Contratto</label>
+                        <input type="date" class="form-control" id="datatermine" name="datatermine" size="50">
+                    </div>     		
+                </div>
+                <div class="row">
+                    <div class="col-md-6">
+                        <label for="fornitore" class="form-label">Fornitore</label>
+                        <input type="text" class="form-control" id="fornitore" name="fornitore" size="50">
+                    </div>
+                    <div class="col-md-6">
+                        <label for="tipo" class="form-label">Tipo Contratto</label>
+                        <input type="text" class="form-control" id="tipo" name="tipo" size="50">
+                    </div>     		
+                </div>
+                <div class="row">
+                    <div class="col-md-6">
+                        <label for="scadenzapagamento" class="form-label">Scadenza Pagamento</label>
+                        <input type="text" class="form-control" id="scadenzapagamento" name="scadenzapagamento" size="50">
+                    </div>
+                    <div class="col-md-6">
+                        <label for="importo" class="form-label">Importo</label>
+                        <input type="text" class="form-control" id="importo" name="importo" size="50">
+                    </div>     		
+                </div>
+                <div class="row">
+                    <div class="col-md-6">
+                        <label for="stato" class="form-label">Stato</label>
+                        <input type="text" class="form-control" id="stato" name="stato" size="50">
+                    </div>
+                    <div class="col-md-6">
+                        <label for="filename" class="form-label">File</label>
+                        <input type="file" class="form-control" id="filename" name="filename" size="50">
+                    </div>     		
+                </div>
+                <div class="row">
+                    <div class="col-md-12">
+                        <label for="note" class="form-label">Note</label>
+                        <textarea name="note" class="form-control"></textarea>
+                    </div>     		
+                </div>
+                
+            </div>
+            <div class="modal-footer">
+                <button type="submit" class="btn btn-primary">Submit</button>
+               
+                <!-- FINE FORM INSERIMENTO NUOVO CONTRATTO -->
+            </div>
+            </form>
+        </div>
+    </div>
+</div>
+</div>
 @endsection
 @section('script')
 <script src="/js/app/contratti.js"></script>

resources/views/layouts/app.blade.php

@@ -15,7 +15,7 @@
     <!-- Fonts -->
     <link rel="dns-prefetch" href="//fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
-
+    <link rel="stylesheet" href="//code.jquery.com/ui/1.13.2/themes/base/jquery-ui.css">
     <!-- Styles -->
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
 </head>

resources/views/layouts/dashboard.blade.php

@@ -1,5 +1,6 @@
 @extends('admin')
 @section('content')
+
 <div class="row">
 	<div class="col-lg-12">
 		<h1 class="page-header">Riepilogo</h1>
@@ -139,12 +140,12 @@
             </div>
         </div>
     </div>
-    <div class="col-lg-6 col-md-8 draggable">
+    <div class="col-lg-6 col-md-8 draggable ">
         <div class="chat-panel panel panel-default" >
             <div class="panel-heading">
                 <i class="fa fa-arrow-circle-right"></i> Avvisi e informazioni
             </div>
-            <div class="panel-body">
+            <div class="panel-body ">
                 <ul class="chat">
                     @foreach($avvisi as $avviso)
                     <span class="chat-img pull-left">
@@ -172,8 +173,27 @@
             </div>
         </div>
     </div>
+    
+    
+</div>
+<div class="row">
+    <div class="col-lg-3 col-md-8 draggable">
+        <div class="panel panel-yellow">
+            <div class="panel-heading">
+                <div class="row">Notizie</div>
+            </div>
+            <div class="panel-body">
+               <!--<ul class="contenuto">
+                  
+                   
+               </ul>-->
+            </div>
+            <div class=panel-footer></div>
+        </div>
+    </div>
 </div>
 @endcan
+
 @endsection
 
 @section('script')

routes/admin.php

@@ -162,6 +162,7 @@ Route::group(['middleware'=>['permission:tasks']], function(){
 // CONTRATTI
 Route::group(['middleware'=>['permission:contratti']], function(){
     Route::get('contratti', [ContrattiController::class, 'Contratti'])->name('contratti');
+    Route::post('contratti', [ContrattiController::class, 'newContratto']);
 });
 
 Route::group(['middleware'=>['permission:avvisi']], function(){