Ero sivun ”Widget:Test4” versioiden välillä

Rivi 210:

// add compare date to obses

if ( memo.season == 'summer' || obs.obsdatetime.getMonth() > 7 ) {

obs.compareDate = new Date( memo.curSeason, obs.obsdatetime.getMonth(), obs.obsdatetime.getDate(), 12 );

obs.compareDate = new Date( memo.curSeason, obs.obsdatetime.getMonth(), obs.obsdatetime.getDate(), obs.obsdatetime.getHours(), obs.obsdatetime.getMinutes() );

} else {

obs.compareDate = new Date( memo.curSeason+1, obs.obsdatetime.getMonth(), obs.obsdatetime.getDate(), 12 );

obs.compareDate = new Date( memo.curSeason+1, obs.obsdatetime.getMonth(), obs.obsdatetime.getDate(), obs.obsdatetime.getHours(), obs.obsdatetime.getMinutes() );

}

ms = obs.compareDate.getTime();

Rivi 697:

// make week averages

memo.avgW = {};

~~console.log( memo.obsesA );~~

for (var o in memo.obsesA) {

Rivi 704:

Rivi 703:

w = mwDate.getWeek();

v = memo.obsesA[o].value;

~~console.log( mwDate.toISOString() );~~

//if ( typeof memo.avgW[y] == 'undefined' ) { memo.avgW[y] = {}; }

~~console.log( y );~~

~~console.log( w );~~

if ( typeof memo.avgW[y] == 'undefined' ) { memo.avgW[y] = {}; }

if ( typeof memo.avgW~~[y]~~[w] == 'undefined' ) {

if ( typeof memo.avgW[w] == 'undefined' ) {

mwDate.setDate( mwDate.getDate() - mwDate.getDay() + 3 )

memo.avgW~~[y]~~[w] = { cDate: mwDate, values: [ v ], sum: v, count: 1, avg: v };

memo.avgW[w] = { cDate: mwDate, values: [ v ], sum: v, count: 1, avg: v };

} else {

memo.avgW~~[y]~~[w].values.push( v );

memo.avgW[w].values.push( v );

memo.avgW~~[y]~~[w].sum += v;

memo.avgW[w].sum += v;

memo.avgW~~[y]~~[w].count++;

memo.avgW[w].count++;

memo.avgW~~[y]~~[w].avg = memo.avgW~~[y]~~[w].sum / memo.avgW~~[y]~~[w].count;

memo.avgW[w].avg = memo.avgW[w].sum / memo.avgW[w].count;

}

@@ Rivi 210: / Rivi 210: @@
 						// add compare date to obses
 						if ( memo.season == 'summer' || obs.obsdatetime.getMonth() > 7 ) {
-							obs.compareDate = new Date( memo.curSeason, obs.obsdatetime.getMonth(), obs.obsdatetime.getDate(), 12 );
+							obs.compareDate = new Date( memo.curSeason, obs.obsdatetime.getMonth(), obs.obsdatetime.getDate(), obs.obsdatetime.getHours(), obs.obsdatetime.getMinutes() );
 						} else {
-							obs.compareDate = new Date( memo.curSeason+1, obs.obsdatetime.getMonth(), obs.obsdatetime.getDate(), 12 );
+							obs.compareDate = new Date( memo.curSeason+1, obs.obsdatetime.getMonth(), obs.obsdatetime.getDate(), obs.obsdatetime.getHours(), obs.obsdatetime.getMinutes() );
 						}
 						ms = obs.compareDate.getTime();
@@ Rivi 697: / Rivi 697: @@
 					// make week averages
 					memo.avgW = {};
-					console.log( memo.obsesA );
 					for (var o in memo.obsesA) {
@@ Rivi 704: / Rivi 703: @@
 						w = mwDate.getWeek();
 						v = memo.obsesA[o].value;
-						console.log( mwDate.toISOString() );
+						//if ( typeof memo.avgW[y] == 'undefined' ) { memo.avgW[y] = {}; }
-						console.log( y );
-						console.log( w );
-						if ( typeof memo.avgW[y] == 'undefined' ) { memo.avgW[y] = {}; }
-						if ( typeof memo.avgW[y][w] == 'undefined' ) {
+						if ( typeof memo.avgW[w] == 'undefined' ) {
 							mwDate.setDate( mwDate.getDate() - mwDate.getDay() + 3 )
-							memo.avgW[y][w] = { cDate: mwDate, values: [ v ], sum: v, count: 1, avg: v };
+							memo.avgW[w] = { cDate: mwDate, values: [ v ], sum: v, count: 1, avg: v };
 						} else {
-							memo.avgW[y][w].values.push( v );
+							memo.avgW[w].values.push( v );
-							memo.avgW[y][w].sum += v;
+							memo.avgW[w].sum += v;
-							memo.avgW[y][w].count++;
+							memo.avgW[w].count++;
-							memo.avgW[y][w].avg = memo.avgW[y][w].sum / memo.avgW[y][w].count;
+							memo.avgW[w].avg = memo.avgW[w].sum / memo.avgW[w].count;
 						}
 					}

Widget:Test4

Versio 27. joulukuuta 2021 kello 16.13