Merge f26b575 into 3b4705e

openhealthcare · Apr 9, 2020 · da022cf · da022cf
2 parents 3b4705e + f26b575
commit da022cf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/elcid/models.py b/elcid/models.py
@@ -409,7 +409,7 @@ def update_from_dict(self, data, *args, **kwargs):
                 microbiology_input_id=self.id
             )
             icu_round.update_from_dict(
-                self.episode, data["when"], micro_input_icu_round_relation, *args, **kwargs
+                self.episode, data.get("when"), micro_input_icu_round_relation, *args, **kwargs
             )
             return result
         else:

diff --git a/elcid/test/test_models.py b/elcid/test/test_models.py
@@ -257,6 +257,30 @@ def test_update_from_dict_create_micro_relation(self):
             emodels.ICURound.objects.get().id
         )
 
+    def test_update_from_dict_without_when(self):
+        update_dict = {
+            'initials': 'FJK',
+            'infection_control': 'asdf',
+            'clinical_discussion': 'asdf',
+            'reason_for_interaction': 'ICU round',
+            'micro_input_icu_round_relation': {
+                'observation': {'temperature': 1111},
+                'icu_round': {}
+            },
+            'episode_id': self.episode.id
+        }
+        micro_input = emodels.MicrobiologyInput(
+            episode=self.episode
+        )
+        micro_input.update_from_dict(update_dict, self.user)
+
+        # refesh from database
+        micro_input = self.episode.microbiologyinput_set.get()
+
+        self.assertEqual(None, micro_input.when)
+        self.assertEqual(None, micro_input.microinputicuroundrelation.icu_round.when)
+
+
     def test_update_from_dict_micro_relation(self):
         micro_input = emodels.MicrobiologyInput.objects.create(
             episode=self.episode