From b5f6ad523e77cde586c8612742d429e951bd5e6f Mon Sep 17 00:00:00 2001 From: Lukas Halbritter Date: Sun, 27 Jan 2019 10:24:21 +0100 Subject: [PATCH] Added routes for reports. Added project reports. --- app/Http/Controllers/ReportsController.php | 76 ++++++++++++++++++ resources/views/projects/.index.blade.php.swo | Bin 0 -> 24576 bytes resources/views/projects/index.blade.php | 69 ++++++++++++++-- resources/views/reports/project.blade.php | 58 +++++++++++++ routes/web.php | 9 +++ 5 files changed, 206 insertions(+), 6 deletions(-) create mode 100644 app/Http/Controllers/ReportsController.php create mode 100644 resources/views/projects/.index.blade.php.swo create mode 100644 resources/views/reports/project.blade.php diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php new file mode 100644 index 0000000..c4285ed --- /dev/null +++ b/app/Http/Controllers/ReportsController.php @@ -0,0 +1,76 @@ +id; + + $projectBookings = + SubBooking::select('id', 'account_type_id', 'reference', 'amount', + 'booking_id') + ->whereHas('project', function($query) use ($id) { + return $query->whereId($id); + }) + ->with('accountType:id,name,account_class_id', + 'accountType.accountClass:id,io_type_id,name,scope_id', + 'accountType.accountClass.scope:id,name', + 'accountType.accountClass.ioType:id,name,factor', + 'booking:id,date,person_or_company') + ->get() + ->sortBy('booking.date'); + + $incomes = $projectBookings + ->where('accountType.accountClass.ioType.factor', '>', 0) + ->sum('amount'); + + $expeditures = $projectBookings + ->where('accountType.accountClass.ioType.factor', '<', 0) + ->sum('amount'); + + return view('reports.project', compact('project', 'projectBookings', + 'incomes', 'expeditures')); + } + + /** + * Display the monthly balances during a year. + * + * @return \Illuminate\Http\Response + */ + public function balances($year) + { + // + } + + /** + * Display the bookings sorted by scopes. + * + * @return \Illuminate\Http\Response + */ + public function scopes($type, $year) + { + // + } + + /** + * Display a list of all open targets. + * + * @return \Illuminate\Http\Response + */ + public function targets() + { + // + } +} diff --git a/resources/views/projects/.index.blade.php.swo b/resources/views/projects/.index.blade.php.swo new file mode 100644 index 0000000000000000000000000000000000000000..daea056a4c24838189a2d26f4d5976359f77a66b GIT binary patch literal 24576 zcmeI4TWl0n7{?FFMQ(~B2?>!5D`s18yKTXMvfUJd7g9lk5lsMfcII?vWOinmIom?8 z5<~QXXeCCYM$~BZq4J`^5R8g37>qoKFT_MK=z}CAnh-GXV!;2|oy&H2cH1HsgWn{- zot-&n&gI{oZ_YX2H_f%LTeVtQ(zcjko59%j(&`Ow&C9Z$nT#2#l{4k}5w-_pKCj4K z-aO;8fD|AFNP)|sfT}arJ%zDTK>GiK`TvQV82cT33l4$3 z;7xEJ$bfc`26Mpq8yPzec7s9i9LR$n&;e$G3E=E>#y$g^!Be0UoSw$mr{FcP99)>n z*!SRFV1wmgDv<5_100^r*gh}>c7prCGSCiYgY!2qb^;s*2f!!50FQxIaB>o3d%%le zDL8-yiDlp`EMR;92EjAH0PDd$;2ah|PJ&}#9~cA%$bxn-5B!7$j_<(B;304`IE_V> zcffq`9u`!70T;lTU~#3%-&1M6WmLs*d2d$|Q4>YSMUX@oEwOEzGT%Q)Wldcf7)UCb zrFvdhA}4GGr219YHtl>On=yl=Ue!~2)s$wau1Hy?&5@WkftqFUO^KS&r0O)+O;K0B zSJDvX;l-Mz~Q^y3us5YDU;@FO}^#5UkUZ4BDT(Q%Pp?!PTk`;zU&)@)wd3M$lBvu@c$kn}q4u+?JO{t%=KdFXDSf&b5N)O?woj zt$`}TORJItjSRby5o*rj!B44jQ2tDL!ZnLrS1Lz2$JHTMaA-Jv-1UDb8Dmj)9e4Ap zo#!@J9+nYHn*^%I`Lc3oh^!>)e>XJu{~+ZIQV+QyV~w8v*(%M;8U2q;8n;1IY;_U} z3#~)5TT|y27rgG~)MaPT!8+R@T-7s1xH+rqCd+h zJGjXkS|6DfXK&>Bcnc#_YHdnrQIHrmWn?TyYK{<2A z@&&@l=VcwjaV%jLn`EyU00slF2IY_L`B5I)#g_1Y8=_r|Aq@ZY;g{H9S+=W*9h8?g z8Qu*ysF|oFR;jbbjMf`coM~c8E2(kDw2~5UPAh4(234L7$3K_BsA4c$;uc1GF+((? zGuyq@ZW|3l z@0c-`QxbBHl?v{|>>6I;UeLJE8fC0-erBtEDHxFgj7Zcjuav|2ayGWAr{|%VK?*elEANc3x-2Vvp5)6UeK<2p>&_)W70;B*b zKnjooqyQ;E3XlS%04YEUTnh@+&+)IE6X#0TE$9C`;p5&ZC;piK2l4%%W1hbgtOpC^ zoF9AxAN~;F;4Ux`9EA`6BjAC@K^I7ZSzsLa3qJj$;1%!!*akGP3Uq*3U^4g{KK{Mn zeIUSMa2EdlAHfc=9LxZ}!N>nG*a239PVguE`d@&Tzy{C>&ce6{wL z4}t8jhkkDaJzxn~049S&@aOLbd%*KxBUl2agA4HMp8`YR4e$h*3x0)<|7%bH(!XD9 z;N!2Xyw!e2D@WusyT+YnfsdTr`Q*-z%mBIb(~%g}-@>)<>XXs;I?r5HkOGUc)qL|^ za}OTe=V``&$}#5$Uo>cX^q3e$Tt}la8b@?VmFfhojRIISEW&i(N%$H@%yqy0p^cQgA{Qujq2C&p$54a8cbC~}h0dh@X zJJ<|zU=El9e!%>H7g!4xf#aCxzYQ$V1*U=HnCB0HL9hzU1}8Dk-wy`CTCfD1!94#U zcok@1DHsQ2yEP!=`e`EtNC8rS6d(miff@yr*llcc-{4)DvAstYTXEGpDx;ZoUtG;2 zy}>rd!6S{vX*AyGhuCO-GVJ|@k>1m6RLB^Ar?j?2YfFLAm2bDw3#8>2Qk%Sw5J*(c NcctG=xT-IZ{sSm2lB@s# literal 0 HcmV?d00001 diff --git a/resources/views/projects/index.blade.php b/resources/views/projects/index.blade.php index fdd1970..335ef0d 100644 --- a/resources/views/projects/index.blade.php +++ b/resources/views/projects/index.blade.php @@ -28,8 +28,27 @@ {{ formatDate($project->end_date) }}
- - + + + + + + + + +
@@ -52,8 +71,27 @@ {{ formatDate($project->end_date) }}
- - + + + + + + + + +
@@ -76,8 +114,27 @@ {{ formatDate($project->end_date) }}
- - + + + + + + + + +
diff --git a/resources/views/reports/project.blade.php b/resources/views/reports/project.blade.php new file mode 100644 index 0000000..de65d4e --- /dev/null +++ b/resources/views/reports/project.blade.php @@ -0,0 +1,58 @@ +@extends('layout.master') + +@section('title', 'Projektbericht ' . $project->name) + +@section('subnav') + Zurück +@endsection + +@section('content') +

@yield('title')

+ + + + + + + + + @foreach($projectBookings as $subBooking) + + + + + + + + @endforeach + + + + + + + + + + + + + + +
DatumBuchungstextPerson / FirmaAusgang (S)Eingang (H)
{{ formatDate($subBooking->date()) }}{{ $subBooking->reference }}{{ $subBooking->personOrCompany() }} + @if($subBooking->ioType()->factor < 0) + {!! formatAmount($subBooking->signedAmount()) !!} + @endif + + @if($subBooking->ioType()->factor > 0) + {!! formatAmount($subBooking->signedAmount()) !!} + @endif +
Abschluss + {!! formatAmount(- $expeditures) !!} + + {!! formatAmount($incomes) !!} +
Saldo + {!! formatAmount($incomes - $expeditures) !!} + +
+@endsection diff --git a/routes/web.php b/routes/web.php index 5e887a2..bf95fec 100644 --- a/routes/web.php +++ b/routes/web.php @@ -29,6 +29,7 @@ Route::middleware(['auth'])->group(function() { /************************************************************************** * BOOKINGS * **************************************************************************/ + Route::get('/bookings', function() { return redirect('bookings/year-' . date('Y')); }); Route::get('/bookings/year-{year}', 'BookingsController@index'); Route::post('/bookings', 'BookingsController@store'); @@ -64,6 +65,14 @@ Route::middleware(['auth'])->group(function() { Route::get('/targets/{personTarget}/edit', 'PersonTargetsController@edit'); Route::get('/targets/{personTarget}/delete', 'PersonTargetsController@delete'); + + /************************************************************************** + * REPORTS * + **************************************************************************/ + Route::get('/reports/projects/{project}', 'ReportsController@project'); + Route::get('/reports/balances/{year}', 'ReportsController@balances'); + Route::get('/reports/scopes/{type}/{year}', 'ReportsController@scopes'); + Route::get('/reports/targets/', 'ReportsController@targets'); }); // Authentication Routes...