Merge pull request #74 from EventStore/competing-rounding-status

Fix competing status and rounding

Author: jen20

gulpfile.js

@@ -138,7 +138,8 @@ gulp.task('dist-js', function () {
         './src/bower_components/ace-builds/src-min-noconflict/mode-javascript.js',
         './src/bower_components/ace-builds/src-min-noconflict/theme-monokai.js',
         './src/bower_components/ace-builds/src-min-noconflict/mode-json.js',
-        './src/bower_components/ace-builds/src-min-noconflict/worker-javascript.js'
+        './src/bower_components/ace-builds/src-min-noconflict/worker-javascript.js',
+        './src/bower_components/ace-builds/src-min-noconflict/worker-json.js'
     ])
     .pipe(gulp.dest('./es-dist/js/ace'));
 

src/css/main.css

@@ -493,12 +493,9 @@ tbody .table-subheading {
     border-radius:12px;
     border:1px solid black;
 }
-.idle{
+.subscription-active{
     background:lime;
 }
-.behind-catchingup{
-    background:orange;
-}
 .behind-notcatchingup{
     background:red;
 }

src/js/modules/competing/services/SubscriptionsMapper.js

@@ -30,12 +30,12 @@ define(['./_module'], function (app) {
 		function determineStatus(subscription){
 			if(subscription.behindByMessages > 0){
 				if(subscription.averageItemsPerSecond > 0){
-					return 'behind-catchingup';
+					return 'subscription-active';
 				}else{
 					return 'behind-notcatchingup';
 				}
 			}
-			return 'idle';
+			return 'subscription-active';
 		}
 
 		function determineGroupStatus(group){
@@ -69,7 +69,7 @@ define(['./_module'], function (app) {
 	            current.currentMessages = current.lastProcessedEventNumber + 1;
 	            current.inFlightMessages = current.totalInFlightMessages;
 	            current.behindByMessages = (current.knownMessages - current.currentMessages);
-	            current.behindByTime = current.behindByMessages / current.averageItemsPerSecond;
+	            current.behindByTime = Math.round((current.behindByMessages / current.averageItemsPerSecond) * 100)/100;
 	            current.behindByTime = isFinite(current.behindByTime) ? current.behindByTime : 0;
 	            current.status = determineStatus(current);
 	            if(key) {
@@ -91,6 +91,7 @@ define(['./_module'], function (app) {
                     group.connectionCount += current.connectionCount;
                     group.behindByMessages += current.behindByMessages;
                     group.behindByTime += current.behindByTime;
+                    group.behindByTime = Math.round(current.behindByTime * 100)/100;
                     group.status = determineGroupStatus(group);
 
 	                result[key] = group;

src/js/modules/competing/templates/templates.js

@@ -6,7 +6,7 @@ try {
 }
 module.run(['$templateCache', function($templateCache) {
   $templateCache.put('subscription.row.header.tpl.html',
-    '<td ng-if=esSubscription.show>{{ esSubscription.streamName }} <a class=table-collapsetoggle>&minus;</a></td><td ng-if=!esSubscription.show>{{ esSubscription.streamName }} <a class=table-collapsetoggle>&plus;</a></td><td>{{ esSubscription.averageItemsPerSecond }}</td><td>{{ esSubscription.knownMessages }}</td><td>{{ esSubscription.currentMessages }}</td><td>{{ esSubscription.inFlightMessages }}</td><td>{{ esSubscription.connectionCount }}</td><td><div class="status {{ esSubscription.status }}"></div>{{ esSubscription.behindByMessages }} / {{ esSubscription.behindByTime | number:0 }}</td><td>n/a</td>');
+    '<td ng-if=esSubscription.show>{{ esSubscription.streamName }} <a class=table-collapsetoggle>&minus;</a></td><td ng-if=!esSubscription.show>{{ esSubscription.streamName }} <a class=table-collapsetoggle>&plus;</a></td><td>{{ esSubscription.averageItemsPerSecond }}</td><td>{{ esSubscription.knownMessages }}</td><td>{{ esSubscription.currentMessages }}</td><td>{{ esSubscription.inFlightMessages }}</td><td>{{ esSubscription.connectionCount }}</td><td><div class="status {{ esSubscription.status }}"></div>{{ esSubscription.behindByMessages }} / {{ esSubscription.behindByTime }}</td><td>n/a</td>');
 }]);
 })();
 

src/js/modules/competing/views/subscription.row.header.tpl.html

@@ -10,7 +10,7 @@
 <td>{{ esSubscription.inFlightMessages }}</td>
 <td>{{ esSubscription.connectionCount }}</td>
 <td>
-	<div class="status {{ esSubscription.status }}"></div> {{ esSubscription.behindByMessages }} / {{ esSubscription.behindByTime | number:0 }}
+	<div class="status {{ esSubscription.status }}"></div> {{ esSubscription.behindByMessages }} / {{ esSubscription.behindByTime }}
 </td>
 <td>n/a</td>