Merge branch 'devel'

app/Http/Controllers/AvvisoController.php

@@ -0,0 +1,16 @@
+<?php
+
+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();
+    }
+}

app/Http/Controllers/MovimentiController.php

@@ -5,8 +5,12 @@ namespace App\Http\Controllers;
 use App\Models\Categorie;
 use App\Models\Movimenti;
 use App\Models\tag;
+use App\Models\Task;
+use App\Models\Avviso;
+// use App\Http\Controllers\Auth;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 use Rap2hpoutre\FastExcel\FastExcel;
 
 class MovimentiController extends Controller
@@ -41,11 +45,17 @@ class MovimentiController extends Controller
         $entrate=Movimenti::getEntrate(date('Y'));
         $uscite=Movimenti::getUscite(date('Y'));
         $saldo=Movimenti::getSaldoTot();
+        $mieiTasks=Task::getTaskAssignedToUser(Auth::id());
+        // $TasksAssegnati=Task::getTaskAssignedByUser(Auth::id());
+        $avvisi=Avviso::getAvvisi();
 
         return view('layouts.dashboard',[
             'entrate'=>$entrate,
             'uscite'=>$uscite,
             'saldo'=>$saldo,
+            'mieitask' => $mieiTasks,
+           // 'assegnati' => $TasksAssegnati,
+           'avvisi'=>$avvisi,
         ]);
     }
 

app/Http/Controllers/TaskController.php

@@ -11,6 +11,28 @@ class TaskController extends Controller
     public function listTask()
     {
         return Task::all();
+        // debug
+        // return get_class_methods($this);
+    }
+
+    public function Task()
+    {
+        return view('tasks.list',['tasks'=>$this->listTask()]);
+    }
+
+    public function newTask(Request $data)
+    {
+        Task::create([
+            'titolo'=>$data['titolo'],
+            'descrizione'=>$data['descrizione'],
+            'assegnato_a'=>$data['assegnato_a'],
+            'creato_da'=>$data['creato_da'],
+            'termine_il'=>$data['termine_il'],
+            'creato_il'=>$data['creato_il'],
+            'chiuso_il'=>$data['chiuso_il'],
+            'stato'=>$data['stato'],
+        ]);
+        return redirect()->back();
     }
 
 

app/Http/Controllers/Utenti.php

@@ -47,6 +47,10 @@ class Utenti extends Controller
         return view('users.list',['users'=>$users]);
     }
 
+    function getUsers(){
+        return User::getUsers();
+    }
+
     function listRoles(){
         $roles = Role::all();
         return $roles;

app/Models/Avviso.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+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();
+    }
+}

app/Models/Task.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Task extends Model
+{
+    use HasFactory;
+
+    protected $fillable=['titolo','descrizione','creato_da','assegnato_a','creato_il','termine_il','chiuso_il','stato'];
+
+    public function getAllTasks()
+    {
+        return self::all();
+    }
+
+    // 
+    public static function getTaskAssignedToUser($userid)
+    {
+        return self::where('assegnato_a',$userid)->get();
+    }
+
+    // 
+    public static function getTaskAssignedByUser($userid)
+    {
+        return self::where('creato_da',$userid)->get();
+    }
+
+    public static function saveTask($collection)
+    {
+        self::create(
+            [
+                'titolo' => $collection['titolo'],
+                'descrizione'=>$collection['descrizione'],
+                'creato_da'=>$collection['creato_da'],
+                'assegnato_a'=>$collection['assegnato_a'],
+                'creato_il'=>date('Y-m-d'),
+                'termine_il'=>$collection['termine_il'],
+                'stato'=>'Aperto',
+            ]
+            );
+    }
+
+}

app/Models/User.php

@@ -66,7 +66,7 @@ class User extends Authenticatable
 
     public static function getUserById($id)
     {
-        return DB::table('users')->where('id','=',$id)->get();
+        return DB::table('users')->where('id','=',$id)->first();
     }
 
     public static function getUsers()

composer.json

@@ -10,6 +10,7 @@
 	"require" : {
 		"php": "^7.3|^8.0",
 		"barryvdh/laravel-dompdf": "^2.0",
+		"creativeorange/gravatar": "^1.0",
 		"directorytree/ldaprecord": "^2.9",
 		"fruitcake/laravel-cors": "^2.0",
 		"guzzlehttp/guzzle": "^7.0.1",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e6ac2be787f145ea140b72b55e302e90",
+    "content-hash": "acd096c2d0a14521dd551b39dde1ef28",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -350,6 +350,69 @@
             ],
             "time": "2022-04-01T19:23:25+00:00"
         },
