Ei muokkausyhteenvetoa |
Ei muokkausyhteenvetoa |
||
| Rivi 134: | Rivi 134: | ||
memo.headerEl.append( '<div class="obscharttitle" style="float: left;"></div>' ); | memo.headerEl.append( '<div class="obscharttitle" style="float: left;"></div>' ); | ||
memo.titleEl = jQuery( this ).find( '.obscharttitle' ); | memo.titleEl = jQuery( this ).find( '.obscharttitle' ); | ||
// add or hide footer | // add or hide footer | ||
if ( memo.caption == '' ) { | if ( memo.caption == '' ) { | ||
| Rivi 961: | Rivi 961: | ||
// series for trend line | // series for trend line | ||
//memo.options.trendlines[0] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['trend'], lineWidth: 2, opacity: 0.5, type: 'linear', visibleInLegend: memo.trendType!='moving' }; | //memo.options.trendlines[0] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['trend'], lineWidth: 2, opacity: 0.5, type: 'linear', visibleInLegend: memo.trendType!='moving' }; | ||
for (var o in memo.obsesA) { | for (var o in memo.obsesA) { | ||
| Rivi 1 059: | Rivi 1 057: | ||
memo.seasonsO[s].obses.push( memo.obsesA[o] ); | memo.seasonsO[s].obses.push( memo.obsesA[o] ); | ||
} | } | ||
console.log( memo ); | //console.log( memo ); | ||
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; } ); | ||
| Rivi 1 137: | Rivi 1 135: | ||
// make week averages | // make week averages | ||
memo.avgW = {}; | memo.avgW = {}; | ||
for (var o in memo.obsesA) { | for ( var o in memo.obsesA ) { | ||
mwDate = new Date( memo.obsesA[o].compareDate.getFullYear(), memo.obsesA[o].compareDate.getMonth(), memo.obsesA[o].compareDate.getDate() ); | mwDate = new Date( memo.obsesA[o].compareDate.getFullYear(), memo.obsesA[o].compareDate.getMonth(), memo.obsesA[o].compareDate.getDate() ); | ||
| Rivi 1 143: | Rivi 1 141: | ||
w = mwDate.getWeek(); | w = mwDate.getWeek(); | ||
v = memo.obsesA[o].value + memo.distF*Math.random() - memo.distF*Math.random(); | v = memo.obsesA[o].value + memo.distF*Math.random() - memo.distF*Math.random(); | ||
if ( v == 15 ) { | |||
console.log( memo.obsesA[ o ] ); | |||
} | |||
if ( typeof memo.avgW[y] == 'undefined' ) { memo.avgW[y] = {}; } | if ( typeof memo.avgW[y] == 'undefined' ) { memo.avgW[y] = {}; } | ||


