From 70a6b171d06b8c2fe417d7e6499bcc14d14406ef Mon Sep 17 00:00:00 2001 From: Jeremy Stretch <jstretch@digitalocean.com> Date: Wed, 16 Aug 2017 11:20:52 -0400 Subject: [PATCH] Fixes #1429: Fixed uptime formatting on device status page --- netbox/templates/dcim/device_status.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/netbox/templates/dcim/device_status.html b/netbox/templates/dcim/device_status.html index 4d3c9ba78..7c62b3971 100644 --- a/netbox/templates/dcim/device_status.html +++ b/netbox/templates/dcim/device_status.html @@ -80,13 +80,19 @@ $(document).ready(function() { $('#model').html(json['get_facts']['model']); $('#serial_number').html(json['get_facts']['serial_number']); $('#os_version').html(json['get_facts']['os_version']); - $('#uptime').html(json['get_facts']['uptime']); + // Calculate uptime + var uptime = json['get_facts']['uptime']; + console.log(uptime); + var uptime_days = Math.floor(uptime / 86400); + var uptime_hours = Math.floor(uptime % 86400 / 3600); + var uptime_minutes = Math.floor(uptime % 3600 / 60); + $('#uptime').html(uptime_days + "d " + uptime_hours + "h " + uptime_minutes + "m"); $.each(json['get_environment']['cpu'], function(name, obj) { var row="<tr><td>" + name + "</td><td>" + obj['%usage'] + "%</td></tr>"; $("#cpu").after(row) }); - $('#memory').after("<tr><td>Used</td><td>" + json['get_environment']['memory']['used_ram'] + "MB</td></tr>"); - $('#memory').after("<tr><td>Available</td><td>" + json['get_environment']['memory']['available_ram'] + "MB</td></tr>"); + $('#memory').after("<tr><td>Used</td><td>" + json['get_environment']['memory']['used_ram'] + "</td></tr>"); + $('#memory').after("<tr><td>Available</td><td>" + json['get_environment']['memory']['available_ram'] + "</td></tr>"); $.each(json['get_environment']['temperature'], function(name, obj) { var style = "success"; if (obj['is_alert']) {