You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/09/02 06:54:41 UTC
svn commit: r1621915 - in /incubator/sirona/trunk/server/reporting:
reporting-api/src/main/java/org/apache/sirona/reporting/web/status/
reporting-ui/src/main/webapp/js/app/controllers/
reporting-ui/src/main/webapp/partials/
Author: olamy
Date: Tue Sep 2 04:54:41 2014
New Revision: 1621915
URL: http://svn.apache.org/r1621915
Log:
improve status rendering
Modified:
incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/NodeStatusInfo.java
incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/StatusService.java
incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/ValidationResultInfo.java
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/status.html
Modified: incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/NodeStatusInfo.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/NodeStatusInfo.java?rev=1621915&r1=1621914&r2=1621915&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/NodeStatusInfo.java (original)
+++ incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/NodeStatusInfo.java Tue Sep 2 04:54:41 2014
@@ -39,18 +39,22 @@ public class NodeStatusInfo
private final String status;
+ private final String statusLabel;
+
public NodeStatusInfo( String name, NodeStatus nodeStatus )
{
this.name = name;
this.date = nodeStatus.getDate();
- this.status = StatusHelper.map( nodeStatus.getStatus() );
+ this.status = nodeStatus.getStatus().toString();
+ this.statusLabel = StatusHelper.map( nodeStatus.getStatus() );
if ( nodeStatus.getResults() != null )
{
this.results = new ArrayList<ValidationResultInfo>( nodeStatus.getResults().length );
for ( ValidationResult validationResult : nodeStatus.getResults() )
{
- this.results.add( new ValidationResultInfo( StatusHelper.map( validationResult.getStatus() ), //
+ this.results.add( new ValidationResultInfo( validationResult.getStatus().toString(),//
+ StatusHelper.map( validationResult.getStatus() ), //
validationResult.getMessage(), //
validationResult.getName() ) );
}
@@ -61,14 +65,6 @@ public class NodeStatusInfo
}
}
- public NodeStatusInfo( String name, String status, Date date, List<ValidationResultInfo> results )
- {
- this.name = name;
- this.status = status;
- this.date = date;
- this.results = results;
- }
-
public List<ValidationResultInfo> getResults()
{
return results;
@@ -84,6 +80,11 @@ public class NodeStatusInfo
return status;
}
+ public String getStatusLabel()
+ {
+ return statusLabel;
+ }
+
public String getName()
{
return name;
Modified: incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/StatusService.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/StatusService.java?rev=1621915&r1=1621914&r2=1621915&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/StatusService.java (original)
+++ incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/StatusService.java Tue Sep 2 04:54:41 2014
@@ -21,6 +21,7 @@ import org.apache.sirona.status.NodeStat
import javax.ws.rs.GET;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import java.util.ArrayList;
@@ -82,4 +83,15 @@ public class StatusService
return applicationStatuseses;
}
+
+ @GET
+ @Path( "/{node}" )
+ @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
+ public ApplicationStatuses find( @PathParam( "node" ) String node )
+ {
+ NodeStatus nodeStatus = Repository.INSTANCE.statuses().get( node );
+
+ nodeStatus.
+ }
+
}
Modified: incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/ValidationResultInfo.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/ValidationResultInfo.java?rev=1621915&r1=1621914&r2=1621915&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/ValidationResultInfo.java (original)
+++ incubator/sirona/trunk/server/reporting/reporting-api/src/main/java/org/apache/sirona/reporting/web/status/ValidationResultInfo.java Tue Sep 2 04:54:41 2014
@@ -28,13 +28,16 @@ public class ValidationResultInfo
private final String status;
+ private final String statusLabel;
+
private final String message;
private final String name;
- public ValidationResultInfo( String status, String message, String name )
+ public ValidationResultInfo( String status, String statusLabel, String message, String name )
{
this.status = status;
+ this.statusLabel = statusLabel;
this.message = message;
this.name = name;
}
@@ -44,6 +47,11 @@ public class ValidationResultInfo
return status;
}
+ public String getStatusLabel()
+ {
+ return statusLabel;
+ }
+
public String getMessage()
{
return message;
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js?rev=1621915&r1=1621914&r2=1621915&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/app/controllers/controllers-status.js Tue Sep 2 04:54:41 2014
@@ -35,13 +35,17 @@ define(['jquery','angular','bootstrap','
}]);
- statusControllers.controller( 'StatusDetailCtrl', ['$scope','$routeParams',
- function ($scope,$routeParams){
+ statusControllers.controller( 'StatusDetailCtrl', ['$scope','$routeParams','status',
+ function ($scope,$routeParams,status){
$scope.data={};
console.log("StatusDetailCtrl:"+$routeParams.nodeName);
+ status.query({nodeName:$routeParams.nodeName}).$promise.then( function ( results ){
+ $scope.data.applicationStatuseses=results;
+ });
+
}]);
});
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/status.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/status.html?rev=1621915&r1=1621914&r2=1621915&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/status.html (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/partials/status.html Tue Sep 2 04:54:41 2014
@@ -18,7 +18,13 @@
<div class="col-lg-12">
<ul>
<li ng-repeat="applicationStatuses in data.applicationStatuseses">
- <a href="#status/{{::applicationStatuses.name}}">{{::applicationStatuses.name}}</a>
+ {{::applicationStatuses.name}}
+ <ul>
+ <li ng-repeat="nodeStatusInfo in applicationStatuses.nodeStatusInfos">
+ <a href="#status/{{::nodeStatusInfo.name}}">{{::nodeStatusInfo.name}} ({{::nodeStatusInfo.date | date:'medium'}}) - {{::nodeStatusInfo.status}}</a>
+ </li>
+ </ul>
+ </li>
</li>
</ul>
</div>