From 7eaf56f5c76ff23cfce8c0cf5755a39efb18eb33 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 13 Mar 2017 15:48:58 +0100
Subject: [PATCH] reminders about sending post mails added
---
smash/web/tests/test_view_notifications.py | 47 ++++++++++++++++++++++
smash/web/urls.py | 1 +
smash/web/views.py | 11 +++--
3 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/smash/web/tests/test_view_notifications.py b/smash/web/tests/test_view_notifications.py
index 82868c27..2447e4a2 100644
--- a/smash/web/tests/test_view_notifications.py
+++ b/smash/web/tests/test_view_notifications.py
@@ -206,3 +206,50 @@ class NotificationViewTests(TestCase):
notification = get_subject_with_no_visit_notifications_count(worker)
self.assertEquals(original_notification.count +1, notification.count)
+
+
+ def test_get_approaching_visits_for_mail_contact_count(self):
+ original_notification = get_approaching_visits_for_mail_contact_count(self.user)
+ subject = create_subject()
+ visit = create_visit(subject)
+ visit.datetime_begin = get_today_midnight_date()+datetime.timedelta(days=100)
+ visit.save()
+
+ notification = get_approaching_visits_for_mail_contact_count(self.user)
+ self.assertEquals(original_notification.count + 1, notification.count)
+
+ def test_get_approaching_visits_for_mail_contact_count_2(self):
+ original_notification = get_approaching_visits_for_mail_contact_count(self.user)
+ subject = create_subject()
+ visit = create_visit(subject)
+ visit.datetime_begin = get_today_midnight_date()+datetime.timedelta(days=100)
+ visit.save()
+ appointment = create_appointment(visit)
+
+ notification = get_approaching_visits_for_mail_contact_count(self.user)
+ self.assertEquals(original_notification.count, notification.count)
+
+ def test_get_approaching_visits_for_mail_contact_count_3(self):
+ original_notification = get_approaching_visits_for_mail_contact_count(self.user)
+ subject = create_subject()
+ visit = create_visit(subject)
+ visit.datetime_begin = get_today_midnight_date()+datetime.timedelta(days=100)
+ visit.save()
+ appointment = create_appointment(visit)
+
+ appointment.status = Appointment.APPOINTMENT_STATUS_CANCELLED
+ appointment.save()
+
+ notification = get_approaching_visits_for_mail_contact_count(self.user)
+ self.assertEquals(original_notification.count + 1, notification.count)
+
+ def test_get_approaching_visits_for_mail_contact_count_4(self):
+ original_notification = get_approaching_visits_for_mail_contact_count(self.user)
+ subject = create_subject()
+ visit = create_visit(subject)
+ visit.datetime_begin = get_today_midnight_date()+datetime.timedelta(days=100)
+ visit.post_mail_sent = True
+ visit.save()
+
+ notification = get_approaching_visits_for_mail_contact_count(self.user)
+ self.assertEquals(original_notification.count, notification.count)
diff --git a/smash/web/urls.py b/smash/web/urls.py
index 6712d2a4..ec7fc856 100644
--- a/smash/web/urls.py
+++ b/smash/web/urls.py
@@ -33,6 +33,7 @@ urlpatterns = [
url(r'^visits/exceeded$', views.exceeded_visits, name='web.views.exceeded_visits'),
url(r'^visits/unfinished$', views.unfinished_visits, name='web.views.unfinished_visits'),
url(r'^visits/approaching$', views.approaching_visits_without_appointments, name='web.views.approaching_visits_without_appointments'),
+ url(r'^visits/approaching_post_mail$', views.approaching_visits_for_mail_contact, name='web.views.approaching_visits_for_mail_contact'),
url(r'^visits/missing_appointments$', views.visits_with_missing_appointments, name='web.views.visits_with_missing_appointments'),
url(r'^visits/details/(?P<id>\d+)$', views.visit_details, name='web.views.visit_details'),
url(r'^visits/add$', views.visit_add, name='web.views.visit_add'),
diff --git a/smash/web/views.py b/smash/web/views.py
index 7d0707ee..61708d97 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -242,6 +242,7 @@ def get_notifications(the_user):
notifications.append(get_unfinished_appointments_count(person))
notifications.append(get_visits_with_missing_appointments_count(person))
notifications.append(get_subject_with_no_visit_notifications_count(person))
+ notifications.append(get_approaching_visits_for_mail_contact_count(person))
for notification in notifications:
count += notification.count
@@ -305,9 +306,16 @@ def approaching_visits_without_appointments(request):
context = {
'visit_list': get_approaching_visits_without_appointments(request.user)
}
+ return wrap_response(request, 'visits/index.html', context)
+def approaching_visits_for_mail_contact(request):
+ context = {
+ 'visit_list': get_approaching_visits_for_mail_contact(request.user)
+ }
return wrap_response(request, 'visits/index.html', context)
+
+
def visit_details(request, id):
displayedVisit = get_object_or_404(Visit, id=id)
if request.method == 'POST':
@@ -765,9 +773,6 @@ def get_kit_requests_data(request, start_date = None, end_date = None):
params.update({
'form': form
})
- print "\n\n\n\n"
- print params['start_date']
- print "\n\n\n\n"
return params
def kit_requests(request):
--
GitLab