Skip to content

Merge v2.49-rc into master #3890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janorivera merged 9 commits into from
Feb 12, 2026
Merged

Merge v2.49-rc into master #3890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ad9942c
fix (#3882)
janorivera Feb 10, 2026
e873caa
zmvawie
Humairaa127 Feb 10, 2026
9a2aca0
Update PerpetratorForm.json
Humairaa127 Feb 11, 2026
5232eee
Update ReferralForm.json
Humairaa127 Feb 11, 2026
778815a
Update PerpetratorForm.json
Humairaa127 Feb 11, 2026
6f6988e
Update ReferralForm.json
Humairaa127 Feb 11, 2026
cd53a4a
Update IssueCategorizationTab.json
Humairaa127 Feb 11, 2026
08adf2b
Merge pull request #3886 from techmatters/zmvawie
Humairaa127 Feb 11, 2026
d7f6c89
fixes (#3889)
janorivera Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...s/packages/hrm-form-definitions/form-definitions/usvc/v1/insights/oneToOneConfigSpec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
},
{
"name": "preferredLanguage",
"insights": ["conversations", "initiated_by"]
"insights": ["conversations", "conversation_attribute_6"]
}
],
"childInformation": [
{
"name": "user",
"insights": ["customers", "customer_email"]
"insights": ["conversations", "conversation_attribute_7"]
},
{
"name": "frequencyOfAccess",
Expand Down
6 changes: 0 additions & 6 deletions lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/CallTypeButtons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@
"type": "button",
"category": "non-data"
},
{
"name": "VAWIE",
"label": "VAWIE",
"type": "button",
"category": "non-data"
},
{
"name": "blank",
"label": "Blank",
Expand Down
54 changes: 51 additions & 3 deletions lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/IncidentForm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"isPII": false
},
{
"name": "Witnesses",
"name": "witnesses",
"label": "Who was the incident witnessed by?",
"type": "input",
"isPII": true
Expand All @@ -111,6 +111,54 @@
"type": "checkbox",
"isPII": false
},
{
"name": "electoralActor",
"label": "Electoral Actor",
"type": "select",
"options": [
{
"label": "Voter/Individual",
"value": "Voter/Individual"
},
{
"label": "Candidate/Aspiring candidate",
"value": "Candidate/Aspiring candidate"
},
{
"label": "Party activist/Member",
"value": "Party activist/Member"
},
{
"label": "Party agent/Pollwatcher",
"value": "Party agent/Pollwatcher"
},
{
"label": "Nonpartisan election observer",
"value": "Nonpartisan election observer"
},
{
"label": "CSO Rep",
"value": "CSO Rep"
},
{
"label": "Security Agent",
"value": "Security Agent"
},
{
"label": "Media",
"value": "Media"
},
{
"label": "Family/Community",
"value": "Family/Community"
},
{
"label": "Election worker/official",
"value": "Election worker/official"
}
],
"isPII": false
},
{
"name": "locationElectionIncident",
"label": "Location of the incident in Relation to Politics/Elections",
Expand Down Expand Up @@ -174,11 +222,11 @@
"isPII": true
},
{
"name": "VAWIENote",
"name": "vawieNote",
"label": "VAWIE Notes",
"type": "textarea",
"rows": 25,
"width": 300,
"isPII": false
}
]
]
23 changes: 16 additions & 7 deletions lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/PerpetratorForm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,26 +1017,26 @@
"options": [
{
"value": "Unknown",
"label": ""
"label": "Unknown"
},
{
"value": "partyMember",
"value": "Party Member",
"label": "Party Member"
},
{
"value": "supporter",
"value": "Supporter",
"label": "Supporter"
},
{
"value": "candidate",
"value": "Candidate",
"label": "Candidate"
},
{
"value": "pollingAgent",
"value": "Polling Agent",
"label": "Polling Agent"
},
{
"value": "other",
"value": "Other",
"label": "Others"
}
],
Expand Down Expand Up @@ -1091,5 +1091,14 @@
"label": "Ethnicity",
"type": "input",
"isPII": true
},
{
"name": "vawieComments",
"label": "VAWIE Notes",
"type": "textarea",
"placeholder": "",
"rows": 10,
"width": 100,
"isPII": false
}
]
]
12 changes: 8 additions & 4 deletions lambdas/packages/hrm-form-definitions/form-definitions/zm/v1/caseForms/ReferralForm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
{
"name": "referredTo",
"label": "Referred To",
"type": "select",
"type": "listbox-multiselect",
"options": [
{
"value": "",
"label": ""
"value": "Unknown",
"label": "Unknown"
},
{
"value": "OSC",
Expand Down Expand Up @@ -57,6 +57,10 @@
"value": "Chief/Head man",
"label": "Chief/Head man"
},
{
"value": "Legal aid",
"label": "Legal Aid"
},
{
"value": "Head teacher",
"label": "Head teacher"
Expand Down Expand Up @@ -88,4 +92,4 @@
"width": 300,
"isPII": true
}
]
]
94 changes: 12 additions & 82 deletions ...kages/hrm-form-definitions/form-definitions/zm/v1/tabbedForms/IssueCategorizationTab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@
{
"label": "Online Addiction"
},
{
"label": "VAWIE"
},
{
"label": "Other Online Harm"
}
Expand Down Expand Up @@ -147,9 +144,6 @@
{
"label": "Physical violence"
},
{
"label": "Political related GBV"
},
{
"label": "Sexual violence"
},
Expand Down Expand Up @@ -462,51 +456,22 @@
"color": "#47BA5E",
"subcategories": [
{
"label": "Violence Experienced During Election"
},
{
"label": "VAWIE Confirmed GBV component"
},
{
"label": "VAWIE Possible GBV component"
},
{
"label": "Unspecified/Other"
}
]
},
"VAWIE Electoral Actor": {
"color": "#472A5E",
"subcategories": [
{
"label": "Voter/Individual"
},
{
"label": "Candidate/Aspiring candidate"
},
{
"label": "Party activist/Member"
},
{
"label": "Party agent/Pollwatcher"
},
{
"label": "Nonpartisan election observer"
"label": "Physical"
},
{
"label": "CSO Rep"
"label": "Sexual"
},
{
"label": "Security Agent"
"label": "Psychological/Emotional"
},
{
"label": "Media"
"label": "Threats and Coercion"
},
{
"label": "Family/Community"
"label": "Economic"
},
{
"label": "Election worker/official"
"label": "Information seeking about VAWIE services"
},
{
"label": "Unspecified/Other"
Expand Down Expand Up @@ -616,9 +581,6 @@
{
"label": "Hacking"
},
{
"label": "VAWIE"
},
{
"label": "Online Addiction"
},
Expand Down Expand Up @@ -723,9 +685,6 @@
{
"label": "Physical violence"
},
{
"label": "Political related GBV"
},
{
"label": "Sexual violence"
},
Expand Down Expand Up @@ -919,51 +878,22 @@
"color": "#47BA5E",
"subcategories": [
{
"label": "Violence Experienced During Election"
},
{
"label": "VAWIE Confirmed GBV component"
},
{
"label": "VAWIE Possible GBV component"
},
{
"label": "Unspecified/Other"
}
]
},
"VAWIE Electoral Actor": {
"color": "#472A5E",
"subcategories": [
{
"label": "Voter/Individual"
},
{
"label": "Candidate/Aspiring candidate"
},
{
"label": "Party activist/Member"
},
{
"label": "Party agent/Pollwatcher"
},
{
"label": "Nonpartisan election observer"
"label": "Physical"
},
{
"label": "CSO Rep"
"label": "Sexual"
},
{
"label": "Security Agent"
"label": "Psychological/Emotional"
},
{
"label": "Media"
"label": "Threats and Coercion"
},
{
"label": "Family/Community"
"label": "Economic"
},
{
"label": "Election worker/official"
"label": "Information seeking about VAWIE services"
},
{
"label": "Unspecified/Other"
Expand Down
Loading