corretto resoconto movimenti per le categorie solo per il periodo dell'anno in corso

Issue #9 - corretto passaggio parametri
Merge branch 'devel'
2023-07-28 11:25:16 +02:00 · 2023-07-28 11:09:52 +02:00 · 2023-07-28 10:29:56 +02:00 · 2023-07-19 11:14:30 +02:00 · 2023-07-14 16:19:40 +02:00
4 changed files with 74 additions and 73 deletions
--- a/composer.lock
+++ b/composer.lock
@ -2405,16 +2405,16 @@
        },
        {
            "name": "maennchen/zipstream-php",
-            "version": "3.0.2",
+            "version": "3.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/maennchen/ZipStream-PHP.git",
-                "reference": "b46726e666b5d2ad32959ae9492ee1034e798162"
+                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b46726e666b5d2ad32959ae9492ee1034e798162",
-                "reference": "b46726e666b5d2ad32959ae9492ee1034e798162",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
+                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
                "shasum": ""
            },
            "require": {
@ -2470,7 +2470,7 @@
            ],
            "support": {
                "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
-                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.0.2"
+                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.0"
            },
            "funding": [
                {
@ -2482,7 +2482,7 @@
                    "type": "open_collective"
                }
            ],
-            "time": "2023-04-19T19:51:03+00:00"
+            "time": "2023-06-21T14:59:35+00:00"
        },
        {
            "name": "markbaker/complex",
@ -2762,16 +2762,16 @@
        },
        {
            "name": "nesbot/carbon",
-            "version": "2.67.0",
+            "version": "2.68.1",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8"
+                "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/c1001b3bc75039b07f38a79db5237c4c529e04c8",
-                "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4f991ed2a403c85efbc4f23eb4030063fdbe01da",
+                "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da",
                "shasum": ""
            },
            "require": {
@ -2860,7 +2860,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-25T22:09:47+00:00"
+            "time": "2023-06-20T18:29:04+00:00"
        },
        {
            "name": "nette/schema",
@ -3013,16 +3013,16 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v4.15.5",
+            "version": "v4.16.0",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e"
+                "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
+                "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
                "shasum": ""
            },
            "require": {
@ -3063,9 +3063,9 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
            },
