Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Independent scaling for multi currency data visualizations

Browse Source
This commit is contained in:
Hillel Coren 2018-04-10 21:37:35 +03:00
parent ef93f35bd9
commit f02e909a68
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/views/reports/d3.blade.php
View File

@ -122,11 +122,12 @@
console.log('paid: %s, balance: %s', client.paid_to_date, client.balance); console.log('paid: %s, balance: %s', client.paid_to_date, client.balance);
var currencyId = client.currency_id || {{ Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY) }}; var currencyId = client.currency_id || {{ Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY) }};
var total = +client.paid_to_date + +client.balance; var total = +client.paid_to_date + +client.balance;
client.displayTotal = total;
if (currencyId != accountCurrencyId) { if (currencyId != accountCurrencyId) {
total = convertCurrency(total, currencyId, accountCurrencyId); total = convertCurrency(total, currencyId, accountCurrencyId);
} }
client.convertedTotal = total;
client.displayName = getClientDisplayName(client); client.displayName = getClientDisplayName(client);
client.displayTotal = total;
client.displayBalance = +client.balance; client.displayBalance = +client.balance;
client.displayPercent = (+client.paid_to_date / (+client.paid_to_date + +client.balance)).toFixed(2); client.displayPercent = (+client.paid_to_date / (+client.paid_to_date + +client.balance)).toFixed(2);
var oldestInvoice = _.max(client.invoices, function(invoice) { return calculateInvoiceAge(invoice) }); var oldestInvoice = _.max(client.invoices, function(invoice) { return calculateInvoiceAge(invoice) });
@ -137,11 +138,12 @@
_.each(invoices, function(invoice) { _.each(invoices, function(invoice) {
var currencyId = invoice.client.currency_id || {{ Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY) }}; var currencyId = invoice.client.currency_id || {{ Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY) }};
var total = +invoice.amount; var total = +invoice.amount;
invoice.displayTotal = total;
if (currencyId != accountCurrencyId) { if (currencyId != accountCurrencyId) {
total = convertCurrency(total, currencyId, accountCurrencyId); total = convertCurrency(total, currencyId, accountCurrencyId);
} }
invoice.convertedTotal = total;
invoice.displayName = invoice.invoice_number; invoice.displayName = invoice.invoice_number;
invoice.displayTotal = total;
invoice.displayBalance = +invoice.balance; invoice.displayBalance = +invoice.balance;
invoice.displayPercent = (+invoice.amount - +invoice.balance) / +invoice.amount; invoice.displayPercent = (+invoice.amount - +invoice.balance) / +invoice.amount;
invoice.displayAge = calculateInvoiceAge(invoice); invoice.displayAge = calculateInvoiceAge(invoice);
@ -151,11 +153,12 @@
_.each(products, function(product) { _.each(products, function(product) {
var currencyId = product.values.currency_id; var currencyId = product.values.currency_id;
var total = product.values.amount; var total = product.values.amount;
product.displayTotal = total;
if (currencyId != accountCurrencyId) { if (currencyId != accountCurrencyId) {
total = convertCurrency(total, currencyId, accountCurrencyId); total = convertCurrency(total, currencyId, accountCurrencyId);
} }
product.convertedTotal = total;
product.displayName = product.key; product.displayName = product.key;
product.displayTotal = total;
product.displayBalance = product.values.amount - product.values.paid; product.displayBalance = product.values.amount - product.values.paid;
product.displayPercent = (product.values.paid / product.values.amount).toFixed(2); product.displayPercent = (product.values.paid / product.values.amount).toFixed(2);
product.displayAge = product.values.age; product.displayAge = product.values.age;
@ -188,7 +191,7 @@
var bubble = d3.layout.pack() var bubble = d3.layout.pack()
.sort(null) .sort(null)
.size([diameter, diameter]) .size([diameter, diameter])
.value(function(d) { return d.displayTotal }) .value(function(d) { return d.convertedTotal })
.padding(12); .padding(12);
var svg = d3.select(".svg-div").append("svg") var svg = d3.select(".svg-div").append("svg")