From 56dd407b57c4a9614efdd0c724cea93507ecc991 Mon Sep 17 00:00:00 2001
From: vanzhiganov <vanzhiganov@ya.ru>
Date: Thu, 12 May 2016 04:28:46 +0300
Subject: [PATCH] tasks list page

---
 .../templates/administrator/_layout.auth.html |  1 +
 .../templates/administrator/tasks/index.html  | 43 +++++++++++++++++++
 SWSCloudCore/views/administrator/__init__.py  | 25 ++++++++---
 3 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 SWSCloudCore/templates/administrator/tasks/index.html

diff --git a/SWSCloudCore/templates/administrator/_layout.auth.html b/SWSCloudCore/templates/administrator/_layout.auth.html
index c6ffd21..32ae34d 100644
--- a/SWSCloudCore/templates/administrator/_layout.auth.html
+++ b/SWSCloudCore/templates/administrator/_layout.auth.html
@@ -38,6 +38,7 @@
                         <li><a href="{{ url_for('administrator.datacenters') }}">Datacenters</a></li>
                         <li><a href="{{ url_for('administrator.servers_index') }}">Servers</a></li>
                         <li><a href="{{ url_for('administrator.ips_index') }}">IPs</a></li>
+                        <li><a href="{{ url_for('administrator.tasks_index') }}">Tasks</a></li>
                         <li><a href="#">Traffic</a></li>
                     </ul>
                 </li>
diff --git a/SWSCloudCore/templates/administrator/tasks/index.html b/SWSCloudCore/templates/administrator/tasks/index.html
new file mode 100644
index 0000000..3a24698
--- /dev/null
+++ b/SWSCloudCore/templates/administrator/tasks/index.html
@@ -0,0 +1,43 @@
+{% extends 'administrator/_layout.auth.html' %}
+
+{% set title="Infrastructure" %}
+{% set subtitle="Tasks" %}
+
+{% block content %}
+    <table class="table table-bordered" width="100%">
+        <thead>
+            <tr>
+                <th>Info</th>
+                <th>Task</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% if tasks|length == 0 %}
+                <tr>
+                    <td colspan="7">No tasks.</td>
+                </tr>
+            {% else %}
+                {% for task in tasks %}
+                    <tr>
+                        <td nowrap="">
+                            <ul>
+                                <li>ID: {{ task.id }}</li>
+                                <li>DC: <a href="{{ url_for('administrator.datacenters_edit', dc_id=task.datacenter.id|string) }}">{{ task.datacenter.name }}</a></li>
+                                <li>Server: {{ task.server.hostname }}</li>
+                                <li>User: {{ task.user.email }}</li>
+                                <li>Created: {{ task.created }}</li>
+                                <li>Status: {{ task.status }}</li>
+                            </ul>
+                        </td>
+                        <td>
+                            <ul>
+                                <li>{{ task.task }}</li>
+                                <li>{{ task.plain }}</li>
+                            </ul>
+                        </td>
+                    </tr>
+                {% endfor %}
+            {% endif %}
+        </tbody>
+    </table>
+{% endblock %}
\ No newline at end of file
diff --git a/SWSCloudCore/views/administrator/__init__.py b/SWSCloudCore/views/administrator/__init__.py
index 62b64d7..dc11bf0 100644
--- a/SWSCloudCore/views/administrator/__init__.py
+++ b/SWSCloudCore/views/administrator/__init__.py
@@ -222,7 +222,7 @@ def datacenters_edit(dc_id):
     cmd = ControllerManageDatacenters()
 
     return render_template(
-        'administrator/datacenters_edit.html',
+        'administrator/datacenters/edit.html',
         datacenter=cmd.item_get(dc_id)
     )
 
@@ -268,13 +268,14 @@ def ips_create():
         return redirect(url_for("administrator.logout"))
     #
     if request.method == "POST":
+        print request.form
         if ControllerManageIPs().is_valid_ipv4_address(request.form['ipv4'])\
                 and ControllerManageIPs().is_valid_ipv4_address(request.form['ipv4_gateway']):
             ControllerManageIPs().item_create(
-                request.form['datacenter_id'],
-                request.form['server_id'],
-                request.form['ipv4'],
-                request.form['ipv4_gateway'],
+                request.form.get('datacenter'),
+                request.form.get('server'),
+                request.form.get('ipv4'),
+                request.form.get('ipv4_gateway'),
                 '',
                 '',
                 0
@@ -282,8 +283,8 @@ def ips_create():
         if ControllerManageIPs().is_valid_ipv6_address(request.form['ipv6'])\
                 and ControllerManageIPs().is_valid_ipv6_address(request.form['ipv6_gateway']):
             ControllerManageIPs().item_create(
-                request.form['datacenter_id'],
-                request.form['server_id'],
+                request.form['datacenter'],
+                request.form['server'],
                 '',
                 '',
                 request.form['ipv6'],
@@ -488,3 +489,13 @@ def settings_messages_email_test():
 @viewAdministrator.route('/json/datacenter/list', methods=['GET'])
 def json_datacenter_list():
     return jsonify(ControllerManageDatacenters().items_get())
+
+
+@viewAdministrator.route('/tasks/', methods=['GET'])
+def tasks_index():
+    from SWSCloudCore.controllers.tasks.manage import ControllerManageTasks
+    return render_template(
+        'administrator/tasks/index.html',
+        # tasks=ControllerManageTasks().get_by_server().get()
+        tasks=ControllerManageTasks().get()
+    )