-            "time": "2023-05-19T20:20:00+00:00"
+            "time": "2023-06-25T14:52:30+00:00"
        },
        {
            "name": "opis/closure",
@ -4828,16 +4828,16 @@
        },
        {
            "name": "spatie/db-dumper",
-            "version": "3.3.1",
+            "version": "3.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/db-dumper.git",
-                "reference": "3b9fd47899bf6a59d3452392121c9ce675d55d34"
+                "reference": "bbd5ae0f331d47e6534eb307e256c11a65c8e24a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/db-dumper/zipball/3b9fd47899bf6a59d3452392121c9ce675d55d34",
-                "reference": "3b9fd47899bf6a59d3452392121c9ce675d55d34",
+                "url": "https://api.github.com/repos/spatie/db-dumper/zipball/bbd5ae0f331d47e6534eb307e256c11a65c8e24a",
+                "reference": "bbd5ae0f331d47e6534eb307e256c11a65c8e24a",
                "shasum": ""
            },
            "require": {
@ -4875,7 +4875,7 @@
                "spatie"
            ],
            "support": {
-                "source": "https://github.com/spatie/db-dumper/tree/3.3.1"
+                "source": "https://github.com/spatie/db-dumper/tree/3.4.0"
            },
            "funding": [
                {
@ -4887,7 +4887,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-05-02T11:05:31+00:00"
+            "time": "2023-06-27T08:34:52+00:00"
        },
        {
            "name": "spatie/laravel-backup",
@ -5044,16 +5044,16 @@
        },
        {
            "name": "spatie/laravel-permission",
-            "version": "5.10.1",
+            "version": "5.10.2",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/laravel-permission.git",
-                "reference": "d08b3ffc5870cce4a47a39f22174947b33c191ae"
+                "reference": "671e46e079cbd4990a98427daaa09f4977b57ca9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/d08b3ffc5870cce4a47a39f22174947b33c191ae",
-                "reference": "d08b3ffc5870cce4a47a39f22174947b33c191ae",
+                "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/671e46e079cbd4990a98427daaa09f4977b57ca9",
+                "reference": "671e46e079cbd4990a98427daaa09f4977b57ca9",
                "shasum": ""
            },
            "require": {
@ -5114,7 +5114,7 @@
            ],
            "support": {
                "issues": "https://github.com/spatie/laravel-permission/issues",
-                "source": "https://github.com/spatie/laravel-permission/tree/5.10.1"
+                "source": "https://github.com/spatie/laravel-permission/tree/5.10.2"
            },
            "funding": [
                {
@ -5122,7 +5122,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-04-12T17:08:32+00:00"
+            "time": "2023-07-04T13:38:13+00:00"
        },
        {
            "name": "spatie/laravel-signal-aware-command",
@ -5927,16 +5927,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v5.4.24",
+            "version": "v5.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "3c59f97f6249ce552a44f01b93bfcbd786a954f5"
+                "reference": "f66be2706075c5f6325d2fe2b743a57fb5d23f6b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3c59f97f6249ce552a44f01b93bfcbd786a954f5",
-                "reference": "3c59f97f6249ce552a44f01b93bfcbd786a954f5",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f66be2706075c5f6325d2fe2b743a57fb5d23f6b",
+                "reference": "f66be2706075c5f6325d2fe2b743a57fb5d23f6b",
                "shasum": ""
            },
            "require": {
@ -5983,7 +5983,7 @@
            "description": "Defines an object-oriented layer for the HTTP specification",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v5.4.24"
+                "source": "https://github.com/symfony/http-foundation/tree/v5.4.25"
            },
            "funding": [
                {
@ -5999,20 +5999,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-19T07:21:23+00:00"
+            "time": "2023-06-22T08:06:06+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v5.4.24",
+            "version": "v5.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "f38b722e1557eb3f487d351b48f5a1279b50e9d1"
+                "reference": "f6c92fe64bbdad7616cb90663c24f6350f3ca464"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f38b722e1557eb3f487d351b48f5a1279b50e9d1",
-                "reference": "f38b722e1557eb3f487d351b48f5a1279b50e9d1",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6c92fe64bbdad7616cb90663c24f6350f3ca464",
+                "reference": "f6c92fe64bbdad7616cb90663c24f6350f3ca464",
                "shasum": ""
            },
            "require": {
@ -6095,7 +6095,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.4.24"
+                "source": "https://github.com/symfony/http-kernel/tree/v5.4.25"
            },
            "funding": [
                {
@ -6111,7 +6111,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-27T08:06:30+00:00"
+            "time": "2023-06-26T05:58:08+00:00"
        },
        {
            "name": "symfony/mime",
@ -6999,16 +6999,16 @@
        },
        {
            "name": "symfony/routing",
-            "version": "v5.4.22",
+            "version": "v5.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/routing.git",
-                "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d"
+                "reference": "56bfc1394f7011303eb2e22724f9b422d3f14649"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/c2ac11eb34947999b7c38fb4c835a57306907e6d",
-                "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/56bfc1394f7011303eb2e22724f9b422d3f14649",
+                "reference": "56bfc1394f7011303eb2e22724f9b422d3f14649",
                "shasum": ""
            },
            "require": {
@ -7069,7 +7069,7 @@
                "url"
            ],
            "support": {
-                "source": "https://github.com/symfony/routing/tree/v5.4.22"
+                "source": "https://github.com/symfony/routing/tree/v5.4.25"
            },
            "funding": [
                {
@ -7085,7 +7085,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-03-14T14:59:20+00:00"
+            "time": "2023-06-05T14:18:47+00:00"
        },
        {
            "name": "symfony/service-contracts",
@ -7430,16 +7430,16 @@
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v5.4.24",
+            "version": "v5.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3"
+                "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8e12706bf9c68a2da633f23bfdc15b4dce5970b3",
-                "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82269f73c0f0f9859ab9b6900eebacbe54954ede",
+                "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede",
                "shasum": ""
            },
            "require": {
@ -7498,7 +7498,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.4.24"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.4.25"
            },
            "funding": [
                {
@ -7514,7 +7514,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-25T13:05:00+00:00"
+            "time": "2023-06-20T20:56:26+00:00"
        },
        {
            "name": "tightenco/collect",
@ -8312,16 +8312,16 @@
        },
        {
            "name": "filp/whoops",
-            "version": "2.15.2",
+            "version": "2.15.3",
            "source": {
                "type": "git",
                "url": "https://github.com/filp/whoops.git",
-                "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73"
+                "reference": "c83e88a30524f9360b11f585f71e6b17313b7187"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/aac9304c5ed61bf7b1b7a6064bf9806ab842ce73",
-                "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/c83e88a30524f9360b11f585f71e6b17313b7187",
+                "reference": "c83e88a30524f9360b11f585f71e6b17313b7187",
                "shasum": ""
            },
            "require": {
@ -8371,7 +8371,7 @@
            ],
            "support": {
                "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.15.2"
+                "source": "https://github.com/filp/whoops/tree/2.15.3"
            },
            "funding": [
                {
@ -8379,7 +8379,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-04-12T12:00:00+00:00"
+            "time": "2023-07-13T12:00:00+00:00"
        },
        {
            "name": "hamcrest/hamcrest-php",
@ -8434,16 +8434,16 @@
        },
        {
            "name": "laravel/sail",
-            "version": "v1.22.0",
+            "version": "v1.23.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/sail.git",
-                "reference": "923e1e112b6a8598664dbb0ee79dd3137f1c9d56"
+                "reference": "62582606f80466aa81fba40b193b289106902853"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/923e1e112b6a8598664dbb0ee79dd3137f1c9d56",
-                "reference": "923e1e112b6a8598664dbb0ee79dd3137f1c9d56",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/62582606f80466aa81fba40b193b289106902853",
+                "reference": "62582606f80466aa81fba40b193b289106902853",
                "shasum": ""
            },
            "require": {
@ -8495,7 +8495,7 @@
                "issues": "https://github.com/laravel/sail/issues",
                "source": "https://github.com/laravel/sail"
            },
-            "time": "2023-05-04T14:52:56+00:00"
+            "time": "2023-06-28T18:31:28+00:00"
        },
        {
            "name": "mockery/mockery",
@ -9152,16 +9152,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "9.6.9",
+            "version": "9.6.10",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a9aceaf20a682aeacf28d582654a1670d8826778"
+                "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778",
-                "reference": "a9aceaf20a682aeacf28d582654a1670d8826778",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328",
+                "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328",
                "shasum": ""
            },
            "require": {
@ -9235,7 +9235,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10"
            },
            "funding": [
                {
@ -9251,7 +9251,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-06-11T06:13:56+00:00"
+            "time": "2023-07-10T04:04:23+00:00"
        },
        {
            "name": "sebastian/cli-parser",
--- a/resources/views/conti/report/catanno.blade.php
+++ b/resources/views/conti/report/catanno.blade.php
@ -54,7 +54,7 @@
            			{
            		@endphp
            		
-            		<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{$categoria->id}}&month={{$index+1}}">{{ $matrice[$cat][$index] }}</a></td>
+            		<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{$categoria->id}}&month={{$index+1}}&year={{ $anno ?? date('Y') }}">{{ $matrice[$cat][$index] }}</a></td>
            		@php
            				$index++;
            			}
--- a/resources/views/conti/report/list.blade.php
+++ b/resources/views/conti/report/list.blade.php
@ -25,7 +25,7 @@
            		<tbody>
            		@foreach( $dataSpesa as $dato )
            		<tr>
-            			<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}">{{ $dato->cat_name; }}</a> </td>
+            			<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}&year={{ date('Y') }}">{{ $dato->cat_name; }}</a> </td>
            			<td>{{ $dato->resoconto; }}</td>

            		</tr>
@ -55,7 +55,7 @@
            		<tbody>
            		@foreach( $dataEntrate as $dato )
            		<tr>
-            			<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}">{{ $dato->cat_name; }}</a> </td>
+            			<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}&year={{ date('Y')}}">{{ $dato->cat_name; }}</a> </td>
            			<td>{{ $dato->resoconto; }}</td>

            		</tr>
--- a/resources/views/tasks/list.blade.php
+++ b/resources/views/tasks/list.blade.php
@ -3,6 +3,7 @@
 <div class="row">
 	<div class="col-lg-12">
 		<h1 class="page-header">Lista Attività</h1>
+
 	</div>
 </div>
 <div class="container">
Author	SHA1	Message	Date
FlavioBarachino	8ff62254bf	corretto resoconto movimenti per le categorie solo per il periodo dell'anno in corso	2023-07-28 11:25:16 +02:00
FlavioBarachino	fc675ce07b	Issue #9 - corretto passaggio parametri	2023-07-28 11:09:52 +02:00
FlavioBarachino	9cf1f9a388	Merge branch 'devel'	2023-07-28 10:29:56 +02:00
FlavioBarachino	8381aa068d	Merge branch 'devel'	2023-07-19 11:14:30 +02:00
FlavioBarachino	350c5737b7	Task Controllers	2023-07-14 16:19:40 +02:00