From ea7ee7ee9a4d959a39dc05a2dfe353549a1635a0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 8 Oct 2016 16:24:07 +0200 Subject: [PATCH] Moved a report out of the controller. --- .../Controllers/Report/AccountController.php | 44 ++++++++++++++++ app/Http/Controllers/ReportController.php | 47 ++++++++---------- public/css/firefly.css | 5 ++ public/images/loading-small.gif | Bin 0 -> 24345 bytes public/js/ff/reports/default/all.js | 18 +++++++ resources/views/reports/default/month.twig | 6 ++- .../views/reports/default/multi-year.twig | 7 +-- resources/views/reports/default/year.twig | 6 ++- routes/web.php | 10 +++- 9 files changed, 109 insertions(+), 34 deletions(-) create mode 100644 app/Http/Controllers/Report/AccountController.php create mode 100644 public/images/loading-small.gif diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.php new file mode 100644 index 0000000000..e2d6f01b31 --- /dev/null +++ b/app/Http/Controllers/Report/AccountController.php @@ -0,0 +1,44 @@ +getAccountReport($start, $end, $accounts); + + return view('reports.partials.accounts', compact('accountReport')); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 225a8ee31d..8f34806a8b 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -16,7 +16,6 @@ namespace FireflyIII\Http\Controllers; use Carbon\Carbon; use FireflyIII\Crud\Account\AccountCrudInterface; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Report\AccountReportHelperInterface; use FireflyIII\Helpers\Report\BalanceReportHelperInterface; use FireflyIII\Helpers\Report\BudgetReportHelperInterface; use FireflyIII\Helpers\Report\ReportHelperInterface; @@ -24,7 +23,6 @@ use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; -use FireflyIII\Repositories\Account\AccountTaskerInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Support\Collection; @@ -41,8 +39,6 @@ use View; class ReportController extends Controller { - /** @var AccountTaskerInterface */ - protected $accountTasker; /** @var BalanceReportHelperInterface */ protected $balanceHelper; @@ -235,7 +231,6 @@ class ReportController extends Controller private function createRepositories() { $this->helper = app(ReportHelperInterface::class); - $this->accountTasker = app(AccountTaskerInterface::class); $this->budgetHelper = app(BudgetReportHelperInterface::class); $this->balanceHelper = app(BalanceReportHelperInterface::class); } @@ -254,14 +249,13 @@ class ReportController extends Controller $expenseTopLength = 8; // get report stuff! - $accountReport = $this->accountTasker->getAccountReport($start, $end, $accounts); - $incomes = $this->helper->getIncomeReport($start, $end, $accounts); - $expenses = $this->helper->getExpenseReport($start, $end, $accounts); - $budgets = $this->budgetHelper->getBudgetReport($start, $end, $accounts); - $categories = $this->helper->getCategoryReport($start, $end, $accounts); - $balance = $this->balanceHelper->getBalanceReport($start, $end, $accounts); - $bills = $this->helper->getBillReport($start, $end, $accounts); - $tags = $this->helper->tagReport($start, $end, $accounts); + $incomes = $this->helper->getIncomeReport($start, $end, $accounts); + $expenses = $this->helper->getExpenseReport($start, $end, $accounts); + $budgets = $this->budgetHelper->getBudgetReport($start, $end, $accounts); + $categories = $this->helper->getCategoryReport($start, $end, $accounts); + $balance = $this->balanceHelper->getBalanceReport($start, $end, $accounts); + $bills = $this->helper->getBillReport($start, $end, $accounts); + $tags = $this->helper->tagReport($start, $end, $accounts); // and some id's, joined: $accountIds = join(',', $accounts->pluck('id')->toArray()); @@ -271,7 +265,7 @@ class ReportController extends Controller 'reports.default.month', compact( 'start', 'end', 'reportType', - 'accountReport', 'tags', + 'tags', 'incomes', 'incomeTopLength', 'expenses', 'expenseTopLength', 'budgets', 'balance', @@ -296,12 +290,11 @@ class ReportController extends Controller $incomeTopLength = 8; $expenseTopLength = 8; // list of users stuff: - $budgets = app(BudgetRepositoryInterface::class)->getActiveBudgets(); - $categories = app(CategoryRepositoryInterface::class)->getCategories(); - $accountReport = $this->accountTasker->getAccountReport($start, $end, $accounts); - $incomes = $this->helper->getIncomeReport($start, $end, $accounts); - $expenses = $this->helper->getExpenseReport($start, $end, $accounts); - $tags = $this->helper->tagReport($start, $end, $accounts); + $budgets = app(BudgetRepositoryInterface::class)->getActiveBudgets(); + $categories = app(CategoryRepositoryInterface::class)->getCategories(); + $incomes = $this->helper->getIncomeReport($start, $end, $accounts); + $expenses = $this->helper->getExpenseReport($start, $end, $accounts); + $tags = $this->helper->tagReport($start, $end, $accounts); // and some id's, joined: $accountIds = []; @@ -314,7 +307,8 @@ class ReportController extends Controller return view( 'reports.default.multi-year', compact( - 'budgets', 'accounts', 'categories', 'start', 'end', 'accountIds', 'reportType', 'accountReport', 'incomes', 'expenses', + 'budgets', 'accounts', 'categories', 'start', 'end', 'accountIds', 'reportType', + 'incomes', 'expenses', 'incomeTopLength', 'expenseTopLength', 'tags' ) ); @@ -333,11 +327,10 @@ class ReportController extends Controller $incomeTopLength = 8; $expenseTopLength = 8; - $accountReport = $this->accountTasker->getAccountReport($start, $end, $accounts); - $incomes = $this->helper->getIncomeReport($start, $end, $accounts); - $expenses = $this->helper->getExpenseReport($start, $end, $accounts); - $tags = $this->helper->tagReport($start, $end, $accounts); - $budgets = $this->budgetHelper->budgetYearOverview($start, $end, $accounts); + $incomes = $this->helper->getIncomeReport($start, $end, $accounts); + $expenses = $this->helper->getExpenseReport($start, $end, $accounts); + $tags = $this->helper->tagReport($start, $end, $accounts); + $budgets = $this->budgetHelper->budgetYearOverview($start, $end, $accounts); Session::flash('gaEventCategory', 'report'); Session::flash('gaEventAction', 'year'); @@ -354,7 +347,7 @@ class ReportController extends Controller return view( 'reports.default.year', compact( - 'start', 'accountReport', 'incomes', 'reportType', 'accountIds', 'end', + 'start', 'incomes', 'reportType', 'accountIds', 'end', 'expenses', 'incomeTopLength', 'expenseTopLength', 'tags', 'budgets' ) ); diff --git a/public/css/firefly.css b/public/css/firefly.css index a33f04a936..354ea0b15b 100644 --- a/public/css/firefly.css +++ b/public/css/firefly.css @@ -73,4 +73,9 @@ body.waiting * { .bootstrap-tagsinput { margin-bottom: 10px; width: 100%; +} + +.loading { + background:url('/images/loading-small.gif') no-repeat center center; + min-height:30px; } \ No newline at end of file diff --git a/public/images/loading-small.gif b/public/images/loading-small.gif new file mode 100644 index 0000000000000000000000000000000000000000..5c4758cc12e6e4debb56cc9c421db13123017915 GIT binary patch literal 24345 zcmeI4cTm)6y8UN#Fn~CY0Z4Vtw0QC2B}gHvu2HigoLD|q?DA@+O=!fty?E8EiEG>vwr=0Sy|Z)8#Zj* zxN*~_O`A7w-m+!O)~#E&ZQHhe`}Q3>cI@1_bJwn2a&mIJckh;$m*2BzkAi~2-o1Mj z6&3gG+qZxJ{sRXN96WeXNlEF@p+kocA68aYR#8zoa^%Rbzy5mk=+R@xj{WxAZ^w@x zKXKy3$&)8fojP^;^yxEa&YV4a_T0I1s;a8z&!4|=;ljm>7cX79q^72J`SRr}SFZg2 z`|nq;UcGkh+V$(#Z``MRCJT9BZ>C-gybG*TPj_>T=6|q1}~Q9Ef)CLhsh}J|rh6HMSwucd5u&eJ>GvLfd&I zPo}reZ*%0##xE|}{_9jNH>v38Ia+tbMK5z&YMPzcxdCx*X5@O9byv)-ndI=#haHet zBP!$D#vWUdcA7T^Zqt?Wj@aVs_^K=!rWR~?Ew9i+H%xqZgQkZK;ZuQQ)h=_rO#$OL zrMriiekrEA-%;dGn>QDF98rphJZ1hosV=o!a*V@6X{2S!i*|At#Jh&8Rd*|$F6Qa* zw;j_&Di>DVJz{mtpJI5Y`mVy~49m55x=%!3j^s(%*&-I4T}6;{u!Jew;Mg;(D0lDg zzazGA!QX#PZ|1e+{~ayyb=LKD*7I{Q@PBzL=(S168#9=@MYy+3r0;|10DE|#V@&W9 z1ndPe^ffBn6BX%?iV8wSha#h+5OAbGQT|p={zgdV{z^h1NGK#3gC@sf$wWLUjz~%% z6O-ZysR@MiL_9SaM^C|Kq+&C{q+zqtv5a&alL8Hk8q1>L*)#&1Mr6}TY&w~f5zoy` z3; zrnzmdKr+K8wL4(V_~G*xUp{g9RH@q0EX1Hic7WXX_jIeKK4oMmOFIU>4thgPW)c8 zxn$j%V-jlzSe8ync@H0jx5?eeSz-9_&YpXR-C%w$ucIUfPZcMhr1!(}Zzj9;jZMQW zv?q^0il5NAbir4VWEwTDaUR#tXk}=yEQ~6I-@qULU@* z*Kn}C?exIp$wQN8_9o7cj9na!Upg7Rer)9W*vRe4tv63^c|0}re5UXHT;Io8-}i-q zpNk>*?FT?s!UR}}U@&f`A#cC{DYyf3HxKo+i14$x7l(|AMa1BN-H3tas|_K=#QZTpIuHml8coK>lH*9^r1-eBqT_Qv}|@}Hk+BvW^>tGfxXD#aPq)#xdJKR7v$v@6c!W}7ZsP5l$DoN zR8~}0S5?% zYj8{TOb1(1(ia9TXg@DmlA@lj@irvQv+k5xH^PDJW)m&E$M|SiXgm=04dl?R)2K(k3|Sj#lb%b!$F~ z>V`d5-ybrQea#?Er)+j6ya zPt6Q{@lW$Q@gLU-pb+lQjJ%%T@_BK~*X7oqRKX4G7^X0HvrvyaVV>q;o)+O=RuSHJ zBYmu)@wJHp<99FG|32K`R-hAhKq?SH_K08yWbh*tOsE#lxJZ}SsMmP7J0ZrKfb=J# zf{Exb0y+YZj*3Oc;7~{m5{*J&fhxqn2{CZu?EE1Ne^Lmb3P@xe8Xb?tCgSnQBvM*@ zJT)nao|>9Tp)hGQ7M;$?$lzpVa=~O}WebMKV9XAa$^SYm7N5n+0rnxA0~Qia4v&+^ z=N9DgiwpBhi;K$3$|@_XtE+43>l>Pzo7-AjJKEd3x;lG%y5IKp^u6uv@9Q1xhZd62 z;r`K)fw9rS@v)(a@sY`i(f9Ah-@lu9|9;}b`^gUP!D$tr=eMc3XXXmhrP6L#ywmw&wJ zM&7A0S^)J)8eZ=Zn zw9@O4e5osUyw~hM2or@3z{)-`OwaeHo{W0tv`?+((b_9iZ?ve|og*O=uxfnSP!Wl0 zqFEv$X=7DbtJ2w1cI#S)yjA$*h?oc$=KR~nd8zoGQsHplKk8Zsb#20Rl z4cwm?ctG*Rx7h_0T+Bum&N_ZzUg-L}=mosg4}4`9^x7!I%{b)EZJ4{MP(s4JEF-+F zB7N=x<%ssTjR~?xhB#rup5r24#YVf~;T{Bp4*>zJgC7AIKtKlLk+4`~I1U+!MZ*8y zKnUE!w+7-*Iw3R@KrK+HS+$6bO(GCd1cE_HOr)ixK!QP~3I&6kkpT%tW@h%cGp8T3 zD#B)Eb2(goHaCaI&Ese1=Vlk?^NR{{ON#Q#N{TAVimED#Ybs0Xs!Qr?N*ch_mNwRw zHr1CmH&nDVR<<@(wKZ3_x72jB)^)bkceOWk3k*kJ4=@>>1AW~?1HHmgQ5*6+W?;_!3Rn>{-Ki){^Q)rF-2L{bo>$wSc=>c!_DXXe%eOVDAG9X z)4 zK2ck?5`7mxhI-5!2s!9lu%J$~b6^yh{d}02y?IG@#iMgb!#qV;yw4=4t+26)<4-GMK;%0 zqq%rfi;C(tlGeSOg}$PN=$T3S|mIzuQOG#XoAHz3^rS^-=Jo5joKW&?@H<#F=)oPu0# zVIHq2KNs>8CB+qGWi?e54Ruw`jWw;!b?vS7or0~Sr?a^SEFN90g2kf^2tr?Phd>j$ z2K$Aw09*#}7bEW`Cx8?PL_m;n{*?y&g*^Q6zXXOtUUjgAsv;r+RN^W!`DoV0BIN2g z{}eZ=f-j_lvFIF?M#V#gH*!rd7hR5=@`PROJZ`#vgT?A4DJI)O7dY8R5$<1Cjhflq z6~2mKl4piN4C`S(A`SB^+shl}T2h+3t-iGn;k6aHEAN>s%Oza!T%?@G5Q z>6B8}azplY<@n|WT9DL|WJ|!7y^{3IVK|T70)2)5U2;lL|q z3Lq3c!$WUJhX=qSGC48!;XPm?e_B2So5wfH$G^FMY~7&<+v?Kx6C@X{n|0F{iKEW$ z{+;V3x~;1&H{h3(-lBQeI(K?hqkR0Oloo#6+n9IM|F`K&>9*Gn!DjAu{jxRX7W||# z;bgv@e_M)Al8tfadD14O;N2(r`CR;_%U;R}+jYaNS5&=j{mIuv%GU(0Rf6vti|E;u zs$Rzm2;}>(qan=>Z@=MYEk$5rf|2M9#hNR=r=x!~P_taK3%el3`k0)eb{dluVM@{% z7~bpMsezJyN3_*)&7VHB<*BV+4@+GC%X@Q#MiZ0ihp^&XxDq7HXT1~ zxDy_6v(mZa`4|4PvUe?-JU10LpYfPv!}7HfGdiyE8K(xhxBZS;Pa7UEpCJxvNUfMR z7T@1kd`EgJBpwhz6-1r_+;K0;{~VgV;jS7E*itrK;k6>g}1OTXC zb>VLSsz4_Gv850umq;YEcmVW)!;%QGWHOPQNG2u6lTs5&=}9C?GLf20prsJ#srZc4 z*er;9!~)#G%^>p_319>OH7SRcoXZB2lE+DfhMNW^pPQbaP07oq=4I3Jvgx_mnYr1F zTplZz&lV_1eob#-<14fPF;4UJ7rO)XHG(bCb@+S$?8 z-PQiK2kag_BSZb;W5Yl-KyU$s0|Ff%KYacKG711X{^ify`mtJhsD$cVmk*MP`>o37 zJ1oCg+}wRF*-c6W_8F`n*$?aXFIUr4&{RF2w%Y0F&i&ds=R`&5Q#USko;dHk0&B8! zUl}EOv+XI%4{;{B-pUp$yTX?3JZI=LEpOTDg}&@k7N#H*>W;=ZcT}4m%(K0oeve6? zzTjXRoN8BPwr@hD%0$(GOgtvddlXEzH?Ztz$$IuVKX9A1k;>Vwe5ElFm~=~K z2kSz=bP%4yARn3G@+BLq9y}!}Jyq%pk&o>7kgTUnQaTjSp%Y@Gr5k^qN4_iQJ5@ zL(0x1XJ^I<1`yE%ZWe%|$=s||b{2)5MPp@Uu(C3lSqvtF#bf|J%44(n98RtfhVc0X zIXOZuT2xR_Tv%9ATnt(l<>lp-RaG^$wRQFN4NZ-WEiI5fw70c_>FR9n>F((3?HcIs z9fqRLf$>o&U7_63QW!*m&5sOKO{Eb}#S~ z3wLb$1oF(SM#+l%gL$^?7*82-&#A?M9q0!OFHF~^1$Oa|D@vaG6l5Mq4f%D4QfK%6 zp0hS_=GW>_@4NW`J`?o76RI5enzVUA4B>Nr7 zf0lhWWd9AvQM$gCLeo}S5P2U8MoA>ytCqU*SluS{tX0tnFbS6dN8e~VUT(%+7dzS` zH=G{Qq80~hUZ!ne)lyxxl@hORlu5E&S#HL=YoB_LTNo2rNLQVlJ%^;E#U*KENt6Yc_zp0M-JHj*E>= zAd?ak6Oz+GkV#ErWu|ko(z%Ru2#PW(JQj_|qVw2U*=$BOh%GrBP`eUx(XVtAXu{m& zXJ^k2Xior@00Vjxg@t9s#pM8k)YJ%+p{c1=APXJsZIE+-3KVU<-M~Mze-l_hX~oD; z9{?f(p#Y8oq9GrlJ>=ad06{)|fY`^>=jp$UFTWL&IhB~w^bMptr#V0>VMKFo9odO` z{YHWfLJIY4Zqk-*$Ek{kFz&HGZ&PzQ^4scNiF#*_dT2~@dA~?1!)8|64s5xx5$AjO zEUe-J!AQxs;{G(+ov`VUZ|(i+_MP~)n;ys34x!ZTHYp!hv|3;2b_H|gXc*CmBqHIL zZaz32=lO20?x8oYh87+wAh z+auMguKnt_yF0Abkl|I+<-EF~dueXi#VMH*{lgSDxMq>@NAYoD#xjezz>w8D$m(pV zbU5jt?x1>tNcyF?N4yt8Y&wMw0=-Hg5ffN1)=g-)Eo{Cw7)?} zk<_eSy_^!ZQLSOUEKEHBgB**S6YnLBYc*Kz%tfdXrnz8%Q*I{XR0pcw&rK~ z&3EMVX z*0U;jADD^8Mnm6z1Y>SvL zXZ}alkH>bvPk=(^tv62$J)RjrJxstzp&B+cg4>Q+$}x*L1Wp375uN~+LN)@xQh-Sz zC<;78pdB*U9xNW1uqU{P=b()Vwho+d>wvme!j4773tqN77m@Q6QS zQv6>uFu$%Gg0uqaatko2P%GlF*o3)01rUmK07!wo5NHKNN7K`p-vClJ=wpF;1puTR z7ARVQqBbX&54u*I{2V|>p#nv*;QFJythB14tgfb_slKYEsiv)^uA{Y~tGyAlB)Vq- zDJW+GM%o6g9De}Po}q!apf>?zVSH>9^t3;G04*zFQQ|u?(yfw1F{vsG#6&^qs_nS` zOULyQb{=bE?kqnbnkitUqDsqG|CF}{bLr&~*;8)UI!}jmN^Bn2D(osy*|+w31UF~< zw%_bFsywX@&_4gh|J~Jxj)`0LhyE&}B41tB&5X8#D>N>eC_Qf1!H`u_-q9s`Ye zVc)}=MC-isrppeGn&g-icyDQ!Yz z6f`ykT}@Ebgz6N)Tp)rS0sBCNJVipM9XFHkMY=AcM`Ao<@hJS;hIB;sRc2QEpjDL3wFW zRXJ!}l>!sd+)&xp44PG-Rs{qDAW{%bbiD29>U#^hhQWb8!7&HuREn|=GTa{6|voOLj zDoM2P!Ub!eRX!3~kRZAB`k%bCU{l`s89|^bJzftrWf#N z#d*w<0!~>Gv~5(B=2w>GSC<#mR2J4&fwiLyav6de7T7l0TbnxCnmfT+SjV5X4WJv~ z6m0I+bQIj0LUqh{AeR8tceb6vYuRE2kqpY^F z*jL&mE8o;AxaC@6{l42h<>V$a=T#;7lXu%T-|g5aUgcJ_mvpBiv+Gm8cn9@$g1p~) z<)V8%A$?Om3ZsGj7=y#Wi|ISbR`{!UD z=Aj-Ip`Mmt!aS|Qq0=znB>mJVE$J1*J_7wwCM2V&r% zXgKI*A`o!wU)QWa$4Y1;&?o{HO^C%3h_Qq?0zNqop9bBE5;D>Vnd#7vpE>)3C$s5s zYZH0Oc`kkuz)y^pkzY%$DQ=f~ z8^ZTlbXxXl`sg*9OZuVu>mToR@D(eW1-r5%?_LPzM}sM%429suZ~Ee5p!#r+4+EB=*{ztw>Y6O;$9yF`1Rgvg5=pHJJ}F|8FRT0XQ55Xw=skx*8Qag)mRc zaKRne+y&U|`4dK1R>dN}s>c;xo z=EnNA*5=NR_TFwlHhKs8-$H%?x*msKs1O`+3{8Mi6;zi1x&YmTL2%;(L^dE6Duf%* zHP|q0SvJFc#iJr^`myE!+}`0$DJ5%b0+OMd5gib+~D z9w1c51azH{8^GCKqqxux)(7IoV$S>QTBB3{VI?LtC}^E!rpCBoHbRVKLDo1>BYX6P z6kmq8U-Qh-wABVrj_lIBXxVV0IcjTM#0{V7Ke8e+r5J})l` z)qza>39ESg%B8wWUTfuRn?=kF&mPo!H(%TS&I#sUp^iV@fr1Y8tU zCqTifxDbM(;NSz)Fw4u!%Bw0XK#{w#9vpqtwnMQdxcd+$n^3sf(+Q@zw+jr^>+b7m z1&!{(K5%d@Xi^M=(^BCr*ytn_T?o&?K*R}kGv@+~zfz33wPWgi;X3x|g#dMY7!E+F zzWM3$mK?9PQx8h+kAm8^AM%mJsw*8*z1Q}fmR{?!Y?opa|LogE)fYdyccrLGYc7vU z{YA3ithAL}YWlwIm!eLsGHWouu;Vmh$(rKMRXcTa2~XvgZ{6Wuf^iv%XWs}@SbsI4 zI(f7&f3aqo-UuMnQgjL zmwuwr?4zraZKMK|Myy*OR!mf5^`5cWem6kBMZH3Tud~g&>rfFXch8jCZu|2OpKI@! z8VKF?E0exjHa70p&b!Pckz{mN&7<=UBliog!^EmvbmSLHF`ggwiMEGT5cNrEM2XM2 zZELP9+#vaUzCiIG$TFYWo4j-c4^J3+JT-tyRkPO|&|_8*`xMB6ka-9W#K3U}IO{M5 z`tawQ4oE13=c3@&9Nd=!QvrGtz&U`2Cx|g_B&0_i+AAL8n}`cYj13e_P-1LwVk|5n zHZ&nNEIu|o4i`nj!U-5eEEk(mLujx0td10w~uj?N>CTwl(&y{@43yfkUJpSh%d*UxFut{{dIO(RFSX06bFMI zZ%++ADS4!G$^NaspI&AwD^EPwb<(x@{Gww!5~Gx{AuDaY5AKmx4175C;(%#UWW2Ft z(d1}tl9Zw~z@nbK!rFc0hZ04DOA4#^04#bzSGj1Tq7Rqc<;p9JJY?YX#5D>Qu-i<_ zaMk__vBQ|dS(jJU?>8ky71))JrR%wehZZ@vk6D_ytH6?K!Y+T&aa0)AjpRM=`qH4T zX;4Eci92LpptUzE=~RQf|skx}YvGCl+7{xh1$J6&{uYMmlRLfS&-zqCzx^1!y$V86W+U z0EeEa0eV41ydfdnfohPDUSt#)Z(;3MP1ia*K}!dfPX zH-%i3NK65#W?~{WC54`r2JXzWXf$R9ospHnn3DzuSVDk0K#$gN`FwtUUT$GQej&Ks z0MAvG6hi`0Q3}+d1kepYL>ud?!O3WQ3v@3ka16}?5IXln4RiwrjySr&4LOj8!GT_g zhzefH16QMC5ElinQjCEmgTJu5`ow`2W zxUo_7grfMBGqt7Kss?3ew)bh}86EV?zh#qel8Y=pdeXZ4BX49K;;4rxY}JzZwzTN= zdsMvm{rzResqx2j)nQ2GK-uw?CK`jFlSv8;xm10>BIda4svmV0QAZ86O(c&z$?N}J z&7ewlN5=L&H7$DU&}a2S3lqrn1zum)zf-%dqU*f$FlLe>RcPg$pfa&+U3a5;xkCbd zjmj2f7GoW3;a#!qRHGzG*!U$1mEYxTAwHgYq@Q^^`If}5Lur=L?~_XH*s@m587J
-
- {% include 'reports/partials/accounts.twig' %} +
@@ -93,6 +92,9 @@ var hideTheRest = '{{ trans('firefly.hideTheRest',{number:incomeTopLength}) }}'; var showTheRestExpense = '{{ trans('firefly.showTheRest',{number:expenseTopLength}) }}'; var hideTheRestExpense = '{{ trans('firefly.hideTheRest',{number:expenseTopLength}) }}'; + + + var accountReportUrl = '{{ route('reports.data.accountReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}'; diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig index 40170b188f..b631c35ff3 100644 --- a/resources/views/reports/default/multi-year.twig +++ b/resources/views/reports/default/multi-year.twig @@ -31,9 +31,7 @@
-
- {% include 'reports/partials/accounts.twig' %} - +
@@ -176,6 +174,9 @@ var showTheRestExpense = '{{ trans('firefly.showTheRest',{number:expenseTopLength}) }}'; var hideTheRestExpense = '{{ trans('firefly.hideTheRest',{number:expenseTopLength}) }}'; + + var accountReportUrl = '{{ route('reports.data.accountReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}'; + diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig index caf274a9ff..8bf9e86b1f 100644 --- a/resources/views/reports/default/year.twig +++ b/resources/views/reports/default/year.twig @@ -31,7 +31,8 @@
- {% include 'reports/partials/accounts.twig' %} +
+
{% include 'reports/partials/income-vs-expenses.twig' %}
@@ -133,6 +134,9 @@ var hideTheRest = '{{ trans('firefly.hideTheRest',{number:incomeTopLength}) }}'; var showTheRestExpense = '{{ trans('firefly.showTheRest',{number:expenseTopLength}) }}'; var hideTheRestExpense = '{{ trans('firefly.hideTheRest',{number:expenseTopLength}) }}'; + + + var accountReportUrl = '{{ route('reports.data.accountReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}'; diff --git a/routes/web.php b/routes/web.php index e6573fa07b..91187a8dc0 100755 --- a/routes/web.php +++ b/routes/web.php @@ -40,7 +40,7 @@ Route::group( Route::group( ['middleware' => 'user-simple-auth'], function () { Route::get('/error', 'HomeController@displayError'); - Route::any('logout', ['uses' => 'Auth\LoginController@logout','as' => 'logout']); + Route::any('logout', ['uses' => 'Auth\LoginController@logout', 'as' => 'logout']); Route::get('/flush', ['uses' => 'HomeController@flush']); } ); @@ -312,6 +312,14 @@ Route::group( Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.index']); Route::get('/reports/report/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'ReportController@report', 'as' => 'reports.report']); + /** + * Report AJAX data Controller: + */ + Route::get( + '/reports/data/accountReport/{start_date}/{end_date}/{accountList}', + ['uses' => 'Report\AccountController@accountReport', 'as' => 'reports.data.accountReport'] + ); + /** * Rules Controller */