Merge branch 'v0.5.4'

Author: fredkingham

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.4 Release
+We change how we handle tags, we no longer delete them, we just archive them
+
+
 ## 0.5.3 Release
 
 #### Wardrounds update

elcid/models.py

@@ -303,11 +303,13 @@ def set_reason_for_interaction(self, incoming_value, user, data):
             else:
                 episode = Episode.objects.get(pk=data["episode_id"])
 
-            exists = Tagging.objects.filter(
+            existing = Tagging.objects.filter(
                 episode=episode, team__name=MICROHAEM_TEAM_NAME
             )
-            exists = exists.exists()
-            if not exists:
+
+            if existing.exists():
+                existing.update(archived=False)
+            else:
                 Tagging.objects.create(
                     episode=episode,
                     team=Team.objects.get(name=MICROHAEM_TEAM_NAME)

elcid/settings.py

@@ -259,7 +259,7 @@
     EMAIL_HOST = 'localhost'
 
 
-VERSION_NUMBER = '0.5.3'
+VERSION_NUMBER = '0.5.4'
 #TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 #TEST_RUNNER = 'django_test_coverage.runner.CoverageTestSuiteRunner'
 

elcid/test/test_views.py

@@ -184,9 +184,9 @@ def test_add_microbiology_input(self):
         self.assertEqual(len(tags), 0)
         self.post_json(self.url, self.args)
         updated_tags = self.episode.get_tag_names(self.user)
-        self.assertEqual(updated_tags, [constants.MICROHAEM_TEAM_NAME])
+        self.assertEqual(list(updated_tags), [constants.MICROHAEM_TEAM_NAME])
         self.post_json(self.url, self.args)
 
         # make sure tags don't get applied twice if run twice
         updated_tags = self.episode.get_tag_names(self.user)
-        self.assertEqual(updated_tags, [constants.MICROHAEM_TEAM_NAME])
+        self.assertEqual(list(updated_tags), [constants.MICROHAEM_TEAM_NAME])

elcid/wardrounds.py

@@ -41,25 +41,8 @@ def episodes(self):
         episodes = Episode.objects.filter(
             category__in=['inpatient', 'Walkin'],
             discharge_date__gte=two_weeks_ago)
-
         if team:
-            result = []
-
-            history_tags_for_episodes = Tagging.historic_tags_for_episodes(
-                episodes
-            )
-
-            for episode_id, tag_dict in history_tags_for_episodes.iteritems():
-                if team in tag_dict:
-                    result.append(episode_id)
-
-            existing_episode_ids_with_tags = Tagging.objects.filter(
-                team__name=team, episode__in=episodes
-            ).values_list("episode_id", flat=True)
-
-            result.extend(existing_episode_ids_with_tags)
-
-            return Episode.objects.filter(id__in=result)
+            return episodes.filter(tagging__team__name=team)
         else:
             return episodes
 
@@ -106,4 +89,8 @@ class OPATCurrentList(WardRound):
     description = 'All patients on the OPAT current list'
 
     def episodes(self):
-        return Episode.objects.filter(active=True, tagging__team__name='opat_current')
+        return Episode.objects.filter(
+            active=True,
+            tagging__team__name='opat_current',
+            tagging__archived=False
+        )

etc/gunicorn.conf

@@ -3,7 +3,7 @@
 ; =====================
 
 [program:gunicorn]
-command=/home/ohc/.virtualenvs/elcid053/bin/gunicorn elcid.wsgi -c %(here)s/gunicorn_conf.py
+command=/home/ohc/.virtualenvs/elcid054/bin/gunicorn elcid.wsgi -c %(here)s/gunicorn_conf.py
 directory=%(here)s/../
 ;user=nobody
 numprocs=1

requirements.txt

@@ -20,7 +20,7 @@ django-celery==3.1.17
 
 django-compressor==1.5
 
--e git+https://github.com/openhealthcare/[email protected].4#egg=opal
+-e git+https://github.com/openhealthcare/[email protected].5#egg=opal
 
 -e git+https://github.com/openhealthcare/[email protected]#egg=opal_observations
 -e git+https://github.com/openhealthcare/[email protected]#egg=opal_walk_in