From 07d501b35f60f96c708dc2b5961c2ababfe2bf86 Mon Sep 17 00:00:00 2001 From: Vaidas Lungis Date: Fri, 22 May 2015 17:12:45 +0300 Subject: [PATCH] load dashboard statistics via ajax call [ci skip] --- src/bb-themes/admin_default/css/main.css | 7 +++ .../html/mod_index_dashboard.phtml | 51 +++++++++---------- src/bb-themes/admin_default/js/bb-admin.js | 22 ++++++++ 3 files changed, 54 insertions(+), 26 deletions(-) diff --git a/src/bb-themes/admin_default/css/main.css b/src/bb-themes/admin_default/css/main.css index 0ba69471e..da1090cfe 100644 --- a/src/bb-themes/admin_default/css/main.css +++ b/src/bb-themes/admin_default/css/main.css @@ -1330,4 +1330,11 @@ li.plupload_droptext { background: transparent; text-align: center; vertical-ali white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} + +.ajax-loader{ + background: url('../images/loader.gif'); + width: 16px; + height:11px; + display: inline-block; } \ No newline at end of file diff --git a/src/bb-themes/admin_default/html/mod_index_dashboard.phtml b/src/bb-themes/admin_default/html/mod_index_dashboard.phtml index 7f2a8d475..b1b0a2674 100644 --- a/src/bb-themes/admin_default/html/mod_index_dashboard.phtml +++ b/src/bb-themes/admin_default/html/mod_index_dashboard.phtml @@ -13,9 +13,8 @@ {% if admin.system_is_allowed({"mod":"stats"}) %}
{{ guest.system_company.name }} {% trans 'Statistics' %}
- {% set stats = admin.stats_get_summary %} {% set income = admin.stats_get_summary_income %} - +
@@ -36,37 +35,37 @@ - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + +
{% trans 'Metric' %}{{ mf.currency_format(income.last_month) }} {{ mf.currency_format(income.total) }}
{% trans 'Clients' %}{{ stats.clients_today }}{{ stats.clients_yesterday }}{{ stats.clients_this_month }}{{ stats.clients_last_month }}{{ stats.clients_total }}{{ stats.clients_today }}{{ stats.clients_yesterday }}{{ stats.clients_this_month }}{{ stats.clients_last_month }}{{ stats.clients_total }}
{% trans 'Orders' %}{{ stats.orders_today }}{{ stats.orders_yesterday }}{{ stats.orders_this_month }}{{ stats.orders_last_month }}{{ stats.orders_total }}{{ stats.orders_today }}{{ stats.orders_yesterday }}{{ stats.orders_this_month }}{{ stats.orders_last_month }}{{ stats.orders_total }}
{% trans 'Invoices' %}{{ stats.invoices_today }}{{ stats.invoices_yesterday }}{{ stats.invoices_this_month }}{{ stats.invoices_last_month }}{{ stats.invoices_total }}{{ stats.invoices_today }}{{ stats.invoices_yesterday }}{{ stats.invoices_this_month }}{{ stats.invoices_last_month }}{{ stats.invoices_total }}
{% trans 'Tickets' %}{{ stats.tickets_today }}{{ stats.tickets_yesterday }}{{ stats.tickets_this_month }}{{ stats.tickets_last_month }}{{ stats.tickets_total }}{{ stats.tickets_today }}{{ stats.tickets_yesterday }}{{ stats.tickets_this_month }}{{ stats.tickets_last_month }}{{ stats.tickets_total }}
diff --git a/src/bb-themes/admin_default/js/bb-admin.js b/src/bb-themes/admin_default/js/bb-admin.js index 6918babed..2cca6d299 100644 --- a/src/bb-themes/admin_default/js/bb-admin.js +++ b/src/bb-themes/admin_default/js/bb-admin.js @@ -298,6 +298,7 @@ $(function() { }).val(bb.cookieRead('BBLANG')); requestNotificationStats(); + requestDashboardStats(); }); @@ -371,4 +372,25 @@ function nonGlobalAjaxCall (url, jsonp){ } } }); +} + +function requestDashboardStats() { + if ($('.mod_stats').length > 0){ + nonGlobalAjaxCall('admin/stats/get_summary', function(result){ + elems = ['clients', 'orders', 'invoices', 'tickets']; + + elems.forEach(function (element, index, array){ + var dynamicName = eval("'."+element+"-stats td a'"); + var elem = $(dynamicName); + elem.hide().removeClass('ajax-loader'); + elem.eq(0).text(eval("result."+element+"_today")); + elem.eq(1).text(eval("result."+element+"_yesterday")); + elem.eq(2).text(eval("result."+element+"_this_month")); + elem.eq(3).text(eval("result."+element+"_last_month")); + elem.eq(4).text(eval("result."+element+"_total")); + elem.fadeIn('slow'); + }); + + }); + } } \ No newline at end of file