Merge branch 'develop'

IFRCGo · Sep 30, 2024 · e80f99d · e80f99d
2 parents 693c16c + 43e1dfe
commit e80f99d
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## 1.1.502
 
 ### Added
+ - SituationReports default ordering
+ - Fix health data loading
+ - New user, guest user issue fix
  - TinyMCE cleanup - no selector is needed in settings
  - Align Admin page Delete button
  - Remove duplication from urls.py

diff --git a/api/admin.py b/api/admin.py
@@ -732,11 +732,13 @@ class SituationReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin):
         "name",
         "link_to_event",
         "type",
+        "created_at",
         "visibility",
     )
     country_in = "event__countries__in"
     region_in = "event__regions__in"
     autocomplete_fields = ("event",)
+    readonly_fields = ("created_at",)
 
     # WikiJS links added
     change_form_template = "admin/situationreport_change_form.html"

diff --git a/api/drf_views.py b/api/drf_views.py
@@ -776,7 +776,7 @@ class SituationReportTypeViewset(viewsets.ReadOnlyModelViewSet):
 
 
 class SituationReportViewset(ReadOnlyVisibilityViewsetMixin, viewsets.ReadOnlyModelViewSet):
-    queryset = SituationReport.objects.select_related("type")
+    queryset = SituationReport.objects.select_related("type").order_by("created_at")
     authentication_classes = (TokenAuthentication,)
     serializer_class = SituationReportSerializer
     ordering_fields = (

diff --git a/api/migrations/0214_alter_profile_limit_access_to_guest.py b/api/migrations/0214_alter_profile_limit_access_to_guest.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.15 on 2024-09-24 11:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("api", "0213_merge_20240807_1001"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="profile",
+            name="limit_access_to_guest",
+            field=models.BooleanField(
+                default=False,
+                help_text="If this value is set to true, the user is treated as a guest user regardless of any other permissions they may have, thereby depriving them of all non-guest user permissions.",
+                verbose_name="limit access to guest user permissions",
+            ),
+        ),
+    ]
diff --git a/api/models.py b/api/models.py
@@ -1859,7 +1859,7 @@ class OrgTypes(models.TextChoices):
             " they may have, thereby depriving them of all non-guest user permissions."
         ),
         verbose_name=_("limit access to guest user permissions"),
-        default=True,
+        default=False,
     )
 
     class Meta:

diff --git a/deploy/helm/ifrcgo-helm/values.yaml b/deploy/helm/ifrcgo-helm/values.yaml
@@ -185,3 +185,4 @@ sshBastion:
     arun.pub: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDE7Od5qJKcdLeAwd7ZxD5kgow1o93rAeZf1LfdzRPIu0PsInwX3Mdn/uvLUbmYQkXuUWGVS8d+9SJ94lbAGN6XuJqYxlfSumZTHNr49j4v4pk2O83N4RZ0v3GQLG/aa6gkmTgS6PEfsiazx5wu6Q3YzdrF6WOyd0r859zpBhApQhzgzQ1wult7T00TRhiUxekKm3/NEsG2RvXAcBPUnRjNdz9qDDAhk2tkIIFzLWn+f0gPWOYwDAx5IoTlzqX0HkfhS8SUe0ykSGpVUTlul2rapkiQ7DAqq96JYUxc4f5g+rIh9eQr7Jzn+mFfVvph3RtWg0/tSsa/9ynQEgwVWfFww3xYAnnDtIbCTT0wRZgmi9mNlxnLSXSKBJysmYOdW5nPevjKwv7ms7LEhoyztxNBdnhfH/9ydYpkDFWf2MvIN5eOvx1nIiTL5YC1ZHmEWPzdQ23+sOy3tge4Uh78aD+hTQ0paAUqRSij7Z6NZq6pp9AUhlR7Djt5SounqHHZaHH9wpF7Np1ImKo32iNhLufTamUYPDAgFkDnH4B9eNIB+snwpnB5UdT/WnHx0kdHGTclJZx6B01nY4JfiHUgQ1wW+GsX9T+4IH2vmO24IoxN6TtP0siDrtDbJrEOQKk4A/LFFn11f4TfpjscuFV3RIKry0/TJfTfJvVrQDzIm7RnSw== [email protected]
     thenav56.pub: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN/f/A3qkaTHSdbKn8Hv75YiJvRMEXvWTDdIiR7tyAjJ navin@nav-machine
     david.pub: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3FzrQdVh5Qwp5Y6KQGcpqHxKErxCW103iEECuutR/jBZe6X0xjD+cW7e+H8SrUsPQwj87fzOsMAc6v6n+3hdYFa6ekgRG/USEIUR5C/GD1Xjva3Xpp45PasBhJEtYt2ON+dlzwvRyOuv2hvqv2WHBO020ewIlVuQ4pU4Qj5ysvwWGj8GAv/jITiVERmjLTStbFwxeIDT3jQEbwnfV1zZZKiGxIecB/y51nk6oIQ00ZGrYEo5ieWsUSVfLHOX0/lZ0mtrdqxDEgMaCbNaUbICAimsJPamNpoirKc7FoKIKKrLQsK8qE1lClWQEecbW+dgSiwxracooKeWhHq+BkKUCNgEL/C0ff2l9e8sJcLmYZUdPtDCdtUDC8BAlELA5HR6tdCTfFcc0nXltclSSODMnZkQohh5/2fixJTwN5p5csEfBLzbdrturKtT/TbYSoaodg4muPqY4YE5jiJfrHVAGS1DVWz/cRcm1vOxT2V4iW2SNvo8fS2PZOpU5furrvbM= ifrcds\david.muchatiza@5CG41911S1
