Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clarify dashboard values

Browse Source
This commit is contained in:
Hillel Coren 2016-12-25 20:22:56 +02:00
parent 3f8efb986d
commit 8b2fdc3860
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/lang/en/texts.php
View File

@ -2275,6 +2275,11 @@ $LANG = array(
'invoice_name' => 'Invoice', 'invoice_name' => 'Invoice',
'product_will_create' => 'product will be created', 'product_will_create' => 'product will be created',
'contact_us_response' => 'Your message has been sent', 'contact_us_response' => 'Your message has been sent',
'last_7_days' => 'Last 7 Days',
'last_30_days' => 'Last 30 Days',
'this_month' => 'This Month',
'last_month' => 'Last Month',
'custom_range' => 'Custom Range',
); );

28
resources/views/dashboard.blade.php
View File

@ -94,25 +94,27 @@
// Initialize date range selector // Initialize date range selector
function cb(start, end) { function cb(start, end, label) {
$('#reportrange span').html(start.format('{{ $account->getMomentDateFormat() }}') + ' - ' + end.format('{{ $account->getMomentDateFormat() }}')); $('#reportrange span').html(start.format('{{ $account->getMomentDateFormat() }}') + ' - ' + end.format('{{ $account->getMomentDateFormat() }}'));
chartStartDate = start; chartStartDate = start;
chartEndDate = end; chartEndDate = end;
$('.range-label-div').text(label);
loadData(); loadData();
} }
$('#reportrange').daterangepicker({ $('#reportrange').daterangepicker({
locale: { locale: {
"format": "{{ $account->getMomentDateFormat() }}", format: "{{ $account->getMomentDateFormat() }}",
customRangeLabel: "{{ trans('texts.custom_range') }}",
}, },
startDate: chartStartDate, startDate: chartStartDate,
endDate: chartEndDate, endDate: chartEndDate,
linkedCalendars: false, linkedCalendars: false,
ranges: { ranges: {
'Last 7 Days': [moment().subtract(6, 'days'), moment()], "{{ trans('texts.last_7_days') }}": [moment().subtract(6, 'days'), moment()],
'Last 30 Days': [moment().subtract(29, 'days'), moment()], "{{ trans('texts.last_30_days') }}": [moment().subtract(29, 'days'), moment()],
'This Month': [moment().startOf('month'), moment().endOf('month')], "{{ trans('texts.this_month') }}": [moment().startOf('month'), moment().endOf('month')],
'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')] "{{ trans('texts.last_month') }}": [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
} }
}, cb); }, cb);
@ -206,6 +208,9 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<div style="overflow:hidden"> <div style="overflow:hidden">
<div class="range-label-div in-thin pull-right" style="color:#337ab7">
{{ trans('texts.last_30_days') }}
</div>
<div class="in-thin"> <div class="in-thin">
{{ trans('texts.total_revenue') }} {{ trans('texts.total_revenue') }}
</div> </div>
@ -233,6 +238,9 @@
<div class="panel-body"> <div class="panel-body">
<div style="overflow:hidden"> <div style="overflow:hidden">
@if (count($expenses)) @if (count($expenses))
<div class="range-label-div in-thin pull-right" style="color:#337ab7">
{{ trans('texts.last_30_days') }}
</div>
<div class="in-thin"> <div class="in-thin">
{{ trans('texts.total_expenses') }} {{ trans('texts.total_expenses') }}
</div> </div>
@ -246,6 +254,9 @@
@endforeach @endforeach
</div> </div>
@else @else
<div class="range-label-div in-thin pull-right" style="color:#337ab7">
{{ trans('texts.last_30_days') }}
</div>
<div class="in-thin"> <div class="in-thin">
{{ trans('texts.average_invoice') }} {{ trans('texts.average_invoice') }}
</div> </div>
@ -273,6 +284,9 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<div style="overflow:hidden"> <div style="overflow:hidden">
<div class="range-label-div in-thin pull-right" style="color:#337ab7">
{{ trans('texts.last_30_days') }}
</div>
<div class="in-thin"> <div class="in-thin">
{{ trans('texts.outstanding') }} {{ trans('texts.outstanding') }}
</div> </div>