+        {
+            "name": "creativeorange/gravatar",
+            "version": "v1.0.23",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/creativeorange/gravatar.git",
+                "reference": "3a1b227c48091b039b967265ec13c0800c70ac79"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/creativeorange/gravatar/zipball/3a1b227c48091b039b967265ec13c0800c70ac79",
+                "reference": "3a1b227c48091b039b967265ec13c0800c70ac79",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "^5|^6|^7|^8|^9|^10.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "nunomaduro/larastan": "^0.6.2|^2.4",
+                "orchestra/testbench": "^5.4|^8.0",
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Creativeorange\\Gravatar\\GravatarServiceProvider"
+                    ],
+                    "aliases": {
+                        "Gravatar": "Creativeorange\\Gravatar\\Facades\\Gravatar"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Creativeorange\\Gravatar\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaco Tijssen",
+                    "email": "jaco@creativeorange.nl",
+                    "homepage": "https://www.creativeorange.nl",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A Laravel Gravatar package for retrieving gravatar image URLs or checking the existance of an image.",
+            "keywords": [
+                "avatar",
+                "gravatar",
+                "laravel"
+            ],
+            "support": {
+                "issues": "https://github.com/creativeorange/gravatar/issues",
+                "source": "https://github.com/creativeorange/gravatar/tree/v1.0.23"
+            },
+            "time": "2023-02-06T07:57:20+00:00"
+        },
         {
             "name": "dflydev/dot-access-data",
             "version": "v3.0.2",

config/app.php

@@ -161,6 +161,7 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
+        Creativeorange\Gravatar\GravatarServiceProvider::class,
        
 
         /*
@@ -232,6 +233,7 @@ return [
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
         'FastExcel' => Rap2hpoutre\FastExcel\Facades\FastExcel::class,
+        'Gravatar' => Creativeorange\Gravatar\Facade\Gravatar::class,
 
     ],
 

database/migrations/2023_07_14_123253_create_tasks_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTasksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('tasks', function (Blueprint $table) {
+            $table->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');
+    }
+}

database/migrations/2023_07_14_123350_subtask.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class Subtask extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+        Schema::create('subtasks', function (Blueprint $table) {
+            $table->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()
+    {
+        //
+    }
+}

database/migrations/2023_07_18_145041_create_avvisos_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAvvisosTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('avvisos', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+            $table->longtext('avviso');
+            $table->date('creato_il')->nullable()->default(date('Y-m-d'));
+            $table->bigInteger('creato_da');
+            $table->boolean('urgente')->nullable()->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('avvisos');
+    }
+}

public/js/app/dashboard.js

@@ -3,4 +3,14 @@ $(document).ready(function() {
 	$('#categorie').DataTable({
 		responsive: true
 	});
+	// Reload del div
+	/*
+	$.ajaxSetup({ cache: false });
+	setInterval(function() {
+		$('#mieitask').load('/admin');
+	}, 8000);
+	*/
 });
+
+
+	

public/js/app/movimenti.js

@@ -117,10 +117,14 @@ $(document).on('click', '.open_modal_modifica', function() {
 		
 });
 
-/*$.getJSON("/admin/service/taglist", {}, function(data) {
+/*
+
+$.getJSON("/admin/service/taglist", {}, function(data) {
 	$.each(data, function(i, item) {
 		$("select[name='mov_fk_tags']").append(
 			new Option(item.tag_name, item.id)
 		)
 	});
-});*/
+});
+
+*/

public/js/app/task.js

