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

Merge branch 'master' of https://bitbucket.org/FlavioBarachino/bubofamily

Browse Source
This commit is contained in:
Amministratore 2023-04-14 11:33:52 +00:00
commit bebac2cd6d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/MovimentiController.php
View File

@ -146,7 +146,15 @@ class MovimentiController extends Controller
public function listMovPerCateg(Request $request) public function listMovPerCateg(Request $request)
{ {
$mov=Movimenti::listByCatMonth($request['month'], $request['cat']); if($request['year'])
{
$anno=$request['year'];
}
else
{
$anno=date('Y');
}
$mov=Movimenti::listByCatMonth($request['month'], $request['cat'],$anno);
return view('conti.movimenti.list', return view('conti.movimenti.list',
[ [
'movimenti'=> $mov, 'movimenti'=> $mov,

3
app/Models/Movimenti.php
View File

@ -108,12 +108,13 @@ class Movimenti extends Model
->delete(); ->delete();
} }
public static function listByCatMonth($month,$cat) { public static function listByCatMonth($month,$cat,$year) {
return DB::table('movimentis') return DB::table('movimentis')
->join('categories','movimentis.mov_fk_categoria','=','categories.id') ->join('categories','movimentis.mov_fk_categoria','=','categories.id')
->join('tags','movimentis.mov_fk_tags','=','tags.id') ->join('tags','movimentis.mov_fk_tags','=','tags.id')
->where('movimentis.mov_fk_categoria','=',$cat) ->where('movimentis.mov_fk_categoria','=',$cat)
->whereMonth('mov_data','=',$month) ->whereMonth('mov_data','=',$month)
->whereYear('mov_data', '=' , $year)
->leftJoin('documentis', 'movimenti_id','=','movimentis.id') ->leftJoin('documentis', 'movimenti_id','=','movimentis.id')
->select('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name', DB::raw('Count(movimenti_id) as quanti')) ->select('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name', DB::raw('Count(movimenti_id) as quanti'))
->groupBy('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name') ->groupBy('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name')