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

@@ Rivi 910: / Rivi 910: @@
 					memo.axisMaxDate.setDate(0);
-					// do Y axis min and max for this chart type
-					//memo.options.vAxis.minValue = 8000;
-					//memo.options.vAxis.viewWindow.min = memo.options.vAxis.minValue;
-					//memo.options.vAxis.maxValue = 9000;
-					//memo.options.vAxis.viewWindow.max = memo.options.vAxis.maxValue;
 					memo.seasonsO = {};
 					memo.seasonsA = [];
@@ Rivi 1 167: / Rivi 1 161: @@
 						}
-						//console.log( memo.avgMlist );
 						memo.avgMsmooth = smooth( memo.avgMlist, memo.gSmoothing );
 						memo.avgLsmooth = smooth( memo.avgLlist, memo.gSmoothing );
 						memo.avgHsmooth = smooth( memo.avgHlist, memo.gSmoothing );
-						//console.log( memo.avgMsmooth );
-						//console.log(memo.avgMlist);
-						//console.log(memo.avgLsmooth);
 						cc = memo.data.getNumberOfColumns();
@@ Rivi 1 196: / Rivi 1 183: @@
 							dataRow[cc-3] = memo.avgLsmooth[i];
 							dataRow[cc-2] = memo.avgHsmooth[i];
-							//dataRow[cc-3] = Math.min( memo.avgLsmooth[i], memo.avgMlist[i+memo.gSmoothing/2+2] );
-							//dataRow[cc-2] = Math.max( memo.avgHsmooth[i], memo.avgMlist[i+1] );
 							memo.dataA.push( dataRow );
@@ Rivi 1 204: / Rivi 1 188: @@
 						memo.options.intervals = { 'style':'area' };
-						//console.log(memo.dataA);
 					} else if (memo.trendType == 'moving') {
@@ Rivi 1 237: / Rivi 1 218: @@
 							dataRow[s*4+2] = obs.style;
 							dataRow[s*4+3] = obs.popup;
-							dataRow[s*4+4] = null; //annotation
+							if ( s == ( memo.seasonsA.length - 1 ) && o == ( memo.seasonsO[memo.seasonsA[s]].obses.length - 1 ) ) {
+								dataRow[s*4+4] = 'Test'; //annotation
+							} else {
+								dataRow[s*4+4] = null; //annotation
+							}
 							memo.dataA.push( dataRow );

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

Versio 15. marraskuuta 2022 kello 12.42