Merge branch 'release/0.1.5'

ambition-trial · Aug 9, 2018 · 30ecc9d · 30ecc9d
2 parents c1692d3 + 9b149cd
commit 30ecc9d
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 8 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.4
+0.1.5
diff --git a/ambition_prn/migrations/0006_auto_20180809_0504.py b/ambition_prn/migrations/0006_auto_20180809_0504.py
@@ -0,0 +1,63 @@
+# Generated by Django 2.1 on 2018-08-09 03:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ambition_prn', '0005_auto_20180708_0925'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='deathreport',
+            name='tracking_identifier',
+            field=models.CharField(max_length=30, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='deathreporttmg',
+            name='tracking_identifier',
+            field=models.CharField(max_length=30, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='historicaldeathreport',
+            name='tracking_identifier',
+            field=models.CharField(db_index=True, max_length=30),
+        ),
+        migrations.AlterField(
+            model_name='historicaldeathreporttmg',
+            name='tracking_identifier',
+            field=models.CharField(db_index=True, max_length=30),
+        ),
+        migrations.AlterField(
+            model_name='historicalprotocoldeviationviolation',
+            name='tracking_identifier',
+            field=models.CharField(db_index=True, max_length=30),
+        ),
+        migrations.AlterField(
+            model_name='historicalstudyterminationconclusion',
+            name='tracking_identifier',
+            field=models.CharField(db_index=True, max_length=30),
+        ),
+        migrations.AlterField(
+            model_name='historicalstudyterminationconclusionw10',
+            name='tracking_identifier',
+            field=models.CharField(db_index=True, max_length=30),
+        ),
+        migrations.AlterField(
+            model_name='protocoldeviationviolation',
+            name='tracking_identifier',
+            field=models.CharField(max_length=30, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='studyterminationconclusion',
+            name='tracking_identifier',
+            field=models.CharField(max_length=30, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='studyterminationconclusionw10',
+            name='tracking_identifier',
+            field=models.CharField(max_length=30, unique=True),
+        ),
+    ]
diff --git a/ambition_prn/models/death_report.py b/ambition_prn/models/death_report.py
@@ -9,14 +9,15 @@
 from edc_constants.choices import YES_NO
 from edc_constants.constants import NOT_APPLICABLE
 from edc_identifier.managers import SubjectIdentifierManager
+from edc_identifier.model_mixins import TrackingModelMixin
 from edc_protocol.validators import datetime_not_before_study_start
 
 from ..action_items import DEATH_REPORT_ACTION
 from ..choices import CAUSE_OF_DEATH, TB_SITE_DEATH
 
 
 class DeathReport(SiteModelMixin,
-                  ActionModelMixin, BaseUuidModel):
+                  ActionModelMixin, TrackingModelMixin, BaseUuidModel):
 
     action_name = DEATH_REPORT_ACTION
 

diff --git a/ambition_prn/models/death_report_tmg.py b/ambition_prn/models/death_report_tmg.py
@@ -8,6 +8,7 @@
 from edc_base.utils import get_utcnow
 from edc_constants.choices import YES_NO
 from edc_constants.constants import NOT_APPLICABLE
+from edc_identifier.model_mixins import TrackingModelMixin
 from edc_protocol.validators import datetime_not_before_study_start
 
 from ..action_items import DEATH_REPORT_TMG_ACTION
@@ -21,7 +22,7 @@ def get_by_natural_key(self, subject_identifier):
         return self.get(death_report__subject_identifier=subject_identifier)
 
 
-class DeathReportTmg(ActionModelMixin, ReportStatusModelMixin,
+class DeathReportTmg(ActionModelMixin, TrackingModelMixin, ReportStatusModelMixin,
                      SiteModelMixin, BaseUuidModel):
 
     action_name = DEATH_REPORT_TMG_ACTION

diff --git a/ambition_prn/models/protocol_deviation_violation.py b/ambition_prn/models/protocol_deviation_violation.py
@@ -7,13 +7,14 @@
 from edc_base.utils import get_utcnow
 from edc_constants.choices import YES_NO, NOT_APPLICABLE
 from edc_identifier.managers import TrackingIdentifierManager
+from edc_identifier.model_mixins import TrackingModelMixin
 
 from ..action_items import PROTOCOL_DEVIATION_VIOLATION_ACTION
 from ..choices import PROTOCOL_VIOLATION, ACTION_REQUIRED, DEVIATION_VIOLATION, REPORT_STATUS
 
 
-class ProtocolDeviationViolation(SiteModelMixin,
-                                 ActionModelMixin, BaseUuidModel):
+class ProtocolDeviationViolation(SiteModelMixin, ActionModelMixin,
+                                 TrackingModelMixin, BaseUuidModel):
 
     action_name = PROTOCOL_DEVIATION_VIOLATION_ACTION
 

diff --git a/ambition_prn/models/study_termination_conclusion.py b/ambition_prn/models/study_termination_conclusion.py
@@ -6,6 +6,7 @@
 from edc_base.sites import CurrentSiteManager
 from edc_constants.choices import YES_NO, YES_NO_NA, NOT_APPLICABLE
 from edc_identifier.managers import SubjectIdentifierManager
+from edc_identifier.model_mixins import TrackingModelMixin
 from edc_model_fields.fields import OtherCharField
 from edc_visit_schedule.model_mixins import OffScheduleModelMixin
 
@@ -14,7 +15,8 @@
 from ..choices import REASON_STUDY_TERMINATED, YES_NO_ALREADY
 
 
-class StudyTerminationConclusion(OffScheduleModelMixin, ActionModelMixin, BaseUuidModel):
+class StudyTerminationConclusion(OffScheduleModelMixin, ActionModelMixin,
+                                 TrackingModelMixin, BaseUuidModel):
 
     action_name = STUDY_TERMINATION_CONCLUSION_ACTION
 

diff --git a/ambition_prn/models/study_termination_conclusion_w10.py b/ambition_prn/models/study_termination_conclusion_w10.py
@@ -3,16 +3,17 @@
 from edc_base.model_managers import HistoricalRecords
 from edc_base.model_mixins import BaseUuidModel
 from edc_base.model_validators import date_not_future
-from edc_identifier.managers import SubjectIdentifierManager
 from edc_base.sites import CurrentSiteManager
+from edc_identifier.managers import SubjectIdentifierManager
+from edc_identifier.model_mixins import TrackingModelMixin
 from edc_visit_schedule.model_mixins import OffScheduleModelMixin
 
 from ..action_items import STUDY_TERMINATION_CONCLUSION_ACTION_W10
 from ..choices import REASON_STUDY_TERMINATED_W10
 
 
 class StudyTerminationConclusionW10(OffScheduleModelMixin, ActionModelMixin,
-                                    BaseUuidModel):
+                                    TrackingModelMixin, BaseUuidModel):
 
     action_name = STUDY_TERMINATION_CONCLUSION_ACTION_W10