From d7fe1fcb81a4dd0b3525ae042390213d9c5e0e51 Mon Sep 17 00:00:00 2001 From: FlavioBarachino Date: Wed, 2 Aug 2023 19:12:37 +0200 Subject: [PATCH] modifiche varie --- app/Http/Controllers/ContrattiController.php | 9 +- app/Models/Avviso.php | 22 +++++ app/Models/Contratti.php | 24 ++++++ app/Models/contatto.php | 1 + config/filesystems.php | 1 + public/contratti | 1 + public/js/app/contratti.js | 7 ++ public/js/app/dashboard.js | 17 ++-- resources/views/contratti/lista.blade.php | 87 +++++++++++++++++++- resources/views/layouts/app.blade.php | 2 +- resources/views/layouts/dashboard.blade.php | 24 +++++- routes/admin.php | 1 + 12 files changed, 183 insertions(+), 13 deletions(-) create mode 120000 public/contratti diff --git a/app/Http/Controllers/ContrattiController.php b/app/Http/Controllers/ContrattiController.php index 7e357bf..6701f09 100644 --- a/app/Http/Controllers/ContrattiController.php +++ b/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(); + } + } diff --git a/app/Models/Avviso.php b/app/Models/Avviso.php index 652cc9a..8fd32be 100644 --- a/app/Models/Avviso.php +++ b/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;*/ + + + } } diff --git a/app/Models/Contratti.php b/app/Models/Contratti.php index 070af1b..6fde9c3 100644 --- a/app/Models/Contratti.php +++ b/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(); + } + } diff --git a/app/Models/contatto.php b/app/Models/contatto.php index 41b9c1e..4feb16c 100644 --- a/app/Models/contatto.php +++ b/app/Models/contatto.php @@ -30,4 +30,5 @@ class contatto extends Model } + } diff --git a/config/filesystems.php b/config/filesystems.php index 73bf20f..01ab2d0 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -74,6 +74,7 @@ return [ 'links' => [ public_path('storage') => storage_path('app/public'), + public_path('contratti') => storage_path('app/Contratti'), ], ]; diff --git a/public/contratti b/public/contratti new file mode 120000 index 0000000..d248a87 --- /dev/null +++ b/public/contratti @@ -0,0 +1 @@ +/var/www/html/bubofamily/storage/app/Contratti \ No newline at end of file diff --git a/public/js/app/contratti.js b/public/js/app/contratti.js index 8c8feb8..4049343 100644 --- a/public/js/app/contratti.js +++ b/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(); \ No newline at end of file diff --git a/public/js/app/dashboard.js b/public/js/app/dashboard.js index f979658..4cf4796 100644 --- a/public/js/app/dashboard.js +++ b/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 diff --git a/resources/views/contratti/lista.blade.php b/resources/views/contratti/lista.blade.php index ab4883c..78e9543 100644 --- a/resources/views/contratti/lista.blade.php +++ b/resources/views/contratti/lista.blade.php @@ -6,6 +6,7 @@
+
@@ -30,13 +31,13 @@ @foreach($data as $contratto) {{$contratto->numero}} - {{$contratto->datainizio}} - {{$contratto->datatermine}} + {{date_format(date_create($contratto->datainizio),'d/m/Y')}} + {{date_format(date_create($contratto->datatermine),'d/m/Y')}} {{$contratto->fornitore}} {{$contratto->tipo}} {{$contratto->importo}} {{$contratto->stato}} - {{$contratto->filename}} + {{$contratto->filename}} @endforeach @@ -49,6 +50,86 @@
+ + + +
@endsection @section('script') diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 9961df7..a29d702 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -15,7 +15,7 @@ - + diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php index bb380b7..6261f7f 100644 --- a/resources/views/layouts/dashboard.blade.php +++ b/resources/views/layouts/dashboard.blade.php @@ -1,5 +1,6 @@ @extends('admin') @section('content') +

Riepilogo

@@ -139,12 +140,12 @@
-
+
Avvisi e informazioni
-
+
    @foreach($avvisi as $avviso) @@ -172,8 +173,27 @@
+ + +
+
+
+
+
+
Notizie
+
+
+ +
+
+
+
@endcan + @endsection @section('script') diff --git a/routes/admin.php b/routes/admin.php index 0762c9b..11445cd 100644 --- a/routes/admin.php +++ b/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(){