diff --git a/index.html b/index.html
index 7f95b9f..d3e96dd 100644
--- a/index.html
+++ b/index.html
@@ -194,26 +194,6 @@
- -
-
- mingran 22%
-
- -
-
- boyao 11%
-
- -
-
- yimian 40%
-
- -
-
- xiaotian 17%
-
- -
-
- hao 10%
-
@@ -328,17 +308,17 @@
var lastWeekTotal = Number(0), lastSecodeWeekTotal = Number(0);
- var lastWeekByUser = {};
+ lastWeekByUser = {};
data.items.forEach(function(item){
if(item.timestamp > new Date().valueOf()/1000 - 7*24*60){
lastWeekTotal += Number(item.value);
+ if(!lastWeekByUser.hasOwnProperty(item.user)) lastWeekByUser[item.user] = 0;
lastWeekByUser[item.user] += Number(item.value);
}else if(item.timestamp > new Date().valueOf()/1000 - 14*24*60){
lastSecodeWeekTotal += Number(item.value);
}
});
-
$('#week-avg').html(Number(lastWeekTotal/7).toFixed(2));
@@ -498,10 +478,6 @@
notice();
-
-
- mingran 22%
-
var advStats = '';
@@ -510,11 +486,11 @@
var Piedata, chartOptions;
+ var colors = ['#F782AA', '#0084B4', '#3FC5AC', '#FFD06B', '#CCCCCC', '#8F3D39', '#9A3481', '#492034', '#593204', '#71e39d', '#B32083', '#D39D32'];
Piedata = [];
- data.['actualTotals'].forEach((val)=>{
- var user = Object.keys(val)[0];
- advStats += ''+data.usersName[user]+' '+(lastWeekByUser[user]/lastWeekTotal)+'';
- Piedata.push({ label: "", data: Math.floor(val(user)) });
+ Object.keys(data.actualTotals).forEach((user, index)=>{
+ advStats += ''+data.usersName[user]+' '+(lastWeekByUser[user]/lastWeekTotal)*100+'%';
+ Piedata.push({ label: "", data: Math.floor(data.actualTotals[user]) });
});
chartOptions = {
series: {
@@ -541,7 +517,7 @@
borderWidth: 0,
},
shadowSize: 0,
- colors: ['#F782AA', '#0084B4', '#3FC5AC', '#FFD06B', '#CCCCCC', '#8F3D39', '#9A3481', '#492034', '#593204', '#71e39d', '#B32083', '#D39D32'],
+ colors: colors
};
var holder = $('#advertising');
if (holder.length) {