Ei muokkausyhteenvetoa |
Ei muokkausyhteenvetoa |
||
| Rivi 85: | Rivi 85: | ||
memo.caption = jQuery( this ).attr( 'data-caption' ); if ( typeof memo.caption == 'undefined' ) { memo.caption = ""; } | memo.caption = jQuery( this ).attr( 'data-caption' ); if ( typeof memo.caption == 'undefined' ) { memo.caption = ""; } | ||
if ( typeof jQuery( this ).attr( 'data-jw-summerwinter' ) != 'undefined' ) { memo.summerwinter = ( jQuery( this ).attr( 'data-jw-summerwinter' ) == 'true' ); } else { memo.summerwinter = false; }; | if ( typeof jQuery( this ).attr( 'data-jw-summerwinter' ) != 'undefined' ) { memo.summerwinter = ( jQuery( this ).attr( 'data-jw-summerwinter' ) == 'true' ); } else { memo.summerwinter = false; }; | ||
if ( typeof jQuery( this ).attr( 'data-jw-summerother' ) != 'undefined' ) { memo.summerother = ( jQuery( this ).attr( 'data-jw-summerother' ) == 'true' ); } else { memo.summerother = false; }; | |||
if ( typeof jQuery( this ).attr( 'data-jw-bottomsurface' ) != 'undefined' ) { memo.bottomsurface = ( jQuery( this ).attr( 'data-jw-bottomsurface' ) == 'true' ); } else { memo.bottomsurface = false; }; | if ( typeof jQuery( this ).attr( 'data-jw-bottomsurface' ) != 'undefined' ) { memo.bottomsurface = ( jQuery( this ).attr( 'data-jw-bottomsurface' ) == 'true' ); } else { memo.bottomsurface = false; }; | ||
| Rivi 93: | Rivi 94: | ||
} else if ( memo.summerwinter ) { | } else if ( memo.summerwinter ) { | ||
memo.divide = 'summerwinter'; | memo.divide = 'summerwinter'; | ||
} else if ( memo.summerother ) { | |||
memo.divide = 'summerother'; | |||
} else { | } else { | ||
memo.divide = '-'; | memo.divide = '-'; | ||
| Rivi 550: | Rivi 553: | ||
obs.seriesId = 'other'; | obs.seriesId = 'other'; | ||
} | } | ||
} else if ( memo.divide == 'summerother' ) { | |||
if ( obs.compareDate.getMonth() > 4 && obs.compareDate.getMonth() < 9 ) { | |||
obs.seriesId = 'summer'; | |||
} else { | |||
obs.seriesId = 'other'; | |||
} | |||
} else if ( memo.divide == 'bottomsurface' ) { | } else if ( memo.divide == 'bottomsurface' ) { | ||
if ( obs.data.depthR == 'bottom' ) { | if ( obs.data.depthR == 'bottom' ) { | ||
| Rivi 1 151: | Rivi 1 160: | ||
memo.data.addColumn( { type: 'string', role: 'annotation' } ); | memo.data.addColumn( { type: 'string', role: 'annotation' } ); | ||
memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } ); | memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } ); | ||
} else if ( memo.divide == 'summerother' ) { | |||
memo.options.series[0] = { type: 'scatter', pointSize: 10, color: colors[ 'spring-autumn' ] }; | |||
memo.options.series[1] = { type: 'scatter', pointSize: 10, color: colors[ 'summer' ] }; | |||
memo.data.addColumn( 'number', 'Kevät/syksy' ); | |||
memo.data.addColumn( {'type': 'string', 'role': 'style' } ); | |||
memo.data.addColumn( { type: 'string', role: 'annotation' } ); | |||
memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } ); | |||
memo.data.addColumn( 'number', 'Kesä (kesä-syyskuu)' ); | |||
memo.data.addColumn( {'type': 'string', 'role': 'style' } ); | |||
memo.data.addColumn( { type: 'string', role: 'annotation' } ); | |||
memo.data.addColumn( { type: 'string', role: 'tooltip', 'p': { 'html': true } } ); | |||
} else if ( memo.divide == 'bottomsurface' ) { | } else if ( memo.divide == 'bottomsurface' ) { | ||
| Rivi 1 191: | Rivi 1 215: | ||
memo.options.trendlines[1] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['summer'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: false }; | memo.options.trendlines[1] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['summer'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: false }; | ||
memo.options.trendlines[2] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['winter'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: false }; | memo.options.trendlines[2] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['winter'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: false }; | ||
} else if ( memo.divide == 'summerother' ) { | |||
memo.options.trendlines[0] = { 'lineWidth': 0, 'opacity': 0, tooltip: false, visibleInLegend: false }; | |||
memo.options.trendlines[1] = { labelInLegend: i18n['trendline'][memo.lang], tooltip: false, color: colors['summer'], lineWidth: 3, originalLineWidth: 3, opacity: 1, type: memo.trendType, 'degree': 2, visibleInLegend: false }; | |||
} else if ( memo.divide == 'bottomsurface' ) { | } else if ( memo.divide == 'bottomsurface' ) { | ||
memo.options.trendlines[0] = { 'lineWidth': 0, 'opacity': 0, tooltip: false, visibleInLegend: false }; | memo.options.trendlines[0] = { 'lineWidth': 0, 'opacity': 0, tooltip: false, visibleInLegend: false }; | ||
| Rivi 1 224: | Rivi 1 251: | ||
memo.dataA.push( [ memo.obsesA[o].obsdatetime, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup, null, null, null, null, null, null, null, null ] ); | memo.dataA.push( [ memo.obsesA[o].obsdatetime, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup, null, null, null, null, null, null, null, null ] ); | ||
} | } | ||
} else if ( memo.divide == 'summerother' ) { | |||
if ( memo.obsesA[o].seriesId == 'summer' ) { | |||
memo.dataA.push( [ memo.obsesA[o].obsdatetime, null, null, null, null, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup, null, null, null, null ] ); | |||
} else { | |||
memo.dataA.push( [ memo.obsesA[o].obsdatetime, memo.obsesA[o].value, memo.obsesA[o].style, null, memo.obsesA[o].popup, null, null, null, null, null, null, null, null ] ); | |||
} | |||
} else if ( memo.divide == 'bottomsurface' ) { | } else if ( memo.divide == 'bottomsurface' ) { | ||
if ( memo.obsesA[o].seriesId == 'bottom' ) { | if ( memo.obsesA[o].seriesId == 'bottom' ) { | ||