@@ -0,0 +1,127 @@
+$(document).ready(function() {
+	$('#listatask').DataTable({
+		"responsive": true,
+        columnDefs: [
+            {
+                target: 0,
+                render: DataTable.render.date(),
+            }
+        ],
+		"order": [[0, "desc"]]
+	});
+});
+
+var d = new Date();
+
+var month = d.getMonth()+1;
+var day = d.getDate();
+
+var strDate = d.getFullYear() + '-' +
+    (month<10 ? '0' : '') + month + '-' +
+    (day<10 ? '0' : '') + day;
+
+
+$(document).on('click', '.open_modal_new', function() {
+	console.log(strDate);
+	$("#titolo").empty();
+	$("#descrizione").empty();
+	$('#form').find('input[type="text"], textarea, input[type="number"],input[type="date"],option').val("");
+	$('#form').find('input[type="date"]').val(strDate);
+	$('#myModal').modal('show');
+	$('.modal-title').text(' Nuova attività');
+	$('#form').attr('action', '/admin/task/new');
+	$.getJSON("/admin/service/getUsers", {}, function(users) {
+		$.each(users, function(i, users) {
+			$("select[name='assegnato_a']").append(
+				new Option(users.name, users.id)
+			)
+		}
+		);
+	});
+	
+});
+
+
+/*
+$(document).on('click', '.open_modal_entrata', function() {
+	console.log(strDate);
+	$("#titolo").empty();
+	$("#tags").empty();
+	$('#form').find('input[type="text"], textarea, input[type="number"],option').val("");
+	$('#form').find('input[type="date"]').val(strDate);
+	$('#myModal_new').modal('show');
+	$('.modal-title').text('Nuovo movimento in entrata');
+	$('#form').attr('action', '/admin/movimenti/entrata');
+	$.getJSON("/admin/service/catlistEntrata", {}, function(data) {
+		$.each(data, function(i, item) {
+			$("select[name='mov_fk_categoria']").append(
+				new Option(item.cat_name, item.id)
+			)
+		}
+		);
+	});
+	$.getJSON("/admin/service/taglist", {}, function(data) {
+		$.each(data, function(i, item) {
+			$("select[name='mov_fk_tags']").append(
+				new Option(item.tag_name, item.id)
+			)
+		});
+});
+});
+
+$(document).on('click', '.open_modal_modifica', function() {
+	var url = "/admin/movimenti/modify";
+	var riga_id = $(this).val();
+	$("#categoria").empty();
+	$("#tags").empty();
+	$.getJSON(url + '/' + riga_id, function(data) {
+		// success data
+		console.log(data[0]);
+		$.getJSON("/admin/service/taglist", {}, function(tags) {
+			$.each(tags, function(i, tag) {
+				$("select[name='mov_fk_tags']").append(
+					new Option(tag.tag_name, tag.id)
+				)
+				$('#tags')
+					.find('option:contains(' + data[0].tag_name + ')')
+					.prop('selected', true)
+					.trigger('change');
+			});
+		});
+		$.getJSON("/admin/service/catlist", {}, function(cats) {
+			$.each(cats, function(i, cat) {
+				$("select[name='mov_fk_categoria']").append(
+					new Option(cat.cat_name, cat.id)
+				)
+				$('#categoria')
+					.find('option:contains(' + data[0].cat_name + ')')
+					.prop('selected', true)
+					.trigger('change');
+			}
+			);
+		});
+		$('.modal-title').text('Modifica movimento');
+		$('#data').val(data[0].mov_data);
+		$('#descrizione').val(data[0].mov_descrizione);
+		$('#importo').val(data[0].mov_importo);
+		
+		$('#myModal').modal('show');
+		// $('.panel-heading').text('Modifica movimento');
+		$('#form').attr('action', '/admin/movimenti/modify');
+		$('#form').append('<input type="hidden" name="id" value="' + riga_id + '">');
+		
+	});
+		
+});
+
+/*
+
+$.getJSON("/admin/service/taglist", {}, function(data) {
+	$.each(data, function(i, item) {
+		$("select[name='mov_fk_tags']").append(
+			new Option(item.tag_name, item.id)
+		)
+	});
+});
+
+*/

resources/views/components/menu.blade.php

@@ -51,7 +51,11 @@
 		Progetti <span class="fa arrow"></span></a></li>
 
 @endcan
+@can('tasks')
+<li><a href="{{ route('tasks'); }}"><i class="fa fa-list fa-fw"></i>
+		Attività <span class="fa arrow"></span></a></li>
 
+@endcan
 @can('amministrazione')
 <li><a href="#"><i class="fa fa-gears fa-fw"></i>Amministrazione<span
 		class="fa arrow"></span></a>

resources/views/layouts/dashboard.blade.php

@@ -8,7 +8,7 @@
 <div class="row">
 @hasanyrole('user|admin')
 <!-- WIDGET Bilancio -->
-	<div class="col-lg-4 col-md-8">
+	<div class="col-lg-3 col-md-8">
         <div class="panel panel-success">
             <div class="panel-heading">
                 <div class="row">
@@ -31,7 +31,7 @@
      	</div>
 	</div>
     <!-- WIDGET Bilancio -->
