Restructure forms to separate contact and app forms

README.md

@@ -40,13 +40,18 @@ This tool expects a project to be sctructured as follows:
 			rules.nools.js
 			schedules.json
 		forms/
-			contact-person-create.xlsx
+			app/
+				my_project_form.xlsx
+				my_project_form.properties.json
+				my_project_form/
+					xml
+					…
+			contact/
+				person-create.xlsx
+				person-create/
+					xml
+					…
 			…
-			my_project_form.xlsx
-			my_project_form.properties.json
-			my_project_form/
-				xml
-				…
 			…
 		translations/
 			messages-xx.properties
@@ -81,7 +86,6 @@ This tool expects a project to be sctructured as follows:
 
 # TODO
 
-* split app/ and contact/ forms into separate directories
 * apply all necessary transforms to contact forms
 * only upload things which have changed (this could be a separate mode - e.g. `update` vs `configure`)
 * require manual confirmation of upload if url is *.app.medicmobile.org and either git is not available, or the working directory is dirty or has new files

bin/medic-conf

@@ -25,7 +25,8 @@ if(args.length === 2) {
     'convert-forms',
     'backup-forms',
     'delete-forms',
-    'upload-forms',
+    'upload-app-forms',
+    'upload-contact-forms',
     'upload-resources',
     'upload-custom-translations',
   ];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "medic-configurer-beta",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "description": "Configure Medic Mobile deployments",
   "main": "index.js",
   "scripts": {

src/cli/supported-actions.js

@@ -5,8 +5,9 @@ module.exports = [
   'compress-images',
   'convert-forms',
   'delete-forms',
+  'upload-app-forms',
   'upload-app-settings',
-  'upload-forms',
+  'upload-contact-forms',
   'upload-resources',
   'upload-custom-translations',
 ];

src/fn/upload-app-forms.js

@@ -0,0 +1,3 @@
+const uploadForms = require('../lib/upload-forms');
+
+module.exports = (project, couchUrl) => uploadForms(project, couchUrl, 'app');

src/fn/upload-contact-forms.js

@@ -0,0 +1,5 @@
+const uploadForms = require('../lib/upload-forms');
+
+module.exports = (project, couchUrl) => uploadForms(project, couchUrl, 'contact', {
+  id_prefix: 'contact:',
+});

src/fn/upload-forms.js → src/lib/upload-forms.js

@@ -7,16 +7,18 @@ const PouchDB = require('pouchdb');
 const attachmentsFromDir = require('../lib/attachments-from-dir');
 const insertOrReplace = require('../lib/insert-or-replace');
 
-module.exports = (project, couchUrl) => {
+module.exports = (project, couchUrl, subDirectory, options) => {
   const db = new PouchDB(couchUrl);
 
-  const formsDir = `${project}/forms`;
+  if(!options) options = {};
+
+  const formsDir = `${project}/forms/${subDirectory}`;
   return Promise.all(fs.readdir(formsDir)
     .filter(name => name.endsWith('.xlsx'))
     .map(xls => {
       const baseFileName = fs.withoutExtension(xls);
       const formDir = `${formsDir}/${baseFileName}`;
-      const expectedId = baseFileName.replace(/-/g, ':');
+      const expectedId = (options.id_prefix || '') + baseFileName.replace(/-/g, ':');
 
       if(!fs.exists(formDir)) {
         warn(`No form directory found corresponding to XML ${formDir}`);