app/Http/Controllers/AssociazioneController.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class AssociazioneController extends Controller
+{
+    //
+}

app/Http/Controllers/GruppiController.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class GruppiController extends Controller
+{
+    //
+}

app/Http/Controllers/MovimentiController.php

@@ -37,10 +37,14 @@ class MovimentiController extends Controller
 
     public static function dashboard()
     {
-        $bilancio=Movimenti::getSaldo(date('Y'));
+        /*$bilancio=Movimenti::getSaldo(date('Y'));*/
+        $entrate=Movimenti::getEntrate(date('Y'));
+        $uscite=Movimenti::getUscite(date('Y'));
         $saldo=Movimenti::getSaldoTot();
+
         return view('layouts.dashboard',[
-            'bilancio'=>$bilancio,
+            'entrate'=>$entrate,
+            'uscite'=>$uscite,
             'saldo'=>$saldo,
         ]);
     }

app/Http/Controllers/RivistaController.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class RivistaController extends Controller
+{
+    //
+}

app/Http/Controllers/Utenti.php

@@ -12,7 +12,7 @@ use App\Models\User;
 
 class Utenti extends Controller
 {
-    
+
     public function createRole($ruolo)
     {
         $role=Role::create(['name'=>$ruolo]);
@@ -23,40 +23,69 @@ class Utenti extends Controller
         $permission=Permission::create(['name'=>$permesso]);
         return json_encode(Permission::all()->pluck('name'));
     }
-    
+
     function userClass() {
         $user=new User();
         return get_class_methods($user);
     }
-    
+
     // post del create user
     function createUser(Request $params){
         User::addUser($params);
         return redirect('/admin/users/new');
     }
-    
+
     // mostra il form della creazione dell'utente
     function addUser(){
         $roles = Role::all();
         $users = User::all();
         return view('users.create',['ruoli'=>$roles,'users'=>$users]);
     }
-    
+
     function listUser(){
         $users = User::all();
-        return view('users.list',['users'=>$users]);       
+        return view('users.list',['users'=>$users]);
     }
-    
+
     function listRoles(){
         $roles = Role::all();
         return $roles;
     }
-    
+
     function deleteUser($id) {
         User::destroy($id);
-        
+
         return redirect('/admin/users/new');
     }
-        
+
-    
+    function givePermissionToUser()
+    {
+        $users=User::all();
+        $permissions=Permission::all();
+        return view('users.assignperm',['users'=>$users,'permissions'=>$permissions]);
+    }
+
+    function assignPermission(Request $request)
+    {
+       //$user=User::getUserbyId($request['user']);
+       $user=User::findOrFail($request['user']);
+       foreach($request['permesso'] as $key => $value){
+            if($value=='true')
+            {
+               $key=str_replace('\'','',$key);
+                $user->givePermissionTo($key);
+                // $permission['allowed'][]=$key;
+            }
+            else
+            {
+                $key=str_replace('\'','',$key);
+                $user->revokePermissionTo($key);
+                // $permission['denied'][]=$key;
+            }
+
+        }
+        return redirect('/admin/users/givepermission');
+
+        //return dd($user);
+    }
 }

app/Models/Associazione.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Associazione extends Model
+{
+    use HasFactory;
+}

app/Models/Gruppi.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Gruppi extends Model
+{
+    use HasFactory;
+}

app/Models/Movimenti.php

@@ -20,15 +20,15 @@ class Movimenti extends Model
         ->groupBy('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name')
         ->get();
     }
-    
+
     public static function getSaldo($date) {
         return DB::table('movimentis')->whereYear('mov_data','=',$date)->sum('mov_importo');
     }
-    
+
     public static function getSaldoTot() {
         return DB::table('movimentis')->sum('mov_importo');
     }
-    
+
     public static function insSpesa($request) {
         DB::table('movimentis')->insert(
             [
@@ -40,7 +40,7 @@ class Movimenti extends Model
                 'mov_inserito_da'=>$request['userid'],
             ]);
     }
-    
+
     public static function insEntrata($request) {
         DB::table('movimentis')->insert(
             [
@@ -52,7 +52,7 @@ class Movimenti extends Model
                 'mov_inserito_da'=>$request['userid'],
             ]);
     }
