Ero sivun ”Widget:JwObsCharts” versioiden välillä
Järvi-meriwikistä
Rivi 568: | Rivi 568: | ||
function addDataToCurrentChart( memo ) { | function addDataToCurrentChart( memo ) { | ||
+ | |||
+ | |||
+ | // sort according to compare date | ||
+ | memo.obsesA.sort( function( a, b ) { return a.compareDate - b.compareDate; }); | ||
+ | |||
+ | // make week averages | ||
+ | memo.avgW = {}; | ||
+ | for (var o in memo.obsesA) { | ||
+ | |||
+ | mwDate = new Date( memo.obsesA[o].compareDate.getFullYear(), memo.obsesA[o].compareDate.getMonth(), memo.obsesA[o].compareDate.getDate() ); | ||
+ | y = mwDate.getFullYear(); | ||
+ | w = mwDate.getWeek(); | ||
+ | v = memo.obsesA[o].value + memo.distF*Math.random() - memo.distF*Math.random(); | ||
+ | if ( typeof memo.avgW[y] == 'undefined' ) { memo.avgW[y] = {}; } | ||
+ | if ( typeof memo.avgW[y][w] == 'undefined' ) { | ||
+ | mwDate.setDate( mwDate.getDate() - mwDate.getDay() + 3 ) | ||
+ | memo.avgW[y][w] = { cDate: mwDate, values: [ v ], sum: v, count: 1, avg: v }; | ||
+ | } else { | ||
+ | memo.avgW[y][w].values.push( v ); | ||
+ | memo.avgW[y][w].sum += v; | ||
+ | memo.avgW[y][w].count++; | ||
+ | memo.avgW[y][w].avg = memo.avgW[y][w].sum / memo.avgW[y][w].count; | ||
+ | } | ||
+ | } | ||
+ | |||
+ | console.log( memo.obsesA ); | ||
+ | |||
+ | //var diff = obs.value - memo.avgW[ obs.compareDate.getFullYear() ][ obs.compareDate.getWeek() ].avg; | ||
+ | //var diff = Math.round( diff*100 ); | ||
+ | //var diffStr = diff.toString() + ' cm'; | ||
+ | //if ( diff > 0 ) { diffStr = '+' + diffStr; } | ||
+ | //dataRow[s*4+4] = diffStr; //annotation | ||
Rivi 834: | Rivi 866: | ||
drawChart(memo); | drawChart(memo); | ||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
} | } | ||