From 38376857fa661039b0f8ca6717df38fb5f63549e Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Wed, 31 Jan 2024 11:50:29 +0100 Subject: [PATCH] modified activity types --- caimira/apps/calculator/model_generator.py | 2 +- caimira/store/data_registry.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/caimira/apps/calculator/model_generator.py b/caimira/apps/calculator/model_generator.py index 38110bb7..4a305418 100644 --- a/caimira/apps/calculator/model_generator.py +++ b/caimira/apps/calculator/model_generator.py @@ -413,7 +413,7 @@ class VirusFormData(FormData): expiration_defn = self.data_registry.population_scenario_activity[self.activity_type]['expiration'] if (self.activity_type == 'smallmeeting'): # Conversation of N people is approximately 1/N% of the time speaking. - expiration_defn['Breathing'] = self.total_people - 1 + expiration_defn = {'Speaking': 1, 'Breathing': self.total_people - 1} elif (self.activity_type == 'precise'): activity_defn, expiration_defn = self.generate_precise_activity_expiration() diff --git a/caimira/store/data_registry.py b/caimira/store/data_registry.py index 5f15680a..5e708fd2 100644 --- a/caimira/store/data_registry.py +++ b/caimira/store/data_registry.py @@ -443,7 +443,7 @@ class DataRegistry: "activity": "Seated", "expiration": {"Breathing": 1, "Speaking": 9}, }, - "precise": {}, + "precise": {"activity": "", "expiration": {}}, } def update(self, data, version=None):