Changeset 236
- Timestamp:
- 11/07/11 15:50:30 (13 years ago)
- Location:
- ether_megapoli/trunk/web
- Files:
-
- 474 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/web/resources/js/classesForJQuery/etherClasses.js
r234 r236 57 57 { 58 58 parentNode.empty(); 59 // Dom.clearContainer( parentNode );60 59 if( 0 >= this.array.length ) 61 60 { -
ether_megapoli/trunk/web/resources/templates/appleTemplate.jsp
r234 r236 22 22 <ether:htmlCss cssFile="megapoliApple"/> 23 23 24 <ether:htmlJs jsFile="library/jquery-1. 4.2.min"/>24 <ether:htmlJs jsFile="library/jquery-1.6.2.min"/> 25 25 <ether:htmlJs jsFile="library/jquery.class"/> 26 26 <ether:htmlJs jsFile="library/jquery.protify-0.3"/> -
ether_megapoli/trunk/web/visualization/visu_parameter_by_pf-script.jsp
r234 r236 1 <%@ page import="com.ether.EtherPlotServiceImpl" %>2 3 1 <script type="text/javascript"> 4 2 var InterfaceVisualization = Class.create( { … … 62 60 // Calendar 63 61 this.calendarFormat = "%Y-%m-%d %H:%i"; 64 //this.calendarConverter = new AnyTime.Converter( { format: this.calendarFormat } );65 66 //AnyTime.picker( "beginDate", { format: this.calendarFormat, firstDOW: 1,67 //labelTitle: interfaceTexts["data.visualization.selectDate"], labelYear: interfaceTexts["data.visualization.selectYear"], labelMonth: interfaceTexts["data.visualization.selectMonth"], labelDayOfMonth: interfaceTexts["data.visualization.selectDay"],68 //labelHour: interfaceTexts["data.visualization.selectHour"], labelMinute: interfaceTexts["data.visualization.selectMinute"],69 // methodToCall: this.onClickBeginDate.bindAsEventListener(this )70 //} );71 // 72 //AnyTime.picker( "endDate", { format: this.calendarFormat, firstDOW: 1,73 //labelTitle: interfaceTexts["data.visualization.selectDate"], labelYear: interfaceTexts["data.visualization.selectYear"], labelMonth: interfaceTexts["data.visualization.selectMonth"], labelDayOfMonth: interfaceTexts["data.visualization.selectDay"],74 //labelHour: interfaceTexts["data.visualization.selectHour"], labelMinute: interfaceTexts["data.visualization.selectMinute"],75 // methodToCall: this.onClickEndDate.bindAsEventListener(this ),76 //idToUpdateEarliest: "beginDate"77 //} );78 // 79 // $( "beginDate" ).value = this.firstDate;80 // $( "endDate" ).value = this.lastDate;62 this.calendarConverter = new AnyTime.Converter( { format: this.calendarFormat } ); 63 64 AnyTime.picker( "beginDate", { format: this.calendarFormat, firstDOW: 1, 65 labelTitle: interfaceTexts["data.visualization.selectDate"], labelYear: interfaceTexts["data.visualization.selectYear"], labelMonth: interfaceTexts["data.visualization.selectMonth"], labelDayOfMonth: interfaceTexts["data.visualization.selectDay"], 66 labelHour: interfaceTexts["data.visualization.selectHour"], labelMinute: interfaceTexts["data.visualization.selectMinute"], 67 methodToCall: jQuery.proxy( this.onClickBeginDate, this ) 68 } ); 69 70 AnyTime.picker( "endDate", { format: this.calendarFormat, firstDOW: 1, 71 labelTitle: interfaceTexts["data.visualization.selectDate"], labelYear: interfaceTexts["data.visualization.selectYear"], labelMonth: interfaceTexts["data.visualization.selectMonth"], labelDayOfMonth: interfaceTexts["data.visualization.selectDay"], 72 labelHour: interfaceTexts["data.visualization.selectHour"], labelMinute: interfaceTexts["data.visualization.selectMinute"], 73 methodToCall: jQuery.proxy( this.onClickEndDate, this ), 74 idToUpdateEarliest: "beginDate" 75 } ); 76 77 $( "#beginDate" ).val( this.firstDate ); 78 $( "#endDate" ).val( this.lastDate ); 81 79 this.clearCalendarButton = new Button( {value:interfaceTexts["data.visualization.button.clear"], parent:this.containerOptionCalendar, id:"button_clear_calendar", className:"small", onClick:jQuery.proxy( this.onClickClear, this )} ); 82 80 … … 90 88 { 91 89 this.visualizeButton = new Button( {value:interfaceTexts["data.visualization.button.visualize"], parent:this.containerButtons, id:"button_visualize", onClick:jQuery.proxy( this.onClickVisualize, this )} ); 92 this.visualizeButton.disable();90 // this.visualizeButton.disable(); 93 91 this.downloadButton = new Button( {value:interfaceTexts["data.visualization.button.download"], parent:this.containerButtons, id:"button_download", onClick:jQuery.proxy( this.onClickDownload, this )} ); 94 92 this.downloadButton.disable(); … … 259 257 { 260 258 var oneHour = 60 * 60 * 1000; 261 var beginDateTime = this.calendarConverter.parse( $( " beginDate" ).value).getTime();259 var beginDateTime = this.calendarConverter.parse( $( "#beginDate" ).val() ).getTime(); 262 260 var endDateTime = null; 263 if( "" != $( " endDate" ).value)264 endDateTime = this.calendarConverter.parse( $( " endDate" ).value).getTime();261 if( "" != $( "#endDate" ).val() ) 262 endDateTime = this.calendarConverter.parse( $( "#endDate" ).val() ).getTime(); 265 263 this.beginDateWithAnHourLater = new Date( beginDateTime + oneHour ); 266 264 267 265 if( null == endDateTime || endDateTime < beginDateTime ) 268 $( " endDate" ).value = this.calendarConverter.format( this.beginDateWithAnHourLater);269 270 this.beginDate = this.calendarConverter.parse( $( " beginDate" ).value).getTime();271 this.endDate = this.calendarConverter.parse( $( " endDate" ).value).getTime();266 $( "#endDate" ).val( this.calendarConverter.format( this.beginDateWithAnHourLater ) ); 267 268 this.beginDate = this.calendarConverter.parse( $( "#beginDate" ).val() ).getTime(); 269 this.endDate = this.calendarConverter.parse( $( "#endDate" ).val() ).getTime(); 272 270 273 271 this.testAllFields(); … … 276 274 onClickEndDate: function() 277 275 { 278 this.endDate = this.calendarConverter.parse( $( " endDate" ).value).getTime();276 this.endDate = this.calendarConverter.parse( $( "#endDate" ).val() ).getTime(); 279 277 }, 280 278 281 279 onClickClear: function() 282 280 { 283 $( " beginDate" ).value = "";281 $( "#beginDate" ).val( "" ); 284 282 this.beginDate = false; 285 $( " endDate" ).value = "";283 $( "#endDate" ).val( "" ); 286 284 this.endDate = false; 287 285 }, … … 304 302 { 305 303 var url = "visualization/plotEther?" + urlObject.parameters; 306 307 this.plotWindow.getContent().innerHTML = '<img src=' + url + ' />'; 308 this.plotWindow.setSize( <%=EtherPlotServiceImpl.getMaxWidth()%>, <%=EtherPlotServiceImpl.getMaxHeight()%> ); 309 this.plotWindow.show(); 310 } 311 else 312 { 313 this.plotWindow.getContent().innerHTML = '<BR/><center>' + interfaceTexts["data.visualization.graph.noPlot"] + '</center>'; 314 this.plotWindow.setSize( 400, 50 ); 315 this.plotWindow.show(); 316 } 304 var $dialog = $( '<div></div>' ) 305 .html( '<img src=' + url + ' />' ) 306 .dialog( { 307 autoOpen: false, 308 title: interfaceTexts["app.title"] + "-" + interfaceTexts["data.visualization.quicklook"] 309 } ); 310 } 311 else 312 { 313 var $dialog = $( '<div></div>' ) 314 .html( '<BR/><center>' + interfaceTexts["data.visualization.graph.noPlot"] + '</center>' ) 315 .dialog( { 316 autoOpen: false, 317 title: interfaceTexts["app.title"] + "-" + interfaceTexts["data.visualization.quicklook"] 318 } ); 319 // this.plotWindow.setSize( 400, 50 ); 320 } 321 322 $dialog.dialog( 'open' ); 323 // prevent the default action, e.g., following a link 324 return false; 317 325 }, 318 326 … … 336 344 if( (!this.selectedPlateform || !this.selectedParameter) && 0 == this.numberParameterToDisplay ) 337 345 { 338 this.visualizeButton.disable();346 // this.visualizeButton.disable(); 339 347 this.downloadButton.disable(); 340 348 return; … … 418 426 this.selectPlotsPlateformType = this.selectedPlateform.jsonElement.type; 419 427 // if( !isParameterAlreadySelected ) 420 428 this.selectParameters.push( this.selectedParameter.getId() ); 421 429 422 430 this.numberParameterToDisplay = this.selectPlots.getSize(); -
ether_megapoli/trunk/web/visualization/visu_parameter_by_pf.jsp
r234 r236 14 14 <ether:htmlCss cssFile="visu_parameter_by_pf"/> 15 15 <ether:htmlCss cssFile="select"/> 16 <%-- Calendar --%>17 16 <ether:htmlCss cssFile="calendar/anytime"/> 18 <ether:htmlCss cssFile="windows_js_1.3/themes/default"/> 19 <ether:htmlCss cssFile="windows_js_1.3/themes/mac_os_x"/> 17 <ether:htmlCss cssFile="jquery-ui-1.8.16.custom/jquery-ui-1.8.16.custom"/> 20 18 </tiles:put> 21 19 … … 27 25 <ether:htmlJs jsFile="classesForJQuery/Select"/> 28 26 <ether:htmlJs jsFile="classesForJQuery/Loading"/> 29 <%-- Calendar --%> 30 <%--<ether:htmlJs jsFile="calendar/anytime"/>--%> 31 <%--<ether:htmlJs jsFile="windows_js_1.3/javascripts/debug"/>--%> 32 <%--<ether:htmlJs jsFile="windows_js_1.3/javascripts/effects"/>--%> 33 <%--<ether:htmlJs jsFile="windows_js_1.3/javascripts/window"/>--%> 34 <%--<ether:htmlJs jsFile="windows_js_1.3/javascripts/window_ext"/>--%> 27 <ether:htmlJs jsFile="calendar/anytime"/> 28 <ether:htmlJs jsFile="jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min"/> 35 29 </tiles:put> 36 30 37 <tiles:put name="title" type="string"><bean:message key="app.title"/> - <bean:message key="data.visualization.title"/></tiles:put> 31 <tiles:put name="title" type="string"><bean:message key="app.title"/> - <bean:message 32 key="data.visualization.title"/></tiles:put> 38 33 <tiles:put name="nav" type="string"> 39 34 <html:link page="/index.jsp"><bean:message key="app.home"/></html:link> > 40 35 <html:link page="/visualization?methodName=view"><bean:message key="all.visualization"/></html:link> > 41 <html:link page="/visualization?methodName=viewParametersByPlateform"><bean:message key="data.visualization"/></html:link> 36 <html:link page="/visualization?methodName=viewParametersByPlateform"><bean:message 37 key="data.visualization"/></html:link> 42 38 </tiles:put> 43 39 … … 48 44 <tiles:put name="body" type="string"> 49 45 50 <div id="generalContainerPlateforms" class="span-5 colborder"> 51 <div id="messages"><bean:message key="data.visualization.selectPf"/></div> 46 <%--<button id="opener">Open the dialog</button>--%> 52 47 53 <div id="containerPlateforms"></div> 48 <div id="generalContainerPlateforms" class="span-5 colborder"> 49 <div id="messages"><bean:message key="data.visualization.selectPf"/></div> 50 51 <div id="containerPlateforms"></div> 52 </div> 53 54 <div id="generalContainerParameters" class="span-6 colborder"> 55 <div id="messages"><bean:message key="data.visualization.selectParameter"/></div> 56 57 <div id="containerParameters"></div> 58 </div> 59 60 <div id="generalContainerOptions" class="span-11 last"> 61 <div id="containerOptionCalendar" class="span-10"> 62 <div id="messages" class="messagesHeight"><bean:message key="data.visualization.selectPeriod"/></div> 63 <input type="text" id="beginDate" size="15"/> 64 <input type="text" id="endDate" size="15"/> 54 65 </div> 55 66 56 <div id="generalContainerParameters" class="span-6 colborder"> 57 <div id="messages"><bean:message key="data.visualization.selectParameter"/></div> 58 59 <div id="containerParameters"></div> 67 <div id="containerOptionTitle" class="span-5"> 68 <div id="messages" class="messagesHeight"><bean:message key="data.visualization.titleChoice"/></div> 69 <textarea id="textareaTitle" cols="25" rows="1"></textarea> 60 70 </div> 61 71 62 <div id="generalContainerOptions" class="span-11 last"> 63 <div id="containerOptionCalendar" class="span-10"> 64 <div id="messages" class="messagesHeight"><bean:message key="data.visualization.selectPeriod"/></div> 65 <input type="text" id="beginDate" size="15"/> 66 <input type="text" id="endDate" size="15"/> 67 </div> 72 <div id="containerOptionType" class="span-5"> 73 <div id="messages" class="messagesHeight"><bean:message key="data.visualization.type"/></div> 74 </div> 68 75 69 <div id="containerOptionTitle" class="span-5"> 70 <div id="messages" class="messagesHeight"><bean:message key="data.visualization.titleChoice"/></div> 71 <textarea id="textareaTitle" cols="25" rows="1"></textarea> 72 </div> 73 74 <div id="containerOptionType" class="span-5"> 75 <div id="messages" class="messagesHeight"><bean:message key="data.visualization.type"/></div> 76 </div> 77 78 <div id="containerOptionPlots" class="span-10"> 79 <div id="messages" class="messagesHeight span-4"><bean:message key="data.visualization.graph"/></div> 80 <div id="messages_number_parameters" class="messagesHeight messages_number_parameters"></div> 81 <div id="containerOptionPlotsSelect" class="span-10"></div> 82 <div id="containerOptionPlotsButtons" class="span-10"> 83 <img src="/megapoli/resources/icons/help.gif" id="toolTipPlots" height="19px" width="17px" class="toolTipPlots" onclick="javascript:onClickHelp();"> 84 </div> 85 </div> 86 87 <div class="actionButtons"> 88 <div id="containerButtons" class="span-7"></div> 76 <div id="containerOptionPlots" class="span-10"> 77 <div id="messages" class="messagesHeight span-4"><bean:message key="data.visualization.graph"/></div> 78 <div id="messages_number_parameters" class="messagesHeight messages_number_parameters"></div> 79 <div id="containerOptionPlotsSelect" class="span-10"></div> 80 <div id="containerOptionPlotsButtons" class="span-10"> 81 <img src="/megapoli/resources/icons/help.gif" id="toolTipPlots" height="19px" width="17px" 82 class="toolTipPlots" onclick="javascript:onClickHelp();"> 89 83 </div> 90 84 </div> 85 86 <div class="actionButtons"> 87 <div id="containerButtons" class="span-7"></div> 88 </div> 89 </div> 91 90 92 91 <script type="text/javascript">
Note: See TracChangeset
for help on using the changeset viewer.