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

Rivi 1 007:

if ( i18n[memo.obscode].type == 'num' ) {

headerCols.push( i18n[ 'Date' ][ memo.lang ] );

headerCols.push( i18n[ 'Time' ][ memo.lang ] );

headerCols.push( i18n[ 'Observation' ][ memo.lang ] );

headerCols.push( i18n[ 'Value' ][ memo.lang ] );

headerCols.push( i18n[ 'ValueUnit' ][ memo.lang ] );

headerCols.push( i18n[ 'Additionalinfo' ][ memo.lang ] );

headerCols.push( i18n[ 'Image' ][ memo.lang ] );

headerCols.push( i18n[ 'ObserverStatus' ][ memo.lang ] );

~~//headerCols.push( i18n[ 'Date' ][ memo.lang ] );~~

header += headerCols.join( ';' );

~~//headerCols.push( i18n[ 'Date' ][ memo.lang ] );~~

~~headerCols.push( '"' + i18n[memo.obscode].axisTitleV[memo.lang] + '"' );~~

~~headerCols.push( 'Lisätiedot' );~~

~~headerCols.push( 'Valokuva' );~~

~~headerCols.push( 'Havainnoijan status' );~~

header += headerCols.join( ~~i18n[~~'~~sep~~'~~][memo.lang]~~ );

for ( var o in memo.obses ) {

Rivi 1 021:

Rivi 1 023:

csvCols = [];

csvCols.push( memo.obses[o].obsdatetime.~~getFullYear~~() ~~+ '-' +~~ ( memo.obses[o].obsdatetime.~~getMonth~~(~~) + 1 ) + '-' +~~ memo.~~obses[o].obsdatetime.getDate(~~) );

csvCols.push( memo.obses[o].obsdatetime.toLocaleDateString( memo.lang ) );

csvCols.push( memo.obses[o].obsdatetime.toLocaleTimeString( memo.lang ) );

~~if ( memo~~.~~obses[o].obsdatetime.getUTCHours~~(~~) == 0 &&~~ memo.obses[o].obsdatetime.~~getUTCMinutes~~() ~~== 0 && memo.obses[o].obsdatetime.getUTCSeconds() == 0 ) {~~

~~csvCols.push(~~ '' );

//csvCols.push( memo.obses[o].obsdatetime.getFullYear() + '-' + ( memo.obses[o].obsdatetime.getMonth() + 1 ) + '-' + memo.obses[o].obsdatetime.getDate() );

~~} else {~~

~~csvCols.push~~( ~~( "0" +~~ memo.obses[o].obsdatetime.~~getUTCHours~~() ~~).slice(-2~~) + ':' ~~+ ( "0"~~ + memo.obses[o].obsdatetime.~~getUTCMinutes() ).slice~~(-2) );

}

//if ( memo.obses[o].obsdatetime.getUTCHours() == 0 && memo.obses[o].obsdatetime.getUTCMinutes() == 0 && memo.obses[o].obsdatetime.getUTCSeconds() == 0 ) {

// csvCols.push( '' );

//} else {

// csvCols.push( ( "0" + memo.obses[o].obsdatetime.getUTCHours() ).slice(-2) + ':' + ( "0" + memo.obses[o].obsdatetime.getUTCMinutes() ).slice(-2) );

//}

csvCols.push( i18n[ memo ].title[memo.lang ] );

csvCols.push( '"' + memo.obses[o].value.toString().replace( '.', i18n['dec'][memo.lang] ) + '"' );

csvCols.push( memo.obses[o].addInfo );

Rivi 1 275:

Rivi 1 280:

'title': { 'fi': 'Pintaveden lämpötila', 'en': 'Surface water termperature', 'sv': 'Ytvattentemperatur', 'ru': '???' },

'unit': '°C',

'axisTitleV': { 'fi': 'Lämpötila, °C', 'en': 'Temperature, °C', 'sv': 'Temperatur, °C', 'ru': '°C' }

'axisTitleV': { 'fi': 'Lämpötila, °C', 'en': 'Temperature, °C', 'sv': 'Temperatur, °C', 'ru': '°C' },

'changes': {

'fi': 'Pintaveden lämpötilan kuvio on uudistunut.',

'en': 'The surface water temperature graph has been renewed.',

'sv': 'Ytvattentemperaturdiagrammet har förnyats.',

'ru': ''

}

},

'ice': {

@@ Rivi 1 007: / Rivi 1 007: @@
 							if ( i18n[memo.obscode].type == 'num' ) {
+								headerCols.push( i18n[ 'Date' ][ memo.lang ] );
+								headerCols.push( i18n[ 'Time' ][ memo.lang ] );
+								headerCols.push( i18n[ 'Observation' ][ memo.lang ] );
+								headerCols.push( i18n[ 'Value' ][ memo.lang ] );
+								headerCols.push( i18n[ 'ValueUnit' ][ memo.lang ] );
+								headerCols.push( i18n[ 'Additionalinfo' ][ memo.lang ] );
+								headerCols.push( i18n[ 'Image' ][ memo.lang ] );
+								headerCols.push( i18n[ 'ObserverStatus' ][ memo.lang ] );
-								//headerCols.push( i18n[ 'Date' ][ memo.lang ] );
+								header += headerCols.join( ';' );
-								//headerCols.push( i18n[ 'Date' ][ memo.lang ] );
-								headerCols.push( '"' + i18n[memo.obscode].axisTitleV[memo.lang] + '"' );
-								headerCols.push( 'Lisätiedot' );
-								headerCols.push( 'Valokuva' );
-								headerCols.push( 'Havainnoijan status' );
-								header += headerCols.join( i18n['sep'][memo.lang] );
 								for ( var o in memo.obses ) {
@@ Rivi 1 021: / Rivi 1 023: @@
 									csvCols = [];
-									csvCols.push( memo.obses[o].obsdatetime.getFullYear() + '-' +  ( memo.obses[o].obsdatetime.getMonth() + 1 ) + '-' + memo.obses[o].obsdatetime.getDate() );
+									csvCols.push( memo.obses[o].obsdatetime.toLocaleDateString( memo.lang ) );
+									csvCols.push( memo.obses[o].obsdatetime.toLocaleTimeString( memo.lang ) );
-									if ( memo.obses[o].obsdatetime.getUTCHours() == 0 && memo.obses[o].obsdatetime.getUTCMinutes() == 0 && memo.obses[o].obsdatetime.getUTCSeconds() == 0 ) {
-										csvCols.push( '' );
+									//csvCols.push( memo.obses[o].obsdatetime.getFullYear() + '-' +  ( memo.obses[o].obsdatetime.getMonth() + 1 ) + '-' + memo.obses[o].obsdatetime.getDate() );
-									} else {
-										csvCols.push( ( "0" + memo.obses[o].obsdatetime.getUTCHours() ).slice(-2) + ':' + ( "0" + memo.obses[o].obsdatetime.getUTCMinutes() ).slice(-2) );
-									}
+									//if ( memo.obses[o].obsdatetime.getUTCHours() == 0 && memo.obses[o].obsdatetime.getUTCMinutes() == 0 && memo.obses[o].obsdatetime.getUTCSeconds() == 0 ) {
+									//	csvCols.push( '' );
+									//} else {
+									//	csvCols.push( ( "0" + memo.obses[o].obsdatetime.getUTCHours() ).slice(-2) + ':' + ( "0" + memo.obses[o].obsdatetime.getUTCMinutes() ).slice(-2) );
+									//}
+									csvCols.push( i18n[ memo ].title[memo.lang ] );
 									csvCols.push( '"' + memo.obses[o].value.toString().replace( '.', i18n['dec'][memo.lang] ) + '"' );
 									csvCols.push( memo.obses[o].addInfo );
@@ Rivi 1 275: / Rivi 1 280: @@
 						'title': { 'fi': 'Pintaveden lämpötila', 'en': 'Surface water termperature', 'sv': 'Ytvattentemperatur', 'ru': '???' },
 						'unit': '°C',
-						'axisTitleV': { 'fi': 'Lämpötila, °C', 'en': 'Temperature, °C', 'sv': 'Temperatur, °C', 'ru': '°C' }
+						'axisTitleV': { 'fi': 'Lämpötila, °C', 'en': 'Temperature, °C', 'sv': 'Temperatur, °C', 'ru': '°C' },
+						'changes': {
+							'fi': 'Pintaveden lämpötilan kuvio on uudistunut.',
+							'en': 'The surface water temperature graph has been renewed.',
+							'sv': 'Ytvattentemperaturdiagrammet har förnyats.',
+							'ru': ''
+						}
 					},
 					'ice': {

Widget:Test4

Versio 11. tammikuuta 2022 kello 09.07