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

Rivi 67:

memo.service = jQuery( this ).attr( 'data-coo311-service_code' );

memo.graphType = jQuery( this ).attr( 'data-graph-type' );

~~//if ( typeof jQuery( this ).attr( 'data-current-period' ) == 'undefined' ) { memo.currentPeriod = '-'; }~~

~~//else { memo.currentPeriod = jQuery( this ).attr( 'data-current-period' ); }~~

memo.editUrl = jQuery( this ).attr( 'data-edit-url' ); if (typeof memo.editUrl == 'undefined') { memo.editUrl = '-'; }

memo.csvfile = jQuery( this ).attr( 'data-csv-filename' ); if (typeof memo.csvfile == 'undefined') { memo.csvfile = i18n[ memo.obscode ].title[ memo.lang ] + '_SiteID-' + memo.siteid + '_Downloaded-' + today.toISOString().split( 'T' )[0] + '.csv'; }

Rivi 564:

Rivi 562:

addDataToTrendChart(memo);

} else if (memo.graphType == 'trendwithhighlow') {

addDataToTrendWithHighLowChart(memo);

} else if (memo.graphType == 'season') {

Rivi 867:

Rivi 869:

}

function addDataToTrendWithHighLowChart (memo) {

// do axis min and max

memo.axisMinDate = new Date(memo.obsMinDate.getTime());

memo.axisMaxDate = new Date(memo.obsMaxDate.getTime());

memo.axisMinDate.setMonth(0);

memo.axisMaxDate.setMonth(11);

memo.axisMinDate.setDate(1);

memo.axisMaxDate.setDate(31);

memo.data.addColumn( 'number', memo.obsMinYear + '-' + memo.obsMaxYear );

memo.data.addColumn( {'type': 'string', 'role': 'style' } );

memo.data.addColumn( { type: 'string', role: 'annotation' } );

memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } );

// 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' };

for (var o in memo.obsesA) {

memo.dataA.push( [ memo.obsesA[o].obsdatetime, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup ] );

}

memo.options.hAxis.ticks = [];

for (i=memo.axisMinDate.getFullYear(); i<=memo.axisMaxDate.getFullYear(); i++) {

middleOfYear = new Date( i, 6, 1 );

memo.options.hAxis.ticks.push({v: middleOfYear, f: String(i) });

}

memo.options.series[0] = {type: 'line', pointSize: 6, color: '#3366cc' };

drawChart(memo);

}

function addDataToTrendChart(memo) {

@@ Rivi 67: / Rivi 67: @@
 						memo.service = jQuery( this ).attr( 'data-coo311-service_code' );
 						memo.graphType = jQuery( this ).attr( 'data-graph-type' );
-						//if ( typeof jQuery( this ).attr( 'data-current-period' ) == 'undefined' ) { memo.currentPeriod = '-'; }
-						//else { memo.currentPeriod = jQuery( this ).attr( 'data-current-period' ); }
 						memo.editUrl = jQuery( this ).attr( 'data-edit-url' ); if (typeof memo.editUrl == 'undefined') { memo.editUrl = '-'; }
 						memo.csvfile = jQuery( this ).attr( 'data-csv-filename' ); if (typeof memo.csvfile == 'undefined') { memo.csvfile = i18n[ memo.obscode ].title[ memo.lang ] + '_SiteID-' + memo.siteid + '_Downloaded-' + today.toISOString().split( 'T' )[0] + '.csv'; }
@@ Rivi 564: / Rivi 562: @@
 					addDataToTrendChart(memo);
+				} else if (memo.graphType == 'trendwithhighlow') {
+					addDataToTrendWithHighLowChart(memo);
 				} else if (memo.graphType == 'season') {
@@ Rivi 867: / Rivi 869: @@
 			}
+			function addDataToTrendWithHighLowChart	(memo) {
+				// do axis min and max
+				memo.axisMinDate = new Date(memo.obsMinDate.getTime());
+				memo.axisMaxDate = new Date(memo.obsMaxDate.getTime());
+				memo.axisMinDate.setMonth(0);
+				memo.axisMaxDate.setMonth(11);
+				memo.axisMinDate.setDate(1);
+				memo.axisMaxDate.setDate(31);
+				memo.data.addColumn( 'number', memo.obsMinYear + '-' + memo.obsMaxYear );
+				memo.data.addColumn( {'type': 'string', 'role': 'style' } );
+				memo.data.addColumn( { type: 'string', role: 'annotation' } );
+				memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } );
+				// 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' };
+				for (var o in memo.obsesA) {
+					memo.dataA.push( [ memo.obsesA[o].obsdatetime, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup ] );
+				}
+				memo.options.hAxis.ticks = [];
+				for (i=memo.axisMinDate.getFullYear(); i<=memo.axisMaxDate.getFullYear(); i++) {
+					middleOfYear = new Date( i, 6, 1 );
+					memo.options.hAxis.ticks.push({v: middleOfYear, f: String(i) });
+				}
+				memo.options.series[0] = {type: 'line', pointSize: 6, color: '#3366cc'  };
+				drawChart(memo);
+			}
 			function addDataToTrendChart(memo) {

Widget:JwObsCharts

Versio 4. huhtikuuta 2023 kello 14.27