From 730746b758b9d11568088deffe24e87dec0c1f1a Mon Sep 17 00:00:00 2001
From: "piotr.atyjaszyk" <piotrmk1@gmail.com>
Date: Wed, 1 Feb 2017 17:39:51 +0100
Subject: [PATCH] Added creating assignments with default date, added lookup of
subject's details from assignment list
---
smash/web/templates/assignments/index.html | 14 +++++++-------
smash/web/urls.py | 1 +
smash/web/views.py | 17 +++++++++++++++++
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/smash/web/templates/assignments/index.html b/smash/web/templates/assignments/index.html
index d9b5f02c..1ebe0c54 100644
--- a/smash/web/templates/assignments/index.html
+++ b/smash/web/templates/assignments/index.html
@@ -31,7 +31,7 @@
<thead>
<tr>
<th>Subject name</th>
- <th>Full information</th>
+ <th>Subject's details</th>
<th>Suggested date</th>
<th>Plan/Modify</th>
</tr>
@@ -40,15 +40,15 @@
{% for planned in planning_list %}
<tr>
<td>{{ planned.visit.subject.first_name }} {{ planned.visit.subject.last_name }}</td>
- <td>
- <button type="button" class="btn btn-block btn-default btn-xs">See full information</button>
- </td>
+ <td>
+ <a href="{% url 'web.views.subject_details' planned.visit.subject.id %}" type="button" class="btn btn-block btn-default">Subject's details</a>
+ </td>
<td>
{{ planned.datetime_when }}
</td>
- <td>
- <button type="button" class="btn btn-block btn-default">Plan/Modify</button>
- </td>
+ <td>
+ <a href="{% url 'web.views.assignment_edit_datetime' planned.id %}" type="button" class="btn btn-block btn-default">Plan/Modify</a>
+ </td>
</tr>
{% endfor %}
</tbody>
diff --git a/smash/web/urls.py b/smash/web/urls.py
index 030dd7b6..086c5a10 100644
--- a/smash/web/urls.py
+++ b/smash/web/urls.py
@@ -21,6 +21,7 @@ urlpatterns = [
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'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 a697fffb..454d0f61 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -269,6 +269,10 @@ def assignments(request):
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())
+
+ for plan in planning_list:
+ plan.datetime_when = plan.visit.datetime_begin
+
context = {
'planning_list': planning_list,
'approaching_list': approaching_list
@@ -304,3 +308,16 @@ def assignment_edit(request, id):
else:
form = AppointmentEditForm(instance=Appointment.objects.get(id=id))
return wrap_response(request, 'assignments/edit.html', {'form': form})
+
+
+def assignment_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)
+ 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})
--
GitLab