Merge b63deb7 into 3deb5fc

openhealthcare · Feb 13, 2019 · a4f8513 · a4f8513
2 parents 3deb5fc + b63deb7
commit a4f8513
Show file tree

Hide file tree

Showing 32 changed files with 1,025 additions and 187 deletions.
diff --git a/apps/tb/migrations/0040_auto_20190211_1111.py b/apps/tb/migrations/0040_auto_20190211_1111.py
@@ -0,0 +1,323 @@
+# Generated by Django 2.0.9 on 2019-02-11 11:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tb', '0039_tbhistory_previous_tb_contact'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='lymphnodeswellingsiteoptions',
+            name='code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='lymphnodeswellingsiteoptions',
+            name='system',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='lymphnodeswellingsiteoptions',
+            name='version',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='recreationaldrug',
+            name='code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='recreationaldrug',
+            name='system',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='recreationaldrug',
+            name='version',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='tbcasemanager',
+            name='code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='tbcasemanager',
+            name='system',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='tbcasemanager',
+            name='version',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='tbsite',
+            name='code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='tbsite',
+            name='system',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='tbsite',
+            name='version',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='tbtreatmentcentre',
+            name='code',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='tbtreatmentcentre',
+            name='system',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='tbtreatmentcentre',
+            name='version',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='accessconsiderations',
+            name='access_assistance',
+            field=models.CharField(blank=True, choices=[('provision', 'provision'), ('finance', 'finance')], max_length=256, null=True),
+        ),
+        migrations.AlterField(
+            model_name='allergies',
+            name='drug_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='allergies',
+            name='provisional',
+            field=models.BooleanField(default=False, help_text='True if the allergy is only suspected. Defaults to False.', verbose_name='Suspected?'),
+        ),
+        migrations.AlterField(
+            model_name='bcg',
+            name='bcg_scar',
+            field=models.BooleanField(default=False, verbose_name='BCG Scar Seen'),
+        ),
+        migrations.AlterField(
+            model_name='bcg',
+            name='bcg_type',
+            field=models.CharField(blank=True, choices=[('Neonatal', 'Neonatal'), ('School', 'School'), ('Adult', 'Adult'), ('Unsure', 'Unsure'), ('None', 'None')], max_length=255, verbose_name='BCG'),
+        ),
+        migrations.AlterField(
+            model_name='bcg',
+            name='red_book_documentation_of_bcg_seen',
+            field=models.BooleanField(default=False, verbose_name='Red Book Documentation Of BCG Given'),
+        ),
+        migrations.AlterField(
+            model_name='employment',
+            name='financial_status',
+            field=models.CharField(blank=True, choices=[('Nil income', 'Nil income'), ('On benefits', 'On benefits'), ('Other(SS/NASS)', 'Other(SS/NASS)'), ('Employed', 'Employed')], max_length=256),
+        ),
+        migrations.AlterField(
+            model_name='lymphnodeswellingsite',
+            name='site_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='mantouxtest',
+            name='batch_number',
+            field=models.CharField(blank=True, default='', max_length=256),
+        ),
+        migrations.AlterField(
+            model_name='mantouxtest',
+            name='induration',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Induration (mm)'),
+        ),
+        migrations.AlterField(
+            model_name='mantouxtest',
+            name='site',
+            field=models.CharField(blank=True, choices=[('Left Lower Arm', 'Left Lower Arm'), ('Right Lower Arm', 'Right Lower Arm')], default='', max_length=256),
+        ),
+        migrations.AlterField(
+            model_name='nationality',
+            name='arrival_in_the_uk',
+            field=models.CharField(blank=True, max_length=250, null=True, verbose_name='Year of arrival in the UK'),
+        ),
+        migrations.AlterField(
+            model_name='patientconsultation',
+            name='assessment',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AlterField(
+            model_name='patientconsultation',
+            name='initials',
+            field=models.CharField(blank=True, help_text='The initials of the user who gave the consult.', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='patientconsultation',
+            name='plan',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AlterField(
+            model_name='patientconsultation',
+            name='reason_for_interaction_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='socialhistory',
+            name='community_nurse',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='CPN/CMHT'),
+        ),
+        migrations.AlterField(
+            model_name='socialhistory',
+            name='drinking',
+            field=models.CharField(blank=True, choices=[('None', 'None'), ('Occasional', 'Occasional'), ('Excess', 'Excess'), ('Dependent', 'Dependent')], max_length=250, null=True, verbose_name='Alcohol'),
+        ),
+        migrations.AlterField(
+            model_name='socialhistory',
+            name='drug_community_worker',
+            field=models.CharField(blank=True, max_length=256, null=True, verbose_name='Drug/alcohol worker'),
+        ),
+        migrations.AlterField(
+            model_name='socialhistory',
+            name='homelessness',
+            field=models.CharField(blank=True, choices=[('Never', 'Never'), ('Current', 'Current'), ('Past', 'Past')], max_length=256, null=True),
+        ),
+        migrations.AlterField(
+            model_name='socialhistory',
+            name='homelessness_type',
+            field=models.CharField(blank=True, choices=[('Hostel', 'Hostel'), ('Sofa surfing', 'Sofa surfing'), ('Street', 'Street'), ('Other', 'Other')], max_length=256, null=True),
+        ),
+        migrations.AlterField(
+            model_name='socialhistory',
+            name='opiate_replacement_therapy',
+            field=models.BooleanField(default=False, verbose_name='on opiate replacement therapy'),
+        ),
+        migrations.AlterField(
+            model_name='socialhistory',
+            name='prison_history',
+            field=models.CharField(blank=True, choices=[('Never', 'Never'), ('Current', 'Current'), ('Within the last 5 years', 'Within the last 5 years'), ('Over 5 years ago', 'Over 5 years ago')], max_length=250, null=True),
+        ),
+        migrations.AlterField(
+            model_name='socialhistory',
+            name='prison_history_details',
+            field=models.TextField(blank=True, default=''),
+        ),
+        migrations.AlterField(
+            model_name='socialhistory',
+            name='recreational_drug_type_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='socialhistory',
+            name='recreational_drug_use',
+            field=models.CharField(blank=True, choices=[('Never', 'Never'), ('Current', 'Current'), ('Dependent', 'Dependent'), ('Past', 'Past')], max_length=250, null=True),
+        ),
+        migrations.AlterField(
+            model_name='socialhistory',
+            name='smoking',
+            field=models.CharField(blank=True, choices=[('Never', 'Never'), ('Current', 'Current'), ('Past', 'Past')], max_length=250, null=True),
+        ),
+        migrations.AlterField(
+            model_name='tbhistory',
+            name='contact_details',
+            field=models.TextField(default=''),
+        ),
+        migrations.AlterField(
+            model_name='tbhistory',
+            name='country_treated_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='tbhistory',
+            name='diagnosis_details',
+            field=models.TextField(default=''),
+        ),
+        migrations.AlterField(
+            model_name='tbhistory',
+            name='previous_tb_contact',
+            field=models.BooleanField(default=False, verbose_name='Previous TB contact'),
+        ),
+        migrations.AlterField(
+            model_name='tbhistory',
+            name='previous_tb_diagnosis',
+            field=models.BooleanField(default=False, verbose_name='Previous TB diagnosis'),
+        ),
+        migrations.AlterField(
+            model_name='tbhistory',
+            name='site_of_tb_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='tbhistory',
+            name='tb_type',
+            field=models.CharField(blank=True, choices=[('Active', 'Active'), ('Latent', 'Latent'), ('Unknown', 'Unknown')], max_length=256, null=True, verbose_name='TB Type'),
+        ),
+        migrations.AlterField(
+            model_name='tbhistory',
+            name='treatment_centre_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='tbmanagement',
+            name='case_manager_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='tbmanagement',
+            name='ltbr_number',
+            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='LTBR Number'),
+        ),
+        migrations.AlterField(
+            model_name='travel',
+            name='country_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='travel',
+            name='reason_for_travel_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='treatment',
+            name='drug_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='treatment',
+            name='frequency_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='treatment',
+            name='route_ft',
+            field=models.CharField(blank=True, default='', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='treatment',
+            name='start_date',
+            field=models.DateField(blank=True, help_text='The date on which the patient began receiving this treatment.', null=True),
+        ),
+        migrations.AlterUniqueTogether(
+            name='lymphnodeswellingsiteoptions',
+            unique_together={('code', 'system')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='recreationaldrug',
+            unique_together={('code', 'system')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='tbcasemanager',
+            unique_together={('code', 'system')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='tbsite',
+            unique_together={('code', 'system')},
+        ),
+        migrations.AlterUniqueTogether(
+            name='tbtreatmentcentre',
+            unique_together={('code', 'system')},
+        ),
+    ]
diff --git a/apps/tb/static/js/tb/controllers/add_episode_helper.js b/apps/tb/static/js/tb/controllers/add_episode_helper.js
@@ -1,10 +1,10 @@
 angular.module('opal.controllers').controller('AddEpisodeHelperCtrl',
-    function($scope, FieldTranslater, $location, $http, ngProgressLite) {
+    function($scope, FieldTranslator, $location, $http, ngProgressLite) {
       "use strict";
       var DATE_FORMAT = 'DD/MM/YYYY';
       this.addEpisode = function(category){
         var toSave = {
-            demographics: FieldTranslater.jsToSubrecord(
+            demographics: FieldTranslator.jsToSubrecord(
                 $scope.patient.demographics[0].makeCopy(), "demographics"
             )
         }

diff --git a/apps/tb/static/js/tb/services/treatment_utils.js b/apps/tb/static/js/tb/services/treatment_utils.js
@@ -1,4 +1,4 @@
-angular.module('opal.services').service('treatmentUtils', function(FieldTranslater){
+angular.module('opal.services').service('treatmentUtils', function(FieldTranslator){
     "use strict";
     var self = this;
     self.getStopDate = function(treatment){
@@ -36,7 +36,7 @@ angular.module('opal.services').service('treatmentUtils', function(FieldTranslat
       var now = moment();
 
       _.each(treatments, function(treatment){
-        treatment = FieldTranslater.subRecordToJs(treatment, "treatment");
+        treatment = FieldTranslator.subRecordToJs(treatment, "treatment");
         var endDate = self.getStopDate(treatment);
         var start_date = treatment.start_date || treatment.created;
         if(!now.isBefore(start_date, "d")){

diff --git a/apps/tb/static/js/test/test_add_episode_helper.js b/apps/tb/static/js/test/test_add_episode_helper.js
@@ -1,7 +1,7 @@
 describe('AddEpisodeHelperCtrl', function(){
     "use strict";
     var $rootScope, ngProgressLite, $location, $controller;
-    var  $httpBackend, FieldTranslater, controller, $scope;
+    var  $httpBackend, FieldTranslator, controller, $scope;
     var opalTestHelper;
 
     beforeEach(function(){
@@ -13,13 +13,13 @@ describe('AddEpisodeHelperCtrl', function(){
             $location  = $injector.get('$location');
             ngProgressLite  = $injector.get('ngProgressLite');
             $httpBackend  = $injector.get('$httpBackend');
-            FieldTranslater = $injector.get('FieldTranslater');
+            FieldTranslator = $injector.get('FieldTranslator');
             $scope = $rootScope.$new();
             opalTestHelper = $injector.get('opalTestHelper');
         });
 
         controller = $controller('AddEpisodeHelperCtrl', {
-            FieldTranslater: FieldTranslater,
+            FieldTranslator: FieldTranslator,
             $scope: $scope,
             $location: $location,
             ngProgressLite: ngProgressLite

diff --git a/elcid/__init__.py b/elcid/__init__.py
@@ -11,7 +11,7 @@
 class StandardAddPatientMenuItem(menus.MenuItem):
     def for_user(self, user):
         from opal.models import UserProfile
-        if user.is_superuser:
+        if user and user.is_superuser:
             return True
         return not UserProfile.objects.filter(
             user=user,

diff --git a/elcid/api.py b/elcid/api.py
@@ -100,11 +100,11 @@ def extract_observation_value(observation_value):
         if its >12 return >12
         else return None
     """
-    regex = r'^[0-9][0-9.]*$'
+    regex = r'^[-0-9][0-9.]*$'
     obs_result = observation_value.strip()
     obs_result = obs_result.split("~")[0].strip("<").strip(">").strip()
     if re.match(regex, obs_result):
-        return float(obs_result)
+        return round(float(obs_result), 3)
 
 
 def get_observation_value(observation):