Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework #8

Browse Source
This commit is contained in:
LukasDoesDev 2020-12-14 23:52:46 +02:00
parent c13c1ab365
commit 4c9f947aa1
2 changed files with 49 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/classes/web/panel_handler.py
View File

@ -3,6 +3,8 @@ import logging
import tornado.web
import tornado.escape
import bleach
import time
import datetime
from app.classes.shared.console import console
from app.classes.shared.models import Users, installer
@ -23,6 +25,9 @@ class PanelHandler(BaseHandler):
template = "panel/denied.html"
now = time.time()
formatted_time = str(datetime.datetime.fromtimestamp(now).strftime('%Y-%m-%d %H:%M:%S'))
defined_servers = controller.list_defined_servers()
page_data = {
@ -38,7 +43,8 @@ class PanelHandler(BaseHandler):
'menu_servers': defined_servers,
'hosts_data': db_helper.get_latest_hosts_stats(),
'show_contribute': helper.get_setting("show_contribute_link", True),
'error': error
'error': error,
'time': formatted_time
}
# if no servers defined, let's go to the build server area

79
app/frontend/templates/panel/parts/details_stats.html
View File

@ -6,7 +6,7 @@
<div class="col-sm-3 mr-2">
{% if data['server_stats'][0]['running'] %}
<b>Server Status:</b> <span class="text-success">Online</span><br />
<b>Server Started:</b> <span id="started">{{ data['server_stats'][0]['started'] }}</span><br />
<b>Server Started:</b> <span id="started">{{ data['server_stats'][0]['started'] }} (Server Time)</span><br />
<b>Server Uptime:</b> <span id="uptime">Not calculated yet</span>
{% else %}
<b>Server Status:</b> <span class="text-danger">Offline</span><br />
@ -47,49 +47,54 @@
<script>
document.addEventListener('load', () => console.log('loadedghfghfghk'));
function durationToHumanizedString (duration) {
duration._data.months += duration._data.years * 12;
// 30.45833333333 = average month length, calculate with (31+28.5+31+30+31+30+31+31+30+31+30+31) / 12
duration._data.days += duration._data.months * 30.45833333333;
duration._data.hours += duration._data.days * 24;
console.log('calculateTime');
let uptime = document.querySelector('#uptime');
let started = document.querySelector('#started');
let obj = {
hours: Math.round(duration._data.hours),
minutes: duration._data.minutes,
seconds: duration._data.seconds
}
if (uptime != null && started != null) {
var msdiff = moment(started.textContent,"YYYY-MM-DD HH:mm:ss").diff(moment());
var diff = moment(msdiff);
var s = diff
.format("YYYY-MM-DD HH:mm:ss")
.split(' ')
.map(x=>x.split('-'))
.flat()
.map(x=>x.split(':'))
.flat()
.map(str => str.replace(',', ''))
.map(str => +str) // Convert to number(s)
.reverse()
.map((n, i) =>
n === 0
? n
: `${n} ` +
[
'year',
'month',
'day',
'hour',
'minute',
'second'
].reverse()[i] + (n != 1 && n != -1 ? 's' : '')
)
.reverse()
.filter(num => num !== 0) // filter out 0s
output = Object.entries(obj)
.map(([type, num]) => {
// make them strings
returnData = num + ' ' + type;
console.log(returnData);
// remove the s in the end if the data is -1 or 1
if (returnData == -1 || returnData == 1)
returnData = returnData.slice(0, -1)
return returnData;
})
.map((v, i, a) => // example input: [1,2,3], output: "1, 2 and 3"
v + (i !== a.length - 1
? i !== a.length - 2
? ', '
: ' and '
: '')).join('');
uptime.textContent = s;
return output;
}
document.addEventListener('load', () => {
console.log('calculateTime');
let uptime = document.querySelector('#uptime');
let started = document.querySelector('#started');
let nowServerTime = '{{ data['time'] }}';
let startedServerTime = '{{ data['server_stats'][0]['started'] }}';
if (uptime != null && started != null) {
var msdiff = moment(nowServerTime,"YYYY-MM-DD hh:mm:ss")
.diff(moment(startedServerTime,"YYYY-MM-DD hh:mm:ss"));
var diff = moment.duration(msdiff);
uptime.textContent = durationToHumanizedString(diff);
}
});
</script>