Changeset 399
- Timestamp:
- 01/03/11 22:49:50 (2 years ago)
- Location:
- raptor-web/trunk
- Files:
-
- 3 added
- 4 edited
-
pom.xml (modified) (1 diff)
-
src/main/java/uk/ac/cardiff/raptorweb/engine/RaptorWebEngine.java (modified) (1 diff)
-
src/main/java/uk/ac/cardiff/raptorweb/sei/ServiceEndpointInterface.java (modified) (1 diff)
-
src/main/webapp/WEB-INF/flows/reports/graphicalReports.jspx (modified) (6 diffs)
-
src/main/webapp/templates/raptor/css/common-reg.css (added)
-
src/main/webapp/templates/raptor/images/bg_header-1.gif (added)
-
src/main/webapp/templates/raptor/images/img01.jpg (added)
Legend:
- Unmodified
- Added
- Removed
-
raptor-web/trunk/pom.xml
r382 r399 423 423 <groupId>uk.ac.cardiff.raptor</groupId> 424 424 <artifactId>raptor-serviceinterfaces</artifactId> 425 <version>0.3 -SNAPSHOT</version>425 <version>0.3</version> 426 426 </dependency> 427 427 <dependency> -
raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/engine/RaptorWebEngine.java
r365 r399 154 154 public void updateMUAStatistic(GraphModel model) { 155 155 log.debug("Updating statistic {} ",model.getSelectedStatisticalUnit().getStatisticParameters().getUnitName()); 156 log.debug("With start date: {} and end date: {}" ,model.getSelectedStatisticalUnit().getStatisticParameters().getStartTimeAsDate(),model.getSelectedStatisticalUnit().getStatisticParameters().getEndTimeAsDate());157 156 ServiceEndpointInterface.updateStatisticalUnit(attachedMUA.getServiceEndpoint(),model.getSelectedStatisticalUnit()); 158 157 } -
raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/sei/ServiceEndpointInterface.java
r365 r399 71 71 capabilities.setErrorMessage(e.getMessage()); 72 72 log.error("Error retrieving capabilities from MUA [{}], {}",endpoint,e); 73 e.printStackTrace(); 73 74 } 74 75 return capabilities; -
raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/graphicalReports.jspx
r365 r399 19 19 20 20 <f:facet name="start"> 21 <tr:panelCaptionGroup 22 inlineStyle="border-style: hidden;background-color:#EEE9E8; height:1500px; width=500px"> 23 24 <tr:panelGroupLayout layout="horizontal"> 25 <tr:panelHeader text="Statistics" /> 21 22 <tr:panelBox text="Control Panel"> 23 24 <tr:panelGroupLayout layout="horizontal"> 26 25 <tr:spacer width="5px" /> 27 26 <tr:statusIndicator /> … … 36 35 </tr:statusIndicator> 37 36 </tr:panelGroupLayout> 38 39 <tr:spacer height="5px" /> 40 <!-- force the packing algorithm on the start facet to consider this output text, to maintain a minumum size --> 41 <tr:outputText value="No Attached Aggregator" 42 inlineStyle="color:rgb(0,0,0);" 43 rendered="#{empty graphService.statisticalUnits}" /> 44 45 <tr:outputText 46 value="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" 47 inlineStyle="color:#EEE9E8;" /> 48 49 <tr:table value="#{graphService.statisticalUnits}" 50 bandingInterval="2" banding="row" var="unit" width="95%" 51 labelWidth="5%" inlineStyle="border-style: hidden;" 52 rendered="#{not empty graphService.statisticalUnits}"> 53 54 <f:facet name="detailStamp"> 55 <tr:panelFormLayout rows="8" labelWidth="5%"> 56 <tr:panelGroupLayout layout="horizontal"> 57 <tr:outputText value="Method Name:" 58 inlineStyle="font-weight: bold;" /> 59 <tr:outputText value="#{unit.statisticParameters.methodName}" /> 60 </tr:panelGroupLayout> 61 62 <tr:panelGroupLayout layout="horizontal" 63 rendered="#{not empty unit.statisticParameters.startTimeAsJavaDate}"> 64 <tr:outputText value="Start Time:" 65 inlineStyle="font-weight: bold;" /> 66 <tr:inputNumberSpinbox autoSubmit="true" label="Hour:" 67 value="#{unit.statisticParameters.startTimeHour}" 68 minimum="00" maximum="23" simple="true" /> 69 <tr:inputNumberSpinbox autoSubmit="true" label="Minutes:" 70 value="#{unit.statisticParameters.startTimeMinute}" 71 minimum="00" maximum="59" simple="true" /> 72 <tr:inputNumberSpinbox autoSubmit="true" label="Seconds:" 73 value="#{unit.statisticParameters.startTimeSecond}" 74 minimum="00" maximum="59" simple="true" /> 75 <tr:inputDate id="startTimeDate" autoSubmit="true" 76 value="#{unit.statisticParameters.startTimeAsJavaDate}"> 77 <f:convertDateTime dateStyle="short" /> 78 </tr:inputDate> 79 80 </tr:panelGroupLayout> 81 82 <tr:panelGroupLayout layout="horizontal" 83 rendered="#{not empty unit.statisticParameters.endTimeAsJavaDate}"> 84 <tr:outputText value="End Time:" 85 inlineStyle="font-weight: bold;" /> 86 <tr:inputNumberSpinbox autoSubmit="true" label="Hour:" 87 value="#{unit.statisticParameters.endTimeHour}" minimum="00" 88 maximum="23" simple="true" /> 89 <tr:inputNumberSpinbox autoSubmit="true" label="Minutes:" 90 value="#{unit.statisticParameters.endTimeMinute}" 91 minimum="00" maximum="59" simple="true" /> 92 <tr:inputNumberSpinbox autoSubmit="true" label="Seconds:" 93 value="#{unit.statisticParameters.endTimeSecond}" 94 minimum="00" maximum="59" simple="true" /> 95 <tr:inputDate id="endTimeDate" autoSubmit="true" 96 value="#{unit.statisticParameters.endTimeAsJavaDate}"> 97 <f:convertDateTime dateStyle="short" /> 98 </tr:inputDate> 99 </tr:panelGroupLayout> 100 101 <!--<tr:panelGroupLayout layout="horizontal"> 37 38 <tr:spacer height="10px" /> 39 40 <tr:panelAccordion discloseMany="true"> 41 <tr:showDetailItem text="Statistics"> 42 43 <tr:outputText value="No Attached Aggregator" 44 inlineStyle="color:rgb(0,0,0);" 45 rendered="#{empty graphService.statisticalUnits}" /> 46 47 48 49 <tr:table value="#{graphService.statisticalUnits}" 50 bandingInterval="2" banding="row" var="unit" width="95%" 51 labelWidth="5%" inlineStyle="border-style: hidden;" 52 rendered="#{not empty graphService.statisticalUnits}"> 53 54 <f:facet name="detailStamp"> 55 <tr:panelFormLayout rows="8" labelWidth="5%"> 56 <tr:panelGroupLayout layout="horizontal"> 57 <tr:outputText value="Method Name:" 58 inlineStyle="font-weight: bold;" /> 59 <tr:outputText 60 value="#{unit.statisticParameters.methodName}" /> 61 </tr:panelGroupLayout> 62 63 <tr:panelGroupLayout layout="horizontal" 64 rendered="#{not empty unit.statisticParameters.startTimeAsJavaDate}"> 65 <tr:outputText value="Start Time:" 66 inlineStyle="font-weight: bold;" /> 67 <tr:inputNumberSpinbox autoSubmit="true" label="Hour:" 68 value="#{unit.statisticParameters.startTimeHour}" 69 minimum="00" maximum="23" simple="true" /> 70 <tr:inputNumberSpinbox autoSubmit="true" label="Minutes:" 71 value="#{unit.statisticParameters.startTimeMinute}" 72 minimum="00" maximum="59" simple="true" /> 73 <tr:inputNumberSpinbox autoSubmit="true" label="Seconds:" 74 value="#{unit.statisticParameters.startTimeSecond}" 75 minimum="00" maximum="59" simple="true" /> 76 <tr:inputDate id="startTimeDate" autoSubmit="true" 77 value="#{unit.statisticParameters.startTimeAsJavaDate}"> 78 <f:convertDateTime dateStyle="short" /> 79 </tr:inputDate> 80 81 </tr:panelGroupLayout> 82 83 <tr:panelGroupLayout layout="horizontal" 84 rendered="#{not empty unit.statisticParameters.endTimeAsJavaDate}"> 85 <tr:outputText value="End Time:" 86 inlineStyle="font-weight: bold;" /> 87 <tr:inputNumberSpinbox autoSubmit="true" label="Hour:" 88 value="#{unit.statisticParameters.endTimeHour}" 89 minimum="00" maximum="23" simple="true" /> 90 <tr:inputNumberSpinbox autoSubmit="true" label="Minutes:" 91 value="#{unit.statisticParameters.endTimeMinute}" 92 minimum="00" maximum="59" simple="true" /> 93 <tr:inputNumberSpinbox autoSubmit="true" label="Seconds:" 94 value="#{unit.statisticParameters.endTimeSecond}" 95 minimum="00" maximum="59" simple="true" /> 96 <tr:inputDate id="endTimeDate" autoSubmit="true" 97 value="#{unit.statisticParameters.endTimeAsJavaDate}"> 98 <f:convertDateTime dateStyle="short" /> 99 </tr:inputDate> 100 </tr:panelGroupLayout> 101 102 <!--<tr:panelGroupLayout layout="horizontal"> 102 103 <tr:outputText value="Field:" 103 104 inlineStyle="font-weight: bold;" /> … … 106 107 107 108 --> 108 <tr:panelGroupLayout layout="horizontal"> 109 <tr:outputText value="Parameters:" 110 inlineStyle="font-weight: bold;" /> 111 <tr:table value="#{unit.statisticParameters.methodParams}" 112 var="parameter" width="95%" labelWidth="5%" 113 inlineStyle="border-style: hidden;" 114 rendered="#{not empty unit.statisticParameters.methodParams}"> 115 <tr:column inlineStyle="border-style: hidden;"> 116 <tr:inputText value="#{parameter.parameter}" /> 117 </tr:column> 118 </tr:table> 119 </tr:panelGroupLayout> 120 121 <tr:panelGroupLayout layout="horizontal"> 122 <tr:outputText value="Series Label:" 123 inlineStyle="font-weight: bold;" /> 124 <tr:inputText value="#{unit.statisticParameters.seriesLabel}" /> 125 </tr:panelGroupLayout> 126 127 <tr:panelGroupLayout layout="horizontal"> 128 <tr:outputText value="Preprocessors:" 129 inlineStyle="font-weight: bold;" /> 130 <tr:outputText value="#{unit.preProcessorsAsString}" /> 131 </tr:panelGroupLayout> 132 133 <tr:panelGroupLayout layout="horizontal"> 134 <tr:outputText value="Postprocessors:" 135 inlineStyle="font-weight: bold;" /> 136 <tr:outputText value="#{unit.postProcessorsAsString}" /> 137 </tr:panelGroupLayout> 138 139 <tr:panelGroupLayout layout="horizontal"> 140 <tr:commandButton partialSubmit="true" text="Update" 141 action="updateMUAStatistic"> 109 <tr:panelGroupLayout layout="horizontal"> 110 <tr:outputText value="Parameters:" 111 inlineStyle="font-weight: bold;" /> 112 <tr:table value="#{unit.statisticParameters.methodParams}" 113 var="parameter" width="95%" labelWidth="5%" 114 inlineStyle="border-style: hidden;" 115 rendered="#{not empty unit.statisticParameters.methodParams}"> 116 <tr:column inlineStyle="border-style: hidden;"> 117 <tr:inputText value="#{parameter.parameter}" /> 118 </tr:column> 119 </tr:table> 120 </tr:panelGroupLayout> 121 122 <tr:panelGroupLayout layout="horizontal"> 123 <tr:outputText value="Series Label:" 124 inlineStyle="font-weight: bold;" /> 125 <tr:inputText 126 value="#{unit.statisticParameters.seriesLabel}" /> 127 </tr:panelGroupLayout> 128 129 <tr:panelGroupLayout layout="horizontal"> 130 <tr:outputText value="Preprocessors:" 131 inlineStyle="font-weight: bold;" /> 132 <tr:outputText value="#{unit.preProcessorsAsString}" /> 133 </tr:panelGroupLayout> 134 135 <tr:panelGroupLayout layout="horizontal"> 136 <tr:outputText value="Postprocessors:" 137 inlineStyle="font-weight: bold;" /> 138 <tr:outputText value="#{unit.postProcessorsAsString}" /> 139 </tr:panelGroupLayout> 140 141 <tr:panelGroupLayout layout="horizontal"> 142 <tr:commandButton partialSubmit="true" text="Update" 143 action="updateMUAStatistic"> 144 <f:setPropertyActionListener value="#{unit}" 145 target="#{graphmodel.selectedStatisticalUnit}" /> 146 </tr:commandButton> 147 </tr:panelGroupLayout> 148 149 150 151 </tr:panelFormLayout> 152 </f:facet> 153 154 <f:facet name="header"> 155 <tr:showDetailHeader 156 text="#{graphService.attachedCapabilities.muaMetadata.muaName}" 157 id="showDetail1"> 158 <tr:outputDocument 159 value="Organisation Name: #{graphService.attachedCapabilities.muaMetadata.organisationName}" /> 160 <tr:outputDocument 161 value="Contact: #{graphService.attachedCapabilities.muaMetadata.contactEmail}" /> 162 <tr:outputDocument 163 value="Endpoint: #{graphService.currentlyAttached.serviceEndpoint}" /> 164 </tr:showDetailHeader> 165 </f:facet> 166 167 <tr:column> 168 <f:facet name="header"> 169 <tr:outputText value="Statistic" /> 170 </f:facet> 171 <tr:commandLink text="#{unit.statisticParameters.unitName}" 172 action="invokeStatisticalUnit" partialSubmit="true"> 142 173 <f:setPropertyActionListener value="#{unit}" 143 174 target="#{graphmodel.selectedStatisticalUnit}" /> 144 </tr:commandButton> 175 </tr:commandLink> 176 177 </tr:column> 178 </tr:table> 179 180 181 </tr:showDetailItem> 182 183 <tr:showDetailItem text="Download Options"> 184 <tr:panelBorderLayout> 185 186 <tr:panelGroupLayout id="reportTypePanel" layout="horizontal" 187 labelWidth="3%"> 188 <tr:commandLink id="generateExcelReport" 189 action="generateExcelReport"> 190 <!-- need to get the partialSubmit="true"> working for this action --> 191 <h:graphicImage value="/image/excel-icon.gif" 192 style="border:0"> 193 </h:graphicImage> 194 195 </tr:commandLink> 196 197 <tr:commandLink action="generateCSVReport"> 198 <h:graphicImage value="/image/csv-icon.png" style="border:0"> 199 </h:graphicImage> 200 </tr:commandLink> 145 201 </tr:panelGroupLayout> 146 202 147 203 148 204 149 </tr:panelFormLayout> 150 </f:facet> 151 152 <f:facet name="header"> 153 <tr:showDetailHeader 154 text="#{graphService.attachedCapabilities.muaMetadata.muaName}" 155 id="showDetail1"> 156 <tr:outputDocument 157 value="Organisation Name: #{graphService.attachedCapabilities.muaMetadata.organisationName}" /> 158 <tr:outputDocument 159 value="Contact: #{graphService.attachedCapabilities.muaMetadata.contactEmail}" /> 160 <tr:outputDocument 161 value="Endpoint: #{graphService.currentlyAttached.serviceEndpoint}" /> 162 </tr:showDetailHeader> 163 </f:facet> 164 165 <tr:column> 166 <f:facet name="header"> 167 <tr:outputText value="Statistic" /> 168 </f:facet> 169 <tr:commandLink text="#{unit.statisticParameters.unitName}" 170 action="invokeStatisticalUnit" partialSubmit="true"> 171 <f:setPropertyActionListener value="#{unit}" 172 target="#{graphmodel.selectedStatisticalUnit}" /> 173 </tr:commandLink> 174 175 </tr:column> 176 </tr:table> 177 <br></br> 178 <tr:panelHeader text="Download Options" /> 179 180 181 <tr:panelBorderLayout> 182 183 <tr:panelGroupLayout id="reportTypePanel" layout="horizontal" 184 labelWidth="3%"> 185 <tr:commandLink id="generateExcelReport" 186 action="generateExcelReport"> 187 <!-- need to get the partialSubmit="true"> working for this action --> 188 <h:graphicImage value="/image/excel-icon.gif" style="border:0"> 189 </h:graphicImage> 190 191 </tr:commandLink> 192 193 <tr:commandLink action="generateCSVReport"> 194 <h:graphicImage value="/image/csv-icon.png" style="border:0"> 195 </h:graphicImage> 196 </tr:commandLink> 197 </tr:panelGroupLayout> 198 199 200 201 <tr:table id="reportDownloadTable" 202 value="#{reportmodel.reportsForDownload}" bandingInterval="2" 203 banding="row" var="row" 204 rendered="#{not empty reportmodel.reportsForDownload}" 205 partialTriggers=":generateExcelReport :reportDownloadTable:removeReportCommandLink" 206 width="95%" labelWidth="5%"> 207 208 <tr:column> 209 <f:facet name="header"> 210 <tr:outputText value="Report Name" /> 211 </f:facet> 212 <tr:outputText value="#{row.friendlyName} "> 213 214 </tr:outputText> 215 </tr:column> 216 <tr:column align="center"> 217 <f:facet name="header"> 218 <tr:outputText value="Download" /> 219 </f:facet> 220 <a href="#{row.downloadPath}">download</a> 221 </tr:column> 222 <tr:column align="center"> 223 <f:facet name="header"> 224 <tr:outputText value="Remove" /> 225 </f:facet> 226 <tr:commandLink id="removeReportCommandLink" text="x" 227 action="removeReport" partialSubmit="true"> 228 <f:setPropertyActionListener value="#{row}" 229 target="#{reportmodel.selectedDownloadFile}" /> 230 </tr:commandLink> 231 232 </tr:column> 233 </tr:table> 234 235 </tr:panelBorderLayout> 236 237 </tr:panelCaptionGroup> 205 <tr:table id="reportDownloadTable" 206 value="#{reportmodel.reportsForDownload}" bandingInterval="2" 207 banding="row" var="row" 208 rendered="#{not empty reportmodel.reportsForDownload}" 209 partialTriggers=":generateExcelReport :reportDownloadTable:removeReportCommandLink" 210 width="95%" labelWidth="5%"> 211 212 <tr:column> 213 <f:facet name="header"> 214 <tr:outputText value="Report Name" /> 215 </f:facet> 216 <tr:outputText value="#{row.friendlyName} "> 217 218 </tr:outputText> 219 </tr:column> 220 <tr:column align="center"> 221 <f:facet name="header"> 222 <tr:outputText value="Download" /> 223 </f:facet> 224 <a href="#{row.downloadPath}">download</a> 225 </tr:column> 226 <tr:column align="center"> 227 <f:facet name="header"> 228 <tr:outputText value="Remove" /> 229 </f:facet> 230 <tr:commandLink id="removeReportCommandLink" text="x" 231 action="removeReport" partialSubmit="true"> 232 <f:setPropertyActionListener value="#{row}" 233 target="#{reportmodel.selectedDownloadFile}" /> 234 </tr:commandLink> 235 236 </tr:column> 237 </tr:table> 238 239 </tr:panelBorderLayout> 240 </tr:showDetailItem> 241 </tr:panelAccordion> 242 243 244 245 <!-- force the packing algorithm on the start facet to consider this output text, to maintain a minumum size --> 246 <tr:outputText 247 value="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" 248 inlineStyle="opacity:0.0;color:#EEE9E8;" /> 249 </tr:panelBox> 238 250 239 251 </f:facet> … … 335 347 336 348 337 <!-- RESULTS TABLE AND DOWNLOAD OPTIONS-->349 <!-- RESULTS TABLE --> 338 350 <!-- ________________________________ --> 339 351 … … 358 370 359 371 </tr:table> 360 <br /> 372 361 373 362 374 … … 365 377 366 378 367 <!-- DONE Results table and download options-->379 <!-- DONE Results table done --> 368 380 369 381
Note: See TracChangeset
for help on using the changeset viewer.
