diff --git a/requirements.txt b/requirements.txt
index fb33ee6b7111cec03803cd7fc6c823d7613070b4..d63534e9e13c0d2846f3470378ae705607cccdae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+pycurl==7.43.0.2
asn1crypto==0.24.0
Babel==2.6.0
backports.functools-lru-cache==1.5
@@ -36,7 +37,6 @@ phonenumberslite==8.9.14
Pillow==3.4.2
psycopg2==2.7.6.1
pycparser==2.19
-pycurl==7.43.0.2
pyexcel==0.5.3
pyexcel-io==0.5.9.1
pyexcel-webio==0.1.4
diff --git a/smash/web/forms/appointment_form.py b/smash/web/forms/appointment_form.py
index a07294741c65d29d1482b27e4f1cce1d4f2a72e9..3966c13ea7a11f97bab74defb7f38c20a5b29082 100644
--- a/smash/web/forms/appointment_form.py
+++ b/smash/web/forms/appointment_form.py
@@ -2,11 +2,12 @@ import logging
from collections import OrderedDict
from django import forms
+from django.db.models.query import QuerySet
from django.forms import ModelForm
-from web.models.worker_study_role import WORKER_STAFF
from web.forms.forms import DATETIMEPICKER_DATE_ATTRS, APPOINTMENT_TYPES_FIELD_POSITION
-from web.models import Appointment, Worker, AppointmentTypeLink, AppointmentType
+from web.models import Appointment, Worker, AppointmentTypeLink, AppointmentType, Provenance
+from web.models.worker_study_role import WORKER_STAFF
from web.views.notifications import get_filter_locations
logger = logging.getLogger(__name__)
@@ -22,6 +23,47 @@ class AppointmentForm(ModelForm):
self.fields['worker_assigned'].queryset = Worker.get_workers_by_worker_type(WORKER_STAFF).filter(
locations__in=get_filter_locations(self.user)).distinct().order_by('first_name', 'last_name')
+ def save_changes(self):
+ for change in self.changes:
+ if change.modified_table_id is None:
+ change.modified_table_id = self.instance.id
+ change.save()
+
+ def register_changes(self):
+ self.changes = []
+ for field in self.changed_data:
+ new_value = self.cleaned_data[field] or self.data[field]
+ if isinstance(new_value, QuerySet):
+ new_human_values = '; '.join([str(element) for element in new_value])
+ new_value = ','.join([str(element.id) for element in new_value]) #overwrite variable
+ #old value
+ if self.instance.id: #update instance
+ list_of_values = getattr(self.instance, field).all()
+ old_human_values = '; '.join([str(element) for element in list_of_values])
+ previous_value = ','.join([str(element.id) for element in list_of_values])
+ else: #new instance
+ old_human_values = ''
+ previous_value = ''
+ # description
+ description = '{} changed from "{}" to "{}"'.format(field, old_human_values, new_human_values)
+ else:
+ if self.instance.id: # update instance
+ previous_value = str(getattr(self.instance, field))
+ else:
+ previous_value = ''
+ new_value = str(self.cleaned_data[field])
+ description = '{} changed from "{}" to "{}"'.format(field, previous_value, new_value)
+
+ p = Provenance(modified_table=Appointment._meta.db_table,
+ modified_table_id=self.instance.id,
+ modification_author=self.user,
+ previous_value=previous_value,
+ new_value=new_value,
+ modification_description=description,
+ modified_field=field,
+ )
+ self.changes.append(p)
+
class AppointmentDetailForm(AppointmentForm):
class Meta:
@@ -64,10 +106,16 @@ class AppointmentEditForm(AppointmentForm):
location = self.cleaned_data['location']
if self.user.locations.filter(id=location.id).count() == 0:
self.add_error('location', "You cannot create appointment for this location")
+ raise forms.ValidationError("You cannot create appointment for this location")
else:
return location
+ def clean(self):
+ if len(self.errors) == 0:
+ self.register_changes() # right before instance is changed
+
def save(self, commit=True):
+
appointment = super(AppointmentEditForm, self).save(commit)
# if appointment date change, remove appointment_type links
if 'datetime_when' in self.changed_data:
@@ -89,6 +137,8 @@ class AppointmentEditForm(AppointmentForm):
appointment_type_link = AppointmentTypeLink(appointment=appointment,
appointment_type=appointment_type)
appointment_type_link.save()
+
+ self.save_changes()
return appointment
@@ -117,12 +167,16 @@ class AppointmentAddForm(AppointmentForm):
)
fields['worker_assigned'].widget.attrs = {'class': 'search_worker_availability'}
fields['datetime_when'].widget.attrs = {'class': 'start_date', 'placeholder': 'yyyy-mm-dd HH:MM',
- 'pattern': '[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}'}
+ 'pattern': '[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}'}
fields['length'].widget.attrs = {'class': 'appointment_duration'}
self.fields = fields
self.fields['location'].queryset = get_filter_locations(self.user)
+ def clean(self):
+ if len(self.errors) == 0:
+ self.register_changes() # right before instance is changed
+
def clean_location(self):
location = self.cleaned_data['location']
if self.user.locations.filter(id=location.id).count() == 0:
@@ -136,4 +190,5 @@ class AppointmentAddForm(AppointmentForm):
for appointment_type in appointment_types:
appointment_type_link = AppointmentTypeLink(appointment=appointment, appointment_type=appointment_type)
appointment_type_link.save()
+ self.save_changes()
return appointment
diff --git a/smash/web/migrations/0141_auto_20200319_1040.py b/smash/web/migrations/0141_auto_20200319_1040.py
new file mode 100644
index 0000000000000000000000000000000000000000..a47dfea4765b67f9455d92a7234844ad40ae73ed
--- /dev/null
+++ b/smash/web/migrations/0141_auto_20200319_1040.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2020-03-19 10:40
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('web', '0140_auto_20190528_0953'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='appointmenttype',
+ name='calendar_font_color',
+ field=models.CharField(default=b'#00000', max_length=2000, verbose_name=b'Calendar font color'),
+ ),
+ ]
diff --git a/smash/web/migrations/0142_provenance.py b/smash/web/migrations/0142_provenance.py
new file mode 100644
index 0000000000000000000000000000000000000000..34e1568b71a6a267beeef1f3793c2f1252255be5
--- /dev/null
+++ b/smash/web/migrations/0142_provenance.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2020-03-19 10:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('web', '0141_auto_20200319_1040'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Provenance',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('modified_table', models.CharField(max_length=1024, verbose_name=b'Modified table')),
+ ('modified_table_id', models.CharField(max_length=1024, verbose_name=b'Modified table row')),
+ ('modification_date', models.DateTimeField(verbose_name=b'Modified on')),
+ ('previous_value', models.CharField(blank=True, max_length=2048, null=True, verbose_name=b'Previous Value')),
+ ('new_value', models.CharField(blank=True, max_length=2048, null=True, verbose_name=b'New Value')),
+ ('modification_description', models.CharField(max_length=2048, verbose_name=b'Description')),
+ ('modification_author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='web.Worker', verbose_name=b'Worker who modified the row')),
+ ],
+ ),
+ ]
diff --git a/smash/web/migrations/0143_auto_20200319_1121.py b/smash/web/migrations/0143_auto_20200319_1121.py
new file mode 100644
index 0000000000000000000000000000000000000000..57b5f92d46ca0a2346d91164f552407fa46a4ed5
--- /dev/null
+++ b/smash/web/migrations/0143_auto_20200319_1121.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2020-03-19 11:21
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('web', '0142_provenance'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='provenance',
+ name='modification_date',
+ field=models.DateTimeField(auto_now_add=True, verbose_name=b'Modified on'),
+ ),
+ ]
diff --git a/smash/web/migrations/0144_auto_20200319_1221.py b/smash/web/migrations/0144_auto_20200319_1221.py
new file mode 100644
index 0000000000000000000000000000000000000000..a232453bb6bb96bd20d1f7dbe5510454a9fa85cf
--- /dev/null
+++ b/smash/web/migrations/0144_auto_20200319_1221.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2020-03-19 12:21
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('web', '0143_auto_20200319_1121'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='provenance',
+ name='modified_field',
+ field=models.CharField(default='', max_length=1024, verbose_name=b'Modified field'),
+ preserve_default=False,
+ ),
+ migrations.AlterField(
+ model_name='provenance',
+ name='modification_description',
+ field=models.CharField(max_length=20480, verbose_name=b'Description'),
+ ),
+ ]
diff --git a/smash/web/migrations/0145_auto_20200319_1404.py b/smash/web/migrations/0145_auto_20200319_1404.py
new file mode 100644
index 0000000000000000000000000000000000000000..fda7e5189461e4375b4b95e177a553b9f0955bd0
--- /dev/null
+++ b/smash/web/migrations/0145_auto_20200319_1404.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2020-03-19 14:04
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('web', '0144_auto_20200319_1221'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='provenance',
+ name='modified_field',
+ field=models.CharField(blank=b'', max_length=1024, verbose_name=b'Modified field'),
+ ),
+ ]
diff --git a/smash/web/migrations/0146_auto_20200319_1446.py b/smash/web/migrations/0146_auto_20200319_1446.py
new file mode 100644
index 0000000000000000000000000000000000000000..8cd04b4486246d6dd67b724fe62121db273d4c41
--- /dev/null
+++ b/smash/web/migrations/0146_auto_20200319_1446.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2020-03-19 14:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('web', '0145_auto_20200319_1404'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='provenance',
+ name='modification_author',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='web.Worker', verbose_name=b'Worker who modified the row'),
+ ),
+ ]
diff --git a/smash/web/migrations/0147_auto_20200320_0931.py b/smash/web/migrations/0147_auto_20200320_0931.py
new file mode 100644
index 0000000000000000000000000000000000000000..58a3dc901515fa768382f239352409bb6a7a9ed8
--- /dev/null
+++ b/smash/web/migrations/0147_auto_20200320_0931.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2020-03-20 09:31
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('web', '0146_auto_20200319_1446'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='provenance',
+ name='modified_table_id',
+ field=models.IntegerField(default=0, verbose_name=b'Modified table row'),
+ ),
+ ]
diff --git a/smash/web/migrations/0141_auto_20200319_1301.py b/smash/web/migrations/0148_auto_20200319_1301.py
similarity index 93%
rename from smash/web/migrations/0141_auto_20200319_1301.py
rename to smash/web/migrations/0148_auto_20200319_1301.py
index 82d45afe3c2cb59017c44e55a03078f898c82b0c..1b2abecbe955819c77d988944336b22ad28bd016 100644
--- a/smash/web/migrations/0141_auto_20200319_1301.py
+++ b/smash/web/migrations/0148_auto_20200319_1301.py
@@ -7,7 +7,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('web', '0140_auto_20190528_0953'),
+ ('web', '0147_auto_20200320_0931'),
]
operations = [
diff --git a/smash/web/migrations/0142_auto_20200319_1415.py b/smash/web/migrations/0149_auto_20200319_1415.py
similarity index 90%
rename from smash/web/migrations/0142_auto_20200319_1415.py
rename to smash/web/migrations/0149_auto_20200319_1415.py
index ea5d462085fccf023fc04503eefdf26fda15e101..c948e9780d3d5da309c62035ff5afb27f0d835fc 100644
--- a/smash/web/migrations/0142_auto_20200319_1415.py
+++ b/smash/web/migrations/0149_auto_20200319_1415.py
@@ -8,7 +8,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('web', '0141_auto_20200319_1301'),
+ ('web', '0148_auto_20200319_1301'),
]
operations = [
diff --git a/smash/web/migrations/0143_auto_20200319_1446.py b/smash/web/migrations/0150_auto_20200319_1446.py
similarity index 91%
rename from smash/web/migrations/0143_auto_20200319_1446.py
rename to smash/web/migrations/0150_auto_20200319_1446.py
index d6c74b0cb78b6fc342a2140b38ac4bec2bd968cb..0fcdea7e40cf414c94558b82d7befe42e7dbc275 100644
--- a/smash/web/migrations/0143_auto_20200319_1446.py
+++ b/smash/web/migrations/0150_auto_20200319_1446.py
@@ -8,7 +8,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('web', '0142_auto_20200319_1415'),
+ ('web', '0149_auto_20200319_1415'),
]
operations = [
diff --git a/smash/web/migrations/0144_auto_20200319_1518.py b/smash/web/migrations/0151_auto_20200319_1518.py
similarity index 91%
rename from smash/web/migrations/0144_auto_20200319_1518.py
rename to smash/web/migrations/0151_auto_20200319_1518.py
index bdb5b3eebb7a1b9a2aed55790bd8a9fb7dae6dc1..a034d7b50283e5a6011cbcf3e9bf24a465c0cfcb 100644
--- a/smash/web/migrations/0144_auto_20200319_1518.py
+++ b/smash/web/migrations/0151_auto_20200319_1518.py
@@ -8,7 +8,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('web', '0143_auto_20200319_1446'),
+ ('web', '0150_auto_20200319_1446'),
]
operations = [
diff --git a/smash/web/migrations/0145_add_permissions_to_existing_workers.py b/smash/web/migrations/0152_add_permissions_to_existing_workers.py
similarity index 96%
rename from smash/web/migrations/0145_add_permissions_to_existing_workers.py
rename to smash/web/migrations/0152_add_permissions_to_existing_workers.py
index 877a37547c0ff7b9d87e409235effc33c5d7d8f7..67752e4690b59643da8f7ae2fe375db39a43f2a2 100644
--- a/smash/web/migrations/0145_add_permissions_to_existing_workers.py
+++ b/smash/web/migrations/0152_add_permissions_to_existing_workers.py
@@ -7,7 +7,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('web', '0144_auto_20200319_1518'),
+ ('web', '0151_auto_20200319_1518'),
]
operations = [
diff --git a/smash/web/migrations/0146_auto_20200320_0932.py b/smash/web/migrations/0153_auto_20200320_0932.py
similarity index 97%
rename from smash/web/migrations/0146_auto_20200320_0932.py
rename to smash/web/migrations/0153_auto_20200320_0932.py
index 93b2487ba4a8bcf2f002110c262a83cc370d33b8..06a7de106240cf856fceb9720477be0b9aa87526 100644
--- a/smash/web/migrations/0146_auto_20200320_0932.py
+++ b/smash/web/migrations/0153_auto_20200320_0932.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('web', '0145_add_permissions_to_existing_workers'),
+ ('web', '0152_add_permissions_to_existing_workers'),
]
operations = [
diff --git a/smash/web/models/__init__.py b/smash/web/models/__init__.py
index 3dc346ec8d6b719b90273225b1626aa765571ac8..ee5fdb79d7681d2cd9a10e0fdde4d862e136ed39 100644
--- a/smash/web/models/__init__.py
+++ b/smash/web/models/__init__.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
from django.contrib.auth.models import User
+from provenance import Provenance
from configuration_item import ConfigurationItem
from flying_team import FlyingTeam
from location import Location
diff --git a/smash/web/models/provenance.py b/smash/web/models/provenance.py
new file mode 100644
index 0000000000000000000000000000000000000000..0d9aeb7a7e3f2020d36c61254dd681dd02322522
--- /dev/null
+++ b/smash/web/models/provenance.py
@@ -0,0 +1,44 @@
+# coding=utf-8
+from django.db import models
+
+
+class Provenance(models.Model):
+ class Meta:
+ app_label = 'web'
+
+
+ modified_table = models.CharField(max_length=1024,
+ verbose_name='Modified table',
+ blank=False, null=False
+ )
+
+ modified_table_id = models.IntegerField(default=0, verbose_name='Modified table row', blank=False, null=False)
+
+ modification_date = models.DateTimeField(
+ verbose_name='Modified on',
+ null=False, blank=False,
+ auto_now_add=True
+ )
+
+ modification_author = models.ForeignKey("web.Worker",
+ verbose_name='Worker who modified the row',
+ null=True, blank=False
+ )
+
+ modified_field = models.CharField(max_length=1024,
+ verbose_name='Modified field',
+ blank='', null=False
+ )
+
+ previous_value = models.CharField(max_length=2048,
+ verbose_name='Previous Value',
+ blank=True, null=True)
+
+ new_value = models.CharField(max_length=2048,
+ verbose_name='New Value',
+ blank=True, null=True)
+
+ modification_description = models.CharField(max_length=20480,
+ verbose_name='Description',
+ blank=False, null=False
+ )
\ No newline at end of file
diff --git a/smash/web/models/subject.py b/smash/web/models/subject.py
index fa9f067db93781e5e4fb90a70a51f5eee41a339e..bc70691410f4d7459a0ea7b08336abd8a506d7a0 100644
--- a/smash/web/models/subject.py
+++ b/smash/web/models/subject.py
@@ -6,7 +6,7 @@ from django.db.models.signals import post_save
from django.dispatch import receiver
from constants import SEX_CHOICES, COUNTRY_OTHER_ID
-from web.models import Country, Visit, Appointment
+from web.models import Country, Visit, Appointment, Provenance
from . import Language
logger = logging.getLogger(__name__)
@@ -154,4 +154,11 @@ class Subject(models.Model):
@receiver(post_save, sender=Subject)
def set_as_deceased(sender, instance, **kwargs):
if instance.dead:
+ p = Provenance(modified_table = Subject._meta.db_table,
+ modified_table_id = instance.id, modification_author = None,
+ previous_value = instance.dead, new_value = True,
+ modification_description = 'Subject "{}" marked as dead'.format(instance),
+ modified_field = 'dead',
+ )
instance.mark_as_dead()
+ p.save()
\ No newline at end of file
diff --git a/smash/web/templates/provenance/breadcrumb.html b/smash/web/templates/provenance/breadcrumb.html
new file mode 100644
index 0000000000000000000000000000000000000000..1d4019a699c2cb1dee0b005b58ed1e2a4da53099
--- /dev/null
+++ b/smash/web/templates/provenance/breadcrumb.html
@@ -0,0 +1,2 @@
+<li><a href="{% url 'web.views.provenance' %}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+<li class="active"><a href="{% url 'web.views.provenance' %}">Provenance</a></li>
\ No newline at end of file
diff --git a/smash/web/templates/provenance/list.html b/smash/web/templates/provenance/list.html
new file mode 100644
index 0000000000000000000000000000000000000000..42840c32a6b7b5be70bf0ea9cb2149e784efccda
--- /dev/null
+++ b/smash/web/templates/provenance/list.html
@@ -0,0 +1,70 @@
+{% extends "_base.html" %}
+{% load static %}
+
+{% block styles %}
+ {{ block.super }}
+ <!-- DataTables -->
+ <link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
+{% endblock styles %}
+
+{% block ui_active_tab %}'provenance'{% endblock ui_active_tab %}
+{% block page_header %}Provenance{% endblock page_header %}
+{% block page_description %}{% endblock page_description %}
+
+{% block breadcrumb %}
+ {% include "languages/breadcrumb.html" %}
+{% endblock breadcrumb %}
+
+{% block maincontent %}
+
+ <div class="box-body">
+ <table id="table" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>Table</th>
+ <th>Row</th>
+ <th>Date</th>
+ <th>Author</th>
+ <th>Field</th>
+ <th>Previous Value</th>
+ <th>New Value</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for provenance in provenances %}
+ <tr>
+ <td>{{ provenance.modified_table }}</td>
+ <td>{{ provenance.modified_table_id }}</td>
+ <td>{{ provenance.modification_date }}</td>
+ <td>{{ provenance.modification_author }}</td>
+ <td>{{ provenance.modified_field }}</td>
+ <td>{{ provenance.previous_value }}</td>
+ <td>{{ provenance.new_value }}</td>
+ <td>{{ provenance.modification_description }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </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": true,
+ "ordering": true,
+ "info": true,
+ "autoWidth": false
+ });
+ });
+ </script>
+{% endblock scripts %}
diff --git a/smash/web/urls.py b/smash/web/urls.py
index bbbdfbcde4fee7032359ec9a7030ab98e83e96ff..e8b61fa0aaf83e4b04cf9c3c1dc6dc908b829b10 100644
--- a/smash/web/urls.py
+++ b/smash/web/urls.py
@@ -233,6 +233,8 @@ urlpatterns = [
url(r'^statistics$', views.statistics.statistics, name='web.views.statistics'),
+ url(r'^provenance$', views.provenance.ProvenanceListView.as_view(), name='web.views.provenance'),
+
####################
# STUDY #
####################
diff --git a/smash/web/views/__init__.py b/smash/web/views/__init__.py
index f662f7e759ca56715f910877c68e7d51a4e4197c..66c3b6339e4afecdf3332e273a6f03d4e1c43705 100644
--- a/smash/web/views/__init__.py
+++ b/smash/web/views/__init__.py
@@ -104,4 +104,5 @@ import rooms
import uploaded_files
import study
import password
-import appointment_type
\ No newline at end of file
+import appointment_type
+import provenance
\ No newline at end of file
diff --git a/smash/web/views/appointment.py b/smash/web/views/appointment.py
index d2d1f0ff92fa75353f7e8a08845270c45c67908e..84b12b2493f97f22c0e1073588c785815f2b515d 100644
--- a/smash/web/views/appointment.py
+++ b/smash/web/views/appointment.py
@@ -12,7 +12,7 @@ from web.models.appointment_list import APPOINTMENT_LIST_APPROACHING, APPOINTMEN
from . import wrap_response
from web.forms import AppointmentDetailForm, AppointmentEditForm, AppointmentAddForm, SubjectEditForm, \
StudySubjectEditForm
-from ..models import Appointment, StudySubject, MailTemplate, Visit, Study
+from ..models import Appointment, StudySubject, MailTemplate, Visit, Study, Provenance, Worker
from django.views.generic import DeleteView
from . import WrappedView
from django.urls import reverse_lazy
@@ -184,6 +184,16 @@ class AppointmentDeleteView(DeleteView, WrappedView):
return redirect('web.views.appointment_edit', id=appointment.id)
else:
messages.success(request, "Appointment deleted")
+ worker = Worker.get_by_user(request.user)
+ p = Provenance(modified_table = Appointment._meta.db_table,
+ modified_table_id = appointment.id,
+ modification_author = worker,
+ previous_value = '',
+ new_value = '',
+ modification_description = 'Appointment deleted',
+ modified_field = '',
+ )
+ p.save()
return super(AppointmentDeleteView, self).delete(request, *args, **kwargs)
@PermissionDecorator('delete_appointment', 'configuration')
diff --git a/smash/web/views/provenance.py b/smash/web/views/provenance.py
new file mode 100644
index 0000000000000000000000000000000000000000..dc2e85293892712dac29c5f00f679f394d388b9b
--- /dev/null
+++ b/smash/web/views/provenance.py
@@ -0,0 +1,15 @@
+# coding=utf-8
+from django.views.generic import ListView
+
+from . import WrappedView
+from ..models import Provenance
+from web.decorators import PermissionDecorator
+
+class ProvenanceListView(ListView, WrappedView):
+ model = Provenance
+ context_object_name = "provenances"
+ template_name = 'provenance/list.html'
+
+ @PermissionDecorator('view_provenance', 'configuration')
+ def dispatch(self, *args, **kwargs):
+ return super(ProvenanceListView, self).dispatch(*args, **kwargs)
\ No newline at end of file
diff --git a/smash/web/views/subject.py b/smash/web/views/subject.py
index a11a77f73cb0eea85db236cf96c4117377c629c3..cb8cf69d285f57f1496dd66e092e08bf9365cc1d 100644
--- a/smash/web/views/subject.py
+++ b/smash/web/views/subject.py
@@ -6,8 +6,8 @@ from django.shortcuts import redirect, get_object_or_404
from . import wrap_response
from ..forms import VisitDetailForm, SubjectAddForm, SubjectEditForm, StudySubjectAddForm, StudySubjectEditForm
-from ..models import StudySubject, MailTemplate, Worker, Study
-from ..models.constants import GLOBAL_STUDY_ID
+from ..models import StudySubject, MailTemplate, Worker, Study, Provenance, Subject
+from ..models.constants import GLOBAL_STUDY_ID, SUBJECT_TYPE_CHOICES
from ..models.study_subject_list import SUBJECT_LIST_GENERIC, SUBJECT_LIST_NO_VISIT, SUBJECT_LIST_REQUIRE_CONTACT, \
SUBJECT_LIST_VOUCHER_EXPIRY, SUBJECT_LIST_CHOICES
@@ -68,6 +68,7 @@ def subject_edit(request, id):
contact_attempts = study_subject.contactattempt_set.order_by('-datetime_when').all()
was_dead = study_subject.subject.dead
was_resigned = study_subject.resigned
+ old_type = study_subject.type
endpoint_was_reached = study_subject.endpoint_reached
if request.method == 'POST':
study_subject_form = StudySubjectEditForm(request.POST, request.FILES, instance=study_subject,
@@ -80,8 +81,44 @@ def subject_edit(request, id):
study_subject_form.save()
subject_form.save()
# check if subject was marked as dead or resigned
+ if 'type' in study_subject_form.changed_data and old_type != study_subject_form.cleaned_data['type']:
+ worker = Worker.get_by_user(request.user)
+ old_value = SUBJECT_TYPE_CHOICES.get(old_type, old_type)
+ new_value = SUBJECT_TYPE_CHOICES.get(study_subject_form.cleaned_data['type'], study_subject_form.cleaned_data['type'])
+ p = Provenance(modified_table = StudySubject._meta.db_table,
+ modified_table_id = study_subject.id,
+ modification_author = worker,
+ previous_value = old_type,
+ new_value = study_subject_form.cleaned_data['type'],
+ modification_description = 'Worker "{}" changed study subject "{}" from "{}" to "{}"'.format(worker,
+ study_subject.subject, old_value, new_value),
+ modified_field = 'type',
+ )
+ p.save()
if subject_form.cleaned_data['dead'] and not was_dead:
+ worker = Worker.get_by_user(request.user)
+ p = Provenance(modified_table = Subject._meta.db_table,
+ modified_table_id = study_subject.subject.id,
+ modification_author = worker,
+ previous_value = was_dead,
+ new_value = True,
+ modification_description = 'Worker "{}" marks subject "{}" as dead'.format(worker, study_subject.subject),
+ modified_field = 'dead',
+ )
study_subject.subject.mark_as_dead()
+ p.save()
+ if study_subject_form.cleaned_data['resigned'] and not was_resigned:
+ worker = Worker.get_by_user(request.user)
+ p = Provenance(modified_table = StudySubject._meta.db_table,
+ modified_table_id = study_subject.id,
+ modification_author = worker,
+ previous_value = was_resigned,
+ new_value = True,
+ modification_description = 'Worker "{}" marks study subject "{}" as resigned from study "{}"'.format(worker, study_subject.nd_number, study_subject.study),
+ modified_field = 'resigned',
+ )
+ study_subject.mark_as_resigned()
+ p.save()
messages.success(request, "Modifications saved")
if '_continue' in request.POST:
return redirect('web.views.subject_edit', id=study_subject.id)
diff --git a/smash/web/views/visit.py b/smash/web/views/visit.py
index 10f2f80cf96e3fb6237ce303131869ba124aaa95..05d0ac44e9022231b52552752d32d64f31917ecd 100644
--- a/smash/web/views/visit.py
+++ b/smash/web/views/visit.py
@@ -9,7 +9,7 @@ from web.models.study_visit_list import VISIT_LIST_GENERIC, VISIT_LIST_MISSING_A
VISIT_LIST_UNFINISHED, VISIT_LIST_CHOICES
from . import wrap_response
from ..forms import VisitDetailForm, VisitAddForm, SubjectDetailForm, StudySubjectDetailForm
-from ..models import Visit, Appointment, StudySubject, MailTemplate
+from ..models import Visit, Appointment, StudySubject, MailTemplate, Worker, Provenance
logger = logging.getLogger(__name__)
@@ -93,7 +93,17 @@ def visit_details(request, id):
def visit_mark(request, id, as_what):
visit = get_object_or_404(Visit, id=id)
if as_what == 'finished':
+ worker = Worker.get_by_user(request.user)
+ p = Provenance(modified_table = Visit._meta.db_table,
+ modified_table_id = id,
+ modification_author = worker,
+ previous_value = visit.is_finished,
+ new_value = True,
+ modification_description = 'Worker "{}" marked visit from "{}" as finished'.format(worker, visit.subject),
+ modified_field = 'is_finished',
+ )
visit.mark_as_finished()
+ p.save()
return redirect('web.views.visit_details', id=id)