added total apps installed chart (bug 932984)

spasovski · spasovski · commit 157ff48c7006 · 2013-11-12T12:27:15.000-08:00
diff --git a/src/media/js/routes.js b/src/media/js/routes.js
@@ -9,6 +9,7 @@ var routes = window.routes = [
     {'pattern': '^/stats/total\-developers/$', 'view_name': 'total_developers'},
     {'pattern': '^/stats/total\-visits/$', 'view_name': 'total_visits'},
     {'pattern': '^/stats/apps\-installed/$', 'view_name': 'apps_installed'},
+    {'pattern': '^/stats/apps\-installed\-total/$', 'view_name': 'apps_installed_total'},
     {'pattern': '^/stats/apps\-by\-type/$', 'view_name': 'apps_by_type'},
     {'pattern': '^/stats/apps\-available\-by\-type/$', 'view_name': 'apps_available_by_type'},
     {'pattern': '^/stats/apps\-available\-by\-payment/$', 'view_name': 'apps_available_by_premium'},
diff --git a/src/media/js/routes_api.js b/src/media/js/routes_api.js
@@ -5,6 +5,7 @@ define('routes_api', [], function() {
         'total_developers': '/api/v1/stats/global/total_developers/',
         'total_visits': '/api/v1/stats/global/total_visits/',
         'apps_installed': '/api/v1/stats/global/apps_installed/',
+        'apps_installed_total': '/api/v1/stats/global/apps_installed/',
         'apps_by_type': '/api/v1/stats/global/apps_added_by_package/',
         'gross_revenue': '/api/v1/stats/global/revenue/',
         'apps_available_by_type': '/api/v1/stats/global/apps_available_by_package/',
diff --git a/src/media/js/views/apps_added.js b/src/media/js/views/apps_added.js
@@ -8,8 +8,11 @@ define('views/apps_added', ['chartutils', 'l10n'],
 
         builder.start('apps_chart.html',
                       {title: chartTitle, regions: cutils.regions}).done(function() {
-            cutils.createChart('apps_added', gettext('Apps'),
-                               gettext('Number of Apps'));
+            cutils.createChart(
+                'apps_added',
+                gettext('Apps'),
+                gettext('Number of Apps')
+            );
         });
 
         builder.z('type', 'root');
diff --git a/src/media/js/views/apps_available_by_premium.js b/src/media/js/views/apps_available_by_premium.js
@@ -8,8 +8,11 @@ define('views/apps_available_by_premium', ['chartutils', 'l10n'],
 
         builder.start('apps_chart.html',
                       {title: chartTitle, regions: cutils.regions}).done(function() {
-            cutils.createChart('apps_available_by_premium', gettext('Apps'),
-                               gettext('Number of Apps'));
+            cutils.createChart(
+                'apps_available_by_premium',
+                gettext('Apps'),
+                gettext('Number of Apps')
+            );
         });
 
         builder.z('type', 'root');
diff --git a/src/media/js/views/apps_available_by_type.js b/src/media/js/views/apps_available_by_type.js
@@ -7,7 +7,11 @@ define('views/apps_available_by_type', ['chartutils', 'l10n'], function(cutils,
 
         builder.start('apps_chart.html',
         			  {title: chartTitle, regions: cutils.regions}).done(function() {
-            cutils.createChart('apps_available_by_type', gettext('Apps'), gettext('Number of Apps'));
+            cutils.createChart(
+                'apps_available_by_type',
+                gettext('Apps'),
+                gettext('Number of Apps')
+            );
         });
 
         builder.z('type', 'root');
diff --git a/src/media/js/views/apps_by_type.js b/src/media/js/views/apps_by_type.js
@@ -7,7 +7,11 @@ define('views/apps_by_type', ['chartutils', 'l10n'], function(cutils, l10n) {
 
         builder.start('apps_chart.html',
         			  {title: chartTitle, regions: cutils.regions}).done(function() {
-            cutils.createChart('apps_by_type', gettext('Apps'), gettext('Number of Apps'));
+            cutils.createChart(
+                'apps_by_type',
+                gettext('Apps'),
+                gettext('Number of Apps')
+            );
         });
 
         builder.z('type', 'root');
diff --git a/src/media/js/views/apps_installed.js b/src/media/js/views/apps_installed.js
@@ -7,7 +7,11 @@ define('views/apps_installed', ['chartutils', 'l10n'], function(cutils, l10n) {
 
         builder.start('apps_chart.html',
         			  {title: chartTitle, regions: cutils.regions}).done(function() {
-            cutils.createChart('apps_installed', gettext('Apps'), gettext('Number of Apps'));
+            cutils.createChart(
+                'apps_installed',
+                gettext('Apps'),
+                gettext('Number of Apps')
+            );
         });
 
         builder.z('type', 'root');
diff --git a/src/media/js/views/apps_installed_total.js b/src/media/js/views/apps_installed_total.js
@@ -0,0 +1,21 @@
+define('views/apps_installed_total', ['chartutils', 'l10n'], function(cutils, l10n) {
+
+    var gettext = l10n.gettext;
+
+    return function(builder) {
+        var chartTitle = gettext('Total Apps Installed');
+
+        builder.start('apps_chart.html',
+        			  {title: chartTitle}).done(function() {
+            cutils.createChart(
+                'apps_installed_total',
+                gettext('Apps'),
+                gettext('Number of Apps'),
+                {noregion: true}
+            );
+        });
+
+        builder.z('type', 'root');
+        builder.z('title', chartTitle);
+    };
+});
diff --git a/src/media/js/views/gross_revenue.js b/src/media/js/views/gross_revenue.js
@@ -8,8 +8,12 @@ define('views/gross_revenue', ['chartutils', 'l10n'],
 
         builder.start('apps_chart.html',
                       {title: chartTitle}).done(function() {
-            cutils.createChart('gross_revenue', gettext('Revenue'),
-                               gettext('Daily Total'), {noregion: true});
+            cutils.createChart(
+                'gross_revenue',
+                gettext('Revenue'),
+                gettext('Daily Total'),
+                {noregion: true}
+            );
         });
 
         builder.z('type', 'root');
diff --git a/src/media/js/views/per_app_installs.js b/src/media/js/views/per_app_installs.js
@@ -9,8 +9,13 @@ define('views/per_app_installs', ['chartutils', 'l10n', 'utils'],
 
         builder.start('per_app_chart.html',
                       {title: chartTitle, regions: cutils.regions, slug: slug}).done(function() {
-            cutils.createChart('per_app_installs', gettext('Installs'),
-                               gettext('Number of Installs'), {}, slug);
+            cutils.createChart(
+                'per_app_installs',
+                gettext('Installs'),
+                gettext('Number of Installs'),
+                {},
+                slug
+            );
         });
 
         builder.z('type', 'root');
diff --git a/src/media/js/views/per_app_revenue.js b/src/media/js/views/per_app_revenue.js
@@ -9,8 +9,13 @@ define('views/per_app_revenue', ['chartutils', 'l10n', 'utils'],
 
         builder.start('per_app_chart.html',
                       {title: chartTitle, slug: slug}).done(function() {
-            cutils.createChart('per_app_revenue', gettext('Revenue'),
-                               gettext('Total Revenue'), {noregion: true}, slug);
+            cutils.createChart(
+                'per_app_revenue',
+                gettext('Revenue'),
+                gettext('Total Revenue'),
+                {noregion: true},
+                slug
+            );
         });
 
         builder.z('type', 'root');
diff --git a/src/media/js/views/per_app_visits.js b/src/media/js/views/per_app_visits.js
@@ -9,8 +9,13 @@ define('views/per_app_visits', ['chartutils', 'l10n', 'utils'],
 
         builder.start('per_app_chart.html',
                       {title: chartTitle, slug: slug}).done(function() {
-            cutils.createChart('per_app_visits', gettext('Visits'),
-                               gettext('Number of Visits'), {noregion: true}, slug);
+            cutils.createChart(
+                'per_app_visits',
+                gettext('Visits'),
+                gettext('Number of Visits'),
+                {noregion: true},
+                slug
+            );
         });
 
         builder.z('type', 'root');
diff --git a/src/media/js/views/total_developers.js b/src/media/js/views/total_developers.js
@@ -7,8 +7,12 @@ define('views/total_developers', ['chartutils', 'l10n'], function(cutils, l10n)
 
         builder.start('apps_chart.html',
                       {title: chartTitle}).done(function() {
-            cutils.createChart('total_developers', gettext('Developers'),
-                               gettext('Number of Developers'), {noregion: true});
+            cutils.createChart(
+                'total_developers',
+                gettext('Developers'),
+                gettext('Number of Developers'),
+                {noregion: true}
+            );
         });
 
         builder.z('type', 'root');
diff --git a/src/media/js/views/total_visits.js b/src/media/js/views/total_visits.js
@@ -7,7 +7,12 @@ define('views/total_visits', ['chartutils', 'l10n'], function(cutils, l10n) {
 
         builder.start('apps_chart.html',
         			  {title: chartTitle}).done(function() {
-            cutils.createChart('total_visits', gettext('Visits'), gettext('Number of Visits'), {noregion: true});
+            cutils.createChart(
+                'total_visits',
+                gettext('Visits'),
+                gettext('Number of Visits'),
+                {noregion: true}
+            );
         });
 
         builder.z('type', 'root');
diff --git a/src/templates/homepage.html b/src/templates/homepage.html
@@ -16,6 +16,9 @@ <h2>{{ _('Charts currently available') }}</h2>
       <li>
         <a href="{{ url('apps_installed') }}">{{ _('Apps Installed') }}</a>
       </li>
+      <li>
+        <a href="{{ url('apps_installed_total') }}">{{ _('Total Apps Installed') }}</a>
+      </li>
       <li>
         <a href="{{ url('apps_by_type') }}">{{ _('Apps Added by Type') }}</a>
       </li>
