From be50c3a6ba459f87dc25f02ab402eefbbc090ee2 Mon Sep 17 00:00:00 2001
From: "piotr.atyjaszyk" <piotrmk1@gmail.com>
Date: Wed, 30 Nov 2016 11:12:27 +0100
Subject: [PATCH] added a simple list for equipment types
---
.../templates/equipment_and_rooms/index.html | 18 +++++++++---------
smash/web/urls.py | 1 +
smash/web/views.py | 10 ++++++++++
3 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/smash/web/templates/equipment_and_rooms/index.html b/smash/web/templates/equipment_and_rooms/index.html
index d9fde6d2..29148f99 100644
--- a/smash/web/templates/equipment_and_rooms/index.html
+++ b/smash/web/templates/equipment_and_rooms/index.html
@@ -5,7 +5,7 @@
{% block page_description %}
{% endblock page_description %}
-{% block breadcrumb %}
+{% block breadcrumb %}
<li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active">Equipment and rooms</li>
{% endblock breadcrumb %}
@@ -22,11 +22,11 @@
<div class="icon">
<i class="ion ion-settings"></i>
</div>
- <a href="#" class="small-box-footer">
+ <a href="{% url 'web.views.equipment_def' %}" class="small-box-footer">
Edit <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
-
+
<div class="bg-red small-box">
<div class="inner">
<h4>Rooms</h4>
@@ -40,7 +40,7 @@
Edit <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
-
+
<div class="bg-red disabled small-box">
<div class="inner">
<h4>Flying teams</h4>
@@ -55,7 +55,7 @@
</a>
</div>
</div>
-
+
<div class="col-md-3">
<div class="bg-yellow-active small-box">
<div class="inner">
@@ -70,7 +70,7 @@
Edit <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
-
+
<div class="bg-yellow small-box">
<div class="inner">
<h4>Equipment in rooms</h4>
@@ -85,7 +85,7 @@
</a>
</div>
</div>
-
+
<div class="col-md-3">
<div class="bg-green-active small-box">
<div class="inner">
@@ -100,7 +100,7 @@
Edit <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
-
+
<div class="bg-green small-box">
<div class="inner">
<h5>Equipment required for visits</h5>
@@ -114,7 +114,7 @@
Edit <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
-
+
<div class="bg-green disabled small-box ">
<div class="inner">
<h5>Equipment assigned to Flying Teams</h5>
diff --git a/smash/web/urls.py b/smash/web/urls.py
index ce91c7dd..e4556be5 100644
--- a/smash/web/urls.py
+++ b/smash/web/urls.py
@@ -21,6 +21,7 @@ urlpatterns = [
url(r'subjects$', views.subjects, name='web.views.subjects'),
url(r'doctors$', views.doctors, name='web.views.doctors'),
url(r'equipment_and_rooms$', views.equipment_and_rooms, name='web.views.equipment_and_rooms'),
+ url(r'equipment_and_rooms/eqdef$', views.equipment_def, name='web.views.equipment_def'),
url(r'mail_templates$', views.mail_templates, name='web.views.mail_templates'),
url(r'login$', views.login, name='web.views.login'),
url(r'logout$', views.logout, name='web.views.logout'),
diff --git a/smash/web/views.py b/smash/web/views.py
index 7a890ace..2928e6fb 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -52,6 +52,16 @@ def doctors(request):
return HttpResponse(template.render(context,request))
+def equipment_def(request):
+ equipment_list = Item.objects.order_by('-name')
+ template = loader.get_template("eqdef/index.html")
+ context = {
+ 'equipment_list': equipment_list
+ }
+
+ return HttpResponse(template.render(context,request))
+
+
def equipment_and_rooms(request):
template = loader.get_template("equipment_and_rooms/index.html")
return HttpResponse(template.render({
--
GitLab