added input to model generator from form

caimira/apps/calculator/defaults.py

@@ -73,6 +73,7 @@ DEFAULTS = {
     'sensor_in_use': '',
     'short_range_option': 'short_range_no',
     'short_range_interactions': '[]',
+    'short_range_total_people': 1,
 }
 
 # ------------------ Activities ----------------------

caimira/apps/calculator/model_generator.py

@@ -72,6 +72,7 @@ class VirusFormData(FormData):
     sensor_in_use: str
     short_range_option: str
     short_range_interactions: list
+    short_range_total_people: int
 
     _DEFAULTS: typing.ClassVar[typing.Dict[str, typing.Any]] = DEFAULTS
 
@@ -182,6 +183,13 @@ class VirusFormData(FormData):
 
             if total_percentage != 100:
                 raise ValueError(f'The sum of all respiratory activities should be 100. Got {total_percentage}.')
+            
+        # Validate number of people with short-range interactions
+        max_people_for_sr = self.total_people - self.infected_people
+        if self.short_range_total_people > max_people_for_sr:
+            raise ValueError(
+                f'The total number of people having short-range interactions ({self.short_range_total_people}) should be lower than the exposed population ({max_people_for_sr}).'
+            )
 
     def initialize_room(self) -> models.Room:
         # Initializes room with volume either given directly or as product of area and height
@@ -206,7 +214,6 @@ class VirusFormData(FormData):
         room = self.initialize_room()
         ventilation: models._VentilationBase = self.ventilation()
         infected_population = self.infected_population()
-
         short_range = []
         if self.short_range_option == "short_range_yes":
             for interaction in self.short_range_interactions:
@@ -216,6 +223,7 @@ class VirusFormData(FormData):
                     activity=infected_population.activity,
                     presence=self.short_range_interval(interaction),
                     distance=short_range_distances(self.data_registry),
+                    total_people=self.short_range_total_people,
                 ))
 
         return mc.ExposureModel(

caimira/apps/templates/base/calculator.form.html.j2

@@ -584,6 +584,16 @@
             <div class="col-md-12 p-0 form-group" id="dialog_sr"></div>
             <div class="text-center"><button type="button" class="add_node_btn_frm_field btn btn-primary btn-sm">Add row</button></div>
             <input type="text" class="form-control d-none" name="short_range_interactions">
+            <br />
+            <div class="form-group row">
+              <div class="col-sm-4">
+                <label class="col-form-label col-form-label-sm">Total people with short-range interactions:</label>
+              </div>
+              <div class="col-sm-2">
+                <input type="number" id="short_range_total_people" name="short_range_total_people" class="form-control form-control-sm" min="0" value="1" tabindex="-1" onchange="validate_sr_people(this)" required>
+              </div>
+              <div class="col-sm-6"></div>
+            </div>
           </div>
 
           <div class="modal-footer">