diff --git a/remo/dashboard/static/dashboard/css/kpi.css b/remo/dashboard/static/dashboard/css/kpi.css
index d515edff4..fb30d377c 100644
--- a/remo/dashboard/static/dashboard/css/kpi.css
+++ b/remo/dashboard/static/dashboard/css/kpi.css
@@ -23,15 +23,31 @@
font-size: 12px;
}
+.people-core {
+ color: #ff4f32;
+}
+
+.people-active {
+ color: #ff725a;
+}
+
+.people-casual {
+ color: #ff9584;
+}
+
+.people-inactive {
+ color: #ffb8ad;
+}
+
.area-people-core {
fill: #ff4f32;
}
-.area-people-casual {
+.area-people-active {
fill: #ff725a;
}
-.area-people-active {
+.area-people-casual {
fill: #ff9584;
}
diff --git a/remo/dashboard/static/dashboard/js/kpi.js b/remo/dashboard/static/dashboard/js/kpi.js
index 92699fe1c..0cb00a32f 100644
--- a/remo/dashboard/static/dashboard/js/kpi.js
+++ b/remo/dashboard/static/dashboard/js/kpi.js
@@ -77,16 +77,15 @@ $(document).ready(function() {
.attr('class', 'd3-tip')
.offset([35, 0])
.html(function(d) {
- return 'Inactive: ' +
- d.inactive + '
' +
- 'Active: ' +
+ return 'Core: ' +
+ d.core + '
' +
+ 'Active: ' +
d.active + '
' +
- 'Casual: ' +
+ 'Casual: ' +
d.casual + '
' +
- 'Core: ' +
- d.core + '
' +
- 'Total: ' +
- d.active_total + '';
+ 'Inactive: ' +
+ d.inactive + '
' +
+ 'Total: ' + d.active_total + '';
});
svg.call(tip);
@@ -112,9 +111,9 @@ $(document).ready(function() {
d.active = +d.active;
d.casual = +d.casual;
d.inactive = +d.inactive;
- d.active_stack = d.active + d.inactive;
- d.casual_stack = d.casual + d.active_stack;
- d.core_stack = d.core + d.casual_stack;
+ d.casual_stack = d.casual + d.inactive;
+ d.active_stack = d.active + d.casual_stack;
+ d.core_stack = d.core + d.active_stack;
d.active_total = d.core + d.active + d.casual + d.inactive;
});