Ei muokkausyhteenvetoa |
Ei muokkausyhteenvetoa |
||
| Rivi 154: | Rivi 154: | ||
memo.curSeason = today.getFullYear()-1; | memo.curSeason = today.getFullYear()-1; | ||
} | } | ||
// first loop | // first loop | ||
for ( var o in memo.obses ) { | for ( var o in memo.obses ) { | ||
| Rivi 178: | Rivi 177: | ||
memo.obsMinCompDateMs = Math.min(ms, memo.obsMinCompDateMs); | memo.obsMinCompDateMs = Math.min(ms, memo.obsMinCompDateMs); | ||
memo.obsMaxCompDateMs = Math.max(ms, memo.obsMaxCompDateMs); | memo.obsMaxCompDateMs = Math.max(ms, memo.obsMaxCompDateMs); | ||
// add series id | // add series id | ||
if ( memo.graphType == 'trend' ) { | if ( memo.graphType == 'trend' ) { | ||
obs.seriesId = 0; | obs.seriesId = 0; | ||
} else if ( memo.graphType == 'dateofyear' ) { | |||
obs.seriesId = obs.data.cat; | |||
} else if ( memo.season == 'summer' || obs.obsdatetime.getMonth() > 7 ) { | } else if ( memo.season == 'summer' || obs.obsdatetime.getMonth() > 7 ) { | ||
obs.seriesId = obs.obsdatetime.getFullYear(); | obs.seriesId = obs.obsdatetime.getFullYear(); | ||
| Rivi 273: | Rivi 274: | ||
memo.options.vAxis.viewWindow = { min: 0 }; | memo.options.vAxis.viewWindow = { min: 0 }; | ||
} | } | ||
if (memo.graphType == 'trend') { | if (memo.graphType == 'trend') { | ||
| Rivi 291: | Rivi 292: | ||
function addDataToDateOfYearChart( memo ) { | function addDataToDateOfYearChart( memo ) { | ||
// do X axis min and max for this chart type | // do X axis min and max for this chart type | ||
| Rivi 306: | Rivi 305: | ||
memo.options.vAxis.ticks = []; | memo.options.vAxis.ticks = []; | ||
// do Y axis min and max for this chart type | // do Y axis min and max for this chart type | ||
| Rivi 319: | Rivi 315: | ||
memo.options.vAxis.maxValue.setDate(0); | memo.options.vAxis.maxValue.setDate(0); | ||
memo.options.vAxis.viewWindow.max = memo.options.vAxis.maxValue; | memo.options.vAxis.viewWindow.max = memo.options.vAxis.maxValue; | ||
// do Y axis ticks and gridlines | // do Y axis ticks and gridlines | ||
| Rivi 329: | Rivi 322: | ||
if (minM > maxM) { | if (minM > maxM) { | ||
mc = 13-minM+maxM; | mc = 13-minM+maxM; | ||
} else { | } else { | ||
mc = maxM-minM+1; | mc = maxM-minM+1; | ||
} | } | ||
for ( mi = 0; mi < mc; mi++ ) { | for ( mi = 0; mi < mc; mi++ ) { | ||
| Rivi 353: | Rivi 344: | ||
memo.vAxisGridlines.push( new Date( startOfMonth.getTime() ) ); | memo.vAxisGridlines.push( new Date( startOfMonth.getTime() ) ); | ||
} | } | ||
} | } | ||
memo.seriesO = {}; | |||
memo.seriesA = []; | |||
for ( var o in memo.obsesA ) { | |||
s = memo.obsesA[o].seriesId; | |||
if (typeof memo.seriesO[s] == 'undefined' ) { memo.seriesO[s] = { 'obses': [] }; } | |||
memo.seriesO[s].obses.push( memo.obsesA[o] ); | |||
} | |||
// data columns | // data columns | ||
memo.data.addColumn( 'date', memo.obsMinYear + '-' + memo.obsMaxYear ); | memo.data.addColumn( 'date', memo.obsMinYear + '-' + memo.obsMaxYear ); | ||
memo.data.addColumn( {'type': 'string', 'role': 'style' } ); | memo.data.addColumn( {'type': 'string', 'role': 'style' } ); | ||


