Changeset 790 for ether_iasi/trunk
- Timestamp:
- 05/21/14 19:41:05 (10 years ago)
- Location:
- ether_iasi/trunk/web
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_iasi/trunk/web/project/quicklook_script.jsp
r786 r790 67 67 paramSelect.parent = div; 68 68 this.selectSatellites = new Select( paramSelect ); 69 this.selectSatellites.add( "metopb", "MetOp-B", jQuery.proxy(this.getQuicklook, this )); 69 70 this.selectSatellites.add( "metopa", "MetOp-A", jQuery.proxy(this.getQuicklook, this )); 70 this.selectSatellites.add( "metopb", "MetOp-B", jQuery.proxy(this.getQuicklook, this ));71 71 this.selectSatellites.add( "metopab", '<spring:message code="label.either"/>', jQuery.proxy(this.getQuicklook, this )); 72 72 this.selectSatellites.selectFirst(); … … 133 133 { 134 134 this.selectSpecies.add( "CO", 'CO', jQuery.proxy(this.getQuicklook, this )); 135 this.selectSpecies.add( "O3", 'O3', jQuery.proxy(this.getQuicklook, this ));136 this.selectSpecies.add( "NH3", 'NH3', jQuery.proxy(this.getQuicklook, this ));137 135 this.selectSpecies.selectFirst(); 138 136 } … … 221 219 $.ajax( { 222 220 url: "project?methodName=getQuicklookByValues&satellite=" + this.selectSatellites.getValue() + "&projection=" + this.selectProjections.getValue() + "&species=" + this.selectSpecies.getValue() + "&level=" + this.selectLevel.getValue() + "&date=" + this.beginDate + "&isdaily=" + this.isDaily + "&datemens=" + this.beginDateMens, 221 dataType: "json", 223 222 success:jQuery.proxy( this.handleQuickLooksBySelectValues, this ), 224 223 error: jQuery.proxy( this.showErrors, this ) … … 233 232 if (this.isDaily) 234 233 { 235 var plotNameA = jQuery.parseJSON( result ).plotNameResultA;236 var plotNameB = jQuery.parseJSON( result ).plotNameResultB;237 var plotNameC = jQuery.parseJSON( result ).plotNameResultC;238 var plotNameD = jQuery.parseJSON( result ).plotNameResultD;239 240 var repDate = jQuery.parseJSON( result ).plotRepResult;241 242 243 244 if( plotNameA && plotName B)234 var plotNameA = result.plotNameResultA; 235 var plotNameB = result.plotNameResultB; 236 var plotNameC = result.plotNameResultC; 237 var plotNameD = result.plotNameResultD; 238 239 var repDate = result.plotRepResult; 240 241 242 243 if( plotNameA && plotNameC ) 245 244 { 246 this.containerResultA.html( "<center>MetOp-A</center><img src='resources/imgiasiA/" + repDate + "/" + plotNameA + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiA/" + repDate + "/" + plotName C+ "' width='430px' height='350px'>" );247 this.containerResultB.html( "<center>MetOp-B</center><img src='resources/imgiasiB/" + repDate + "/" + plotName B+ "' width='430px' height='350px' onerror='javascript:displayNoImageB()'><img src='resources/imgiasiB/" + repDate + "/" + plotNameD + "' width='430px' height='350px'>" );245 this.containerResultA.html( "<center>MetOp-A</center><img src='resources/imgiasiA/" + repDate + "/" + plotNameA + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiA/" + repDate + "/" + plotNameB + "' width='430px' height='350px'>" ); 246 this.containerResultB.html( "<center>MetOp-B</center><img src='resources/imgiasiB/" + repDate + "/" + plotNameC + "' width='430px' height='350px' onerror='javascript:displayNoImageB()'><img src='resources/imgiasiB/" + repDate + "/" + plotNameD + "' width='430px' height='350px'>" ); 248 247 } 249 248 else 250 249 { 251 250 if( plotNameA ) 252 this.containerResultA.html( "<center>MetOp-A</center><img src='resources/imgiasiA/" + repDate + "/" + plotNameA + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiA/" + repDate + "/" + plotName C+ "' width='430px' height='350px'>" );253 254 if( plotName B)255 this.containerResultA.html( "<center>MetOp-B</center><img src='resources/imgiasiB/" + repDate + "/" + plotName B+ "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiB/" + repDate + "/" + plotNameD + "' width='430px' height='350px'>" );251 this.containerResultA.html( "<center>MetOp-A</center><img src='resources/imgiasiA/" + repDate + "/" + plotNameA + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiA/" + repDate + "/" + plotNameB + "' width='430px' height='350px'>" ); 252 253 if( plotNameC ) 254 this.containerResultA.html( "<center>MetOp-B</center><img src='resources/imgiasiB/" + repDate + "/" + plotNameC + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiB/" + repDate + "/" + plotNameD + "' width='430px' height='350px'>" ); 256 255 257 256 } 258 console.log(result); 257 259 258 } 260 259 else 261 260 { 262 var plotNameE = jQuery.parseJSON( result ).plotNameResultE; 263 var plotNameF = jQuery.parseJSON( result ).plotNameResultF; 264 var repDateMens = jQuery.parseJSON( result ).plotRepResultMens; 265 this.containerResultA.html( "<center>MetOp-A</center><img src='resources/imgiasiA/" + repDateMens + "/00/" + plotNameE + "' width='430px' height='400px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiA/" + repDateMens + "/00/" + plotNameF + "' width='430px' height='400px'>" ); 266 267 console.log(result); 261 var plotNameE = result.plotNameResultE; 262 var plotNameF = result.plotNameResultF; 263 var plotNameG = result.plotNameResultG; 264 var plotNameH = result.plotNameResultH; 265 var repDateMens = result.plotRepResultMens; 266 267 if( plotNameE && plotNameG ) 268 { 269 this.containerResultA.html( "<center>MetOp-A</center><img src='resources/imgiasiA/" + repDateMens + "/" + plotNameE + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiA/" + repDateMens + "/" + plotNameF + "' width='430px' height='350px'>" ); 270 this.containerResultB.html( "<center>MetOp-B</center><img src='resources/imgiasiB/" + repDateMens + "/" + plotNameG + "' width='430px' height='350px' onerror='javascript:displayNoImageB()'><img src='resources/imgiasiB/" + repDateMens + "/" + plotNameH + "' width='430px' height='350px'>" ); 271 } 272 else 273 { 274 if( plotNameE ) 275 this.containerResultA.html( "<center>MetOp-A</center><img src='resources/imgiasiA/" + repDateMens + "/" + plotNameE + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiA/" + repDateMens + "/" + plotNameF + "' width='430px' height='350px'>" ); 276 277 if( plotNameG ) 278 this.containerResultA.html( "<center>MetOp-B</center><img src='resources/imgiasiB/" + repDateMens + "/" + plotNameG + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiB/" + repDateMens + "/" + plotNameH + "' width='430px' height='350px'>" ); 279 280 } 281 268 282 } 269 283 }, … … 280 294 this.containerCalendar.show(); 281 295 this.containerCalendarMens.hide(); 282 this.getQuicklook();283 296 this.getQuicklook(); 284 297 }, -
ether_iasi/trunk/web/resources/js/calendar/anytime.5.0.1-1403131246.js
r787 r790 1737 1737 this.hTitle.append( 'Select' ); 1738 1738 1739 1740 // Initialize the picker's date/time value. 1739 /** VMIPSL **/ 1740 if( options.methodToCall ) 1741 this.methodToCall = options.methodToCall; 1742 1743 /** VMIPSL **/ 1744 if( options.idToUpdateEarliest ) 1745 this.idToUpdateEarliest = options.idToUpdateEarliest; 1746 1747 1748 // Initialize the picker's date/time value. 1741 1749 1742 1750 try … … 3078 3086 }, // .showPkr() 3079 3087 3080 //--------------------------------------------------------------------- 3088 3089 /** VMIPSL **/ 3090 updateEarliest: function() 3091 { 3092 if( !this.idToUpdateEarliest || !$( document.getElementById( this.idToUpdateEarliest ) )[0] || !$( document.getElementById( this.idToUpdateEarliest ) )[0].value ) 3093 return; 3094 3095 this.earliest = this.conv.parse( $( document.getElementById( this.idToUpdateEarliest ) )[0].value ).getTime(); 3096 }, 3097 3098 //--------------------------------------------------------------------- 3081 3099 // .upd() updates the picker's appearance. It is called after 3082 3100 // most events to make the picker reflect the currently-selected … … 3086 3104 upd: function(fBtn) 3087 3105 { 3106 /** VMIPSL **/ 3107 this.updateEarliest(); 3108 3088 3109 var cmpLo = new Date(this.time.getTime()); 3089 3110 cmpLo.setMonth(0,1); … … 3358 3379 this.ajax(); 3359 3380 3381 /** VMIPSL **/ 3382 if( this.methodToCall ) 3383 this.methodToCall(); 3384 3360 3385 }, // .upd() 3361 3386 -
ether_iasi/trunk/web/src/com/ether/Controller.java
r788 r790 80 80 final String repDate = DateHelper.formatDate( date, "yyyy/MM/dd" ); 81 81 final String fmtDateMens = DateHelper.formatDate( dateMens, "yyyyMM" ); 82 final String repDateMens = DateHelper.formatDate( dateMens, "yyyy/MM" ); 83 84 85 String plotNameA = ""; 86 String plotNameB = ""; 87 String plotNameC = ""; 88 String plotNameD = ""; 89 String plotNameE = ""; 90 String plotNameF = ""; 82 final String repDateMens = DateHelper.formatDate( dateMens, "yyyy/MM/00" ); 83 84 85 String plotIasiDAD = ""; 86 String plotIasiDAN = ""; 87 String plotIasiDBD = ""; 88 String plotIasiDBN = ""; 89 String plotIasiMAD = ""; 90 String plotIasiMAN = ""; 91 String plotIasiMBD = ""; 92 String plotIasiMBN = ""; 91 93 92 94 if (isDaily) … … 97 99 if (species.equals( "CO" ) || species.equals( "SKT" )) 98 100 { 99 plot NameA= "metopa_iasi_" + species + "_l2_" + fmtDate + "_day_" + projection + ".png";100 plot NameC= "metopa_iasi_" + species + "_l2_" + fmtDate + "_night_" + projection + ".png";101 plotIasiDAD = "metopa_iasi_" + species + "_l2_" + fmtDate + "_day_" + projection + ".png"; 102 plotIasiDAN = "metopa_iasi_" + species + "_l2_" + fmtDate + "_night_" + projection + ".png"; 101 103 } 102 104 if (species.equals( "H2O" )) 103 105 { 104 plot NameA= "metopa_iasi_" + species + "_l2_" + level + "_" + fmtDate + "_day_" + projection + ".png";105 plot NameC= "metopa_iasi_" + species + "_l2_" + level + "_" + fmtDate + "_night_" + projection + ".png";106 plotIasiDAD= "metopa_iasi_" + species + "_l2_" + level + "_" + fmtDate + "_day_" + projection + ".png"; 107 plotIasiDAN = "metopa_iasi_" + species + "_l2_" + level + "_" + fmtDate + "_night_" + projection + ".png"; 106 108 } 107 109 } … … 110 112 if (species.equals( "CO" ) || species.equals( "SKT" )) 111 113 { 112 plot NameB= "metopb_iasi_" + species + "_l2_" + fmtDate + "_day_" + projection + ".png";113 plot NameD= "metopb_iasi_" + species + "_l2_" + fmtDate + "_night_" + projection + ".png";114 plotIasiDBD = "metopb_iasi_" + species + "_l2_" + fmtDate + "_day_" + projection + ".png"; 115 plotIasiDBN = "metopb_iasi_" + species + "_l2_" + fmtDate + "_night_" + projection + ".png"; 114 116 } 115 117 if (species.equals( "H2O" )) 116 118 { 117 plot NameB= "metopb_iasi_" + species + "_l2_" + level + "_" + fmtDate + "_day_" + projection + ".png";118 plot NameD= "metopb_iasi_" + species + "_l2_" + level + "_" + fmtDate + "_night_" + projection + ".png";119 plotIasiDBD = "metopb_iasi_" + species + "_l2_" + level + "_" + fmtDate + "_day_" + projection + ".png"; 120 plotIasiDBN = "metopb_iasi_" + species + "_l2_" + level + "_" + fmtDate + "_night_" + projection + ".png"; 119 121 } 120 122 } 121 123 final JSONObject result = new JSONObject(); 122 result.put( "plotNameResultA", plot NameA);123 result.put( "plotNameResultB", plot NameB);124 result.put( "plotNameResultC", plot NameC);125 result.put( "plotNameResultD", plot NameD);124 result.put( "plotNameResultA", plotIasiDAD ); 125 result.put( "plotNameResultB", plotIasiDAN ); 126 result.put( "plotNameResultC", plotIasiDBD ); 127 result.put( "plotNameResultD", plotIasiDBN ); 126 128 result.put( "plotRepResult", repDate); 127 129 return result; … … 130 132 { 131 133 132 if( satellite.equals( "metopa" ) )134 if( satellite.equals( "metopa" ) || satellite.equals( "metopab" ) ) 133 135 { 134 136 if (species.equals( "CO" )) 135 137 { 136 plotNameE = species + "CT_grid_" + fmtDateMens + "_day" + ".png"; 137 plotNameF = species + "CT_grid_" + fmtDateMens + "_night" + ".png"; 138 139 } 140 141 } 138 plotIasiMAD = "metopa_iasi_" + species + "_l3_" + fmtDateMens + "_day_" + projection + ".png"; 139 plotIasiMAN = "metopa_iasi_" + species + "_l3_" + fmtDateMens + "_night_" + projection + ".png"; 140 141 } 142 } 143 if( satellite.equals( "metopb" ) || satellite.equals( "metopab" ) ) 144 { 145 if (species.equals( "CO" )) 146 { 147 plotIasiMBD = "metopb_iasi_" + species + "_l3_" + fmtDateMens + "_day_" + projection + ".png"; 148 plotIasiMBN = "metopb_iasi_" + species + "_l3_" + fmtDateMens + "_night_" + projection + ".png"; 149 150 } 151 } 152 142 153 143 154 final JSONObject result = new JSONObject(); 144 result.put( "plotNameResultE", plotNameE ); 145 result.put( "plotNameResultF", plotNameF ); 155 result.put( "plotNameResultE", plotIasiMAD ); 156 result.put( "plotNameResultF", plotIasiMAN ); 157 result.put( "plotNameResultG", plotIasiMBD ); 158 result.put( "plotNameResultH", plotIasiMBN ); 146 159 result.put( "plotRepResultMens", repDateMens); 147 160 return result; -
ether_iasi/trunk/web/src/messages_en.properties
r786 r790 8 8 label.MetOpB=MetOp-B 9 9 10 label.quicklook=QUICKLOOKS11 10 label.either=Both 12 11 label.globe=Global … … 37 36 label.access.metopB.title=ACCESS TO METOP-B IASI DATA 38 37 label.access.balloon.title=ACCESS TO BALLOON IASI DATA 39 label.access.daily.title=QUICKLOOKS 40 label.access.monthly.title=QUICKLOOKS 38 label.access.daily.title=QUICKLOOKS - DAILY 39 label.access.monthly.title=QUICKLOOKS - MONTHLY 41 40 label.access.level=- Products available 42 41 label.access.level.balloon=balloon
Note: See TracChangeset
for help on using the changeset viewer.