fbarachino/bubofamily
1
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Compare commits

base: fbarachino:0.1.1.a
Branches Tags
fbarachino:master fbarachino:devel fbarachino:user_role
fbarachino:0.1.1.a fbarachino:v0.1.0-alpha
..
compare: fbarachino:8ff62254bfdb5a97bef72c4374eab7123f590986
Branches Tags
fbarachino:master fbarachino:devel fbarachino:user_role
fbarachino:0.1.1.a fbarachino:v0.1.0-alpha

2 Commits
0.1.1.a ... 8ff62254bf

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
2 changed files with 3 additions and 3 deletions
Expand all files Collapse all files

2
resources/views/conti/report/catanno.blade.php
View File

@@ -54,7 +54,7 @@
{ {
@endphp @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 @php
$index++; $index++;
} }

4
resources/views/conti/report/list.blade.php
View File

@@ -25,7 +25,7 @@
<tbody> <tbody>
@foreach( $dataSpesa as $dato ) @foreach( $dataSpesa as $dato )
<tr> <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> <td>{{ $dato->resoconto; }}</td>
</tr> </tr>
@@ -55,7 +55,7 @@
<tbody> <tbody>
@foreach( $dataEntrate as $dato ) @foreach( $dataEntrate as $dato )
<tr> <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> <td>{{ $dato->resoconto; }}</td>
</tr> </tr>