From fabf85ffb5ecaae8e9f40e391dd8777bd18f3ef2 Mon Sep 17 00:00:00 2001 From: FlavioBarachino Date: Fri, 14 Jul 2023 16:01:14 +0200 Subject: [PATCH] Creazione Tasks --- app/Http/Controllers/TaskController.php | 15 +++++++ app/Models/Task.php | 11 +++++ .../2023_07_14_123253_create_tasks_table.php | 39 +++++++++++++++++ .../migrations/2023_07_14_123350_subtask.php | 42 +++++++++++++++++++ resources/views/components/menu.blade.php | 4 ++ resources/views/tasks/list.blade.php | 15 +++++++ routes/admin.php | 29 +++---------- routes/api.php | 5 ++- 8 files changed, 136 insertions(+), 24 deletions(-) create mode 100644 app/Http/Controllers/TaskController.php create mode 100644 app/Models/Task.php create mode 100644 database/migrations/2023_07_14_123253_create_tasks_table.php create mode 100644 database/migrations/2023_07_14_123350_subtask.php create mode 100644 resources/views/tasks/list.blade.php diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php new file mode 100644 index 0000000..65f393f --- /dev/null +++ b/app/Http/Controllers/TaskController.php @@ -0,0 +1,15 @@ +id(); + $table->timestamps(); + $table->string('titolo',255); + $table->longText('descrizione')->nullable(); + $table->bigInteger('creato_da'); + $table->bigInteger('assegnato_a'); + $table->date('creato_il'); + $table->date('termine_il'); + $table->date('chiuso_il'); + $table->enum('stato', ['Aperto', 'Chiuso'])->nullable()->default('Aperto'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('tasks'); + } +} diff --git a/database/migrations/2023_07_14_123350_subtask.php b/database/migrations/2023_07_14_123350_subtask.php new file mode 100644 index 0000000..3c5eec0 --- /dev/null +++ b/database/migrations/2023_07_14_123350_subtask.php @@ -0,0 +1,42 @@ +id(); + $table->timestamps(); + // $table->bigInteger('tasks_id'); + $table->foreignId('tasks_id')->onDelete('cascade'); + $table->string('titolo',255); + $table->longText('descrizione')->nullable(); + $table->bigInteger('creato_da'); + $table->bigInteger('assegnato_a'); + $table->date('creato_il'); + $table->date('termine_il'); + $table->date('chiuso_il'); + $table->enum('stato', ['Aperto', 'Chiuso'])->nullable()->default('Aperto'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/resources/views/components/menu.blade.php b/resources/views/components/menu.blade.php index ff9bbc0..1c6dccd 100644 --- a/resources/views/components/menu.blade.php +++ b/resources/views/components/menu.blade.php @@ -51,7 +51,11 @@ Progetti @endcan +@can('tasks') +
  • + Attività
    • +@endcan @can('amministrazione')
  • Amministrazione diff --git a/resources/views/tasks/list.blade.php b/resources/views/tasks/list.blade.php new file mode 100644 index 0000000..44dd6b8 --- /dev/null +++ b/resources/views/tasks/list.blade.php @@ -0,0 +1,15 @@ +@extends('admin') +@section('content') +
    +
    +

    Lista Progetti

    +
    +
    +
    + +
    +
    + +
    +
    \ No newline at end of file diff --git a/routes/admin.php b/routes/admin.php index d426b4f..30b83b5 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -123,7 +123,6 @@ Route::group(['middleware'=>['permission:amministrazione']], function(){ Route::post('users/new',[Utenti::class,'createUser']); Route::get('users/roles',[Utenti::class,'listRoles']); Route::get('users/delete/{id}',[Utenti::class,'deleteUser']); -//}); Route::get('users/givepermission',[Utenti::class,'givePermissionToUser']); Route::post('users/givepermission',[Utenti::class,'assignPermission']); Route::get('users/giverole',[Utenti::class,'giveRoleToUser']); @@ -147,35 +146,19 @@ Route::group(['middleware'=>['permission:progetti']], function(){ Route::get('progetti/print',[ProgettiController::class,'stampaPDFProgetto']); }); -/// RIVISTA -Route::group(['middleware'=>['permission:rivista']], function(){ - Route::get('rivista',[RivistaController::class,'rivistaHome'])->name('rivista'); - Route::get('rivista/pubblica',[RivistaController::class,'rivistaDigCarica']); - Route::post('rivista/pubblica',[RivistaController::class,'rivistaDigPubblica']); - Route::get('rivista/abbonati',[RivistaController::class,'rivistaAbbonati']); - Route::get('rivista/abbonamenti',[RivistaController::class,'rivistaAbbonamenti']); - Route::get('rivista/abbonamenti/rinnovo',[RivistaController::class,'rivistaAbbonamentiRinnovo']); - Route::get('rivista/abbonamenti/nuovo',[RivistaController::class,'rivistaAbbonamentiNuovo']); - Route::get('rivista/abbonamenti/scadenza',[RivistaController::class,'rivistaAbbonamentiScadono']); - Route::get('rivista/new',[RivistaController::class,'rivistaNuova']); - Route::get('rivista/archivio',[RivistaController::class,'rivistaArchivio']); +// TASKS +Route::group(['middleware'=>['permission:tasks']], function(){ + Route::get('tasks', [TaskController::class, 'listaTask'])->name('tasks'); + }); -/// ASSOCIAZIONE -Route::group(['middleware'=>['permission:associazione']], function(){ - Route::get('associazione',[AssociazioneController::class,'assocHome'])->name('associazione'); -}); - -/// GRUPPI -Route::group(['middleware'=>['permission:gruppi']], function(){ - Route::get('gruppi',[GruppiController::class,'gruppiHome'])->name('gruppi'); -}); +// -- ONLY FOR TEST -- TO BE REMOVED // /// TEST ROUTES Route::get('test/fullcalendar', [FullCalenderController::class, 'index']); Route::post('test/fullcalendar', [FullCalenderController::class, 'ajax']); Route::get('test/condominio',[CondominioController::class,'testPdf']); - Route::get('test/err403',[CondominioController::class,'err403']); + Route::get('test/err403',[CondominioController::class,'err403'])->name('errore-403'); Route::get('test/user_role',[CondominioController::class,'user_role']); Route::get('test/userclass',[Utenti::class,'userClass']); diff --git a/routes/api.php b/routes/api.php index 10552b1..89b9f5d 100644 --- a/routes/api.php +++ b/routes/api.php @@ -20,6 +20,9 @@ use App\Http\Controllers\MovimentiController; Route::middleware('auth:sanctum')->get('/user', function (Request $request) { return $request->user(); }); + +Route::group(['middleware'=>['permission:conti']], function(){ Route::get('categories', [CategorieController::class,'apiList']); Route::get('tags', [TagController::class,'apiList']); - Route::get('movements', [MovimentiController::class,'apiList']); \ No newline at end of file + Route::get('movements', [MovimentiController::class,'apiList']); +}); \ No newline at end of file