diff --git a/app/Http/Controllers/CondominioController.php b/app/Http/Controllers/CondominioController.php new file mode 100644 index 0000000..66b7450 --- /dev/null +++ b/app/Http/Controllers/CondominioController.php @@ -0,0 +1,21 @@ +get(); + $pdf = PDF::setOptions(['dpi' => 150, 'defaultFont' => 'Helvetica'])->loadView('conti.categorie.list', ['categorie' => $data->toArray()]); + //return $pdf->download('invoice.pdf'); + /*$pdf = App::make('dompdf.wrapper'); + $pdf->loadHTML('

Test

');*/ + return $pdf->stream(); + } +} diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index bbba003..47a50dc 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -143,21 +143,21 @@ class MovimentiController extends Controller } $reportSpesa = DB::table('movimentis') - ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name') + ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name,categories.id') ->join('categories','movimentis.mov_fk_categoria','=','categories.id') ->where('mov_importo','<',0) ->whereYear('mov_data',$year) ->whereMonth('mov_data',$month) - ->groupBy('cat_name') + ->groupBy('cat_name','categories.id') ->get(); $reportEntrate = DB::table('movimentis') - ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name') + ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name,categories.id') ->join('categories','movimentis.mov_fk_categoria','=','categories.id') ->where('mov_importo','>',0) ->whereYear('mov_data',$year) ->whereMonth('mov_data',$month) - ->groupBy('cat_name') + ->groupBy('cat_name','categories.id') ->get(); return view('components.charts',[ @@ -212,6 +212,20 @@ class MovimentiController extends Controller } + public function listMovPerCateg(Request $request) + { + $mov=DB::table('movimentis') + ->join('categories','movimentis.mov_fk_categoria','=','categories.id') + ->join('tags','movimentis.mov_fk_tags','=','tags.id') + ->where('movimentis.mov_fk_categoria','=',$request['cat']) + ->whereMonth('mov_data','=',$request['month']) + ->get(); + return view('conti.movimenti.list', + [ + 'movimenti'=> $mov, + ]); + } + public function apiList() { diff --git a/app/Models/condominio.php b/app/Models/condominio.php new file mode 100644 index 0000000..60cb336 --- /dev/null +++ b/app/Models/condominio.php @@ -0,0 +1,11 @@ +singleton( App\Exceptions\Handler::class ); +// $app->register(\Barryvdh\DomPDF\ServiceProvider::class); +// $app->configure('dompdf'); /* |-------------------------------------------------------------------------- | Return The Application diff --git a/database/migrations/2022_03_11_123007_create_condominios_table.php b/database/migrations/2022_03_11_123007_create_condominios_table.php new file mode 100644 index 0000000..3289bd1 --- /dev/null +++ b/database/migrations/2022_03_11_123007_create_condominios_table.php @@ -0,0 +1,31 @@ +id(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('condominios'); + } +} diff --git a/resources/views/admin.blade.php b/resources/views/admin.blade.php index c709ebf..14683a2 100644 --- a/resources/views/admin.blade.php +++ b/resources/views/admin.blade.php @@ -10,16 +10,16 @@ BuBo Family - made with <3 - - + - + - + - + @@ -108,20 +108,20 @@ - + - + - + - - + + - + @section('script') @show diff --git a/resources/views/conti/report/list.blade.php b/resources/views/conti/report/list.blade.php index 45db9b8..9028c7e 100644 --- a/resources/views/conti/report/list.blade.php +++ b/resources/views/conti/report/list.blade.php @@ -25,7 +25,7 @@ @foreach( $dataSpesa as $dato ) - {{ $dato->cat_name; }} + {{ $dato->cat_name; }} {{ $dato->resoconto; }} @@ -55,7 +55,7 @@ @foreach( $dataEntrate as $dato ) - {{ $dato->cat_name; }} + {{ $dato->cat_name; }} {{ $dato->resoconto; }} diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 52b144d..a722416 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -10,14 +10,14 @@ {{ config('app.name', 'Laravel') }} - + - +
diff --git a/routes/admin.php b/routes/admin.php index 4cdab0b..7b67a92 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -2,6 +2,7 @@ use Illuminate\Support\Facades\Route; use App\Http\Controllers\CategorieController; +use App\Http\Controllers\CondominioController; use App\Http\Controllers\ContatoreEnElController; use App\Http\Controllers\ContatoreGasController; use App\Http\Controllers\MovimentiController; @@ -36,8 +37,7 @@ Route::get('/', function () { Route::post('movmodify',[MovimentiController::class,'updatePostMovimenti']); Route::get('movdelete',[MovimentiController::class,'deleteMovimenti']); - Route::get('fullcalender', [FullCalenderController::class, 'index']); - Route::post('fullcalenderAjax', [FullCalenderController::class, 'ajax']); + Route::get('categorie', [CategorieController::class,'listCategorie'])->name('categorie'); Route::post('categorie', [CategorieController::class,'insCategorie']); @@ -55,3 +55,10 @@ Route::get('/', function () { Route::get('lettureenel', [ContatoreEnElController::class,'listLettureEnel'])->name('enel'); Route::post('lettureenel', [ContatoreEnElController::class,'insLettureEnel']); + + Route::get('movimenti/report/movimenti_categoria', [MovimentiController::class,'listMovPerCateg']); + + /// TEST routes + Route::get('fullcalender', [FullCalenderController::class, 'index']); + Route::post('fullcalenderAjax', [FullCalenderController::class, 'ajax']); + Route::get('condominio',[CondominioController::class,'testPdf']);