Merge pull request #168 from e-picsa/chore/form-update

Chore/form update
e-picsa · Jul 19, 2023 · abcda3f · abcda3f
2 parents 313f48b + 180abf4
commit abcda3f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/apps/picsa-apps/extension-app-native/android/app/build.gradle b/apps/picsa-apps/extension-app-native/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "io.picsa.extension"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3029000
-        versionName "3.29.0"
+        versionCode 3029001
+        versionName "3.29.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/apps/picsa-apps/extension-app/project.json b/apps/picsa-apps/extension-app/project.json
@@ -58,6 +58,11 @@
             "input": "apps/picsa-tools/manual-tool/src/assets",
             "output": "assets"
           },
+          {
+            "glob": "**/*",
+            "input": "apps/picsa-tools/monitoring-tool/src/assets",
+            "output": "assets"
+          },
           {
             "glob": "**/*",
             "input": "apps/picsa-tools/resources-tool/src/assets",

diff --git a/apps/picsa-tools/monitoring-tool/data/forms/ew-monitoring.form.ts b/apps/picsa-tools/monitoring-tool/data/forms/ew-monitoring.form.ts
@@ -1,12 +1,12 @@
 import { IEnketoFormDefinition } from '../../src/app/schema';
 
 const form: IEnketoFormDefinition = {
-  form: '<form autocomplete="off" novalidate="novalidate" class="or clearfix theme-grid no-text-transform" dir="ltr" data-form-id="aQCDPoHBUkgJRWQgswksoo">\n<!--This form was created by transforming an ODK/OpenRosa-flavored (X)Form using an XSL stylesheet created by Enketo LLC.--><section class="form-logo"></section><h3 dir="auto" id="form-title">PICSA Apps - Extension Worker Monitoring</h3>\n  \n  \n    <label class="question non-select "><span lang="" class="question-label active">Date</span><input type="date" name="/aQCDPoHBUkgJRWQgswksoo/date" data-type-xml="date"></label>\n    <fieldset class="question simple-select "><fieldset><legend><span lang="" class="question-label active">District</span>\n                    </legend><div class="option-wrapper"><label class=""><input type="radio" name="/aQCDPoHBUkgJRWQgswksoo/district" data-name="/aQCDPoHBUkgJRWQgswksoo/district" value="chipata" data-type-xml="string"><span lang="" class="option-label active">Chipata</span></label><label class=""><input type="radio" name="/aQCDPoHBUkgJRWQgswksoo/district" data-name="/aQCDPoHBUkgJRWQgswksoo/district" value="petauke" data-type-xml="string"><span lang="" class="option-label active">Petauke</span></label><label class=""><input type="radio" name="/aQCDPoHBUkgJRWQgswksoo/district" data-name="/aQCDPoHBUkgJRWQgswksoo/district" value="kasungu" data-type-xml="string"><span lang="" class="option-label active">Kasungu</span></label><label class=""><input type="radio" name="/aQCDPoHBUkgJRWQgswksoo/district" data-name="/aQCDPoHBUkgJRWQgswksoo/district" value="nkhotakota" data-type-xml="string"><span lang="" class="option-label active">Nkhotakota</span></label></div></fieldset></fieldset>\n    <label class="question non-select "><span lang="" class="question-label active">Location</span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/location" data-type-xml="string"></label>\n    <label class="question non-select "><span lang="" class="question-label active">Your Name</span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/name" data-type-xml="string"></label>\n    <section class="or-group-data or-appearance-w3 " name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_header"><label class="question non-select or-appearance-w1 "><span lang="" class="question-label active"><strong>Farmers Present</strong></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_header/farmers_present_header_note" data-type-xml="string" readonly></label><label class="question non-select or-appearance-w1 "><span lang="" class="question-label active"><h4>Female</h4></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_header/farmers_present_header_u35" data-type-xml="string" readonly></label><label class="question non-select or-appearance-w1 "><span lang="" class="question-label active"><h4>Male</h4></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_header/farmers_present_header_o36" data-type-xml="string" readonly></label>\n            </section><!--end of group -->\n    <section class="or-group-data or-appearance-w3 " name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_35"><label class="question non-select or-appearance-w1 "><span lang="" class="question-label active"><h5>Age 35 or under</h5></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_35/farmers_present_f_1_note" data-type-xml="string" readonly></label><label class="question non-select or-appearance-w1 or-appearance-no-label "><span lang="" class="question-label active"><span style="display:none">f-Age 35 or under</span></span><input type="number" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_35/farmers_female_35orunder" data-type-xml="int"></label><label class="question non-select or-appearance-w1 or-appearance-no-label "><span lang="" class="question-label active"><span style="display:none">m-Age 35 or under</span></span><input type="number" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_35/farmers_male_35orunder" data-type-xml="int"></label>\n            </section><!--end of group -->\n    <section class="or-group-data or-appearance-w3 " name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_36"><label class="question non-select or-appearance-w1 "><span lang="" class="question-label active"><h5>Age 36 or over</h5></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_36/farmers_present_m_1_note" data-type-xml="string" readonly></label><label class="question non-select or-appearance-w1 or-appearance-no-label "><span lang="" class="question-label active"><span style="display:none">f-Age 36 or over</span></span><input type="number" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_36/farmers_female_36orover" data-type-xml="int"></label><label class="question non-select or-appearance-w1 or-appearance-no-label "><span lang="" class="question-label active"><span style="display:none">m-Age 36 or over</span></span><input type="number" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_36/farmers_male_36orover" data-type-xml="int"></label>\n            </section><!--end of group -->\n    <label class="question non-select "><span lang="" class="question-label active">Total Farmers: <span class="or-output" data-value=" /aQCDPoHBUkgJRWQgswksoo/total_farmers "> </span></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/Total_Farmers_total_farmers" data-type-xml="string" readonly></label>\n    <label class="question non-select "><span lang="" class="question-label active">Describe what training and activities you conducted with the farmers today(Please give details)</span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/activities" data-type-xml="string"></label>\n    <label class="question non-select "><span lang="" class="question-label active">Any comments or observations(e.g exercises/activities farmers found useful? Anything you observed that you think is interesting?</span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/observations" data-type-xml="string"></label>\n    <label class="question non-select "><span lang="" class="question-label active">Did you (or anyone else) in addition to the training, share information from PICSA with others in the community(e.g extension app, using notice boards, other meetings)? if yes please give details including date, how many farmers you think may have benefited from this)</span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/share_community" data-type-xml="string"></label>\n  \n<fieldset id="or-preload-items" style="display:none;"><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/start" data-preload="timestamp" data-preload-params="start" data-type-xml="dateTime"></label><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/end" data-preload="timestamp" data-preload-params="end" data-type-xml="dateTime"></label><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/meta/instanceID" data-preload="uid" data-preload-params="" data-type-xml="string"></label></fieldset><fieldset id="or-calculated-items" style="display:none;"><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/total_farmers" data-calculate=" /aQCDPoHBUkgJRWQgswksoo/farmers_present_35/farmers_female_35orunder + /aQCDPoHBUkgJRWQgswksoo/farmers_present_35/farmers_male_35orunder + /aQCDPoHBUkgJRWQgswksoo/farmers_present_36/farmers_female_36orover + /aQCDPoHBUkgJRWQgswksoo/farmers_present_36/farmers_male_36orover " data-type-xml="string"></label><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/__version__" data-calculate="\'v6evZtYBCbVVMTbao7Wed8\'" data-type-xml="string"></label><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/formhub/uuid" data-calculate="\'6047e7f1180a493eb78272460fd38317\'" data-type-xml="string"></label></fieldset></form>',
+  form: '<form autocomplete="off" novalidate="novalidate" class="or clearfix theme-grid no-text-transform" dir="ltr" data-form-id="aQCDPoHBUkgJRWQgswksoo">\n<!--This form was created by transforming an ODK/OpenRosa-flavored (X)Form using an XSL stylesheet created by Enketo LLC.--><section class="form-logo"></section><h3 dir="auto" id="form-title">PICSA Apps - Extension Worker Monitoring</h3>\n  \n  \n    <label class="question non-select "><span lang="" class="question-label active">Date</span><input type="date" name="/aQCDPoHBUkgJRWQgswksoo/date" data-type-xml="date"></label>\n    <fieldset class="question simple-select "><fieldset><legend><span lang="" class="question-label active">District</span>\n                    </legend><div class="option-wrapper"><label class=""><input type="radio" name="/aQCDPoHBUkgJRWQgswksoo/district" data-name="/aQCDPoHBUkgJRWQgswksoo/district" value="chipata" data-type-xml="string"><span lang="" class="option-label active">Chipata</span></label><label class=""><input type="radio" name="/aQCDPoHBUkgJRWQgswksoo/district" data-name="/aQCDPoHBUkgJRWQgswksoo/district" value="petauke" data-type-xml="string"><span lang="" class="option-label active">Petauke</span></label><label class=""><input type="radio" name="/aQCDPoHBUkgJRWQgswksoo/district" data-name="/aQCDPoHBUkgJRWQgswksoo/district" value="kasungu" data-type-xml="string"><span lang="" class="option-label active">Kasungu</span></label><label class=""><input type="radio" name="/aQCDPoHBUkgJRWQgswksoo/district" data-name="/aQCDPoHBUkgJRWQgswksoo/district" value="nkhotakota" data-type-xml="string"><span lang="" class="option-label active">Nkhotakota</span></label></div></fieldset></fieldset>\n    <label class="question non-select "><span lang="" class="question-label active">Location</span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/location" data-type-xml="string"></label>\n    <label class="question non-select "><span lang="" class="question-label active">Your Name</span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/name" data-type-xml="string"></label>\n    <section class="or-group-data or-appearance-w3 " name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_header"><label class="question non-select or-appearance-w1 "><span lang="" class="question-label active"><strong>Farmers Present</strong></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_header/farmers_present_header_note" data-type-xml="string" readonly></label><label class="question non-select or-appearance-w1 "><span lang="" class="question-label active"><h4>Female</h4></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_header/farmers_present_header_u35" data-type-xml="string" readonly></label><label class="question non-select or-appearance-w1 "><span lang="" class="question-label active"><h4>Male</h4></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_header/farmers_present_header_o36" data-type-xml="string" readonly></label>\n            </section><!--end of group -->\n    <section class="or-group-data or-appearance-w3 " name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_35"><label class="question non-select or-appearance-w1 "><span lang="" class="question-label active"><h5>Age 35 or under</h5></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_35/farmers_present_f_1_note" data-type-xml="string" readonly></label><label class="question non-select or-appearance-w1 or-appearance-no-label "><span lang="" class="question-label active"><span style="display:none">f-Age 35 or under</span></span><input type="number" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_35/farmers_female_35orunder" data-type-xml="int"></label><label class="question non-select or-appearance-w1 or-appearance-no-label "><span lang="" class="question-label active"><span style="display:none">m-Age 35 or under</span></span><input type="number" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_35/farmers_male_35orunder" data-type-xml="int"></label>\n            </section><!--end of group -->\n    <section class="or-group-data or-appearance-w3 " name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_36"><label class="question non-select or-appearance-w1 "><span lang="" class="question-label active"><h5>Age 36 or over</h5></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_36/farmers_present_m_1_note" data-type-xml="string" readonly></label><label class="question non-select or-appearance-w1 or-appearance-no-label "><span lang="" class="question-label active"><span style="display:none">f-Age 36 or over</span></span><input type="number" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_36/farmers_female_36orover" data-type-xml="int"></label><label class="question non-select or-appearance-w1 or-appearance-no-label "><span lang="" class="question-label active"><span style="display:none">m-Age 36 or over</span></span><input type="number" name="/aQCDPoHBUkgJRWQgswksoo/farmers_present_36/farmers_male_36orover" data-type-xml="int"></label>\n            </section><!--end of group -->\n    <label class="question non-select "><span lang="" class="question-label active">Total Farmers: <span class="or-output" data-value=" /aQCDPoHBUkgJRWQgswksoo/total_farmers "> </span></span><input type="text" name="/aQCDPoHBUkgJRWQgswksoo/Total_Farmers_total_farmers" data-type-xml="string" readonly></label>\n    <label class="question non-select or-appearance-multiline "><span lang="" class="question-label active">Describe what training and activities you conducted with the farmers today(Please give details)</span><textarea name="/aQCDPoHBUkgJRWQgswksoo/activities" data-type-xml="string"></textarea></label>\n    <label class="question non-select or-appearance-multiline "><span lang="" class="question-label active">Any comments or observations(e.g exercises/activities farmers found useful? Anything you observed that you think is interesting?</span><textarea name="/aQCDPoHBUkgJRWQgswksoo/observations" data-type-xml="string"></textarea></label>\n    <label class="question non-select or-appearance-multiline "><span lang="" class="question-label active">Did you (or anyone else) in addition to the training, share information from PICSA with others in the community(e.g extension app, using notice boards, other meetings)? if yes please give details including date, how many farmers you think may have benefited from this)</span><textarea name="/aQCDPoHBUkgJRWQgswksoo/share_community" data-type-xml="string"></textarea></label>\n  \n<fieldset id="or-preload-items" style="display:none;"><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/start" data-preload="timestamp" data-preload-params="start" data-type-xml="dateTime"></label><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/end" data-preload="timestamp" data-preload-params="end" data-type-xml="dateTime"></label><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/meta/instanceID" data-preload="uid" data-preload-params="" data-type-xml="string"></label></fieldset><fieldset id="or-calculated-items" style="display:none;"><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/total_farmers" data-calculate=" /aQCDPoHBUkgJRWQgswksoo/farmers_present_35/farmers_female_35orunder + /aQCDPoHBUkgJRWQgswksoo/farmers_present_35/farmers_male_35orunder + /aQCDPoHBUkgJRWQgswksoo/farmers_present_36/farmers_female_36orover + /aQCDPoHBUkgJRWQgswksoo/farmers_present_36/farmers_male_36orover " data-type-xml="string"></label><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/__version__" data-calculate="\'vJvRDQC8s78HssdgGaH42M\'" data-type-xml="string"></label><label class="calculation non-select "><input type="hidden" name="/aQCDPoHBUkgJRWQgswksoo/formhub/uuid" data-calculate="\'6047e7f1180a493eb78272460fd38317\'" data-type-xml="string"></label></fieldset></form>',
   media: {},
   model:
-    '<model xmlns:odk="http://www.opendatakit.org/xforms" odk:xforms-version="1.0.0"><instance>\n        <aQCDPoHBUkgJRWQgswksoo xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms" id="aQCDPoHBUkgJRWQgswksoo" version="10 (2023-07-15 20:26:29)">\n          <formhub>\n            <uuid/>\n          </formhub>\n          <start/>\n          <end/>\n          <date/>\n          <district/>\n          <location/>\n          <name/>\n          <farmers_present_header>\n            <farmers_present_header_note/>\n            <farmers_present_header_u35/>\n            <farmers_present_header_o36/>\n          </farmers_present_header>\n          <farmers_present_35>\n            <farmers_present_f_1_note/>\n            <farmers_female_35orunder/>\n            <farmers_male_35orunder/>\n          </farmers_present_35>\n          <farmers_present_36>\n            <farmers_present_m_1_note/>\n            <farmers_female_36orover/>\n            <farmers_male_36orover/>\n          </farmers_present_36>\n          <total_farmers/>\n          <Total_Farmers_total_farmers/>\n          <activities/>\n          <observations/>\n          <share_community/>\n          <__version__/>\n          <meta>\n            <instanceID/>\n          </meta>\n        </aQCDPoHBUkgJRWQgswksoo>\n      </instance></model>',
+    '<model xmlns:odk="http://www.opendatakit.org/xforms" odk:xforms-version="1.0.0"><instance>\n        <aQCDPoHBUkgJRWQgswksoo xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms" id="aQCDPoHBUkgJRWQgswksoo" version="11 (2023-07-19 10:27:20)">\n          <formhub>\n            <uuid/>\n          </formhub>\n          <start/>\n          <end/>\n          <date/>\n          <district/>\n          <location/>\n          <name/>\n          <farmers_present_header>\n            <farmers_present_header_note/>\n            <farmers_present_header_u35/>\n            <farmers_present_header_o36/>\n          </farmers_present_header>\n          <farmers_present_35>\n            <farmers_present_f_1_note/>\n            <farmers_female_35orunder/>\n            <farmers_male_35orunder/>\n          </farmers_present_35>\n          <farmers_present_36>\n            <farmers_present_m_1_note/>\n            <farmers_female_36orover/>\n            <farmers_male_36orover/>\n          </farmers_present_36>\n          <total_farmers/>\n          <Total_Farmers_total_farmers/>\n          <activities/>\n          <observations/>\n          <share_community/>\n          <__version__/>\n          <meta>\n            <instanceID/>\n          </meta>\n        </aQCDPoHBUkgJRWQgswksoo>\n      </instance></model>',
   theme: 'grid',
-  hash: 'md5:3df1198edf03fd9417bee87faf933310--d97bac4e49bda9c52dee96737583f620---1',
+  hash: 'md5:b8315af73406aa98ceed4efe8b41bf24--d97bac4e49bda9c52dee96737583f620---1',
   languageMap: {},
   enketoId: 'PGpldp9m',
   externalData: [],

diff --git a/apps/picsa-tools/monitoring-tool/src/app/pages/home/home.component.html b/apps/picsa-tools/monitoring-tool/src/app/pages/home/home.component.html
@@ -1,9 +1,6 @@
 <div class="page-content">
   <div class="page-columns">
     <div class="content-container">
-      <picsa-alert-box type="warning">
-        These forms are for demonstration purposes only, data is not collected or stored
-      </picsa-alert-box>
       <h2>{{ 'Forms' | translate }}</h2>
       <div class="list-container">
         <monitoring-form-item *ngFor="let form of forms" [form]="form"></monitoring-form-item>

diff --git a/libs/environments/src/version.ts b/libs/environments/src/version.ts
@@ -4,5 +4,5 @@ import packageJson from '../../../package.json';
 
 export const APP_VERSION = {
   number: packageJson.version,
-  date: '2023-07-18',
+  date: '2023-07-19',
 };