From c8f244700be4763c880692b45087974272a9445f Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 12 Apr 2023 17:11:03 +0200 Subject: [PATCH] BUB-19 Realizzato lista e inserimento nuovo progetto --- app/Http/Controllers/ProgettiController.php | 22 +++++ app/Models/Progetti.php | 2 +- app/Models/User.php | 4 + resources/views/components/menu.blade.php | 13 +++ resources/views/progetti/list.blade.php | 2 +- resources/views/progetti/new.blade.php | 94 +++++++++++++++++++++ routes/admin.php | 6 ++ 7 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 resources/views/progetti/new.blade.php diff --git a/app/Http/Controllers/ProgettiController.php b/app/Http/Controllers/ProgettiController.php index 8f1814a..3b91517 100644 --- a/app/Http/Controllers/ProgettiController.php +++ b/app/Http/Controllers/ProgettiController.php @@ -2,9 +2,31 @@ namespace App\Http\Controllers; +use App\Models\Progetti; +use App\Models\User; use Illuminate\Http\Request; class ProgettiController extends Controller { // + public function listaProgetto() + { + return view('progetti.list',[ + 'progetti'=>Progetti::getProgetti() + ]); + } + + public function nuovoProgetto() + { + return view('progetti.new',['coordinatori'=>User::getUsers()]); + } + + public function salvaProgetto(Request $request) + { + Progetti::saveProgetto($request); + return view('progetti.list',[ + 'progetti'=>Progetti::getProgetti() + ]); + } + } diff --git a/app/Models/Progetti.php b/app/Models/Progetti.php index 57aaae9..bbab8cf 100644 --- a/app/Models/Progetti.php +++ b/app/Models/Progetti.php @@ -25,7 +25,7 @@ class Progetti extends Model 'data_creazione'=>date('Y-m-d'), 'data_inizio'=>$progetto['data_inizio'], 'data_fine'=>$progetto['data_fine'], - 'coordinatore'=>$progetto['coordinatore'], + 'fk_user'=>$progetto['coordinatore'], 'budget'=>$progetto['budget'], 'stato'=>$progetto['stato'], 'note'=>$progetto['note'] diff --git a/app/Models/User.php b/app/Models/User.php index ad19806..03f90ea 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -64,6 +64,10 @@ class User extends Authenticatable } public static function getUserById($id) + { + return DB::table('users')->where('id','=',$id)->get(); + } + public static function getUsers() { return DB::table('users')->orderBy('name')->get(); } diff --git a/resources/views/components/menu.blade.php b/resources/views/components/menu.blade.php index 2c5a224..c9d4683 100644 --- a/resources/views/components/menu.blade.php +++ b/resources/views/components/menu.blade.php @@ -78,7 +78,20 @@ +
  • + Progetti + +
  • Amministrazione