From 359baf0297ab47059f0a2ef387627ceadd30beed Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Fri, 9 Aug 2019 11:49:09 +0200
Subject: [PATCH] Change job template.
---
app/main/views.py | 3 +-
app/templates/main/corpus.html.j2 | 43 -----------------------------
app/templates/main/jobs/job.html.j2 | 25 +++++++++++++++++
3 files changed, 26 insertions(+), 45 deletions(-)
delete mode 100644 app/templates/main/corpus.html.j2
create mode 100644 app/templates/main/jobs/job.html.j2
diff --git a/app/main/views.py b/app/main/views.py
index 147d62cb..261d14e6 100644
--- a/app/main/views.py
+++ b/app/main/views.py
@@ -71,5 +71,4 @@ def job(job_id):
elif not job.user_id == current_user.id:
print('Job does not belong to current user.')
abort(403)
- print(job)
- return render_template('main/corpus.html.j2', title=job.title)
+ return render_template('main/jobs/job.html.j2', title='Job', job=job)
diff --git a/app/templates/main/corpus.html.j2 b/app/templates/main/corpus.html.j2
deleted file mode 100644
index a796f3bf..00000000
--- a/app/templates/main/corpus.html.j2
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "base.html.j2" %}
-
-{% block page_content %}
-<div class="col s12 m4">
- <h3>Opaque?</h3>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,</p>
-</div>
-
-<div class="col s12 m8">
- <div class="card">
- <div class="card-content">
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
- </div>
- </div>
-</div>
-
-<div class="col s12 m4">
- <div class="card">
- <div class="card-content">
- <span class="card-title">Open source</span>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy</p>
- </div>
- </div>
-</div>
-
-<div class="col s12 m4">
- <div class="card">
- <div class="card-content">
- <span class="card-title">Cloud processing</span>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy</p>
- </div>
- </div>
-</div>
-
-<div class="col s12 m4">
- <div class="card">
- <div class="card-content">
- <span class="card-title">Context</span>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy</p>
- </div>
- </div>
-</div>
-{% endblock %}
diff --git a/app/templates/main/jobs/job.html.j2 b/app/templates/main/jobs/job.html.j2
new file mode 100644
index 00000000..1963c977
--- /dev/null
+++ b/app/templates/main/jobs/job.html.j2
@@ -0,0 +1,25 @@
+{% extends "base.html.j2" %}
+
+{% block page_content %}
+<div class="col s12 m4">
+ <h3>{{ job.title }}</h3>
+ <p>{{ job.description }}</p>
+</div>
+
+<div class="col s12 m8">
+ <div class="card">
+ <div class="card-content">
+ <span class="card-title">Details</span>
+ <p><b>Creation date</b>: {{ job.creation_date }}</p>
+ <p><b>Description</b>: {{ job.description }}</p>
+ <p><b>Memory</b>: {{ job.mem_mb }} MB</p>
+ <p><b>Cores</b>: {{ job.n_cores }}</p>
+ <p><b>Service</b>: {{ job.service }}</p>
+ <p><b>Service arguments</b>: {{ job.service_args }}</p>
+ <p><b>Service version</b>: {{ job.service_version }}</p>
+ <p><b>Status</b>: {{ job.status }}</p>
+ <p><b>Title</b>: {{ job.title }}</p>
+ </div>
+</div>
+
+{% endblock %}
--
GitLab