diff --git a/smash/web/models.py b/smash/web/models.py
index 1454418ace8f9b0fa689d092a2da0a82ab86db72..18d09a956d97fec61ebcca4e4013a171499d3c95 100644
--- a/smash/web/models.py
+++ b/smash/web/models.py
@@ -3,8 +3,7 @@ from __future__ import unicode_literals
from django.db import models
from django.utils import timezone
from django.contrib.auth.models import User
-
-
+import datetime
class Language (models.Model):
@@ -89,14 +88,30 @@ class AppType (models.Model):
class Worker (models.Model):
languages = models.ManyToManyField(Language)
- appointments = models.ManyToManyField('Appointment')
+ appointments = models.ManyToManyField('Appointment', blank=True)
user = models.OneToOneField(User)
firstName = models.CharField(max_length=50)
lastName = models.CharField(max_length=50)
phoneNo = models.CharField(max_length=20)
+ unit = models.CharField(max_length=50)
email = models.EmailField()
- role = models.CharField(max_length=20)
+ ROLE_CHOICES = (
+ ('DOCTOR', 'Doctor'),
+ ('NURSE', 'Nurse'),
+ ('PSYCHOLOGIST', 'Psychologist'),
+ ('TECHNICIAN', 'Technician'),
+ ('SECRETARY', 'Secretary')
+ )
+ role = models.CharField(max_length=20, choices = ROLE_CHOICES)
specialization = models.CharField(max_length=20)
+ def isOnLeave(self):
+ if len(self.holiday_set.filter(holidayEnd__gt=datetime.datetime.now(),
+ holidayStart__lt=datetime.datetime.now())):
+ return True
+ return False
+
+ def __str__(self):
+ return self.firstName + " " + self.lastName
class FlyingTeam(models.Model):
@@ -131,4 +146,6 @@ class Appointment(models.Model):
+
+
# Create your models here.
diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html
index a59d5ada671be6a875008fce774f9517b1c2cddd..2da89ada2c4e4c1f0e0f93f5002d399f8d9bafb6 100644
--- a/smash/web/templates/_base.html
+++ b/smash/web/templates/_base.html
@@ -5,20 +5,20 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>{% block title %}Scheduling system{% endblock title %}</title>
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-
- {% block styles %}
+
+ {% block styles %}
<!-- Bootstrap 3.3.6 -->
<link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}">
-
+
<!-- Font Awesome -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-
+
<!-- Ionicons -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
-
+
<!-- Theme style -->
<link rel="stylesheet" href="{% static 'AdminLTE/css/AdminLTE.min.css' %}">
-
+
<link rel="stylesheet" href="{% static 'AdminLTE/css/skins/skin-green.min.css' %}">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -67,7 +67,7 @@ desired effect
<a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
<span class="sr-only">Toggle navigation</span>
</a>
-
+
<!-- Navbar Right Menu -->
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
@@ -109,7 +109,7 @@ desired effect
</ul>
<!-- /.menu -->
</li>
- {% endcomment %}
+ {% endcomment %}
<li class="footer"><a href="#">See All</a></li>
</ul>
</li>
@@ -244,42 +244,42 @@ desired effect
<!-- Sidebar Menu -->
<ul class="sidebar-menu">
<li class="header">Pages</li>
-
+
<li data-desc="subjects">
<a href="{% url 'web.views.subjects' %}">
- <i class="fa fa-users"></i>
+ <i class="fa fa-users"></i>
<span>Subjects</span>
</a>
</li>
-
+
<li data-desc="assignments">
<a href="{% url 'web.views.assignments' %}">
- <i class="fa fa-calendar"></i>
+ <i class="fa fa-calendar"></i>
<span>Assignments</span>
</a>
</li>
-
+
<li data-desc="doctors">
<a href="{% url 'web.views.doctors' %}">
- <i class="fa fa-user-md"></i>
- <span>Doctors</span>
+ <i class="fa fa-user-md"></i>
+ <span>Workers</span>
</a>
</li>
-
+
<li data-desc="equipment_and_rooms">
<a href="{% url 'web.views.equipment_and_rooms' %}">
- <i class="fa fa-building-o"></i>
+ <i class="fa fa-building-o"></i>
<span>Equipment&rooms</span>
</a>
</li>
-
+
<li data-desc="mail_templates">
<a href="{% url 'web.views.mail_templates' %}">
- <i class="fa fa-envelope-o"></i>
+ <i class="fa fa-envelope-o"></i>
<span>Mail templates</span>
</a>
</li>
-
+
{% comment "Multi-level" %}
<li class="treeview">
<a href="#"><i class="fa fa-link"></i> <span>Multilevel</span>
@@ -307,9 +307,9 @@ desired effect
{% block page_header %}{% endblock page_header %}
<small>{% block page_description %}{% endblock page_description %}</small>
</h1>
-
+
<ol class="breadcrumb">
- {% block breadcrumb %}
+ {% block breadcrumb %}
<li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active">Index</li>
{% endblock breadcrumb %}
@@ -414,7 +414,7 @@ desired effect
</div>
</aside>
<!-- /.control-sidebar -->
-
+
<!-- Add the sidebar's background. This div must be placed
immediately after the control sidebar -->
<div class="control-sidebar-bg"></div>
@@ -430,17 +430,17 @@ desired effect
<script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script>
<!-- AdminLTE App -->
<script src="{% static 'AdminLTE/js/app.min.js' %}"></script>
-
+
<script>
var activate = function(page_to_activate) {
var $e = $(".sidebar-menu > li[data-desc='" + page_to_activate + "']");
$e.addClass("active");
};
-
+
activate({% block page_title %}{% endblock page_title %});
-
+
</script>
-
+
{% comment "TODO: Check, and add if works %}
<!-- Optionally, you can add Slimscroll and FastClick plugins.
Both of these plugins are recommended to enhance the
diff --git a/smash/web/templates/doctors/index.html b/smash/web/templates/doctors/index.html
index 48940c8604cdbed38571cd730353df82e123122a..6fa6c0bc0c15fbdf184ee41cd28d14fc736f0075 100644
--- a/smash/web/templates/doctors/index.html
+++ b/smash/web/templates/doctors/index.html
@@ -7,31 +7,32 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block page_title %}'doctors'{% endblock page_title %}
-{% block page_header %}Doctors'{% endblock page_header %}
+{% block page_title %}'workers'{% endblock page_title %}
+{% block page_header %}Workers{% endblock page_header %}
{% block page_description %}information{% endblock page_description %}
-{% block breadcrumb %}
+{% block breadcrumb %}
<li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
- <li class="active">Doctors</li>
+ <li class="active">Workers</li>
{% endblock breadcrumb %}
{% block maincontent %}
<div>
<a class="btn btn-app">
- <i class="fa fa-plus"></i> Add new doctor
+ <i class="fa fa-plus"></i> Add new worker
</a>
</div>
<div class="box-body">
+ {% if doctors_list %}
<table id="table" class="table table-bordered table-striped">
<thead>
<tr>
<th>No.</th>
<th>First name</th>
<th>Last name</th>
- <th>Language</th>
+ <th>Languages</th>
<th>Unit</th>
<th>Details</th>
<th>Edit</th>
@@ -40,63 +41,43 @@
</tr>
</thead>
<tbody>
+ {% for worker in doctors_list %}
<tr>
- <td>#1</td>
- <td>Johny</td>
- <td>English</td>
- <td><span class="label label-success">english</span></td>
- <td>PRC</td>
- <td><button type="button" class="btn btn-block btn-default">Details</button></td>
- <td><button type="button" class="btn btn-block btn-default">Edit</button></td>
- <td><button type="button" class="btn btn-block btn-default">Modify availability</button></td>
- <td>
- <button type="button" class="btn btn-block btn-success">NO</button>
- </td>
- </tr>
- <tr>
- <td>#2</td>
- <td>Yves</td>
- <td>French</td>
+ <td>{{ forloop.counter }}</td>
+ <td>{{ worker.firstName }}</td>
+ <td>{{ worker.lastName }}</td>
<td>
- <span class="label label-success">english</span>
- <span class="label label-success">french</span>
- </td>
- <td>PRC</td>
+ {% autoescape off %}
+ {% for language in worker.languages.all %}
+ {{language.image_img}}
+ {% endfor %}
+ {% endautoescape %}
+ </td>
+ <td>{{ worker.unit }}</td>
<td><button type="button" class="btn btn-block btn-default">Details</button></td>
<td><button type="button" class="btn btn-block btn-default">Edit</button></td>
<td><button type="button" class="btn btn-block btn-default">Modify availability</button></td>
<td>
- <button type="button" class="btn btn-block btn-warning">YES</button>
- </td>
- </tr>
- <tr>
- <td>#3</td>
- <td>Hans</td>
- <td>Deutsch</td>
- <td>
- <span class="label label-success">german</span>
- <span class="label label-success">english</span>
- <span class="label label-success">french</span>
- </td>
- <td>PRC</td>
- <td><button type="button" class="btn btn-block btn-default">Details</button></td>
- <td><button type="button" class="btn btn-block btn-default">Edit</button></td>
- <td><button type="button" class="btn btn-block btn-default">Modify availability</button></td>
- <td>
- <button type="button" class="btn btn-block btn-success">NO</button>
+ {% if worker.isOnLeave %}<button type="button" class="btn btn-block btn-danger">YES</button>
+ {% else %}<button type="button" class="btn btn-block btn-success">NO</button>
+ {% endif %}
</td>
</tr>
+ {% endfor %}
+
</tbody>
</table>
+ {% else %}
+ <p>No subjects found.</p>
+ {% endif %}
</div>
{% endblock maincontent %}
{% block scripts %}
{{ block.super }}
-
+
<script src="{% static 'AdminLTE/plugins/datatables/jquery.dataTables.min.js' %}"></script>
<script src="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.min.js' %}"></script>
-
<script>
$(function () {
$('#table').DataTable({
diff --git a/smash/web/templates/eqdef/index.html b/smash/web/templates/eqdef/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..8d80ba8a7787a0fef219681f972c01ac80eea435
--- /dev/null
+++ b/smash/web/templates/eqdef/index.html
@@ -0,0 +1,79 @@
+{% extends "_base.html" %}
+{% load static %}
+
+{% block styles %}
+{{ block.super }}
+ <!-- DataTables -->
+ <link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
+{% endblock styles %}
+
+{% block page_title %}'eqdef'{% endblock page_title %}
+{% block page_header %}Equipment definitions{% endblock page_header %}
+{% block page_description %}{% endblock page_description %}
+
+{% block breadcrumb %}
+ <li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+ <li class="active">Equipment definitions</li>
+{% endblock breadcrumb %}
+
+{% block maincontent %}
+
+<div>
+ <a class="btn btn-app">
+ <i class="fa fa-plus"></i> Add new equipment type
+ </a>
+</div>
+
+<div class="box-body">
+ {% if equipment_list %}
+ <table id="table" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>No.</th>
+ <th>Name</th>
+ <th>Is fixed?</th>
+ <th>Edit</th>
+ <th>Delete</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for equip in equipment_list %}
+ <tr>
+ <td>{{ forloop.counter }}</td>
+ <td>{{ equip.name }}</td>
+ <td>
+ {% if equip.isFixed %}<button type="button" class="btn btn-block btn-danger">YES</button>
+ {% else %}<button type="button" class="btn btn-block btn-success">NO</button>
+ {% endif %}
+ </td>
+ <td><button type="button" class="btn btn-block btn-default">Edit</button></td>
+ <td><button type="button" class="btn btn-block btn-default">Delete</button></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ {% else %}
+ <p>No equipment found.</p>
+ {% endif %}
+</div>
+{% endblock maincontent %}
+
+{% block scripts %}
+ {{ block.super }}
+
+ <script src="{% static 'AdminLTE/plugins/datatables/jquery.dataTables.min.js' %}"></script>
+ <script src="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.min.js' %}"></script>
+
+ <script>
+ $(function () {
+ $('#table').DataTable({
+ "paging": true,
+ "lengthChange": false,
+ "searching": false,
+ "ordering": true,
+ "info": true,
+ "autoWidth": false
+ });
+ });
+ </script>
+{% endblock scripts %}
diff --git a/smash/web/templates/equipment_and_rooms/index.html b/smash/web/templates/equipment_and_rooms/index.html
index d9fde6d29773758c3ccd959eaed8f57a6811e622..29148f99bf003f10153cdb074760bf7822de1f49 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/templates/subjects/index.html b/smash/web/templates/subjects/index.html
index f41c1cbf5eb5aa33bea79e6870ada172af5cad20..c940c80e7ab1504b8c8983246888752c658100f8 100644
--- a/smash/web/templates/subjects/index.html
+++ b/smash/web/templates/subjects/index.html
@@ -55,7 +55,7 @@
{% endfor %}
{% endautoescape %}
</td>
- <td>{{ subject.subjectStatus }}</td>
+ <td>{{ subject.get_subjectStatus_display }}</td>
<td>12-10-2016</td>
<td><button type="button" class="btn btn-block btn-default">Details</button></td>
<td><button type="button" class="btn btn-block btn-default">Edit</button></td>
diff --git a/smash/web/urls.py b/smash/web/urls.py
index ce91c7dd79d17bd4453e60a8444d3ee1be0c93e8..e4556be5571cdb8b39daea3bb68b11894cdef15c 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 17a6dec5d0853aa825d3c4d6ee5f2a98928e527e..4ff4ceea555c9b50b384f0b8f49a8529dec6f3b5 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -51,9 +51,23 @@ def subjects(request):
def doctors(request):
+ doctors_list = Worker.objects.order_by('-lastName')
template = loader.get_template("doctors/index.html")
- return HttpResponse(template.render({
- }), request)
+ context = {
+ 'doctors_list': doctors_list
+ }
+
+ 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):