From c231d5a68662ee4d3511da4fa50fb5066988482c Mon Sep 17 00:00:00 2001 From: Germain Personne Date: Wed, 25 May 2022 12:12:14 +0200 Subject: [PATCH] Moved the `Virus data` block to be inside `Infected` --- cara/apps/expert.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cara/apps/expert.py b/cara/apps/expert.py index 7840de4e..cee0cd9e 100644 --- a/cara/apps/expert.py +++ b/cara/apps/expert.py @@ -292,8 +292,7 @@ class ModelWidgets(View): self.widget.children += (self._build_ventilation(node.concentration_model.ventilation),) self.widget.children += (self._build_infected(node.concentration_model.infected, node.concentration_model.ventilation),) self.widget.children += (self._build_exposed(node),) - self.widget.children += (self._build_infectivity(node.concentration_model.infected),) - + def _build_exposed(self, node): return collapsible([widgets.VBox([ self._build_exposed_number(node.exposed), @@ -309,7 +308,8 @@ class ModelWidgets(View): self._build_activity(node.activity), self._build_expiration(node.expiration), self._build_viral_load(node.virus), - self._build_infected_presence(node.presence, ventilation_node.active) + self._build_infected_presence(node.presence, ventilation_node.active), + ModelWidgets._build_infectivity(self,node) ])], title="Infected") def _build_room_volume(self, node):