diff --git a/smash/web/models.py b/smash/web/models.py
index 8ac791e79c21c83f30f3576ec01eb0592ca31e4d..438546cc3cf8d700d09258840facff879757691e 100644
--- a/smash/web/models.py
+++ b/smash/web/models.py
@@ -253,7 +253,7 @@ class AppointmentType (models.Model):
('ANY', 'Any')
)
required_worker = models.CharField(max_length=20, choices=REQ_ROLE_CHOICES,
- verbose_name='Type of worker required for assignment',
+ verbose_name='Type of worker required for appointment',
default='ANY'
)
diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html
index 451d91cf9d187e18f8728b813e88da50d1451135..197e7717e12de2ad36218dbf4bba071f58df2174 100644
--- a/smash/web/templates/_base.html
+++ b/smash/web/templates/_base.html
@@ -268,10 +268,10 @@ desired effect
</a>
</li>
- <li data-desc="assignments">
- <a href="{% url 'web.views.assignments' %}">
+ <li data-desc="appointments">
+ <a href="{% url 'web.views.appointments' %}">
<i class="fa fa-calendar"></i>
- <span>Assignments</span>
+ <span>Appointments</span>
</a>
</li>
diff --git a/smash/web/templates/assignments/add.html b/smash/web/templates/appointments/add.html
similarity index 89%
rename from smash/web/templates/assignments/add.html
rename to smash/web/templates/appointments/add.html
index 699842b68862f56bd589f156cdc9633b858ba5bd..199bb1ffe262f91e49edb89664bd52d14c4a48dc 100644
--- a/smash/web/templates/assignments/add.html
+++ b/smash/web/templates/appointments/add.html
@@ -8,14 +8,14 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block page_title %}'assignments'{% endblock page_title %}
+{% block page_title %}'appointments'{% endblock page_title %}
{% block page_header %}New appointment{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
{% block title %}{{ block.super }} - Add new appoitnment{% endblock %}
{% block breadcrumb %}
-{% include "assignments/breadcrumb.html" %}
+{% include "appointments/breadcrumb.html" %}
{% endblock breadcrumb %}
{% block maincontent %}
@@ -23,11 +23,11 @@
{% block content %}
<div class="box box-info">
<div class="box-header with-border">
- <a href="{% url 'web.views.assignments' %}" class="btn btn-block btn-default">Cancel</a>
+ <a href="{% url 'web.views.appointments' %}" class="btn btn-block btn-default">Cancel</a>
</div>
{% comment %} <div class="box-header with-border">
- <h3 class="box-title">Adding an assignment</h3>
+ <h3 class="box-title">Adding an appointment</h3>
</div>{% endcomment %}
<form method="post" action="" class="form-horizontal">
diff --git a/smash/web/templates/appointments/breadcrumb.html b/smash/web/templates/appointments/breadcrumb.html
new file mode 100644
index 0000000000000000000000000000000000000000..888712c0475077b95e76af8fb36c4006d997c13b
--- /dev/null
+++ b/smash/web/templates/appointments/breadcrumb.html
@@ -0,0 +1,2 @@
+ <li><a href="{% url 'web.views.appointments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+ <li class="active"><a href="{% url 'web.views.appointments' %}">Appointments</a></li>
\ No newline at end of file
diff --git a/smash/web/templates/assignments/details.html b/smash/web/templates/appointments/details.html
similarity index 80%
rename from smash/web/templates/assignments/details.html
rename to smash/web/templates/appointments/details.html
index 727ce3b8375dd19b650f82e7e7d7d076a500c85f..aa62c2db75c4a55c7114b9396b2d8251fead4782 100644
--- a/smash/web/templates/assignments/details.html
+++ b/smash/web/templates/appointments/details.html
@@ -7,14 +7,14 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block page_title %}'assignments'{% endblock page_title %}
-{% block page_header %}Assignment's details{% endblock page_header %}
+{% block page_title %}'appointments'{% endblock page_title %}
+{% block page_header %}Appointment's details{% endblock page_header %}
{% block page_description %}details{% endblock page_description %}
-{% block title %} - Details of assignment{% endblock %}
+{% block title %} - Details of appointment{% endblock %}
{% block breadcrumb %}
-<!--{% include "assignments/breadcrumb.html" %}-->
+<!--{% include "appointments/breadcrumb.html" %}-->
{% endblock breadcrumb %}
{% block maincontent %}
@@ -22,7 +22,7 @@
{% block content %}
<div class="box box-info">
<div class="box-header with-border">
- <a href="{% url 'web.views.assignments' %}" class="btn btn-block btn-default" onclick="history.back()">Go back</a>
+ <a href="{% url 'web.views.appointments' %}" class="btn btn-block btn-default" onclick="history.back()">Go back</a>
</div>
{% comment %} <div class="box-header with-border">
@@ -53,7 +53,7 @@
</div><!-- /.box-body -->
<div class="box-footer">
- <a href="{% url 'web.views.assignments' %}" class="btn btn-block btn-default" onclick="history.back()">Go back</a>
+ <a href="{% url 'web.views.appointments' %}" class="btn btn-block btn-default" onclick="history.back()">Go back</a>
</div><!-- /.box-footer -->
</form>
</div>
diff --git a/smash/web/templates/assignments/edit.html b/smash/web/templates/appointments/edit.html
similarity index 79%
rename from smash/web/templates/assignments/edit.html
rename to smash/web/templates/appointments/edit.html
index 3ba01a89e856ff57b32b9b6b9a8f20bdf2463668..931a63f3c01c74f1c4624cdacee0a67065492907 100644
--- a/smash/web/templates/assignments/edit.html
+++ b/smash/web/templates/appointments/edit.html
@@ -8,14 +8,14 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block page_title %}'assignments'{% endblock page_title %}
-{% block page_header %}Edit assignment{% endblock page_header %}
+{% block page_title %}'appointments'{% endblock page_title %}
+{% block page_header %}Edit appointment{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
-{% block title %} - Edit assignment information{% endblock %}
+{% block title %} - Edit appointment information{% endblock %}
{% block breadcrumb %}
-{% include "assignments/breadcrumb.html" %}
+{% include "appointments/breadcrumb.html" %}
{% endblock breadcrumb %}
{% block maincontent %}
@@ -23,7 +23,7 @@
{% block content %}
<div class="box box-info">
<div class="box-header with-border">
- <a href="{% url 'web.views.assignments' %}" class="btn btn-block btn-default" onclick="history.back()">Go back (without changes)</a>
+ <a href="{% url 'web.views.appointments' %}" class="btn btn-block btn-default" onclick="history.back()">Go back (without changes)</a>
</div>
{% comment %} <div class="box-header with-border">
@@ -58,7 +58,7 @@
<button type="submit" class="btn btn-block btn-success">Save</button>
</div>
<div class="col-sm-6">
- <a href="{% url 'web.views.assignments' %}" class="btn btn-block btn-default" onclick="history.back()">Cancel</a>
+ <a href="{% url 'web.views.appointments' %}" class="btn btn-block btn-default" onclick="history.back()">Cancel</a>
</div>
</div><!-- /.box-footer -->
</form>
diff --git a/smash/web/templates/assignments/index.html b/smash/web/templates/appointments/index.html
similarity index 88%
rename from smash/web/templates/assignments/index.html
rename to smash/web/templates/appointments/index.html
index 43d23a38c19c943ac3611c0250a516876bcdc4fb..59bf99f683c49b280c3c3eb72156b6295d6ead40 100644
--- a/smash/web/templates/assignments/index.html
+++ b/smash/web/templates/appointments/index.html
@@ -11,14 +11,14 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/fullcalendar/fullcalendar.print.css' %}" media="print">
{% endblock styles %}
-{% block page_title %}'assignments'{% endblock page_title %}
-{% block page_header %}Assignments{% endblock page_header %}
+{% block page_title %}'appointments'{% endblock page_title %}
+{% block page_header %}Appointments{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
-{% block title %}{{ block.super }} - Assignments{% endblock %}
+{% block title %}{{ block.super }} - Appointments{% endblock %}
{% block breadcrumb %}
-{% include "assignments/breadcrumb.html" %}
+{% include "appointments/breadcrumb.html" %}
{% endblock breadcrumb %}
{% block maincontent %}
@@ -47,7 +47,7 @@
{{ planned.datetime_when }}
</td>
<td>
- <a href="{% url 'web.views.assignment_edit_datetime' planned.id %}" type="button" class="btn btn-block btn-default">Plan/Modify</a>
+ <a href="{% url 'web.views.appointment_edit_datetime' planned.id %}" type="button" class="btn btn-block btn-default">Plan/Modify</a>
</td>
</tr>
{% endfor %}
@@ -86,7 +86,7 @@
<td>{{ approach.datetime_when | date:"d-M-Y" }}</td>
<td>{{ approach.datetime_when | time:"H:i" }}</td>
<td>
- <a href="{% url 'web.views.assignment_details' approach.id %}" type="button" class="btn btn-block btn-default">Details</a>
+ <a href="{% url 'web.views.appointment_details' approach.id %}" type="button" class="btn btn-block btn-default">Details</a>
</td>
</tr>
{% endfor %}
diff --git a/smash/web/templates/assignments/breadcrumb.html b/smash/web/templates/assignments/breadcrumb.html
deleted file mode 100644
index d088d44908bbb382b9d60d0750f724f177a064e6..0000000000000000000000000000000000000000
--- a/smash/web/templates/assignments/breadcrumb.html
+++ /dev/null
@@ -1,2 +0,0 @@
- <li><a href="{% url 'web.views.assignments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
- <li class="active"><a href="{% url 'web.views.assignments' %}">Assignments</a></li>
\ No newline at end of file
diff --git a/smash/web/templates/doctors/breadcrumb.html b/smash/web/templates/doctors/breadcrumb.html
index 709191e4dbf9dc9436626a1f895b5ac314cb6b6e..09a3e7625def202e840310097a6368a4384005c4 100644
--- a/smash/web/templates/doctors/breadcrumb.html
+++ b/smash/web/templates/doctors/breadcrumb.html
@@ -1,2 +1,2 @@
- <li><a href="{% url 'web.views.assignments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+ <li><a href="{% url 'web.views.appointments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active"><a href="{% url 'web.views.doctors' %}">Workers</a></li>
\ No newline at end of file
diff --git a/smash/web/templates/eqdef/breadcrumb.html b/smash/web/templates/eqdef/breadcrumb.html
index 996d5f9feee0e43548fc28a00d3786fb3c926ef5..cb09d06459637be8314f7a7d29c94ebda1eaec39 100644
--- a/smash/web/templates/eqdef/breadcrumb.html
+++ b/smash/web/templates/eqdef/breadcrumb.html
@@ -1,2 +1,2 @@
-<li><a href="{% url 'web.views.assignments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+<li><a href="{% url 'web.views.appointments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active"><a href="{% url 'web.views.equipment_def' %}">Equipment definitions</a></li>
\ No newline at end of file
diff --git a/smash/web/templates/equipment_and_rooms/breadcrumb.html b/smash/web/templates/equipment_and_rooms/breadcrumb.html
index 93579eab4347b14923e333894b4b43afa09d07f7..2d6f4c7757f189fa4a441f63ff435b1870cf4f1a 100644
--- a/smash/web/templates/equipment_and_rooms/breadcrumb.html
+++ b/smash/web/templates/equipment_and_rooms/breadcrumb.html
@@ -1,2 +1,2 @@
-<li><a href="{% url 'web.views.assignments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+<li><a href="{% url 'web.views.appointments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active"><a href="{% url 'web.views.equipment_and_rooms' %}">Equipment and rooms</a></li>
\ No newline at end of file
diff --git a/smash/web/templates/mail_templates/breadcrumb.html b/smash/web/templates/mail_templates/breadcrumb.html
index 8621be91ae65d3cbb8df5449db3828fc0c70bf42..c3d68d74bf3f04e400175919e7f00718891587c7 100644
--- a/smash/web/templates/mail_templates/breadcrumb.html
+++ b/smash/web/templates/mail_templates/breadcrumb.html
@@ -1,2 +1,2 @@
-<li><a href="{% url 'web.views.assignments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+<li><a href="{% url 'web.views.appointments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active"><a href="{% url 'web.views.mail_templates' %}">Mail templates</a></li>
\ No newline at end of file
diff --git a/smash/web/templates/subjects/breadcrumb.html b/smash/web/templates/subjects/breadcrumb.html
index 3c3a7dcdc9fb98a3a3d2c03ae4938b5ff1784181..1cdad6d9df58f76294a622f5269b001f40d9822c 100644
--- a/smash/web/templates/subjects/breadcrumb.html
+++ b/smash/web/templates/subjects/breadcrumb.html
@@ -1,4 +1,4 @@
- <li><a href="{% url 'web.views.assignments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+ <li><a href="{% url 'web.views.appointments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active">
<a href="{% url 'web.views.subjects' %}">Subjects</a>
</li>
\ No newline at end of file
diff --git a/smash/web/templates/subjects/visitdetails.html b/smash/web/templates/subjects/visitdetails.html
index 20380b9dabc5f8d4e24145a8f8b4e417e9ae4a50..82168b86ccdc81eda3d2e8c666c6e48e545805a4 100644
--- a/smash/web/templates/subjects/visitdetails.html
+++ b/smash/web/templates/subjects/visitdetails.html
@@ -56,7 +56,7 @@
<div class="box box-widget widget-user-2">
<div class="widget-user-header bg-default">
- <h3 class="widget-user-username">Visit's assignments</h3>
+ <h3 class="widget-user-username">Visit's appointments</h3>
<!--<h5 class="widget-user-desc">
</h5>-->
</div>
@@ -88,7 +88,7 @@
{% endif %}
</td>
<td>
- <a href="{% url 'web.views.assignment_edit' app.id %}" type="button" class="btn btn-block btn-default">Edit</a>
+ <a href="{% url 'web.views.appointment_edit' app.id %}" type="button" class="btn btn-block btn-default">Edit</a>
</td>
</tr>
{% endfor %}
diff --git a/smash/web/templates/visits/breadcrumb.html b/smash/web/templates/visits/breadcrumb.html
index e2222c988bae7c38812d64f3dd4d38a831a5d75a..327ee8492755b58841d81394c1685f9a65faa2e3 100644
--- a/smash/web/templates/visits/breadcrumb.html
+++ b/smash/web/templates/visits/breadcrumb.html
@@ -1,4 +1,4 @@
-<li><a href="{% url 'web.views.assignments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+<li><a href="{% url 'web.views.appointments' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active">
<a href="{% url 'web.views.visits' %}">Visits</a>
</li>
diff --git a/smash/web/templates/visits/details.html b/smash/web/templates/visits/details.html
index 6a2002d87b32fe96c5009602d3e80f8e494b2d8f..c079b3a689f992f33b1f96258a565741ee3adaf2 100644
--- a/smash/web/templates/visits/details.html
+++ b/smash/web/templates/visits/details.html
@@ -65,13 +65,13 @@
<div class="box-header with-border">
- <h3 class="box-title">Visit's assignments</h3>
+ <h3 class="box-title">Visit's appointments</h3>
</div>
<div>
- <a href="{% url 'web.views.assignment_add' vid %}" class="btn btn-app">
+ <a href="{% url 'web.views.appointment_add' vid %}" class="btn btn-app">
<i class="fa fa-plus"></i>
- Add new assignment
+ Add new appointment
</a>
</div>
@@ -103,7 +103,7 @@
{% endif %}
</td>
<td>
- <a href="{% url 'web.views.assignment_edit' app.id %}" type="button" class="btn btn-block btn-default">Edit</a>
+ <a href="{% url 'web.views.appointment_edit' app.id %}" type="button" class="btn btn-block btn-default">Edit</a>
</td>
</tr>
{% endfor %}
diff --git a/smash/web/urls.py b/smash/web/urls.py
index 086c5a10bcc4acb58afdebb0532dd5a953153cb8..a5ba2717f52b67b9aa6ff7d3072e367a5937e969 100644
--- a/smash/web/urls.py
+++ b/smash/web/urls.py
@@ -17,11 +17,11 @@ from django.conf.urls import url
from web import views
urlpatterns = [
- url(r'assignments$', views.assignments, name='web.views.assignments'),
- url(r'assignments/details/(?P<id>\d+)$', views.assignment_details, name='web.views.assignment_details'),
- url(r'assignments/add/(?P<id>\d+)$', views.assignment_add, name='web.views.assignment_add'),
- url(r'assignments/edit/(?P<id>\d+)$', views.assignment_edit, name='web.views.assignment_edit'),
- url(r'assignments/edit_datetime/(?P<id>\d+)$', views.assignment_edit_datetime, name='web.views.assignment_edit_datetime'),
+ url(r'appointments$', views.appointments, name='web.views.appointments'),
+ url(r'appointments/details/(?P<id>\d+)$', views.appointment_details, name='web.views.appointment_details'),
+ url(r'appointments/add/(?P<id>\d+)$', views.appointment_add, name='web.views.appointment_add'),
+ url(r'appointments/edit/(?P<id>\d+)$', views.appointment_edit, name='web.views.appointment_edit'),
+ url(r'appointments/edit_datetime/(?P<id>\d+)$', views.appointment_edit_datetime, name='web.views.appointment_edit_datetime'),
url(r'visits$', views.visits, name='web.views.visits'),
url(r'visits/details/(?P<id>\d+)$', views.visit_details, name='web.views.visit_details'),
diff --git a/smash/web/views.py b/smash/web/views.py
index d214ccfa353c490dd545e1521741f02c1010583c..4ac25f8d8e35cc33aec261fa4d176e1294f40d2e 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -14,7 +14,7 @@ import datetime
def index(request):
if request.user.is_authenticated():
- return redirect(assignments)
+ return redirect(appointments)
return redirect(login)
@@ -28,7 +28,7 @@ def login(request):
if request.method == "POST" and request.POST:
state, message = do_login(request)
if state == True:
- return redirect(assignments)
+ return redirect(appointments)
else:
return redirect('/login?error=' + message)
@@ -251,7 +251,7 @@ def mail_templates(request):
"""
-#An initial draft of a function that was supposed to suggest date, room and worker for an assignment
+#An initial draft of a function that was supposed to suggest date, room and worker for an appointment
def suggest_details(Appointment appoint):
avaibleWorkers = Worker.objects.get()
@@ -269,7 +269,7 @@ def suggest_details(Appointment appoint):
"""
-def assignments(request):
+def appointments(request):
futureDate = datetime.datetime.now()+datetime.timedelta(days=93)
planning_list = Appointment.objects.filter(datetime_when__isnull=True, visit__datetime_begin__lt = futureDate)
approaching_list = Appointment.objects.filter(datetime_when__gt = datetime.datetime.now())
@@ -283,14 +283,14 @@ def assignments(request):
'approaching_list': approaching_list
}
- return wrap_response(request, "assignments/index.html",context)
+ return wrap_response(request, "appointments/index.html",context)
-def assignment_details(request, id):
+def appointment_details(request, id):
form = AppointmentDetailForm(instance=Appointment.objects.get(id=id))
- return wrap_response(request, 'assignments/details.html', {'form': form})
+ return wrap_response(request, 'appointments/details.html', {'form': form})
-def assignment_add(request, id):
+def appointment_add(request, id):
if request.method == 'POST':
form = AppointmentAddForm(request.POST, request.FILES)
form.fields['visit'].widget = forms.HiddenInput()
@@ -301,9 +301,9 @@ def assignment_add(request, id):
form = AppointmentAddForm(initial={'visit': id})
form.fields['visit'].widget = forms.HiddenInput()
- return wrap_response(request, 'assignments/add.html', {'form': form, 'visitID': id})
+ return wrap_response(request, 'appointments/add.html', {'form': form, 'visitID': id})
-def assignment_edit(request, id):
+def appointment_edit(request, id):
if request.method == 'POST':
form = AppointmentEditForm(request.POST, request.FILES, instance=Appointment.objects.get(id=id))
if form.is_valid():
@@ -314,20 +314,20 @@ def assignment_edit(request, id):
visit = Visit.objects.get(id=vis.id)
visit.checkIfFinished()
- return redirect(assignments)
+ return redirect(appointments)
else:
form = AppointmentEditForm(instance=Appointment.objects.get(id=id))
- return wrap_response(request, 'assignments/edit.html', {'form': form})
+ return wrap_response(request, 'appointments/edit.html', {'form': form})
-def assignment_edit_datetime(request, id):
+def appointment_edit_datetime(request, id):
if request.method == 'POST':
form = AppointmentEditForm(request.POST, request.FILES, instance=Appointment.objects.get(id=id))
if form.is_valid():
form.save()
- return redirect(assignments)
+ return redirect(appointments)
else:
obj = Appointment.objects.get(id=id)
obj.datetime_when = obj.visit.datetime_begin
form = AppointmentEditForm(instance=obj)
- return wrap_response(request, 'assignments/edit.html', {'form': form})
+ return wrap_response(request, 'appointments/edit.html', {'form': form})