From d4bfbce6c63f7b24a8d2b9f6edb51504e573d55e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20Grou=C3=A8s?= <valentin.groues@uni.lu>
Date: Tue, 28 Mar 2017 10:59:06 +0200
Subject: [PATCH] add contact attempts feature - #34
---
.gitignore | 4 +-
.gitlab-ci.yml | 2 +-
smash/smash/settings.py | 2 -
smash/web/forms.py | 34 ++++-
smash/web/models/__init__.py | 3 +-
smash/web/models/availability.py | 1 -
smash/web/models/constants.py | 14 ++
smash/web/models/contact_attempt.py | 28 ++++
smash/web/templates/appointments/add.html | 2 +-
smash/web/templates/contact_attempt/add.html | 81 ++++++++++++
smash/web/templates/subjects/edit.html | 130 +++++++++++++------
smash/web/tests/__init__.py | 21 +++
smash/web/tests/test_api.py | 21 +--
smash/web/tests/test_model_appointment.py | 5 +-
smash/web/tests/test_model_subject.py | 4 +-
smash/web/tests/test_view_appointments.py | 14 +-
smash/web/tests/test_view_contact_attempt.py | 53 ++++++++
smash/web/tests/test_view_kit_request.py | 27 +---
smash/web/tests/test_view_login.py | 18 +++
smash/web/tests/test_view_notifications.py | 16 +--
smash/web/tests/test_view_statistics.py | 15 +--
smash/web/tests/test_view_visit.py | 25 +---
smash/web/urls.py | 44 +++++++
smash/web/views/__init__.py | 1 +
smash/web/views/contact_attempt.py | 20 +++
smash/web/views/subject.py | 4 +-
26 files changed, 438 insertions(+), 151 deletions(-)
create mode 100644 smash/web/models/contact_attempt.py
create mode 100644 smash/web/templates/contact_attempt/add.html
create mode 100644 smash/web/tests/test_view_contact_attempt.py
create mode 100644 smash/web/views/contact_attempt.py
diff --git a/.gitignore b/.gitignore
index 381cefd9..51fe0734 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,8 +19,8 @@ appointment-import/tmp.sql
*.iml
out
.idea
+<<<<<<< HEAD
-#coverage tool
.coverage
-smash/htmlcov/*
+smash/htmlcov/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4967b07..fd2748ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,6 @@ test:
script:
- cp "local_settings_ci.py" "smash/smash/local_settings.py"
- cd smash
- - python manage.py makemigrations && python manage.py migrate
+ - python manage.py makemigrations web && python manage.py migrate
- coverage run --source web manage.py test
- coverage report -m
diff --git a/smash/smash/settings.py b/smash/smash/settings.py
index e8276ccc..cd99bb7e 100644
--- a/smash/smash/settings.py
+++ b/smash/smash/settings.py
@@ -15,7 +15,6 @@ import os
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
@@ -100,7 +99,6 @@ USE_L10N = True
USE_TZ = True
-
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.10/howto/static-files/
diff --git a/smash/web/forms.py b/smash/web/forms.py
index 80e00359..b5d6da32 100644
--- a/smash/web/forms.py
+++ b/smash/web/forms.py
@@ -1,17 +1,17 @@
-from datetime import datetime
+import datetime
from django import forms
from django.forms import ModelForm, Form
from django.utils.dates import MONTHS
-from models import Subject, Worker, Appointment, Visit, AppointmentType
+from models import Subject, Worker, Appointment, Visit, AppointmentType, ContactAttempt
from models.constants import SUBJECT_TYPE_CHOICES
"""
Possible redundancy, but if need arises, contents of forms can be easily customized
"""
-CURRENT_YEAR = datetime.now().year
+CURRENT_YEAR = datetime.datetime.now().year
YEAR_CHOICES = tuple(range(CURRENT_YEAR, CURRENT_YEAR - 120, -1))
FUTURE_YEAR_CHOICES = tuple(range(CURRENT_YEAR, CURRENT_YEAR + 5, 1))
DATEPICKER_DATE_ATTRS = {
@@ -79,6 +79,7 @@ class SubjectAddForm(ModelForm):
validate_subject_nd_number(self)
+
def get_new_screening_number(screening_number_prefix):
result_number = 0
subjects = Subject.objects.filter(screening_number__contains=screening_number_prefix)
@@ -95,12 +96,14 @@ def get_new_screening_number(screening_number_prefix):
return screening_number_prefix + str(result_number + 1).zfill(3)
+
def get_prefix_screening_number(user):
prefix_screening_number = ''
if (user is not None) and (user.screening_number_prefix is not None) and (user.screening_number_prefix != ""):
prefix_screening_number = user.screening_number_prefix + "-"
return prefix_screening_number
+
class SubjectDetailForm(ModelForm):
class Meta:
model = Subject
@@ -268,6 +271,29 @@ class VisitAddForm(ModelForm):
self.add_error('datetime_end', "End date must be after start date")
+class ContactAttemptForm(ModelForm):
+ datetime_when = forms.DateTimeField(label='Contact on (YYYY-MM-DD HH:MM)',
+ widget=forms.DateTimeInput(DATETIMEPICKER_DATE_ATTRS)
+ )
+
+ class Meta:
+ model = ContactAttempt
+ fields = '__all__'
+
+ def __init__(self, *args, **kwargs):
+ user = kwargs.pop('user', None)
+ if user is None:
+ raise TypeError("User not defined")
+ self.user = Worker.get_by_user(user)
+ if self.user is None:
+ raise TypeError("Worker not defined for: " + user.username)
+ subject = kwargs.pop('subject', None)
+ super(ContactAttemptForm, self).__init__(*args, **kwargs)
+ self.fields['subject'].initial = subject.id
+ self.fields['subject'].disabled = True
+ self.fields['worker'].initial = self.user
+
+
class KitRequestForm(Form):
start_date = forms.DateField(label="From date",
widget=forms.DateInput(DATEPICKER_DATE_ATTRS, "%Y-%m-%d"),
@@ -286,7 +312,7 @@ class StatisticsForm(Form):
visit_choices = kwargs['visit_choices']
month = kwargs['month']
year = kwargs['year']
- now = datetime.now()
+ now = datetime.datetime.now()
year_now = now.year
number_of_years_for_statistics = year_now - START_YEAR_STATISTICS + 2
diff --git a/smash/web/models/__init__.py b/smash/web/models/__init__.py
index 285641e8..0f14c5c3 100644
--- a/smash/web/models/__init__.py
+++ b/smash/web/models/__init__.py
@@ -17,6 +17,7 @@ from holiday import Holiday
from item import Item
from language import Language
from subject import Subject
+from contact_attempt import ContactAttempt
def get_current_year():
@@ -24,4 +25,4 @@ def get_current_year():
__all__ = [FlyingTeam, Appointment, AppointmentType, Availability, Holiday, Item, Language, Location, Room, Subject,
- Visit, Worker]
+ Visit, Worker, ContactAttempt]
diff --git a/smash/web/models/availability.py b/smash/web/models/availability.py
index 5ff9624c..8323a6ab 100644
--- a/smash/web/models/availability.py
+++ b/smash/web/models/availability.py
@@ -5,7 +5,6 @@ from django.db import models
class Availability(models.Model):
class Meta:
app_label = 'web'
- db_table = 'web_avaibility'
person = models.ForeignKey("web.Worker", on_delete=models.CASCADE,
verbose_name='Worker'
diff --git a/smash/web/models/constants.py b/smash/web/models/constants.py
index 19d93238..333f0baa 100644
--- a/smash/web/models/constants.py
+++ b/smash/web/models/constants.py
@@ -13,3 +13,17 @@ SUBJECT_TYPE_CHOICES = {
}
APPOINTMENT_TYPE_DEFAULT_COLOR = '#cfc600'
APPOINTMENT_TYPE_DEFAULT_FONT_COLOR = '#00000'
+
+CONTACT_TYPES_EMAIL = 'E'
+CONTACT_TYPES_PHONE = 'P'
+CONTACT_TYPES_SMS = 'S'
+CONTACT_TYPES_FAX = 'X'
+CONTACT_TYPES_FACE2FACE = 'F'
+
+CONTACT_TYPES_CHOICES = (
+ (CONTACT_TYPES_EMAIL, 'Email'),
+ (CONTACT_TYPES_FACE2FACE, 'Face to face'),
+ (CONTACT_TYPES_FAX, 'Fax'),
+ (CONTACT_TYPES_PHONE, 'Phone'),
+ (CONTACT_TYPES_SMS, 'SMS'),
+)
diff --git a/smash/web/models/contact_attempt.py b/smash/web/models/contact_attempt.py
new file mode 100644
index 00000000..796b1ce5
--- /dev/null
+++ b/smash/web/models/contact_attempt.py
@@ -0,0 +1,28 @@
+# coding=utf-8
+from django.db import models
+
+from constants import CONTACT_TYPES_CHOICES, CONTACT_TYPES_PHONE
+
+__author__ = 'Valentin Grouès'
+
+
+class ContactAttempt(models.Model):
+ subject = models.ForeignKey("web.Subject",
+ verbose_name='Subject'
+ )
+ worker = models.ForeignKey("web.Worker", null=True,
+ verbose_name='Worker'
+ )
+ type = models.CharField(max_length=2, default=CONTACT_TYPES_PHONE, choices=CONTACT_TYPES_CHOICES)
+
+ datetime_when = models.DateTimeField(verbose_name="Contact on", help_text='When did the contact occurred?')
+
+ success = models.BooleanField(default=False)
+
+ comment = models.TextField(max_length=1024, null=True, blank=True)
+
+ def __str__(self):
+ return "%s %s" % (self.subject, self.worker)
+
+ def __unicode__(self):
+ return "%s %s" % (self.subject, self.worker)
diff --git a/smash/web/templates/appointments/add.html b/smash/web/templates/appointments/add.html
index 63c8d3b1..419e28dc 100644
--- a/smash/web/templates/appointments/add.html
+++ b/smash/web/templates/appointments/add.html
@@ -18,7 +18,7 @@
{% block page_header %}New appointment{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
-{% block title %}{{ block.super }} - Add new appoitnment{% endblock %}
+{% block title %}{{ block.super }} - Add new appointment{% endblock %}
{% block breadcrumb %}
{% include "appointments/breadcrumb.html" %}
diff --git a/smash/web/templates/contact_attempt/add.html b/smash/web/templates/contact_attempt/add.html
new file mode 100644
index 00000000..624407a5
--- /dev/null
+++ b/smash/web/templates/contact_attempt/add.html
@@ -0,0 +1,81 @@
+{% extends "_base.html" %}
+{% load static %}
+{% load filters %}
+
+{% block styles %}
+ {{ block.super }}
+ <link rel="stylesheet" href="{% static 'AdminLTE/plugins/awesomplete/awesomplete.css' %}"/>
+
+ {% include "includes/datepicker.css.html" %}
+{% endblock styles %}
+
+{% block ui_active_tab %}'subjects'{% endblock ui_active_tab %}
+{% block page_header %}New contact attempt{% endblock page_header %}
+{% block page_description %}{% endblock page_description %}
+
+{% block title %}{{ block.super }} - Add new contact attempt{% endblock %}
+
+{% block breadcrumb %}
+ {% include "subjects/breadcrumb.html" %}
+{% endblock breadcrumb %}
+
+{% block maincontent %}
+
+ {% block content %}
+ <div class="row">
+ <div class="col-md-12">
+ <div class="box box-success">
+ <div class="box-header with-border">
+ <h3 class="box-title">Enter contact attempt details</h3>
+ </div>
+
+
+ <form method="post" action="" class="form-horizontal">
+ {% csrf_token %}
+
+ <div class="box-body">
+ {% for field in form %}
+ <div class="form-group {% if field.errors %}has-error{% endif %}">
+ <label class="col-sm-4 col-lg-offset-1 col-lg-2 control-label">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-8 col-lg-4">
+ {{ field|add_class:'form-control' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block">
+ {{ field.errors }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div><!-- /.box-body -->
+ <div class="box-footer">
+ <div class="col-sm-6">
+ <button type="submit" class="btn btn-block btn-success">Add</button>
+ </div>
+ <div class="col-sm-6">
+ <a href="{% url 'web.views.subject_edit' subject_id %}"
+ class="btn btn-block btn-default">Cancel</a>
+ </div>
+ </div><!-- /.box-footer -->
+ </form>
+ </div>
+
+ </div>
+ </div>
+
+ {% endblock %}
+
+
+{% endblock maincontent %}
+
+{% block scripts %}
+ {{ block.super }}
+
+ <script src="{% static 'AdminLTE/plugins/awesomplete/awesomplete.min.js' %}"></script>
+
+ {% include "includes/datetimepicker.js.html" %}
+{% endblock scripts %}
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index 0c8b2f57..f14b4b28 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -23,53 +23,103 @@
{% block maincontent %}
{% block content %}
- <div class="box box-info">
- <div class="box-header with-border">
- <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default" onclick="history.back()">Go
- back (without changes)</a>
+ <div class="row">
+ <p class="col-lg-3 pull-left">
+ <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default"
+ onclick="history.back()">Go
+ back (discard changes)</a>
+ </p>
+ <p class="col-md-2 pull-right">
<a href="{% url 'web.views.subject_visit_details' subject.id %}" type="button"
class="btn btn-block btn-default">Subject's visits</a>
- </div>
-
- {% comment %} <div class="box-header with-border">
- <h3 class="box-title">Details of subject</h3>
- </div>{% endcomment %}
-
- <form method="post" action="" class="form-horizontal">
- {% csrf_token %}
-
- <div class="box-body">
- <div class="col-md-12">
- {% for field in form %}
- <div class="col-md-6 form-group {% if field.errors %}has-error{% endif %}">
- <label for="{# TODO #}" class="col-sm-4 control-label">
- {{ field.label }}
- </label>
-
- <div class="col-sm-8">
- {{ field|add_class:'form-control' }}
- </div>
-
- {% if field.errors %}
- <span class="help-block"> {{ field.errors }} </span>
- {% endif %}
- </div>
- {% endfor %}
+ </p>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <div class="box box-success">
+ <div class="box-header with-border">
+ <h3>Subject details</h3>
</div>
- </div><!-- /.box-body -->
-
- <div class="box-footer">
- <div class="col-sm-6">
- <button type="submit" class="btn btn-block btn-success">Save</button>
+ <div class="box-body">
+ <div class="col-md-12">
+ <form method="post" action="" class="form-horizontal">
+ {% csrf_token %}
+
+ {% for field in form %}
+ <div class="col-md-6 form-group {% if field.errors %}has-error{% endif %}">
+ <label for="{# TODO #}" class="col-sm-4 control-label">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-8">
+ {{ field|add_class:'form-control' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block"> {{ field.errors }} </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+
+
+ </form>
+ </div>
+ </div><!-- /.box-body -->
+
+
+ <div class="box-footer">
+ <div class="col-sm-6">
+ <button type="submit" class="btn btn-block btn-success">Save</button>
+ </div>
+ <div class="col-sm-6">
+ <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default"
+ onclick="history.back()">Cancel</a>
+ </div>
+ </div><!-- /.box-footer -->
+ </div><!-- /.box -->
+ </div><!-- /.col-md-12 -->
+ </div><!-- /.row -->
+ <div class="row">
+ <div class="col-lg-6">
+ <div class="box box-success">
+ <div class="box-header with-border">
+ <h3>Contact attempts <a title="add a new contact attempt"
+ id="add-contact-attempt"
+ href="{% url 'web.views.contact_add' subject.id %}" class="text-primary"
+ ><i class="fa fa-plus-circle text-success"></i></a></h3>
</div>
- <div class="col-sm-6">
- <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default"
- onclick="history.back()">Cancel</a>
+ <div class="box-body">
+ <table class="table table-bordered table-striped">
+ <thead>
+ <tr>
+
+ <th class="text-center">When</th>
+ <th class="text-center">Who</th>
+ <th class="text-center">Type</th>
+ <th class="text-center">Success</th>
+ <th class="text-center">Comment</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for contact_attempt in contact_attempts %}
+ <tr>
+ <td>{{ contact_attempt.datetime_when }}</td>
+ <td>{{ contact_attempt.worker }}</td>
+ <td class="text-center">{{ contact_attempt.get_type_display }}</td>
+ <td class="text-center">
+ <i class="fa {% if contact_attempt.success %}fa-check text-success{% else %}fa-times text-danger{% endif %}"></i>
+ </td>
+ <td>{{ contact_attempt.comment }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
</div>
- </div><!-- /.box-footer -->
- </form>
+ </div>
+
+ </div>
</div>
<div class="modal modal-danger fade" id="confirm-dead-resigned-mark-dialog" tabindex="-1" role="dialog">
diff --git a/smash/web/tests/__init__.py b/smash/web/tests/__init__.py
index e69de29b..72b9f9ad 100644
--- a/smash/web/tests/__init__.py
+++ b/smash/web/tests/__init__.py
@@ -0,0 +1,21 @@
+from django.contrib.auth.models import User
+from django.test import Client
+from django.test import TestCase
+
+from functions import create_worker
+
+
+class LoggedInTestCase(TestCase):
+ def setUp(self):
+ self.client = Client()
+ username = 'piotr'
+ password = 'top_secret'
+ self.user = User.objects.create_user(
+ username=username, email='jacob@bla', password=password)
+ self.client.login(username=username, password=password)
+
+
+class LoggedInWithWorkerTestCase(LoggedInTestCase):
+ def setUp(self):
+ super(LoggedInWithWorkerTestCase, self).setUp()
+ self.worker = create_worker(self.user)
diff --git a/smash/web/tests/test_api.py b/smash/web/tests/test_api.py
index 7772b9a2..f7e2b6c0 100644
--- a/smash/web/tests/test_api.py
+++ b/smash/web/tests/test_api.py
@@ -1,29 +1,18 @@
# coding=utf-8
-import datetime
import json
-from django.contrib.auth.models import User
-from django.test import TestCase
-from django.test import Client
from django.urls import reverse
-from web.models import Visit
-from web.api_views import cities
-from web.tests.functions import create_subject, create_worker, create_appointment_type
+from web.tests.functions import create_subject, create_appointment_type
+from . import LoggedInWithWorkerTestCase
__author__ = 'Piotr Gawron'
-class TestApi(TestCase):
+class TestApi(LoggedInWithWorkerTestCase):
def setUp(self):
+ super(TestApi, self).setUp()
self.subject = create_subject()
- self.client = Client()
- username = 'piotr'
- password = 'top_secret'
- self.user = User.objects.create_user(
- username=username, email='jacob@bla', password=password)
- self.worker = create_worker(self.user)
- self.client.login(username=username, password=password)
def test_cities(self):
city_name = "some city"
@@ -130,7 +119,7 @@ class TestApi(TestCase):
found = False
for type in appointment_types:
- if type['type']==type_name:
+ if type['type'] == type_name:
found = True
self.assertTrue(found)
diff --git a/smash/web/tests/test_model_appointment.py b/smash/web/tests/test_model_appointment.py
index 252c807c..36525f58 100644
--- a/smash/web/tests/test_model_appointment.py
+++ b/smash/web/tests/test_model_appointment.py
@@ -1,9 +1,6 @@
from django.test import TestCase
-from functions import create_subject, create_appointment
-from functions import create_visit
-from web.models import Appointment
-from web.models import Visit
+from functions import create_appointment
class AppointmentModelTests(TestCase):
diff --git a/smash/web/tests/test_model_subject.py b/smash/web/tests/test_model_subject.py
index 6401a89e..5397e82b 100644
--- a/smash/web/tests/test_model_subject.py
+++ b/smash/web/tests/test_model_subject.py
@@ -27,8 +27,8 @@ class SubjectModelTests(TestCase):
subject.mark_as_resigned()
appointment_status = Appointment.objects.filter(id=appointment.id)[0].status
- visit_finsihed = Visit.objects.filter(id=visit.id)[0].is_finished
+ visit_finished = Visit.objects.filter(id=visit.id)[0].is_finished
self.assertTrue(subject.resigned)
- self.assertTrue(visit_finsihed)
+ self.assertTrue(visit_finished)
self.assertEquals(Appointment.APPOINTMENT_STATUS_CANCELLED, appointment_status)
diff --git a/smash/web/tests/test_view_appointments.py b/smash/web/tests/test_view_appointments.py
index 3e7c2d53..52c7e442 100644
--- a/smash/web/tests/test_view_appointments.py
+++ b/smash/web/tests/test_view_appointments.py
@@ -1,24 +1,14 @@
import datetime
-from django.contrib.auth.models import User
-from django.test import Client
-from django.test import TestCase
from django.urls import reverse
from functions import create_subject, create_visit, create_appointment, create_worker
from web.forms import AppointmentEditForm, SubjectEditForm
from web.models import Appointment, Subject
+from . import LoggedInTestCase
-class AppointmentsViewTests(TestCase):
- def setUp(self):
- self.client = Client()
- username = 'piotr'
- password = 'top_secret'
- self.user = User.objects.create_user(
- username=username, email='jacob@bla', password=password)
- self.client.login(username=username, password=password)
-
+class AppointmentsViewTests(LoggedInTestCase):
def test_appointments_list_request(self):
response = self.client.get(reverse('web.views.appointments'))
self.assertEqual(response.status_code, 200)
diff --git a/smash/web/tests/test_view_contact_attempt.py b/smash/web/tests/test_view_contact_attempt.py
new file mode 100644
index 00000000..872bfa8f
--- /dev/null
+++ b/smash/web/tests/test_view_contact_attempt.py
@@ -0,0 +1,53 @@
+import datetime
+
+from django.urls import reverse
+from django.utils import timezone
+
+from functions import create_subject
+from web.models import ContactAttempt
+from web.models.constants import CONTACT_TYPES_EMAIL
+from . import LoggedInWithWorkerTestCase
+
+
+class ContactAttemptViewTests(LoggedInWithWorkerTestCase):
+ def test_contact_attempt_add_get(self):
+ subject = create_subject()
+ response = self.client.get(reverse('web.views.contact_add', kwargs={'subject_id': subject.id}))
+ self.assertContains(response, 'selected">{}'.format(self.worker), 1)
+ self.assertContains(response, 'selected">{}'.format(subject), 1)
+
+ def test_contact_attempt_add_post_valid(self):
+ subject = create_subject()
+ self.assertEqual(0, ContactAttempt.objects.filter(subject=subject).count())
+ now = datetime.datetime.now()
+ now_aware = timezone.make_aware(now, timezone.get_default_timezone())
+ contact_type = CONTACT_TYPES_EMAIL
+ comment = "this is a comment"
+ form_data = {'datetime_when': now, 'worker': self.worker.id, 'type': contact_type, 'comment': comment}
+ response = self.client.post(
+ reverse('web.views.contact_add', kwargs={'subject_id': subject.id}), data=form_data)
+ # check correct redirection to suject edit page
+ self.assertRedirects(response, reverse('web.views.subject_edit', kwargs={'id': subject.id}))
+ contact_attempts = ContactAttempt.objects.filter(subject=subject).all()
+ self.assertEqual(1, len(contact_attempts))
+ contact_attempt = contact_attempts[0]
+ self.assertEqual(now_aware, contact_attempt.datetime_when)
+ self.assertEqual(contact_type, contact_attempt.type)
+ self.assertEqual(subject, contact_attempt.subject)
+ self.assertEqual(self.worker, contact_attempt.worker)
+ self.assertEqual(comment, contact_attempt.comment)
+ self.assertFalse(contact_attempt.success)
+ # follow redirect to check if the new contact attempt is correctly listed
+ response = self.client.get(response.url)
+ self.assertContains(response, comment, 1)
+
+ def test_contact_attempt_add_post_invalid(self):
+ subject = create_subject()
+ self.assertEqual(0, ContactAttempt.objects.filter(subject=subject).count())
+ contact_type = CONTACT_TYPES_EMAIL
+ comment = "this is a comment"
+ form_data = {'type': contact_type, 'comment': comment}
+ response = self.client.post(
+ reverse('web.views.contact_add', kwargs={'subject_id': subject.id}), data=form_data)
+ self.assertContains(response, "This field is required", 2)
+ self.assertEqual(0, ContactAttempt.objects.filter(subject=subject).count())
diff --git a/smash/web/tests/test_view_kit_request.py b/smash/web/tests/test_view_kit_request.py
index 556308fd..3aa380bc 100644
--- a/smash/web/tests/test_view_kit_request.py
+++ b/smash/web/tests/test_view_kit_request.py
@@ -1,23 +1,16 @@
import datetime
-from django.test import TestCase, RequestFactory
from django.urls import reverse
-from functions import create_user, create_appointment_type, create_appointment
+from functions import create_appointment_type, create_appointment
from web.models import Item, Appointment
-from web.views.kit import kit_requests
from web.views.notifications import get_today_midnight_date
+from . import LoggedInTestCase
-class ViewFunctionsTests(TestCase):
- def setUp(self):
- self.factory = RequestFactory()
- self.user = create_user()
-
+class ViewFunctionsTests(LoggedInTestCase):
def test_kit_requests(self):
- request = self.factory.get(reverse('web.views.kit_requests'))
- request.user = self.user
- response = kit_requests(request)
+ response = self.client.get(reverse('web.views.kit_requests'))
self.assertEqual(response.status_code, 200)
def test_kit_requests_2(self):
@@ -32,9 +25,7 @@ class ViewFunctionsTests(TestCase):
appointment.appointment_types.add(appointment_type)
appointment.save()
- request = self.factory.get(reverse('web.views.kit_requests'))
- request.user = self.user
- response = kit_requests(request)
+ response = self.client.get(reverse('web.views.kit_requests'))
self.assertEqual(response.status_code, 200)
self.assertTrue(item_name in response.content)
@@ -52,9 +43,7 @@ class ViewFunctionsTests(TestCase):
appointment.status = Appointment.APPOINTMENT_STATUS_CANCELLED
appointment.save()
- request = self.factory.get(reverse('web.views.kit_requests'))
- request.user = self.user
- response = kit_requests(request)
+ response = self.client.get(reverse('web.views.kit_requests'))
self.assertEqual(response.status_code, 200)
self.assertFalse(item_name in response.content)
@@ -71,9 +60,7 @@ class ViewFunctionsTests(TestCase):
appointment.appointment_types.add(appointment_type)
appointment.save()
- request = self.factory.get(reverse('web.views.kit_requests'))
- request.user = self.user
- response = kit_requests(request)
+ response = self.client.get(reverse('web.views.kit_requests'))
self.assertEqual(response.status_code, 200)
self.assertTrue(item_name in response.content)
diff --git a/smash/web/tests/test_view_login.py b/smash/web/tests/test_view_login.py
index 4b5970a9..4e662d9d 100644
--- a/smash/web/tests/test_view_login.py
+++ b/smash/web/tests/test_view_login.py
@@ -1,4 +1,5 @@
# coding=utf-8
+from django.contrib import auth as django_auth
from django.test import Client
from django.test import TestCase
from django.urls import reverse
@@ -14,11 +15,28 @@ class TestLoginView(TestCase):
password = 'top_secret'
username = user.username
login_url = reverse('web.views.login')
+ self.assertFalse(django_auth.get_user(self.client).is_authenticated())
response = self.client.post(login_url, data={'username': username, 'password': password}, follow=True)
self.assertEqual(200, response.status_code)
+ self.assertTrue(django_auth.get_user(self.client).is_authenticated())
worker = Worker.get_by_user(user)
self.assertIsNotNone(worker)
worker.last_name = 'Grouès'
worker.save()
response = self.client.post(login_url, data={'username': username, 'password': password}, follow=True)
self.assertEqual(200, response.status_code)
+
+ def test_login_failed(self):
+ self.client = Client()
+ user = create_user()
+ username = user.username
+ login_url = reverse('web.views.login')
+ response = self.client.post(login_url, data={'username': username, 'password': 'wrong_password'}, follow=False)
+ self.assertEqual(302, response.status_code)
+ self.assertEqual('/login?error=login_failed', response.url)
+ self.assertFalse(django_auth.get_user(self.client).is_authenticated())
+
+ def test_logout(self):
+ self.test_login()
+ self.client.get(reverse('web.views.logout'))
+ self.assertFalse(django_auth.get_user(self.client).is_authenticated())
diff --git a/smash/web/tests/test_view_notifications.py b/smash/web/tests/test_view_notifications.py
index 817ec07c..e4d4142d 100644
--- a/smash/web/tests/test_view_notifications.py
+++ b/smash/web/tests/test_view_notifications.py
@@ -1,8 +1,5 @@
import datetime
-from django.contrib.auth.models import User
-from django.test import TestCase, RequestFactory
-
from functions import create_appointment, create_location, create_worker, create_appointment_type
from functions import create_subject
from functions import create_visit
@@ -21,16 +18,11 @@ from web.views.notifications import \
get_today_midnight_date, \
get_unfinished_appointments, \
get_unfinished_appointments_count, \
- get_unfinished_visits, get_active_visits_with_missing_appointments
-
+ get_unfinished_visits
+from . import LoggedInTestCase
-class NotificationViewTests(TestCase):
- def setUp(self):
- # Every test needs access to the request factory.
- self.factory = RequestFactory()
- self.user = User.objects.create_user(
- username='piotr', email='jacob@bla', password='top_secret')
+class NotificationViewTests(LoggedInTestCase):
def test_get_exceeded_visit_notifications_count(self):
original_notification = get_visits_without_appointments_count(self.user)
@@ -85,7 +77,7 @@ class NotificationViewTests(TestCase):
appointment = create_appointment(visit)
appointment.appointment_types.add(appointment_type)
- appointment.status=Appointment.APPOINTMENT_STATUS_FINISHED
+ appointment.status = Appointment.APPOINTMENT_STATUS_FINISHED
appointment.save()
notification = get_visits_with_missing_appointments_count(self.user)
diff --git a/smash/web/tests/test_view_statistics.py b/smash/web/tests/test_view_statistics.py
index b070ca19..eac349b6 100644
--- a/smash/web/tests/test_view_statistics.py
+++ b/smash/web/tests/test_view_statistics.py
@@ -1,23 +1,14 @@
# coding=utf-8
from datetime import datetime
-from django.contrib.auth.models import User
-from django.test import Client
-from django.test import TestCase
from django.urls import reverse
-__author__ = 'Valentin Grouès'
+from . import LoggedInTestCase
+__author__ = 'Valentin Grouès'
-class TestStatisticsView(TestCase):
- def setUp(self):
- self.client = Client()
- username = 'piotr'
- password = 'top_secret'
- self.user = User.objects.create_user(
- username=username, email='jacob@bla', password=password)
- self.client.login(username=username, password=password)
+class TestStatisticsView(LoggedInTestCase):
def test_statistics_request(self):
url = reverse('web.views.statistics')
response = self.client.get(url)
diff --git a/smash/web/tests/test_view_visit.py b/smash/web/tests/test_view_visit.py
index 21c16290..b8c0a286 100644
--- a/smash/web/tests/test_view_visit.py
+++ b/smash/web/tests/test_view_visit.py
@@ -1,29 +1,15 @@
import datetime
-from django.test import Client
-from django.test import TestCase
from django.urls import reverse
-from functions import \
- create_appointment, \
- create_appointment_type, \
- create_subject, \
- create_visit, \
- create_user
+from functions import create_subject, create_visit, create_appointment, create_appointment_type
from web.forms import VisitDetailForm, VisitAddForm
-from web.models import Subject, Visit
+from web.models import Visit
from web.views.notifications import get_today_midnight_date
+from . import LoggedInTestCase
-class VisitViewTests(TestCase):
- def setUp(self):
- username = 'piotr'
- password = 'top_secret'
-
- self.client = Client()
- self.user = create_user(username, password)
- self.client.login(username=username, password=password)
-
+class VisitViewTests(LoggedInTestCase):
def test_visit_details_request(self):
visit = create_visit()
create_appointment(visit)
@@ -47,7 +33,7 @@ class VisitViewTests(TestCase):
response = self.client.post(
reverse('web.views.visit_details', kwargs={'id': visit.id}), data=form_data)
self.assertEqual(response.status_code, 200)
- self.assertFalse("error" in response.content)
+ self.assertNotContains(response, "error")
def test_render_add_visit(self):
subject = create_subject()
@@ -133,6 +119,5 @@ class VisitViewTests(TestCase):
visit = create_visit()
visit.datetime_begin = get_today_midnight_date() + datetime.timedelta(days=-10)
visit.save()
-
response = self.client.get(reverse("web.views.unfinished_visits"))
self.assertEqual(response.status_code, 200)
diff --git a/smash/web/urls.py b/smash/web/urls.py
index 6bfa4151..0a9c9be7 100644
--- a/smash/web/urls.py
+++ b/smash/web/urls.py
@@ -20,6 +20,11 @@ from django.conf.urls import url
from web import views
urlpatterns = [
+
+ ####################
+ # APPOINTMENTS #
+ ####################
+
url(r'^appointments$', views.appointment.appointments, name='web.views.appointments'),
url(r'^appointments/unfinished$', views.appointment.unfinished_appointments,
name='web.views.unfinished_appointments'),
@@ -29,6 +34,10 @@ urlpatterns = [
url(r'^appointments/add/general$', views.appointment.appointment_add, name='web.views.appointment_add_general'),
url(r'^appointments/edit/(?P<id>\d+)$', views.appointment.appointment_edit, name='web.views.appointment_edit'),
+ ####################
+ # VISITS #
+ ####################
+
url(r'^visits$', views.visit.visits, name='web.views.visits'),
url(r'^visits/exceeded$', views.visit.exceeded_visits, name='web.views.exceeded_visits'),
url(r'^visits/unfinished$', views.visit.unfinished_visits, name='web.views.unfinished_visits'),
@@ -43,6 +52,10 @@ urlpatterns = [
url(r'^visits/add/(?P<subject_id>\d+)$', views.visit.visit_add, name='web.views.visit_add'),
url(r'^visit/mark/(?P<id>\d+)/(?P<as_what>[A-z]+)$', views.visit.visit_mark, name='web.views.visit_mark'),
+ ####################
+ # SUBJECTS #
+ ####################
+
url(r'^subjects$', views.subject.subjects, name='web.views.subjects'),
url(r'^subjects/no_visit$', views.subject.subject_no_visits, name='web.views.subject_no_visits'),
url(r'^subjects/equire_contact$', views.subject.subject_require_contact, name='web.views.subject_require_contact'),
@@ -51,6 +64,16 @@ urlpatterns = [
name='web.views.subject_visit_details'),
url(r'^subjects/edit/(?P<id>\d+)$', views.subject.subject_edit, name='web.views.subject_edit'),
+ ####################
+ # CONTACTS #
+ ####################
+
+ url(r'^subjects/(?P<subject_id>\d+)/contacts/add$', views.contact_attempt.contact_add, name='web.views.contact_add'),
+
+ ####################
+ # DOCTORS #
+ ####################
+
url(r'^doctors$', views.doctor.doctors, name='web.views.doctors'),
url(r'^doctors/add$', views.doctor.doctor_add, name='web.views.doctor_add'),
url(r'^doctors/details/(?P<doctor_id>\d+)$', views.doctor.doctor_details, name='web.views.doctor_details'),
@@ -61,6 +84,10 @@ urlpatterns = [
views.doctor.doctor_availability_delete,
name='web.views.doctor_availability_delete'),
+ ####################
+ # EQUIPMENT #
+ ####################
+
url(r'^equipment_and_rooms$', views.equipment.equipment_and_rooms, name='web.views.equipment_and_rooms'),
url(r'^equipment_and_rooms/eqdef$', views.equipment.equipment_def, name='web.views.equipment_def'),
url(r'^equipment_and_rooms/kit_requests$', views.kit.kit_requests, name='web.views.kit_requests'),
@@ -69,12 +96,29 @@ urlpatterns = [
url(r'^equipment_and_rooms/kit_requests/(?P<start_date>[\w-]+)/(?P<end_date>[\w-]+)/$',
views.kit.kit_requests_send_mail, name='web.views.kit_requests_send_mail'),
+ ####################
+ # MAIL #
+ ####################
+
url(r'^mail_templates$', views.mails.mail_templates, name='web.views.mail_templates'),
+
+ ####################
+ # STATISTICS #
+ ####################
+
url(r'^statistics$', views.statistics.statistics, name='web.views.statistics'),
+ ####################
+ # EXPORT #
+ ####################
+
url(r'^export$', views.export.export, name='web.views.export'),
url(r'^export/(?P<type>[A-z]+)$', views.export.export_to_csv2, name='web.views.export_to_csv2'),
+ ####################
+ # AUTH #
+ ####################
+
url(r'^login$', views.auth.login, name='web.views.login'),
url(r'^logout$', views.auth.logout, name='web.views.logout'),
diff --git a/smash/web/views/__init__.py b/smash/web/views/__init__.py
index 1ae7ae1c..49820e91 100644
--- a/smash/web/views/__init__.py
+++ b/smash/web/views/__init__.py
@@ -60,3 +60,4 @@ import kit
import mails
import statistics
import export
+import contact_attempt
diff --git a/smash/web/views/contact_attempt.py b/smash/web/views/contact_attempt.py
new file mode 100644
index 00000000..229e11f8
--- /dev/null
+++ b/smash/web/views/contact_attempt.py
@@ -0,0 +1,20 @@
+from django.shortcuts import redirect, get_object_or_404
+
+from . import wrap_response
+from ..forms import ContactAttemptForm
+from ..models import Subject
+
+
+def contact_add(request, subject_id):
+ subject = get_object_or_404(Subject, id=subject_id)
+ if request.method == 'POST':
+ form = ContactAttemptForm(request.POST, user=request.user, subject=subject)
+ form.instance.subject_id = subject_id
+ if form.is_valid():
+ form.save()
+ return redirect('web.views.subject_edit', id=subject_id)
+ else:
+ form = ContactAttemptForm(user=request.user, subject=subject)
+
+ return wrap_response(request, 'contact_attempt/add.html',
+ {'form': form, 'subject_id': subject_id})
diff --git a/smash/web/views/subject.py b/smash/web/views/subject.py
index 37732d54..325e2eca 100644
--- a/smash/web/views/subject.py
+++ b/smash/web/views/subject.py
@@ -50,6 +50,7 @@ def subject_require_contact(request):
def subject_edit(request, id):
the_subject = get_object_or_404(Subject, id=id)
+ contact_attempts = the_subject.contactattempt_set.order_by('-datetime_when').all()
was_dead = the_subject.dead
was_resigned = the_subject.resigned
if request.method == 'POST':
@@ -68,7 +69,8 @@ def subject_edit(request, id):
return wrap_response(request, 'subjects/edit.html', {
'form': form,
- 'subject': the_subject
+ 'subject': the_subject,
+ 'contact_attempts': contact_attempts
})
--
GitLab