From ef93f35bd9660bd57cb75c5ba279a9ee7abb4aaa Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 10 Apr 2018 21:29:14 +0300 Subject: [PATCH] Independent scaling for multi currency data visualizations #1983 --- resources/views/money_script.blade.php | 7 + resources/views/reports/d3.blade.php | 375 +++++++++++++------------ 2 files changed, 203 insertions(+), 179 deletions(-) diff --git a/resources/views/money_script.blade.php b/resources/views/money_script.blade.php index 4eb87f3bd50a..7cf39bced657 100644 --- a/resources/views/money_script.blade.php +++ b/resources/views/money_script.blade.php @@ -161,4 +161,11 @@ } } + function convertCurrency(amount, fromCurrencyId, toCurrencyId) { + return fx.convert(amount, { + from: currencyMap[fromCurrencyId].code, + to: currencyMap[toCurrencyId].code, + }); + } + diff --git a/resources/views/reports/d3.blade.php b/resources/views/reports/d3.blade.php index 16e431a475f9..8a923da25293 100644 --- a/resources/views/reports/d3.blade.php +++ b/resources/views/reports/d3.blade.php @@ -1,148 +1,165 @@ @extends('header') @section('head') - @parent + @parent - @include('money_script') - + @include('money_script') + - + @stop @section('content') - @parent - @include('accounts.nav', ['selected' => ACCOUNT_DATA_VISUALIZATIONS, 'advanced' => true]) + @parent + @include('accounts.nav', ['selected' => ACCOUNT_DATA_VISUALIZATIONS, 'advanced' => true]) - + -
- {{ trans('texts.group_by') }}    - -    {!! $message !!} -
+
+ {{ trans('texts.group_by') }}    + +    {!! $message !!} +
-

 

+

 

-
+
- + @stop