diff --git a/app/Http/Controllers/ContrattiController.php b/app/Http/Controllers/ContrattiController.php index adda3ac..c5caf7c 100644 --- a/app/Http/Controllers/ContrattiController.php +++ b/app/Http/Controllers/ContrattiController.php @@ -18,8 +18,11 @@ class ContrattiController extends Controller { // Contratti::storeContratto($request); //dd($request); + if (isset($request['filename'])) { $filename = $request->file('filename')->store('Contratti'); - + }else{ + $filename=null; + } Contratti::create([ 'numero'=>$request['numero'], 'nome'=>$request['nome'], @@ -36,4 +39,10 @@ class ContrattiController extends Controller return redirect()->back(); } /* */ + + public function schedaContratto($id) + { + $contratto = Contratti::getContrattoById($id); + return view('contratti.detail',['contratto'=>$contratto, 'docs' => \App\Models\GenDoc::listDocument(1,$id)]); + } } diff --git a/app/Models/Contratti.php b/app/Models/Contratti.php index fa204fc..7d93cb4 100644 --- a/app/Models/Contratti.php +++ b/app/Models/Contratti.php @@ -5,6 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; class Contratti extends Model @@ -35,4 +36,8 @@ class Contratti extends Model return self::all(); } + public static function getContrattoById($id){ + return DB::table('contrattis')->where('id','=',$id)->get(); + } + } diff --git a/resources/views/contratti/detail.blade.php b/resources/views/contratti/detail.blade.php new file mode 100644 index 0000000..df28798 --- /dev/null +++ b/resources/views/contratti/detail.blade.php @@ -0,0 +1,119 @@ +@extends('adminlte::page') + +@section('content_header') +

Dettaglio contratto

+@endsection + +@section('content') +
+
+
+
+
+

Dati del contratto

+
+ +
+
+
+ @foreach($contratto as $contr) +
+
+
Nome:
+
+ {{$contr->nome }} +
+
+ +
+
Fornitore
+
+ {{$contr->fornitore }} +
+
+
+
Data Inizio
+
+ {{ date('d/m/Y',strtotime($contr->datainizio)) }} +
+
Data Termine
+
+ {{ date('d/m/Y',strtotime($contr->datatermine)) }} +
+
+
+
Stato
+
+ {{$contr->stato }} +
+
Scadenza pagamento
+
+ {{ date('d/m/Y',strtotime($contr->scadenzapagamento)) }} +
+
+
+
Importo
+
+ {{$contr->importo }} +
+ +
Note
+
+ {{$contr->note }} +
+
+ +
+ @endforeach +
+
+
+
+
+

Documenti caricati

+
+ +
+
+
+ + + + + + + + + + @foreach ($docs as $doc) + + + + + + @endforeach + +
DescrizioneDocumentoAzione
{{$doc->descrizione}}
+
+
+ + +
+
+ +
+
+ +
+ + +@endsection +@section('js') + +@endsection \ No newline at end of file diff --git a/resources/views/contratti/lista.blade.php b/resources/views/contratti/lista.blade.php index ef9cf73..dbc859e 100644 --- a/resources/views/contratti/lista.blade.php +++ b/resources/views/contratti/lista.blade.php @@ -17,6 +17,7 @@ + @@ -24,13 +25,14 @@ - + @foreach($data as $contratto) + @@ -38,7 +40,7 @@ - + @endforeach @@ -108,10 +110,10 @@ -
+
diff --git a/routes/admin.php b/routes/admin.php index b5c17f0..d78fbc2 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -166,6 +166,7 @@ Route::group(['middleware'=>['permission:tasks']], function(){ Route::group(['middleware'=>['permission:contratti']], function(){ Route::get('contratti', [ContrattiController::class, 'Contratti'])->name('contratti'); Route::post('contratti', [ContrattiController::class, 'newContratto']); + Route::get('contratti/{id}', [ContrattiController::class, 'schedaContratto'])->name('contrattodetail'); }); Route::group(['middleware'=>['permission:avvisi']], function(){
Nome Contratto Numero contratto Data Contratto Data TermineTipo contratto Importo StatoDocumento
{{$contratto->nome}} {{$contratto->numero}} {{date_format(date_create($contratto->datainizio),'d/m/Y')}} {{date_format(date_create($contratto->datatermine),'d/m/Y')}}{{$contratto->tipo}} {{$contratto->importo}} {{$contratto->stato}}{{$contratto->filename}}