From 6da9676299eaeba938e59ef8118879be0fd3f5dd Mon Sep 17 00:00:00 2001 From: Retspen Date: Wed, 25 Mar 2015 11:59:22 +0200 Subject: [PATCH] Fixed graphs timer --- computes/views.py | 8 +-- instances/views.py | 54 ++++++++------- templates/accounts.html | 141 +++++++++++++++++++++------------------- 3 files changed, 109 insertions(+), 94 deletions(-) diff --git a/computes/views.py b/computes/views.py index b062068..19feeb3 100644 --- a/computes/views.py +++ b/computes/views.py @@ -195,10 +195,10 @@ def compute_graph(request, compute_id): cookies['cpu'] = None cookies['mem'] = None - if not cookies['cpu'] and not cookies['mem']: - datasets['cpu'] = [0] - datasets['mem'] = [0] - datasets['timer'] = [curent_time] + if not cookies['cpu'] or not cookies['mem']: + datasets['cpu'] = [0] * points + datasets['mem'] = [0] * points + datasets['timer'] = [0] * points else: datasets['cpu'] = eval(cookies['cpu']) datasets['mem'] = eval(cookies['mem']) diff --git a/instances/views.py b/instances/views.py index cc3c1e8..98dfafc 100644 --- a/instances/views.py +++ b/instances/views.py @@ -448,18 +448,14 @@ def inst_graph(request, compute_id, vname): return HttpResponseRedirect(reverse('login')) datasets = {} - datasets_rd = [] - datasets_wr = [] json_blk = [] - cookie_blk = {} - datasets_rx = [] - datasets_tx = [] + datasets_blk = {} json_net = [] - cookie_net = {} + datasets_net = {} + cookies = {} points = 5 curent_time = time.strftime("%H:%M:%S") compute = Compute.objects.get(id=compute_id) - cookies = request.COOKIES response = HttpResponse() response['Content-Type'] = "text/javascript" @@ -479,12 +475,22 @@ def inst_graph(request, compute_id, vname): net_usage = conn.net_usage() conn.close() - if cookies.get('cpu') == '{}' or not cookies.get('cpu') or not cpu_usage: - datasets['cpu'] = [0] - datasets['timer'] = [curent_time] + try: + cookies['cpu'] = request.COOKIES['cpu'] + cookies['blk'] = request.COOKIES['blk'] + cookies['net'] = request.COOKIES['net'] + cookies['timer'] = request.COOKIES['timer'] + except KeyError: + cookies['cpu'] = None + cookies['blk'] = None + cookies['net'] = None + + if not cookies['cpu']: + datasets['cpu'] = [0] * points + datasets['timer'] = [0] * points else: - datasets['cpu'] = eval(cookies.get('cpu')) - datasets['timer'] = eval(cookies.get('timer')) + datasets['cpu'] = eval(cookies['cpu']) + datasets['timer'] = eval(cookies['timer']) datasets['timer'].append(curent_time) datasets['cpu'].append(int(cpu_usage['cpu'])) @@ -493,11 +499,11 @@ def inst_graph(request, compute_id, vname): datasets['cpu'] = check_points(datasets['cpu']) for blk in blk_usage: - if cookies.get('blk') == '{}' or not cookies.get('blk') or not blk_usage: - datasets_wr.append(0) - datasets_rd.append(0) + if not cookies['blk']: + datasets_wr = [0] * points + datasets_rd = [0] * points else: - datasets['blk'] = eval(cookies.get('blk')) + datasets['blk'] = eval(cookies['blk']) datasets_rd = datasets['blk'][blk['dev']][0] datasets_wr = datasets['blk'][blk['dev']][1] @@ -508,14 +514,14 @@ def inst_graph(request, compute_id, vname): datasets_wr = check_points(datasets_wr) json_blk.append({'dev': blk['dev'], 'data': [datasets_rd, datasets_wr]}) - cookie_blk[blk['dev']] = [datasets_rd, datasets_wr] + datasets_blk[blk['dev']] = [datasets_rd, datasets_wr] for net in net_usage: - if cookies.get('net') == '{}' or not cookies.get('net') or not net_usage: - datasets_rx.append(0) - datasets_tx.append(0) + if not cookies['net']: + datasets_rx = [0] * points + datasets_tx = [0] * points else: - datasets['net'] = eval(cookies.get('net')) + datasets['net'] = eval(cookies['net']) datasets_rx = datasets['net'][net['dev']][0] datasets_tx = datasets['net'][net['dev']][1] @@ -526,14 +532,14 @@ def inst_graph(request, compute_id, vname): datasets_tx = check_points(datasets_tx) json_net.append({'dev': net['dev'], 'data': [datasets_rx, datasets_tx]}) - cookie_net[net['dev']] = [datasets_rx, datasets_tx] + datasets_net[net['dev']] = [datasets_rx, datasets_tx] data = json.dumps({'cpudata': datasets['cpu'], 'blkdata': json_blk, 'netdata': json_net, 'timeline': datasets['timer']}) response.cookies['cpu'] = datasets['cpu'] response.cookies['timer'] = datasets['timer'] - response.cookies['blk'] = cookie_blk - response.cookies['net'] = cookie_net + response.cookies['blk'] = datasets_blk + response.cookies['net'] = datasets_net except libvirtError: data = json.dumps({'error': 'Error 500'}) diff --git a/templates/accounts.html b/templates/accounts.html index 3ffe8ec..9ebff0b 100644 --- a/templates/accounts.html +++ b/templates/accounts.html @@ -14,80 +14,89 @@ {% include 'errors_block.html' %}
- {% for user in users %} -
-
-
-

- {{ user.username }} - - - -

-
-
-
-

{% trans "Status:" %}

+ {% if not users %} +
+
+ + {% trans "Warning:" %} {% trans "You don't have any User" %} +
+
+ {% else %} + {% for user in users %} +
+
+
+

+ {{ user.username }} + + + +

-
- {% if user.is_active %} -

{% trans "Active" %}

- {% else %} -

{% trans "Blocked" %}

- {% endif %} +
+
+

{% trans "Status:" %}

+
+
+ {% if user.is_active %} +

{% trans "Active" %}

+ {% else %} +

{% trans "Blocked" %}

+ {% endif %} +
-
- -