-    
+
     public static function export() {
         return DB::table('movimentis')
         ->join('categories','movimentis.mov_fk_categoria','=','categories.id')
@@ -61,7 +61,7 @@ class Movimenti extends Model
         ->orderBy('Data','asc')
         ->get();
     }
-    
+
     public static function reportSpesa($year,$month) {
         return DB::table('movimentis')
         ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name,categories.id')
@@ -72,7 +72,7 @@ class Movimenti extends Model
         ->groupBy('cat_name','categories.id')
         ->get();
     }
-    
+
     public static function reportEntrate($year,$month) {
         return DB::table('movimentis')
         ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name,categories.id')
@@ -83,7 +83,7 @@ class Movimenti extends Model
         ->groupBy('cat_name','categories.id')
         ->get();
     }
-    
+
     public static function getMovimentoById($id) {
         return DB::table('movimentis')
         ->join('categories','movimentis.mov_fk_categoria','=','categories.id')
@@ -91,7 +91,7 @@ class Movimenti extends Model
         ->where('movimentis.id','=',$id)
         ->get();
     }
-    
+
     public static function updateMovimenti($request) {
         DB::table('movimentis')
         ->where('id','=', $request['id'])
@@ -104,13 +104,13 @@ class Movimenti extends Model
             'mov_inserito_da'=>$request['userid'],
         ]);
     }
-    
+
     public static function deleteMovimento($id) {
         DB::table('movimentis')
         ->where('id','=', $id)
         ->delete();
     }
-    
+
     public static function listByCatMonth($month,$cat,$year) {
         return DB::table('movimentis')
         ->join('categories','movimentis.mov_fk_categoria','=','categories.id')
@@ -123,7 +123,7 @@ class Movimenti extends Model
         ->groupBy('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name')
         ->get();
     }
-    
+
     public static function listByCategory($cat) {
        return DB::table('movimentis')
         ->join('categories','movimentis.mov_fk_categoria','=','categories.id')
@@ -134,7 +134,7 @@ class Movimenti extends Model
         ->groupBy('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name')
         ->get();
     }
-    
+
     public static function getByTag($tag) {
        return DB::table('movimentis')
         ->where('mov_fk_tags','=',$tag)
@@ -151,7 +151,7 @@ class Movimenti extends Model
         $inputPath='/var/www/html/bubofamily/public/storage/'.$filename;
         $outputPath='/var/www/html/bubofamily/public/'.$filename;
         rename($inputPath,$outputPath);
-       
+
         $collection = (new FastExcel)->import($filename, function ($line){
             if($line['Data valuta'])
             {
@@ -166,13 +166,13 @@ class Movimenti extends Model
             }
            });
     }
-    
+
     public static function importEstrattoCR($filename)
     {
         $inputPath='/var/www/html/bubofamily/public/storage/'.$filename;
         $outputPath='/var/www/html/bubofamily/public/'.$filename.'.csv';
         rename($inputPath,$outputPath);
-        
+
         $collection = (new FastExcel)->configureCsv(';')->import($filename.'.csv', function ($line){
             if($line['VALUTA'])
             {
@@ -202,18 +202,18 @@ class Movimenti extends Model
             }
         });
     }
-    
+
     public static function getYearsFromMovimenti()
     {
         $anni=DB::table('movimentis')->select(DB::raw('DISTINCT YEAR(mov_data) as anno'))->get();
         // dd($anni); // for test purposes
         return $anni;
     }
-    
+
-    
+
     private static function dateFormat($type,$string)
     {
-        
+
         if($type)
         {
             $string=$string->format('Y-m-d');
@@ -226,4 +226,24 @@ class Movimenti extends Model
         }
     }
 
+    public static function getEntrate($year)
+    {
+        $entrate_anno=DB::table('movimentis')
+            ->where('mov_importo','>',0)
+            ->whereYear('mov_data', '=' , $year)
+            ->sum('mov_importo');
+            //->get();
+        return $entrate_anno;
+    }
+
+    public static function getUscite($year)
+    {
+        $uscite_anno=DB::table('movimentis')
+        ->where('mov_importo','<',0)
+        ->whereYear('mov_data', '=' , $year)
+        ->sum('mov_importo');
+        //->get();
+        return ($uscite_anno);
+    }
+
 }

