facilities fixes

.coveragerc

@@ -1,7 +1,7 @@
 [run]
 branch=True
 source=fahari
-omit=fahari/config/*,fahari/**/migrations/*,scripts/*,fahari/**/tests/*
+omit=fahari/config/*,fahari/**/migrations/*,scripts/*,fahari/**/tests/*,fahari/sims/*
 
 [report]
 exclude_lines =

.github/workflows/ci.yml

@@ -62,6 +62,7 @@ jobs:
 
       - name: mypy
         run: |
+          sudo apt-get update  && sudo apt-get upgrade
           mypy .
 
   pytest:
@@ -105,6 +106,7 @@ jobs:
 
       - name: Set up Django
         run: |
+          sudo apt-get update  && sudo apt-get upgrade
           python manage.py migrate
           python manage.py createcachetable
           python manage.py collectstatic --noinput

fahari/common/constants.py

@@ -58,6 +58,7 @@
                 "Mowlem",
                 "Umoja I",
                 "Umoja II",
+                "Utawala",
             ),
             "Kamukunji": (
                 "Airbase",

fahari/common/tests/test_administrative_unit_utils.py

@@ -83,7 +83,7 @@ def test_get_wards():
     assert ("Ziwani/Kariokor", "Ziwani/Kariokor") in wards
     assert ("Landimawe", "Landimawe") in wards
     assert ("Nairobi South", "Nairobi South") in wards
-    assert len(wards) == 109
+    assert len(wards) == 110
 
 
 def test_get_wards_for_sub_county_with_missing_sub_county():

fahari/common/views/mixins/drf_mixins.py

@@ -65,7 +65,7 @@ def get_excel_io(self, **kwargs) -> EIO:
         excel_io_class = self.get_excel_io_class()
         default_kwargs = self.get_excel_io_kwargs()
         default_kwargs.update(kwargs)
-        return excel_io_class(**default_kwargs)  # type: ignore
+        return excel_io_class(**default_kwargs)
 
     def get_excel_io_kwargs(self) -> Dict[str, Any]:
         """Return kwargs to be used when initializing an excel io instance."""

fahari/misc/exceptions.py

@@ -7,4 +7,4 @@ class ProcessGoogleSheetRowError(RuntimeError):
     def __init__(self, row: Sequence[str], row_index: int, *args, **kwargs):
         self.row: Sequence[str] = tuple(row)
         self.row_index: int = row_index
-        super().__init__(*args, **kwargs)  # type: ignore
+        super().__init__(*args, **kwargs)

fahari/sims/models.py

@@ -846,10 +846,6 @@ def questions(self) -> QuestionQuerySet:
 
         return Question.objects.for_questionnaire(questionnaire=self.questionnaire)
 
-    @property
-    def mentors(self):
-        return self.metadata["mentors"]
-
     def get_absolute_url(self):
         is_complete = bool(self.finish_date is not None)
         if is_complete:

fahari/templates/pages/sims/questionnaire_responses_capture.html

@@ -34,7 +34,7 @@ <h5>Mentors list</h5>
                     <th>Organisation</th>
                 </thead>
                 <tbody>
-                    {%for mentor in object.mentors%}
+                    {%for mentor in object.metadata.mentors%}
                     <tr>
                         <td>{{forloop.counter}}.</td>
                         <td>{{mentor.name}}</td>

fahari/utils/excel_utils/drf_serializer_excel_io.py

@@ -166,7 +166,7 @@ def get_template(self, *args, **kwargs) -> T:
                 self.get_fields(), self.get_nested_entries_delimiter()
             )
 
-        return template_class(*args, **kwargs)  # type: ignore
+        return template_class(*args, **kwargs)
 
     def get_template_class(self) -> Type[T]:
         """Return a class to use for the template. Defaults to using `self.template_class`."""