diff --git a/app/Http/Controllers/ContrattiController.php b/app/Http/Controllers/ContrattiController.php index d7df117..da7fd9c 100644 --- a/app/Http/Controllers/ContrattiController.php +++ b/app/Http/Controllers/ContrattiController.php @@ -44,7 +44,10 @@ class ContrattiController extends Controller public function schedaContratto($id) { $contratto = Contratti::getContrattoById($id); - return view('contratti.detail',['contratto'=>$contratto, 'docs' => \App\Models\GenDoc::listDocument(1,$id)]); + return view('contratti.detail',[ + 'contratto'=>$contratto, + 'docs' => \App\Models\GenDoc::listDocument(1,$id) + ]); } public function documentDelete(Request $id) diff --git a/app/Http/Controllers/ProgettiController.php b/app/Http/Controllers/ProgettiController.php index 3fd7ac9..f0e633e 100644 --- a/app/Http/Controllers/ProgettiController.php +++ b/app/Http/Controllers/ProgettiController.php @@ -6,6 +6,7 @@ use App\Models\Progetti; use App\Models\User; use Illuminate\Http\Request; use App\Models\RigaProgetto; +use App\Models\GenDoc; use function GuzzleHttp\json_encode; use Barryvdh\DomPDF\Facade\Pdf; @@ -75,4 +76,16 @@ class ProgettiController extends Controller return $pdf->stream(); } + public function documentoProgetto(Request $request) + { + $documenti = GenDoc::listDocument(3,$request->input('entity_id')); + + return view('conti.documenti.insert', [ + 'id'=>$request->input('entity_id'), + 'entity'=>$request->input('entity'), + 'documenti'=>$documenti + ]); + + } + } diff --git a/public/js/app/rigaProgetti.js b/public/js/app/rigaProgetti.js index 5b00764..1e7b57b 100644 --- a/public/js/app/rigaProgetti.js +++ b/public/js/app/rigaProgetti.js @@ -1,7 +1,7 @@ $(document).ready(function() { $('#tab_progetti').DataTable({ "responsive": true, - columnDefs: [ + columnDefs: [ { target: 0, render: DataTable.render.date(), diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index 4b21ab5..77bdc2a 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -90,7 +90,9 @@
{{ date('d/m/Y',strtotime($riga->data)) }} | +{{ date('Y-m-d',strtotime($riga->data)) }} | {{ $riga->descrizione }} | {{ $riga->ore }} | {{ $riga->prezzo }} | diff --git a/routes/admin.php b/routes/admin.php index 3068acd..3bbabc4 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -153,6 +153,8 @@ Route::group(['middleware'=>['permission:progetti']], function(){ Route::get('progetti/close',[ProgettiController::class, 'chiudiProgetto']); Route::get('progetti/reopen',[ProgettiController::class, 'riapriProgetto']); Route::get('progetti/print',[ProgettiController::class,'stampaPDFProgetto']); + Route::get('progetti/docs', [ProgettiController::class, 'documentoProgetto']); + Route::post('progetti/docs', [App\Http\Controllers\GenDocController::class,'storeFile']); }); // TASKS