Bump pyxform-medic version to latest

* bump pyxform to pull in latest changes * update travis config to include new pyxform * update form conversion tests in line with pyxform changes
medic · Oct 18, 2018 · 5642a82 · 5642a82
1 parent bf033fa
commit 5642a82
Show file tree

Hide file tree

Showing 22 changed files with 6,539 additions and 7,290 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
       env: TZ='Etc/GMT+12'
 install:
   - "pip install --user -U pip"
-  - "pip install --user git+https://github.com/medic/pyxform.git@medic-conf-1.5#egg=pyxform-medic"
+  - "pip install --user git+https://github.com/medic/pyxform.git@medic-conf-1.17#egg=pyxform-medic"
 before_script:
   - "! grep -Fq '.only(' test/**/*.spec.js"
   - npm install
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,14 @@
 # Changelog
 
+## v1.17.10
+* Bump pyxform-medic version to latest
+* Change switch statement formatting
+* Updates package to AGPL license
+* Creates AGPL license file
+
 ## v1.17.9
-* Add support for contacts and reports for all nools workflows
+* Releasing 1.17.9
+* Add support for contacts and reports for all nools workflows (#81)
 * Replaces the CouchDB port with default API port
 * Replaces the CouchDB port with default API port
 * Add tests for scheduled_tasks-based nools task generation
@@ -606,3 +613,4 @@
 ## v1.0.0
 * Add `-beta` suffix to package name before uploading to NPM
 * Allow setting of internalId field, but include deprecation warning
+
diff --git a/README.md b/README.md
@@ -14,19 +14,19 @@ Medic Project Configurer
 ## Ubuntu
 
 	npm install -g medic-conf
-	sudo python -m pip install git+https://github.com/medic/pyxform.git@medic-conf-1.5#egg=pyxform-medic
+	sudo python -m pip install git+https://github.com/medic/pyxform.git@medic-conf-1.17#egg=pyxform-medic
 
 ## OSX
 
 	npm install -g medic-conf
-	pip install git+https://github.com/medic/pyxform.git@medic-conf-1.5#egg=pyxform-medic
+	pip install git+https://github.com/medic/pyxform.git@medic-conf-1.17#egg=pyxform-medic
 
 ## Windows
 
 As Administrator:
 
 	npm install -g medic-conf
-	python -m pip install git+https://github.com/medic/pyxform.git@medic-conf-1.5#egg=pyxform-medic --upgrade
+	python -m pip install git+https://github.com/medic/pyxform.git@medic-conf-1.17#egg=pyxform-medic --upgrade
 
 ## Bash completion
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medic-conf",
-  "version": "1.17.9",
+  "version": "1.17.10",
   "description": "Configure Medic Mobile deployments",
   "main": "index.js",
   "scripts": {

diff --git a/src/lib/convert-forms.js b/src/lib/convert-forms.js
@@ -9,11 +9,11 @@ const XLS2XFORM = 'xls2xform-medic';
 const INSTALLATION_INSTRUCTIONS = `\nE To install the latest pyxform, try one of the following:
 E
 E Ubuntu
-E	sudo python -m pip install git+https://github.com/medic/pyxform.git@medic-conf-1.5#egg=pyxform-medic
+E	sudo python -m pip install git+https://github.com/medic/pyxform.git@medic-conf-1.17#egg=pyxform-medic
 E OSX
-E	pip install git+https://github.com/medic/pyxform.git@medic-conf-1.5#egg=pyxform-medic
+E	pip install git+https://github.com/medic/pyxform.git@medic-conf-1.17#egg=pyxform-medic
 E Windows (as Administrator)
-E	python -m pip install git+https://github.com/medic/pyxform.git@medic-conf-1.5#egg=pyxform-medic --upgrade`;
+E	python -m pip install git+https://github.com/medic/pyxform.git@medic-conf-1.17#egg=pyxform-medic --upgrade`;
 const UPDATE_INSTRUCTIONS = `\nE To remove the old version of pyxform:
 E
 E	pip uninstall pyxform-medic

diff --git a/test/data/convert-app-forms/forms/app/delivery.expected.xml b/test/data/convert-app-forms/forms/app/delivery.expected.xml
diff --git a/test/data/convert-app-forms/forms/app/immunization_visit.expected.xml b/test/data/convert-app-forms/forms/app/immunization_visit.expected.xml
diff --git a/test/data/convert-app-forms/forms/app/off.expected.xml b/test/data/convert-app-forms/forms/app/off.expected.xml
@@ -41,7 +41,7 @@
             <send_note/>
             <chw_note/>
           </group_note>
-          <meta>
+          <meta tag="hidden">
             <instanceID/>
           </meta>
         </off>

diff --git a/test/data/convert-app-forms/forms/app/on.expected.xml b/test/data/convert-app-forms/forms/app/on.expected.xml
@@ -41,7 +41,7 @@
             <send_note/>
             <chw_note/>
           </group_note>
-          <meta>
+          <meta tag="hidden">
             <instanceID/>
           </meta>
         </on>

diff --git a/test/data/convert-app-forms/forms/app/postnatal_visit.expected.xml b/test/data/convert-app-forms/forms/app/postnatal_visit.expected.xml
diff --git a/test/data/convert-app-forms/forms/app/pregnancy.expected.xml b/test/data/convert-app-forms/forms/app/pregnancy.expected.xml
diff --git a/test/data/convert-app-forms/forms/app/pregnancy_visit.expected.xml b/test/data/convert-app-forms/forms/app/pregnancy_visit.expected.xml
diff --git a/test/data/convert-collect-forms/forms/collect/f.expected.xml b/test/data/convert-collect-forms/forms/collect/f.expected.xml
@@ -5,42 +5,42 @@
     <model>
       <itext>
         <translation lang="Bahasa Indonesia (Indonesian)">
+          <text id="/f/id:label">
+            <value>Pasien ID</value>
+          </text>
           <text id="/f/n:label">
             <value>Notes</value>
           </text>
           <text id="/f/review:label">
             <value>Submitting danger sign report for ID <output value=" /f/id "/>, with the following notes: <output value=" /f/n "/></value></text>
+        </translation>
+        <translation default="true()" lang="English">
           <text id="/f/id:label">
-            <value>Pasien ID</value>
+            <value>Patient ID</value>
           </text>
-        </translation>
-        <translation lang="हिन्दी (Hindi)">
           <text id="/f/n:label">
             <value>Notes</value>
           </text>
           <text id="/f/review:label">
             <value>Submitting danger sign report for ID <output value=" /f/id "/>, with the following notes: <output value=" /f/n "/></value></text>
+        </translation>
+        <translation lang="हिन्दी (Hindi)">
           <text id="/f/id:label">
             <value>मरीज का ID</value>
           </text>
-        </translation>
-        <translation default="true()" lang="English">
           <text id="/f/n:label">
             <value>Notes</value>
           </text>
           <text id="/f/review:label">
             <value>Submitting danger sign report for ID <output value=" /f/id "/>, with the following notes: <output value=" /f/n "/></value></text>
-          <text id="/f/id:label">
-            <value>Patient ID</value>
-          </text>
         </translation>
       </itext>
       <instance>
         <f delimiter="#" id="f" prefix="J1!f!" version="2017-08-12_06-44">
           <id/>
           <n/>
           <review/>
-          <meta>
+          <meta tag="hidden">
             <instanceID/>
           </meta>
         </f>

diff --git a/test/data/convert-contact-forms/forms/contact/district_hospital.expected.xml b/test/data/convert-contact-forms/forms/contact/district_hospital.expected.xml
@@ -29,7 +29,7 @@
             <name/>
           </contact>
           <contact_notes/>
-          <meta>
+          <meta tag="hidden">
             <instanceID/>
           </meta>
         </data>

diff --git a/test/data/convert-contact-forms/forms/contact/person-edit.expected.xml b/test/data/convert-contact-forms/forms/contact/person-edit.expected.xml
@@ -16,7 +16,7 @@
             <phone/>
             <alternate_phone/>
           </person>
-          <meta>
+          <meta tag="hidden">
             <instanceID/>
           </meta>
         </data>

diff --git a/test/data/convert-contact-forms/forms/contact/person.expected.xml b/test/data/convert-contact-forms/forms/contact/person.expected.xml
@@ -30,7 +30,7 @@
             <sex/>
             <geolocation/>
           </person>
-          <meta>
+          <meta tag="hidden">
             <instanceID/>
           </meta>
         </data>