Skip to content
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

the (Pregnancy Form Workflow) issue is complete #6

Merged
merged 7 commits into from
Apr 30, 2024
Merged

the (Pregnancy Form Workflow) issue is complete #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
01150a1
the (Pregnancy Form Workflow) issue is complete
mathewwahome Apr 17, 2024
fd5c4bc
updated the translations in the entire app
mathewwahome Apr 17, 2024
5b2e94b
Ward form undefined Issue when creating with the option create new …
mathewwahome Apr 17, 2024
daf91ca
Community Health Area form undefined issue when creating with the op…
mathewwahome Apr 17, 2024
14b6d0d
Household form undefined issue when creating with the option create …
mathewwahome Apr 17, 2024
0a161f6
Forms Update
mathewwahome Apr 17, 2024
0169ae2
Addition of the notes property and updating of the pregnancy check up…
mathewwahome Apr 17, 2024
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
Binary file removed forms/app/pregnancy.xlsx
View file
Open in desktop
Binary file not shown.
879 changes: 0 additions & 879 deletions forms/app/pregnancy.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion forms/app/pregnancy_check_up_form.properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"icon": "pregnancy",
"title": "Pregnancy registration",
"title": "Pregnancy checkup form",
"context": {
"person": true,
"place": false
Expand Down
Binary file modified forms/app/pregnancy_check_up_form.xlsx
View file
Open in desktop
Binary file not shown.
590 changes: 586 additions & 4 deletions forms/app/pregnancy_check_up_form.xml
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions forms/app/pregnancy_follow_up_form.properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"title": "Pregnancy follow up form",
"context": {
"person": true,
"place": false,
"expression": "(!contact.sex || contact.sex === 'female') && (!contact.date_of_birth || (ageInYears(contact) >= 12"
"place": false
}
}
Binary file modified forms/app/pregnancy_follow_up_form.xlsx
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions forms/app/pregnancy_follow_up_form.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms">
<h:head>
<h:title>Pregnancy registration</h:title>
<h:title>Pregnancy Follow up</h:title>
<model>
<itext>
<translation lang="en">
Expand Down Expand Up @@ -720,7 +720,7 @@
</translation>
</itext>
<instance>
<pregnancy_follow_up_form id="pregnancyfollowup" prefix="J1!pregnancyfollowup!" delimiter="#" version="2024-04-12 09:23:43">
<pregnancy_follow_up_form id="pregnancyfollowup" prefix="J1!pregnancyfollowup!" delimiter="#" version="2024-04-17 10:29:24">
<inputs>
<meta>
<location>
Expand Down Expand Up @@ -791,10 +791,10 @@
<bind nodeset="/pregnancy_follow_up_form/inputs/contact/parent/parent/contact/chp_name" type="string"/>
<bind nodeset="/pregnancy_follow_up_form/inputs/contact/parent/parent/contact/phone" type="string"/>
<bind nodeset="/pregnancy_follow_up_form/pregnacy/pregnant" type="select1"/>
<bind nodeset="/pregnancy_follow_up_form/pregnacy/yes_pregnant" type="int" jr:constraintMsg="jr:itext('/pregnancy_follow_up_form/pregnacy/yes_pregnant:jr:constraintMsg')" constraint=".&gt;=0 and .&lt;=12" relevant="selected( /pregnancy_follow_up_form/pregnacy/pregnant , 'yes')"/>
<bind nodeset="/pregnancy_follow_up_form/pregnacy/yes_pregnant" type="int" relevant="selected( /pregnancy_follow_up_form/pregnacy/pregnant , 'yes')" jr:constraintMsg="jr:itext('/pregnancy_follow_up_form/pregnacy/yes_pregnant:jr:constraintMsg')" constraint=".&gt;=0 and .&lt;=12"/>
<bind nodeset="/pregnancy_follow_up_form/pregnacy/pregnacy_dangers" type="select"/>
<bind nodeset="/pregnancy_follow_up_form/pregnacy/breastfeeding" type="select1" relevant="selected( /pregnancy_follow_up_form/pregnacy/pregnant , 'no')"/>
<bind nodeset="/pregnancy_follow_up_form/pregnacy/lms" type="int" jr:constraintMsg="jr:itext('/pregnancy_follow_up_form/pregnacy/lms:jr:constraintMsg')" constraint=".&gt;=0 and .&lt;=12" relevant="selected( /pregnancy_follow_up_form/pregnacy/pregnant , 'yes')"/>
<bind nodeset="/pregnancy_follow_up_form/pregnacy/lms" type="int" relevant="selected( /pregnancy_follow_up_form/pregnacy/pregnant , 'yes')" jr:constraintMsg="jr:itext('/pregnancy_follow_up_form/pregnacy/lms:jr:constraintMsg')" constraint=".&gt;=0 and .&lt;=12"/>
<bind nodeset="/pregnancy_follow_up_form/pregnacy/breast_milk" type="select1"/>
<bind nodeset="/pregnancy_follow_up_form/meta/instanceID" type="string" readonly="true()" calculate="concat('uuid:', uuid())"/>
</model>
Expand Down
2 changes: 1 addition & 1 deletion forms/app/pregnancy.properties.json → forms/app/pregnancy_form.properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"context": {
"person": true,
"place": false,
"expression": "(!contact.sex || contact.sex === 'female') && (!contact.date_of_birth || (ageInYears(contact) >= 12"
"expression": "(!contact.sex || contact.sex === 'female')"
}
}
Binary file added forms/app/pregnancy_form.xlsx
View file
Open in desktop
Binary file not shown.
Loading