Widget:XJwCharts

Versio 29. lokakuuta 2021 kello 14.05

@@ Rivi 36: / Rivi 36: @@
    					obs.data = JSON.parse( obs.printouts.DataJSON );
-  					var winter = obs.obsdatetime.getFullYear();
+   					if ( obs.obsdatetime.getMonth() > -1 && obs.obsdatetime.getMonth() < 8 ) {
-   					if ( obs.obsdatetime.getMonth() > -1 && obs.obsdatetime.getMonth() < 8 ) { winter--; };
+  						obs.winter = obs.obsdatetime.getFullYear()-1;
+  						obs.comparedate = new Date( now.getFullYear()+1, obs.obsdatetime.getMonth(), obs.obsdatetime.getDate() );
-  					var cdate = new Date( now.getFullYear(), obs.obsdatetime.getMonth(), obs.obsdatetime.getDate() );
+   					} else {
-   					var days = ( cdate.getTime() - now.getTime() ) / ( 1000*60*60*24 );
+  						obs.winter = obs.obsdatetime.getFullYear();
+  						obs.comparedate = new Date( now.getFullYear(), obs.obsdatetime.getMonth(), obs.obsdatetime.getDate() );
+  					}
+   					var days = ( obs.comparedate.getTime() - now.getTime() ) / ( 1000*60*60*24 );
    					firstW = Math.min( firstW, winter ); lastW = Math.min( lastW, winter );
-   					if ( typeof data[ winter ] == 'undefined' ) { data[ winter ] = { 'winter': winter }; }
+   					if ( typeof data[ obs.winter ] == 'undefined' ) { data[ obs.winter ] = { 'winter': obs.winter }; }
    					if ( obs.data.cat == 2 ) {
-   						data[ winter ].freeze = days;
+   						data[ obs.winter ].freeze = days;
    					} else if ( obs.data.cat == 5 ) {
-   						data[ winter ].breakup = days;
+   						data[ obs.winter ].breakup = days;
    					}