Ei muokkausyhteenvetoa |
Ei muokkausyhteenvetoa |
||
| Rivi 601: | Rivi 601: | ||
} | } | ||
function addDataToSeasonChart(memo) { | function addDataToSeasonChart( memo ) { | ||
if ( i18n[memo.obscode]['type'] == 'cat') { | if ( i18n[memo.obscode]['type'] == 'cat') { | ||
| Rivi 609: | Rivi 609: | ||
} | } | ||
// set x-axis min and max for season chart | |||
memo.axisMinDate = new Date( memo.obsMinCompDateMs ); | memo.axisMinDate = new Date( memo.obsMinCompDateMs ); | ||
memo.axisMinDate.setDate(1); | memo.axisMinDate.setDate(1); | ||
| Rivi 615: | Rivi 616: | ||
memo.axisMaxDate.setDate(0); | memo.axisMaxDate.setDate(0); | ||
// create series of each season | |||
memo.seasonsO = {}; | memo.seasonsO = {}; | ||
memo.seasonsA = []; | memo.seasonsA = []; | ||
for (var o in memo.obsesA) { | for (var o in memo.obsesA) { | ||
s = memo.obsesA[o].seriesId; | s = memo.obsesA[o].seriesId; | ||
if (typeof memo.seasonsO[s] == 'undefined' ) { memo.seasonsO[s] = { 'obses': [] }; } | if (typeof memo.seasonsO[s] == 'undefined' ) { memo.seasonsO[s] = { 'obses': [] }; } | ||
memo.seasonsO[s].obses.push( memo.obsesA[o] ); | memo.seasonsO[s].obses.push( memo.obsesA[o] ); | ||
} | } | ||
for (var o in memo.seasonsO) { memo.seasonsA.push(o); } memo.seasonsA.sort( function(a,b) { return b-a; } ); | for (var o in memo.seasonsO) { memo.seasonsA.push(o); } memo.seasonsA.sort( function(a,b) { return b-a; } ); | ||
// create cols for each series | // create data cols for each series | ||
var sc = 0; | var sc = 0; | ||
for (var s in memo.seasonsA) { | for (var s in memo.seasonsA) { | ||
| Rivi 705: | Rivi 704: | ||
v = memo.obsesA[o].value; | v = memo.obsesA[o].value; | ||
if ( typeof memo.avgW[w] == 'undefined' ) { | if ( typeof memo.avgW[y][w] == 'undefined' ) { | ||
mwDate.setDate( mwDate.getDate() - mwDate.getDay() + 3 ) | mwDate.setDate( mwDate.getDate() - mwDate.getDay() + 3 ) | ||
memo.avgW[w] = { cDate: mwDate, values: [ v ], sum: v, count: 1, avg: v }; | memo.avgW[y][w] = { cDate: mwDate, values: [ v ], sum: v, count: 1, avg: v }; | ||
} else { | } else { | ||
memo.avgW[w].values.push( v ); | memo.avgW[y][w].values.push( v ); | ||
memo.avgW[w].sum += v; | memo.avgW[y][w].sum += v; | ||
memo.avgW[w].count++; | memo.avgW[y][w].count++; | ||
memo.avgW[w].avg = memo.avgW[w].sum / memo.avgW[w].count; | memo.avgW[y][w].avg = memo.avgW[y][w].sum / memo.avgW[y][w].count; | ||
} | } | ||
} | } | ||