-	<div class="col-lg-4 col-md-8">
+	<div class="col-lg-3 col-md-8">
         <div class="panel panel-danger">
             <div class="panel-heading">
                 <div class="row">
@@ -55,7 +55,7 @@
 	</div>
 
 	<!-- WIDGET  -->
-	<div class="col-lg-4 col-md-8">
+	<div class="col-lg-3 col-md-8">
         <div class="panel panel-primary">
             <div class="panel-heading">
                 <div class="row">
@@ -77,7 +77,7 @@
            </a>
      	</div>
 	</div>
-    <div class="col-lg-4 col-md-8">
+    <div class="col-lg-3 col-md-8">
         <div class="panel panel-yellow">
             <div class="panel-heading">
                 <div class="row">
@@ -100,9 +100,82 @@
      	</div>
 	</div>
 	@endhasanyrole
+    
 </div>
+
+@can('tasks')
+<!-- Se ha i permessi task -->
+<div class="row">
+    <div class="col-lg-6 col-md-8">
+        <div class="chat-panel panel panel-default">
+            <div class="panel-heading">
+                Attività da svolgere
+            </div>
+            <div class="panel-body" id="mieitask">
+                <ul class="chat">
+                    @foreach($mieitask as $task)
+                    <span class="chat-img pull-left">
+                        <!-- rendere immagine dinamica -->
+                        <img src="{{ Gravatar::get(App\Models\User::getUserById($task->assegnato_a)->email)}}" width="32" class="img-circle">
+                    </span>
+                    <div class="chat-body clearfix">
+                    <li class="left clearfix">
+                        @if($task->stato==='Chiuso')
+                            <s>
+                                <a href="#{{ $task->id }}"> {{ $task->titolo }}</a>
+                            </s><br>
+                            <h6>{{$task->descrizione}}</h6>
+                        @else
+                        <b><a href="#{{ $task->id }}"> {{ $task->titolo }}</a></b><br>
+                        <h6>{{$task->descrizione}}</h6>
+                        @endif
+                    </li>
+                    </div>
+                    @endforeach
+                </ul>
+            </div>
+            <div class="panel-footer">
+
+            </div>
+        </div>
+    </div>
+    <div class="col-lg-6 col-md-8">
+        <div class="chat-panel panel panel-default">
+            <div class="panel-heading">
+                <i class="fa fa-arrow-circle-right"></i> Avvisi e informazioni
+            </div>
+            <div class="panel-body">
+                <ul class="chat">
+                    @foreach($avvisi as $avviso)
+                    <span class="chat-img pull-left">
+                        <!-- rendere immagine dinamica -->
+                        <img src="{{ Gravatar::get(App\Models\User::getUserById($avviso->creato_da)->email)}}" width="32" class="img-circle">
+                    </span>
+                    <div class="chat-body clearfix">
+                        <li class="left clearfix">
+                           
+                            <a href="#{{ $avviso->id }}"><i>{{date_format(date_create($avviso->creato_il),'d/m/Y')}}</i> - {{ $avviso->avviso }}</a>
+                           
+                        </li>
+                    </div>
+                    @endforeach
+                </ul>
+            </div>
+            <div class="panel-footer">
+                <form action="{{ Route('newAvviso') }}" method="POST">
+                    @csrf
+                    <label for="avviso" class="form-label">Nuovo Avviso:</label>
+                    <textarea class="form-control" name="avviso"></textarea>
+                    <input type="hidden" name="creato_da" value="{{ Auth::user()->id }}">
+                    <input type="submit" name="submit" class="button btn-primary">
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+@endcan
 @endsection
 
 @section('script')
-<script src="/js/app/dashboard.js"></script>
+
 @endsection

resources/views/tasks/list.blade.php

@@ -2,7 +2,8 @@
 @section('content')
 <div class="row">
 	<div class="col-lg-12">
-		<h1 class="page-header">Lista Progetti</h1>
+		<h1 class="page-header">Lista Attività</h1>
+
 	</div>
 </div>
 <div class="container">
@@ -10,7 +11,94 @@
 	<div class="row">
 		<div class="col-xs-12">
 			<button class="btn btn-primary open_modal_new"><i
-				class="fa fa-pencil-square-o fw"></i>Nuovo Progetto</button>
+				class="fa fa-pencil-square-o fw"></i>Nuova Attività</button>
 		</div>
 	</div>
