diff --git a/app/Http/Controllers/AvvisoController.php b/app/Http/Controllers/AvvisoController.php index 645ddbd..13aa29b 100644 --- a/app/Http/Controllers/AvvisoController.php +++ b/app/Http/Controllers/AvvisoController.php @@ -3,8 +3,14 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use App\Models\Avviso; class AvvisoController extends Controller { // + public function saveAvviso(Request $request) + { + Avviso::newAvviso($request); + return redirect()->back(); + } } diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index f5fe619..9b31378 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -6,7 +6,7 @@ use App\Models\Categorie; use App\Models\Movimenti; use App\Models\tag; use App\Models\Task; -// use App\Models\User; +use App\Models\Avviso; // use App\Http\Controllers\Auth; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -46,14 +46,16 @@ class MovimentiController extends Controller $uscite=Movimenti::getUscite(date('Y')); $saldo=Movimenti::getSaldoTot(); $mieiTasks=Task::getTaskAssignedToUser(Auth::id()); - $TasksAssegnati=Task::getTaskAssignedByUser(Auth::id()); + // $TasksAssegnati=Task::getTaskAssignedByUser(Auth::id()); + $avvisi=Avviso::getAvvisi(); return view('layouts.dashboard',[ 'entrate'=>$entrate, 'uscite'=>$uscite, 'saldo'=>$saldo, 'mieitask' => $mieiTasks, - 'assegnati' => $TasksAssegnati, + // 'assegnati' => $TasksAssegnati, + 'avvisi'=>$avvisi, ]); } diff --git a/app/Models/Avviso.php b/app/Models/Avviso.php index 8b38f0a..652cc9a 100644 --- a/app/Models/Avviso.php +++ b/app/Models/Avviso.php @@ -8,4 +8,21 @@ use Illuminate\Database\Eloquent\Model; class Avviso extends Model { use HasFactory; + + protected $fillable=['avviso','creato_il', 'creato_da', 'urgente']; + + public static function newAvviso($data) + { + self::create([ + 'avviso'=>$data['avviso'], + 'creato_da'=>$data['creato_da'], + 'creato_il'=>date('Y-m-d'), + 'urgente'=>$data['urgente'], + ]); + } + + public static function getAvvisi() + { + return self::all(); + } } diff --git a/database/migrations/2023_07_18_145041_create_avvisos_table.php b/database/migrations/2023_07_18_145041_create_avvisos_table.php index 0f0ec58..fccb97f 100644 --- a/database/migrations/2023_07_18_145041_create_avvisos_table.php +++ b/database/migrations/2023_07_18_145041_create_avvisos_table.php @@ -17,7 +17,9 @@ class CreateAvvisosTable extends Migration $table->id(); $table->timestamps(); $table->longtext('avviso'); - $table->date('creato_il'); + $table->date('creato_il')->nullable()->default(date('Y-m-d')); + $table->bigInteger('creato_da'); + $table->boolean('urgente')->nullable()->default(false); }); } diff --git a/public/js/app/dashboard.js b/public/js/app/dashboard.js index fdc5c97..a016277 100644 --- a/public/js/app/dashboard.js +++ b/public/js/app/dashboard.js @@ -4,10 +4,12 @@ $(document).ready(function() { responsive: true }); // Reload del div + /* $.ajaxSetup({ cache: false }); setInterval(function() { $('#mieitask').load('/admin'); }, 8000); + */ }); diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php index a511700..b965aef 100644 --- a/resources/views/layouts/dashboard.blade.php +++ b/resources/views/layouts/dashboard.blade.php @@ -146,29 +146,29 @@
@@ -177,5 +177,5 @@ @endsection @section('script') - + @endsection diff --git a/resources/views/tasks/list.blade.php b/resources/views/tasks/list.blade.php index 42b759a..2db016e 100644 --- a/resources/views/tasks/list.blade.php +++ b/resources/views/tasks/list.blade.php @@ -25,7 +25,7 @@
  • - +
    {{ $task->titolo}} @@ -84,7 +84,7 @@