kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 06:01:21 +00:00
Code Issues Projects Releases Wiki Activity

Improve tests, models and views.

Browse Source
This commit is contained in:
James Cole
2019-04-16 16:20:46 +02:00
parent 5ac39dbdef
commit 66c55b7bbe
44 changed files with 13710 additions and 5067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/Support/Twig/General.php
View File

@@ -24,8 +24,8 @@ namespace FireflyIII\Support\Twig;
use Carbon\Carbon;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Twig\Extension\Account as AccountExtension;
use League\CommonMark\CommonMarkConverter;
use Route;
use Twig_Extension;
@@ -56,14 +56,12 @@ class General extends Twig_Extension
public function getFunctions(): array
{
return [
$this->getCurrencyCode(),
$this->getCurrencySymbol(),
$this->phpdate(),
$this->activeRouteStrict(),
$this->activeRoutePartial(),
$this->activeRoutePartialWhat(),
$this->formatDate(),
new Twig_SimpleFunction('accountGetMetaField', [AccountExtension::class, 'getMetaField']),
$this->getMetaField(),
$this->hasRole(),
];
}
@@ -102,7 +100,7 @@ class General extends Twig_Extension
return new Twig_SimpleFunction(
'activeRoutePartialWhat',
function ($context): string {
[, $route, $what] = \func_get_args();
[, $route, $what] = func_get_args();
$activeWhat = $context['what'] ?? false;
if ($what === $activeWhat && !(false === stripos(Route::getCurrentRoute()->getName(), $route))) {
@@ -139,6 +137,8 @@ class General extends Twig_Extension
}
/**
* Show account balance. Only used on the front page of Firefly III.
*
* @return Twig_SimpleFilter
*/
protected function balance(): Twig_SimpleFilter
@@ -158,6 +158,8 @@ class General extends Twig_Extension
}
/**
* Formats a string as a thing by converting it to a Carbon first.
*
* @return Twig_SimpleFunction
*/
protected function formatDate(): Twig_SimpleFunction
@@ -173,6 +175,8 @@ class General extends Twig_Extension
}
/**
* Used to convert 1024 to 1kb etc.
*
* @return Twig_SimpleFilter
*/
protected function formatFilesize(): Twig_SimpleFilter
@@ -198,25 +202,19 @@ class General extends Twig_Extension
/**
* @return Twig_SimpleFunction
*/
protected function getCurrencyCode(): Twig_SimpleFunction
protected function getMetaField(): Twig_SimpleFunction
{
return new Twig_SimpleFunction(
'getCurrencyCode',
function (): string {
return app('amount')->getCurrencyCode();
}
);
}
'accountGetMetaField',
static function (Account $account, string $field): string {
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
$result = $repository->getMetaValue($account, $field);
if (null === $result) {
return '';
}
/**
* @return Twig_SimpleFunction
*/
protected function getCurrencySymbol(): Twig_SimpleFunction
{
return new Twig_SimpleFunction(
'getCurrencySymbol',
function (): string {
return app('amount')->getCurrencySymbol();
return $result;
}
);
}
@@ -257,6 +255,8 @@ class General extends Twig_Extension
}
/**
* Show icon with attachment.
*
* @return Twig_SimpleFilter
*/
protected function mimeIcon(): Twig_SimpleFilter
@@ -334,6 +334,8 @@ class General extends Twig_Extension
}
/**
* Basic example thing for some views.
*
* @return Twig_SimpleFunction
*/
protected function phpdate(): Twig_SimpleFunction