IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-30 10:47:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Optimize new JS code.

Browse Source
This commit is contained in:
James Cole 2017-01-10 18:35:00 +01:00
parent e67709e339
commit 9b4fd57f51
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
app/Http/Controllers/JavascriptController.php
View File

@ -30,12 +30,44 @@ class JavascriptController extends Controller
*/
public function variables()
{
$picker = $this->getDateRangePicker();
$start = Session::get('start');
$end = Session::get('end');
$linkTitle = sprintf('%s - %s', $start->formatLocalized($this->monthAndDayFormat), $end->formatLocalized($this->monthAndDayFormat));
$firstDate = session('first')->format('Y-m-d');
$localeconv = localeconv();
$accounting = Amount::getJsConfig($localeconv);
$localeconv = localeconv();
$defaultCurrency = Amount::getDefaultCurrency();
$localeconv['frac_digits'] = $defaultCurrency->decimal_places;
$pref = Preferences::get('language', config('firefly.default_language', 'en_US'));
$lang = $pref->data;
$data = [
'picker' => $picker,
'linkTitle' => $linkTitle,
'firstDate' => $firstDate,
'currencyCode' => Amount::getCurrencyCode(),
'currencySymbol' => Amount::getCurrencySymbol(),
'accounting' => $accounting,
'localeconv' => $localeconv,
'language' => $lang,
];
return response()
->view('javascript.variables', $data, 200)
->header('Content-Type', 'text/javascript');
}
/**
* @return array
* @throws FireflyException
*/
private function getDateRangePicker(): array
{
$viewRange = Preferences::get('viewRange', '1M')->data;
$start = Session::get('start');
$end = Session::get('end');
$linkTitle = sprintf('%s - %s', $start->formatLocalized($this->monthAndDayFormat), $end->formatLocalized($this->monthAndDayFormat));
$firstDate = session('first')->format('Y-m-d');
$prevStart = clone $start;
$prevEnd = clone $start;
$nextStart = clone $end;
@ -83,35 +115,18 @@ class JavascriptController extends Controller
break;
}
$current = $start->formatLocalized($format);
$next = $nextStart->formatLocalized($format);
$prev = $prevStart->formatLocalized($format);
$localeconv = localeconv();
$accounting = Amount::getJsConfig($localeconv);
$localeconv = localeconv();
$defaultCurrency = Amount::getDefaultCurrency();
$localeconv['frac_digits'] = $defaultCurrency->decimal_places;
$pref = Preferences::get('language', config('firefly.default_language', 'en_US'));
$lang = $pref->data;
$data = [
'dpStart' => $start->format('Y-m-d'),
'dpEnd' => $end->format('Y-m-d'),
'dpCurrent' => $current,
'dpPrevious' => $prev,
'dpNext' => $next,
'dpRanges' => $ranges,
'linkTitle' => $linkTitle,
'firstDate' => $firstDate,
'currencyCode' => Amount::getCurrencyCode(),
'currencySymbol' => Amount::getCurrencySymbol(),
'accounting' => $accounting,
'localeconv' => $localeconv,
'language' => $lang,
];
$current = $start->formatLocalized($format);
$next = $nextStart->formatLocalized($format);
$prev = $prevStart->formatLocalized($format);
return response()
->view('javascript.variables', $data, 200)
->header('Content-Type', 'text/javascript');
return [
'start' => $start->format('Y-m-d'),
'end' => $end->format('Y-m-d'),
'current' => $current,
'previous' => $prev,
'next' => $next,
'ranges' => $ranges,
];
}
}

12
resources/views/javascript/variables.twig
View File

@ -1,20 +1,20 @@
// date range picker configuration:
var dateRangeConfig = {
startDate: moment("{{ dpStart }}"),
endDate: moment("{{ dpEnd }}"),
startDate: moment("{{ picker.start }}"),
endDate: moment("{{ picker.end }}"),
linkTitle: "{{ linkTitle }}",
URL: "{{ route('daterange') }}",
firstDate: moment("{{ firstDate }}"),
currentPeriod: "{{ dpCurrent }}",
previousPeriod: "{{ dpPrevious }}",
nextPeriod: "{{ dpNext }}",
currentPeriod: "{{ picker.current }}",
previousPeriod: "{{ picker.previous }}",
nextPeriod: "{{ picker.next }}",
everything: '{{ 'everything'|_|escape }}',
customRangeLabel: '{{ 'customRange'|_|escape }}',
applyLabel: '{{ 'apply'|_|escape }}',
cancelLabel: '{{ 'cancel'|_|escape }}',
fromLabel: '{{ 'from'|_|escape }}',
toLabel: '{{ 'to'|_|escape }}',
ranges: {{ dpRanges|json_encode|raw }}
ranges: {{ picker.ranges|json_encode|raw }}
};
var language = "{{ language|escape }}";