+	<div class ="row">
+		<div class="col">
+			<div class="panel">
+				<div class="panel-header">
+					Tutte le Attività
+				</div>
+				<div class="panel-body">
+					<ul class="chat">
+					@foreach($tasks as $task)
+						<li class="left" clearfix>
+							<span class="chat-img pull-left">
+								<!-- rendere immagine dinamica -->
+								<img src="{{ Gravatar::get(App\Models\User::getUserById($task->assegnato_a)->email )}}" width="32" class="img-circle">
+							</span>
+							<div class="chat-body clearfix">
+								{{ $task->titolo}}
+							</div>
+						</li>
+					@endforeach	
+					</ul>
+				</div>
+				<div class="panel-footer">
+
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+	<!-- HIDDEN -->
+	<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h4 class="modal-title">Nuova Attività</h4>
+				</div>
+				<div class="modal-body">
+					<div class="row">
+						<div class="col-md-10">
+							<!-- FORM INSERIMENTO NUOVA CATEGORIA -->
+							<form action="" method="POST" id="form">
+								@csrf 
+								<label for="titolo" class="form-label">Titolo:</label>
+								<input type="text" class="form-control" id="titolo"
+									name="titolo" size="50">
+
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-10">
+							<label for="descrizione" class="form-label">Descrizione:</label>
+							<textarea class="form-control" name="descrizione" id="descrizione"></textarea>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-5">
+							<label for="assegnato_a" class="form-label">Assegna a:</label>
+							<!-- SELECT USER -->
+							<select name="assegnato_a" id="assegnato_a" class="form-control">
+
+							</select>
+						</div>	
+						<div class="col-md-5">
+							<!-- Data termine datetimepicker -->
+							<label for="termine_il" class="form-label">Termine:</label>
+							<input type="date" name="termine_il" class="form-control" value="{{ date('Y-m-d'); }}" id="termine_il">
+						</div>
+							
+					</div>
+					
+				</div>
+				<div class="modal-footer">
+					<input type="hidden" name="creato_da" value="{{ Auth::user()->id }}">
+					<input type="hidden" name="stato" value="Aperto">
+					<input type="hidden" name="creato_il" value="{{ date('Y-m-d'); }}">
+					<input type="hidden" name="chiuso_il" value="{{ date('Y-m-d'); }}">
+					<button type="submit" class="btn btn-primary">Submit</button>
+					</form>
+					<!-- FINE FORM INSERIMENTO NUOVA CATEGORIA -->
+				</div>
+			</div>
+		</div>
+	</div>
+
+
+@endsection
+@section('script')
+	<script src="/js/app/task.js"></script>
 @endsection

routes/admin.php

@@ -15,6 +15,8 @@ use App\Http\Controllers\AutoController;
 use App\Http\Controllers\AnagraficaController;
 use App\Http\Controllers\Utenti;
 use App\Http\Controllers\ProgettiController;
+use App\Http\Controllers\TaskController;
+use App\Http\Controllers\AvvisoController;
 use App\Mail\myTestEmail;
 
 /*
@@ -123,7 +125,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 +148,24 @@ Route::group(['middleware'=>['permission:progetti']], function(){
     Route::get('progetti/print',[ProgettiController::class,'stampaPDFProgetto']);
 });
 
-/// RIVISTA
+// TASKS
-Route::group(['middleware'=>['permission:rivista']], function(){
+Route::group(['middleware'=>['permission:tasks']], function(){
-    Route::get('rivista',[RivistaController::class,'rivistaHome'])->name('rivista');
+    Route::get('tasks', [TaskController::class, 'Task'])->name('tasks');
-    Route::get('rivista/pubblica',[RivistaController::class,'rivistaDigCarica']);
+    Route::post('task/new',[TaskController::class, 'newTask']);
-    Route::post('rivista/pubblica',[RivistaController::class,'rivistaDigPubblica']);
+    Route::get('service/getUsers', [Utenti::class,'getUsers']);
-    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']);
 });
 
-/// ASSOCIAZIONE
-Route::group(['middleware'=>['permission:associazione']], function(){
-    Route::get('associazione',[AssociazioneController::class,'assocHome'])->name('associazione');
-});
 
-/// GRUPPI
+Route::group(['middleware'=>['permission:avvisi']], function(){
-Route::group(['middleware'=>['permission:gruppi']], function(){
+    Route::post('avvisi/new',[AvvisoController::class,'saveAvviso'])->name('newAvviso');
-    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']);
 

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']);
+});