Finished stats in Enode details page
diff --git a/mCordPortal/src/app/components/related-stats/related-stats.js b/mCordPortal/src/app/components/related-stats/related-stats.js
index d40f6cf..08bc813 100644
--- a/mCordPortal/src/app/components/related-stats/related-stats.js
+++ b/mCordPortal/src/app/components/related-stats/related-stats.js
@@ -36,7 +36,7 @@
this.model.getStats()
.then((stats) => {
this.selectedStats = 'download_data';
- this.stats = formatStats(stats);
+ this.stats = formatStats(stats.ProfileArray);
});
};
diff --git a/mCordPortal/src/app/view/enode-details/e-node-details.tpl.html b/mCordPortal/src/app/view/enode-details/e-node-details.tpl.html
index 13b91de..b779985 100644
--- a/mCordPortal/src/app/view/enode-details/e-node-details.tpl.html
+++ b/mCordPortal/src/app/view/enode-details/e-node-details.tpl.html
@@ -16,7 +16,26 @@
<related-profiles model="vm.enode"></related-profiles>
</uib-tab>
<uib-tab index="1" heading="Stats">
- <related-stats model="vm.enode" type="enode"></related-stats>
+ <div class="row">
+ <div class="col-xs-8">
+ <related-stats model="vm.enode" type="enode"></related-stats>
+ </div>
+ <div class="col-xs-4">
+ <table class="table">
+ <tr>
+ <td>Status:</td>
+ <td>
+ <i ng-show="vm.enode.Status" class="glyphicon glyphicon-ok"></i>
+ <i ng-show="!vm.enode.Status" class="glyphicon glyphicon-remove"></i>
+ </td>
+ </tr>
+ <tr ng-repeat="(k, v) in vm.enodeStats">
+ <td>{{k}}:</td>
+ <td>{{v}}</td>
+ </tr>
+ </table>
+ </div>
+ </div>
</uib-tab>
</uib-tabset>
</div>
diff --git a/mCordPortal/src/app/view/enode-details/enode-details.js b/mCordPortal/src/app/view/enode-details/enode-details.js
index 51894d2..a383d47 100644
--- a/mCordPortal/src/app/view/enode-details/enode-details.js
+++ b/mCordPortal/src/app/view/enode-details/enode-details.js
@@ -9,9 +9,24 @@
controllerAs: 'vm',
templateUrl: 'app/view/enode-details/e-node-details.tpl.html',
controller: function($stateParams, Enodeb){
+
+ const secondsToHms = d => {
+ d = Number(d);
+ var h = Math.floor(d / 3600);
+ var m = Math.floor(d % 3600 / 60);
+ var s = Math.floor(d % 3600 % 60);
+ return ((h > 0 ? h + ':' + (m < 10 ? '0' :'') :'') + m + ':' + (s < 10 ? '0' :'') + s);
+ };
+
Enodeb.get({id: $stateParams.id}).$promise
.then((enode) => {
this.enode = enode;
+ return enode.getStats();
+ })
+ .then(stats => {
+ delete stats.ProfileArray;
+ stats.Uptime = moment.duration(stats.Uptime, 'seconds').format('HH[h] mm[m] ss[s]');
+ this.enodeStats = stats;
});
this.config = {
diff --git a/mCordPortal/src/app/view/enode-list/enode-list.js b/mCordPortal/src/app/view/enode-list/enode-list.js
index 98dffeb..8814838 100644
--- a/mCordPortal/src/app/view/enode-list/enode-list.js
+++ b/mCordPortal/src/app/view/enode-list/enode-list.js
@@ -16,6 +16,8 @@
})
this.tableConfig = {
+ order: true,
+ filter: 'field',
columns: [
{
label: '#',