Fix branching issues in PR #1662, #1689, and #1773 (#1781)

* Remove squeeze factor from HS

* Ensure default logging for multiple treatment ids

* Replaced rescaling of capabilities based on squeeze so that it is based on load

* Ensure running footprint and load is clinic specific

* Add clinics running footprint and test

* For test to pass for now only log Capacity_By_FacID_and_Officer for GenericClinic

* Style fixes

* Fix test of squeeze logging

* More logging fixes in test

* Update comment in test because rescaling factor cannot be less than 1

* Consistent variable names

* Remove redundant function

log_current_capabilities_and_usage called log_clinic_current_capabilities_and_usage looping over the clinics.
I have now removed log_clinic_current_capabilities_and_usage, and moved the looping logic to where the capabilities are logged.

* Retrieve facility id and district from appointment type needs

* Additional comments in tests to explain rationale

I have updated comments in the test to explain the rationale for retaining an arbitrary clinic capabilities split in test set up.

* WIP: looping over clinics to log

* Debugging

* All but one tests pass

* WIP; debugging

* Fix test rescaling capabilities based on load factors

* Style fixes

* Style fixes

Signed-off-by: sangeetabhatia03 <sangeetabhatia03@gmail.com>

* Remove print statements

---------

Signed-off-by: sangeetabhatia03 <sangeetabhatia03@gmail.com>
Co-authored-by: sangeetabhatia03 <sangeetabhatia03@gmail.com>
Co-authored-by: Tim Hallett <39991060+tbhallett@users.noreply.github.com>

Author: 3 people