app/Models/Rivista.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Rivista extends Model
+{
+    use HasFactory;
+}

composer.lock

@@ -501,28 +501,28 @@
         },
         {
             "name": "doctrine/inflector",
-            "version": "2.0.6",
+            "version": "2.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"
+                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
-                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
+                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^10",
+                "doctrine/coding-standard": "^11.0",
                 "phpstan/phpstan": "^1.8",
                 "phpstan/phpstan-phpunit": "^1.1",
                 "phpstan/phpstan-strict-rules": "^1.3",
                 "phpunit/phpunit": "^8.5 || ^9.5",
-                "vimeo/psalm": "^4.25"
+                "vimeo/psalm": "^4.25 || ^5.4"
             },
             "type": "library",
             "autoload": {
@@ -572,7 +572,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.6"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.8"
             },
             "funding": [
                 {
@@ -588,7 +588,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-20T09:10:12+00:00"
+            "time": "2023-06-16T13:40:37+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -10285,5 +10285,5 @@
         "php": "^7.3|^8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

database/migrations/2023_06_08_162605_columns_anagrafica.php

@@ -13,14 +13,14 @@ class ColumnsAnagrafica extends Migration
      */
     public function up()
     {
-        Schema::table('anagraficas', function (Blueprint $table) {
+        /*Schema::table('anagraficas', function (Blueprint $table) {
-            //
+         /*   //
-		$table->longText('ang_indirizzo');
+	//		$table->longText('ang_indirizzo');
 		$table->string('ang_CAP');
 		$table->string('ang_Citta');  
 		$table->string('ang_Provincia'); 
 		$table->string('ang_telefono');
-        });
+        });*/
     }
 
     /**

database/migrations/2023_06_19_084521_create_rivistas_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateRivistasTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('rivistas', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('rivistas');
+    }
+}

database/migrations/2023_06_19_084538_create_associaziones_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAssociazionesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('associaziones', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('associaziones');
+    }
+}

database/migrations/2023_06_19_094609_create_gruppis_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGruppisTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('gruppis', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('gruppis');
+    }
+}

resources/views/components/menu.blade.php

@@ -49,7 +49,21 @@
 @endcan @can('progetti')
 <li><a href="{{ route('progetti'); }}"><i class="fa fa-list fa-fw"></i>
 		Progetti <span class="fa arrow"></span></a></li>
-@endcan @can('amministrazione')
+
+@endcan
+@can('gruppi')
+<li><a href="{{ route('gruppi'); }}"><i class="fa fa-group fa-fw"></i>
+		Gruppi <span class="fa arrow"></span></a></li>
+@endcan
+@can('rivista')
+<li><a href="{{ route('rivista'); }}"><i class="fa fa-newspaper-o fa-fw"></i>
+		Rivista <span class="fa arrow"></span></a></li>
+@endcan
+@can('associazione')
+<li><a href="{{ route('associazione'); }}"><i class="fa fa-black-tie fa-fw"></i>
+		Associazione <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>
 	<ul class="nav nav-second-level">
@@ -59,8 +73,8 @@
 		<li><a class="active" href="/admin/users/newPermission">Permessi</a></li>
 		-->
 		<li><a class="active" href="/admin/users/assignRole">Assegna Ruoli</a></li>
-		<!--  
+		<!--
-		<li><a href="/login">Login Page</a></li> 
+		<li><a href="/login">Login Page</a></li>
 		-->
 	</ul> <!-- /.nav-second-level --></li>
 @endcan

resources/views/layouts/dashboard.blade.php

@@ -9,15 +9,15 @@
 @hasanyrole('user|admin')
 <!-- WIDGET Bilancio -->
 	<div class="col-lg-4 col-md-8">
-        <div class="panel panel-primary">
+        <div class="panel panel-success">
             <div class="panel-heading">
                 <div class="row">
                            <div class="col-xs-3">
-                                       <i class="fa fa-balance-scale fa-5x"></i>
+                                       <i class="fa fa-plus-square fa-5x"></i>
                            </div>
                            <div class="col-xs-9 text-right">
-                                       <div class="huge">{{ $bilancio }}</div>
+                                       <div class="huge">{{ $entrate }}</div>
-                                       <div>Bilancio attuale anno {{ date('Y') }}</div>
+                                       <div>Entrate attuale anno {{ date('Y') }}</div>
                            </div>
                 </div>
             </div>
@@ -30,9 +30,55 @@
            </a>
      	</div>
 	</div>
+    <!-- WIDGET Bilancio -->
+	<div class="col-lg-4 col-md-8">
+        <div class="panel panel-danger">
+            <div class="panel-heading">
+                <div class="row">
+                           <div class="col-xs-3">
+                                       <i class="fa fa-minus-square fa-5x"></i>
+                           </div>
+                           <div class="col-xs-9 text-right">
+                                       <div class="huge">{{ $uscite }}</div>
+                                       <div>Uscite attuale anno {{ date('Y') }}</div>
+                           </div>
+                </div>
+            </div>
+            <a href="{{ route('budget');}}">
+                <div class="panel-footer">
+                           <span class="pull-left">Report annuo</span>
+                           <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                           <div class="clearfix"></div>
+                </div>
+           </a>
+     	</div>
+	</div>
+
 	<!-- WIDGET  -->
 	<div class="col-lg-4 col-md-8">
-        <div class="panel panel-green">
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                <div class="row">
+                   <div class="col-xs-3">
+                               <i class="fa fa-balance-scale fa-5x"></i>
+                   </div>
+                   <div class="col-xs-9 text-right">
+                       <div class="huge">{{ $entrate + $uscite }}</div>
+                       <div>Saldo attuale nell'anno</div>
+                   </div>
+                </div>
+            </div>
+            <a href="{{ route('budget'); }}">
+                <div class="panel-footer">
+                   <span class="pull-left">Report annuo</span>
+                   <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
+                   <div class="clearfix"></div>
+                </div>
+           </a>
+     	</div>
+	</div>
+    <div class="col-lg-4 col-md-8">
+        <div class="panel panel-yellow">
             <div class="panel-heading">
                 <div class="row">
                    <div class="col-xs-3">
@@ -52,11 +98,11 @@
                 </div>
            </a>
      	</div>
-	</div>	
+	</div>
 	@endhasanyrole
 </div>
 @endsection
 
 @section('script')
 <script src="/js/app/dashboard.js"></script>
-@endsection
+@endsection

resources/views/users/assignperm.blade.php

@@ -0,0 +1,47 @@
+@extends('admin')
+@section('content')
+<div class="row">
+	<div class="col-lg-12">
+		<h1 class="page-header">Assegnazione permessi</h1>
+	</div>
+</div>
+<div class="container">
+    <div class="row">
+         <div class="col-lg-12">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    Nuova assegnazione permessi
+                </div>
+                <div class="panel-body">
+                    <!-- Form -->
+                    <form action="" method="POST">
+                        <select name="user" class="form-control">
+                            @foreach($users as $user)
+                            <option value="{{$user->id}}"> {{$user->name}}</option>
+                            @endforeach
+                        </select>
+                        <table>
+                            <tr>
+                                <th>Permesso</th>
+                                <th>Azione</th>
+                            </tr>
+                        @foreach($permissions as $perm)
+                            <tr>
+                                <td>{{$perm->name}}</td>
+                                <td>
+                                    Attiva<input type="radio" name="permesso['{{$perm->name}}']" value="true">
+                                    &nbsp;
+                                    Disattiva <input type="radio" name="permesso['{{$perm->name}}']" value="false">
+                                </td>
+                            </tr>
+                        @endforeach
+                        </table>
+                        @csrf
+                        <input type="Submit" name="submit" value="associa">
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection

routes/admin.php

@@ -128,6 +128,8 @@ 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']);
 });
 // PROGETTI
 Route::group(['middleware'=>['permission:progetti']], function(){
@@ -142,7 +144,27 @@ Route::group(['middleware'=>['permission:progetti']], function(){
     Route::post('progetti/rigaupdate', [RigaProgettoController::class, 'updateRiga']);
     Route::get('progetti/coordinatori', [ProgettiController::class, 'getCoordinatori']);
 });
-
+/// 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']);
+});
+/// 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');
+});
 
 /// TEST ROUTES
     Route::get('test/fullcalendar', [FullCalenderController::class, 'index']);