+    paola.pub: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDGql4RrbxSQTW5QrTh+P+94jGCXOCeZgc23hxL9zFCYQrzL0SMw1F53Z5SFZimIhJswYPqV2pT8L4oTRqIrTCM+looWi7b9/9u+m/KmA+FWbo3u6uRrckkA3nVIKsKHvlOucX2GxE6i+tXdeXEisW49ZpMtuvxMLJ3Eg4MK10d/2d3FKuzTsrxCTlJn8FAE3yOsVow0jdu+381IrkAqRE2GINeQ87hVlQpbo+bL2N/2QZmNjDhBBQkRJLDisW0+UNgo+S9wN7HbpV5LheSJS9wGN7LlmcqlpZFrDO/lVyoMxEQ0588wUI8BVfqAZDEBJPdGtzq513r+5iXEX/9A1Mendlvxfl6ANNRcH9PVZHkRN1dxY3rckQ+Lk3qqIjjfYFYvl5Gybidb1BM2VNWHAuzaDDQzJpeTHIbQnDt7Ke4oX2xWYgyu+kVhqz0HnAV28qMXbMEsrMIrtwl7IjcrorgdduHghZvWFbaJZNtXOfgnf1IYNXkZ9eWPS+Bz9nWMhE= ifrcds\paola.yela@5CG41911RT
diff --git a/local_units/fixtures/health-affiliation-functionality.json b/local_units/fixtures/health-affiliation-functionality.json
@@ -492,7 +492,7 @@
       "pk": 6,
       "fields": {
         "code": 6,
-        "name": "Hemopurification, hemofiltration"
+        "name": "Hemopurification Hemofiltration"
       }
     },
     {

diff --git a/local_units/management/commands/import_health_data.py b/local_units/management/commands/import_health_data.py
@@ -55,6 +55,8 @@ def numerize(value):
             facilitytype_id_map["hospitals"] = facilitytype_id_map["hospital"]
             facilitytype_id_map["pharmacies"] = facilitytype_id_map["pharmacy"]
             facilitytype_id_map["bloodcentres"] = facilitytype_id_map["bloodcenter"]
+            facilitytype_id_map["bloodcentre"] = facilitytype_id_map["bloodcenter"]
+            # facilitytype_id_map["blood"] = facilitytype_id_map["bloodcenter"]
             specializedmedicalservice_id_map["surgicalspecialties"] = specializedmedicalservice_id_map["surgicalspecialities"]
 
             primaryhcc_id_map[""] = None

diff --git a/local_units/management/commands/import_local_units_health.py b/local_units/management/commands/import_local_units_health.py
@@ -65,7 +65,7 @@ def parse_date(date):
                     except ValueError:
                         pass
                 validated = True
-                level_id = int(row["COVERAGECODE"]) + 1
+                level_id = int(row["COVERAGECODE"])  # + 1
                 local_branch_name = row["NAME_LOC"]
                 english_branch_name = row["NAME_EN"]
                 postcode = row["POSTCODE"]
@@ -89,19 +89,19 @@ def parse_date(date):
                     type_id=type,
                     # is_public=is_public,
                     validated=validated,
-                    local_branch_name=local_branch_name,
-                    english_branch_name=english_branch_name,
-                    focal_person_loc=focal_person_loc,
-                    focal_person_en=focal_person_en,
+                    local_branch_name=local_branch_name[:255],
+                    english_branch_name=english_branch_name[:255],
+                    focal_person_loc=focal_person_loc[:255],
+                    focal_person_en=focal_person_en[:255],
                     location=location,
                     postcode=postcode,
                     address_loc=address_loc,
                     address_en=address_en,
-                    city_loc=city_loc,
-                    city_en=city_en,
+                    city_loc=city_loc[:255],
+                    city_en=city_en[:255],
                     phone=phone,
-                    email=email,
-                    link=link,
+                    email=email[:255],
+                    link=link[:255],
                     source_loc=source_loc,
                     source_en=source_en,
                     date_of_data=date_of_data,