From 8f55a70053ad2787d4d1bebf6b8c6a8338fb59b4 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Sat, 5 Mar 2022 10:03:20 +0100 Subject: [PATCH] pulizia e definizione dei report in base al mese corrente --- app/Http/Controllers/CategorieController.php | 4 +- .../Controllers/ContatoreGasController.php | 4 +- app/Http/Controllers/MovimentiController.php | 47 ++++-- composer.json | 135 +++++++++--------- composer.lock | 30 ++-- config/services.php | 3 + resources/views/components/widget.blade.php | 100 +++++++++++++ resources/views/layouts/app.blade.php | 4 +- 8 files changed, 223 insertions(+), 104 deletions(-) create mode 100644 resources/views/components/widget.blade.php diff --git a/app/Http/Controllers/CategorieController.php b/app/Http/Controllers/CategorieController.php index dd8a42a..6cf8e8b 100644 --- a/app/Http/Controllers/CategorieController.php +++ b/app/Http/Controllers/CategorieController.php @@ -26,9 +26,7 @@ class CategorieController extends Controller DB::table('categories') ->where('id','=', $request['id']) ->delete(); - - return redirect(route('categorie')); - + return redirect(route('categorie')); } public function apiList() diff --git a/app/Http/Controllers/ContatoreGasController.php b/app/Http/Controllers/ContatoreGasController.php index f7f435b..a9dc9b2 100644 --- a/app/Http/Controllers/ContatoreGasController.php +++ b/app/Http/Controllers/ContatoreGasController.php @@ -18,7 +18,9 @@ class ContatoreGasController extends Controller 'gas_date'=> $request['gas_date'], 'gas_lettura'=> $request['gas_lettura'], ]); - $letture=DB::table('contatore_gases')->orderBy('gas_date','desc')->get(); + $letture=DB::table('contatore_gases') + ->orderBy('gas_date','asc') + ->get(); return view('components.chartGas',['lettureGas'=>$letture]); } } diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index 5e00de2..63eb61b 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -122,27 +122,47 @@ class MovimentiController extends Controller // return dd($movimenti); } - public function resocontoMovimenti() + public function resocontoMovimenti(Request $request) { // SELECT Sum(movimentis.mov_importo) as resoconto, categories.cat_name FROM movimentis JOIN categories ON movimentis.mov_fk_categoria = categories.id GROUP BY categories.id; + // aggiunto per definizione del periodo di resoconto. + if(!$request['Year']) + { + $year=date('Y'); + } + else { + $year=$request['Year']; + } + + if (!$request['Month']) + { + $month=date('m'); + } + else { + $month=$request['Month']; + } + $reportSpesa = DB::table('movimentis') ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name') ->join('categories','movimentis.mov_fk_categoria','=','categories.id') ->where('mov_importo','<',0) - ->whereYear('mov_data',date('Y')) + ->whereYear('mov_data',$year) + ->whereMonth('mov_data',$month) ->groupBy('cat_name') ->get(); - $reportEntrate = DB::table('movimentis') + + $reportEntrate = DB::table('movimentis') ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name') ->join('categories','movimentis.mov_fk_categoria','=','categories.id') ->where('mov_importo','>',0) ->whereYear('mov_data',date('Y')) + ->whereMonth('mov_data',date('m')) ->groupBy('cat_name') ->get(); + return view('components.charts',[ 'dataSpesa'=>$reportSpesa, - 'dataEntrate'=>$reportEntrate, - + 'dataEntrate'=>$reportEntrate, ]); } @@ -150,16 +170,16 @@ class MovimentiController extends Controller { $id=$request['id']; $mov=DB::table('movimentis') - ->join('categories','movimentis.mov_fk_categoria','=','categories.id') - ->join('tags','movimentis.mov_fk_tags','=','tags.id') - ->where('movimentis.id','=',$id) - ->get(); + ->join('categories','movimentis.mov_fk_categoria','=','categories.id') + ->join('tags','movimentis.mov_fk_tags','=','tags.id') + ->where('movimentis.id','=',$id) + ->get(); $categorie=DB::table('categories') - ->orderBy('cat_name') - ->get(); + ->orderBy('cat_name') + ->get(); $tags=DB::table('tags') - ->orderBy('tag_name') - ->get(); + ->orderBy('tag_name') + ->get(); return view('conti.movimenti.update', [ 'categorie'=> $categorie, @@ -179,7 +199,6 @@ class MovimentiController extends Controller 'mov_importo'=>$request['mov_importo'], 'mov_fk_tags'=>$request['mov_fk_tags'], 'mov_inserito_da'=>$request['userid'], - ]); return redirect(route('movimenti')); } diff --git a/composer.json b/composer.json index 06782db..fd94414 100644 --- a/composer.json +++ b/composer.json @@ -1,72 +1,67 @@ { - "name": "laravel/laravel", - "type": "project", - "description": "The Laravel Framework.", - "keywords": ["framework", "laravel"], - "license": "MIT", - "require": { - "php": "^7.3|^8.0", - "barryvdh/laravel-dompdf": "^1.0", - "consoletvs/charts": "7.*", - "directorytree/ldaprecord": "^2.9", - "fruitcake/laravel-cors": "^2.0", - "guzzlehttp/guzzle": "^7.0.1", - "laravel-notification-channels/telegram": "^1.0", - "laravel/framework": "^8.75", - "laravel/sanctum": "^2.11", - "laravel/tinker": "^2.5", - "laravel/ui": "^3.4", - "laraveldaily/laravel-charts": "^0.1.29", - "rap2hpoutre/fast-excel": "^3.2", - "secondtruth/startmin": "^1.1", - "snapappointments/bootstrap-select": "^1.13", - "webklex/laravel-imap": "^2.4" - }, - "require-dev": { - "facade/ignition": "^2.5", - "fakerphp/faker": "^1.9.1", - "laravel/sail": "^1.0.1", - "mockery/mockery": "^1.4.4", - "nunomaduro/collision": "^5.10", - "phpunit/phpunit": "^9.5.10" - }, - "autoload": { - "psr-4": { - "App\\": "app/", - "Database\\Factories\\": "database/factories/", - "Database\\Seeders\\": "database/seeders/" - } - }, - "autoload-dev": { - "psr-4": { - "Tests\\": "tests/" - } - }, - "scripts": { - "post-autoload-dump": [ - "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", - "@php artisan package:discover --ansi" - ], - "post-update-cmd": [ - "@php artisan vendor:publish --tag=laravel-assets --ansi --force" - ], - "post-root-package-install": [ - "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" - ], - "post-create-project-cmd": [ - "@php artisan key:generate --ansi" - ] - }, - "extra": { - "laravel": { - "dont-discover": [] - } - }, - "config": { - "optimize-autoloader": true, - "preferred-install": "dist", - "sort-packages": true - }, - "minimum-stability": "dev", - "prefer-stable": true + "name" : "laravel/laravel", + "type" : "project", + "description" : "The Laravel Framework.", + "keywords" : [ + "framework", + "laravel" + ], + "license" : "MIT", + "require" : { + "php": "^7.3|^8.0", + "barryvdh/laravel-dompdf": "^1.0", + "consoletvs/charts": "7.*", + "directorytree/ldaprecord": "^2.9", + "fruitcake/laravel-cors": "^2.0", + "guzzlehttp/guzzle": "^7.0.1", + "laravel-notification-channels/telegram": "^2.0", + "laravel/framework": "^8.75", + "laravel/sanctum": "^2.11", + "laravel/tinker": "^2.5", + "laravel/ui": "^3.4", + "laraveldaily/laravel-charts": "^0.1.29", + "rap2hpoutre/fast-excel": "^3.2", + "secondtruth/startmin": "^1.1", + "snapappointments/bootstrap-select": "^1.13", + "webklex/laravel-imap": "^2.4" + }, + "require-dev" : { + "facade/ignition" : "^2.5", + "fakerphp/faker" : "^1.9.1", + "laravel/sail" : "^1.0.1", + "mockery/mockery" : "^1.4.4", + "nunomaduro/collision" : "^5.10", + "phpunit/phpunit" : "^9.5.10" + }, + "autoload" : { + "psr-4" : { + "App\\" : "app/", + "Database\\Factories\\" : "database/factories/", + "Database\\Seeders\\" : "database/seeders/" + } + }, + "autoload-dev" : { + "psr-4" : { + "Tests\\" : "tests/" + } + }, + "scripts" : { + "post-autoload-dump" : [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", + "@php artisan package:discover --ansi" + ], + "post-update-cmd" : "@php artisan vendor:publish --tag=laravel-assets --ansi --force", + "post-root-package-install" : "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"", + "post-create-project-cmd" : "@php artisan key:generate --ansi" + }, + "extra" : { + "laravel" : {} + }, + "config" : { + "optimize-autoloader" : true, + "preferred-install" : "dist", + "sort-packages" : true + }, + "minimum-stability" : "dev", + "prefer-stable" : true } diff --git a/composer.lock b/composer.lock index 68244e5..8bbb101 100644 --- a/composer.lock +++ b/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": "a669213562786481db52e95cf7c82be2", + "content-hash": "a4647119c1cdf9d566876ae0272f6a00", "packages": [ { "name": "barryvdh/laravel-dompdf", @@ -1362,29 +1362,29 @@ }, { "name": "laravel-notification-channels/telegram", - "version": "1.0.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/laravel-notification-channels/telegram.git", - "reference": "bc578efbd9cc08ec24830b64b8011992dfabb073" + "reference": "63f6727c3f9953e11ee9a690c29ce0db456d69a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel-notification-channels/telegram/zipball/bc578efbd9cc08ec24830b64b8011992dfabb073", - "reference": "bc578efbd9cc08ec24830b64b8011992dfabb073", + "url": "https://api.github.com/repos/laravel-notification-channels/telegram/zipball/63f6727c3f9953e11ee9a690c29ce0db456d69a1", + "reference": "63f6727c3f9953e11ee9a690c29ce0db456d69a1", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/guzzle": "^6.2 || ^7.0", - "illuminate/contracts": "^5.5 || ^6.0 || ^7.0 || ^8.0", - "illuminate/notifications": "^5.5 || ^6.0 || ^7.0 || ^8.0", - "illuminate/support": "^5.5 || ^6.0 || ^7.0 || ^8.0", - "php": "^7.2 || ^8.0" + "guzzlehttp/guzzle": "^7.0", + "illuminate/contracts": "8.45 - 9", + "illuminate/notifications": "8.45 - 9", + "illuminate/support": "8.45 - 9", + "php": "^7.4 || ^8.0" }, "require-dev": { - "mockery/mockery": "^1.3", - "phpunit/phpunit": "^7.0 || ^8.5.21 || ^9.0" + "mockery/mockery": "^1.4", + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { @@ -1406,7 +1406,7 @@ "authors": [ { "name": "Irfaq Syed", - "email": "syed@lukonet.com", + "email": "github@lukonet.net", "homepage": "https://lukonet.com", "role": "Developer" } @@ -1422,9 +1422,9 @@ ], "support": { "issues": "https://github.com/laravel-notification-channels/telegram/issues", - "source": "https://github.com/laravel-notification-channels/telegram/tree/1.0.0" + "source": "https://github.com/laravel-notification-channels/telegram/tree/2.0.0" }, - "time": "2021-12-10T22:33:41+00:00" + "time": "2022-02-10T19:29:50+00:00" }, { "name": "laravel/framework", diff --git a/config/services.php b/config/services.php index 2a1d616..16c4998 100644 --- a/config/services.php +++ b/config/services.php @@ -30,4 +30,7 @@ return [ 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], + 'telegram-bot-api' => [ + 'token' => env('TELEGRAM_BOT_TOKEN', 'YOUR BOT TOKEN HERE') + ], ]; diff --git a/resources/views/components/widget.blade.php b/resources/views/components/widget.blade.php new file mode 100644 index 0000000..efc1a57 --- /dev/null +++ b/resources/views/components/widget.blade.php @@ -0,0 +1,100 @@ +@extends('app') +@section('widget') +
+ +
+
+
+
+
+ +
+
+
{{ $summary->uscite }}
+
Uscite
+
+
+
+ +
+ View Details + + +
+
+ +
+
+ +
+
+
+
+
+ +
+
+
{{ $summary->entrate }}
+
Entrate
+
+
+
+ +
+ View Details + + +
+
+ +
+
+ +
+
+
+
+
+ +
+
+
{{ $summary->entrate - $summary->uscite }}
+
Bilancio
+
+
+
+ +
+ View Details + + +
+
+ +
+
+
+
+
+
+
+ +
+
+
13
+
Support Tickets!
+
+
+
+ +
+ View Details + + +
+
+ +
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 9961df7..52b144d 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -24,7 +24,7 @@
+ @section('widget') + @show @yield('content')