Merge pull request #2993 from unicef/develop

staging

Author: robertavram

src/etools/applications/audit/views.py

@@ -518,29 +518,28 @@ def perform_create(self, serializer, **kwargs):
     def perform_update(self, serializer):
         self.check_serializer_permissions(serializer, edit=True)
 
-        hidden_staff = AuditorStaffMember.objects.filter(
-            user__email=getattr(serializer.validated_data['user'], 'email', ''),
-            hidden=True,
-        ).first()
-        if hidden_staff:
-            if hidden_staff.auditor_firm != self.get_parent_object():
-                raise ValidationError(f'User already associated with {hidden_staff.auditor_firm}')
-            else:
-                hidden_staff.hidden = False
-                timestamp = str(now())
-                hidden_staff.history.append(
-                    f'requestor:{self.request.user.username},hidden:{hidden_staff.hidden},timestamp:{timestamp}'
-                )
-                hidden_staff.save()
-                deactivated_user = hidden_staff.user
-                deactivated_user.is_active = True
-                deactivated_user.save()
-                deleted_profile = hidden_staff.user.profile
-                deleted_profile.countries_available.add(self.request.tenant)
-                if not deleted_profile.country:
-                    deleted_profile.country = self.request.tenant
-                deleted_profile.save()
-            return
+        if 'email' in serializer.validated_data['user']:
+            hidden_staff = AuditorStaffMember.objects.filter(
+                user__email=serializer.validated_data['user']['email'], hidden=True).first()
+            if hidden_staff:
+                if hidden_staff.auditor_firm != self.get_parent_object():
+                    raise ValidationError(f'User already associated with {hidden_staff.auditor_firm}')
+                else:
+                    hidden_staff.hidden = False
+                    timestamp = str(now())
+                    hidden_staff.history.append(
+                        f'requestor:{self.request.user.username},hidden:{hidden_staff.hidden},timestamp:{timestamp}'
+                    )
+                    hidden_staff.save()
+                    deactivated_user = hidden_staff.user
+                    deactivated_user.is_active = True
+                    deactivated_user.save()
+                    deleted_profile = hidden_staff.user.profile
+                    deleted_profile.countries_available.add(self.request.tenant)
+                    if not deleted_profile.country:
+                        deleted_profile.country = self.request.tenant
+                    deleted_profile.save()
+                return
 
         super().perform_update(serializer)
         instance = serializer.save(auditor_firm=self.get_parent_object())

src/etools/applications/core/data/field_monitoring_questions.json

@@ -639,7 +639,7 @@
     "choices_size": null,
     "level": "partner",
     "category": 6,
-    "text": "Proportion of interviewed partner personnel (staff, consultants, volunteers, interns, sub-contractors) in the location who have received a training on PSEA In the last 12 months that meets the minimum criteria?",
+    "text": "Proportion of partner personnel (staff, consultants, volunteers, interns, sub-contractors) in the location who have received a training on PSEA In the last 12 months that meets the minimum criteria?",
     "is_hact": false,
     "is_custom": false,
     "is_active": true,
@@ -658,7 +658,7 @@
     "choices_size": null,
     "level": "partner",
     "category": 6,
-    "text": "Proportion of interviewed beneficiaries in the programme location that can explain at least one channel to report SEA (such as SMS, phone hotline, email, feedback box, PSEA focal point from partner organization)",
+    "text": "Proportion of beneficiaries in the programme location that can explain at least one channel to report SEA (such as SMS, phone hotline, email, feedback box, PSEA focal point from partner organization)",
     "is_hact": false,
     "is_custom": false,
     "is_active": true,
@@ -1493,7 +1493,7 @@
   "pk": 1092,
   "fields": {
     "question": 1035,
-    "label": "None of interviewed beneficiaries are aware",
+    "label": "None of the beneficiaries are aware",
     "value": "1"
   }
 },
@@ -1502,7 +1502,7 @@
   "pk": 1093,
   "fields": {
     "question": 1035,
-    "label": "1-25% of interviewed beneficiaries are aware",
+    "label": "1-25% of beneficiaries are aware",
     "value": "2"
   }
 },
@@ -1511,7 +1511,7 @@
   "pk": 1094,
   "fields": {
     "question": 1035,
-    "label": "26-50% of interviewed beneficiaries are aware",
+    "label": "26-50% of beneficiaries are aware",
     "value": "3"
   }
 },
@@ -1520,7 +1520,7 @@
   "pk": 1095,
   "fields": {
     "question": 1035,
-    "label": "51%-75% of interviewed beneficiaries are aware",
+    "label": "51%-75% of beneficiaries are aware",
     "value": "4"
   }
 },
@@ -1529,7 +1529,7 @@
   "pk": 1096,
   "fields": {
     "question": 1035,
-    "label": "76%-100% of interviewed beneficiaries are aware",
+    "label": "76%-100% of beneficiaries are aware",
     "value": "5"
   }
 }

src/etools/applications/core/data/field_monitoring_questiontemplate.json

@@ -0,0 +1,26 @@
+[
+{
+  "model": "field_monitoring_planning.questiontemplate",
+  "pk": 1034,
+  "fields": {
+    "partner": null,
+    "cp_output": null,
+    "intervention": null,
+    "question": 1034,
+    "is_active": true,
+    "specific_details": "Minimum criteria for PSEA training include the following :1) a definition of SEA (that is aligned with the UN's definition); 2) explanation on prohibition of SEA; and 3) actions that personnel are required to take (i.e. prompt reporting of allegations and X- partner staff X- partner staff Scale -5 None 1-25% have received training. 26%-50% have received training. 51-75% have received training. 76-100% have received training. Corresponds to indicator in Output 2.3, Results Monitoring Framework referral of victims)."
+  }
+},
+{
+  "model": "field_monitoring_planning.questiontemplate",
+  "pk": 1035,
+  "fields": {
+    "partner": null,
+    "cp_output": null,
+    "intervention": null,
+    "question": 1035,
+    "is_active": true,
+    "specific_details": "Necessary elements include: 1. Available in the local language; 2. Adapted for different levels of literacy; 3. Contact information is clear (SMS, email or phone number); 4. Design is child-sensitive."
+  }
+}
+]