Merge pull request #40 from hopetambala/master

Merge
hopetambala · Nov 11, 2020 · dfa3bfd · dfa3bfd
2 parents a638d16 + 8ce1055
commit dfa3bfd
Show file tree

Hide file tree

Showing 11 changed files with 134 additions and 87 deletions.
diff --git a/.versionrc.js b/.versionrc.js
@@ -15,5 +15,17 @@ module.exports = {
       filename: 'app.json',
       updater: require.resolve('standard-version-expo/ios'),
     }
-  ]
+  ],
+  types: [
+    { type: 'chore', section: 'Chores' },
+    { type: 'ci', section: 'Pipeline Changes' },
+    { type: 'docs', section: 'Documentation Changes' },
+    { type: 'feat', section: 'New Features' },
+    { type: 'fix', section: 'Bug fixes' },
+    { type: 'perf', hidden: true },
+    { type: 'refactor', section: 'Code Refactors' },
+    { type: 'release', hidden: true },
+    { type: 'style', hidden: true },
+    { type: 'test', hidden: true },
+  ],
 };
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,43 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [8.4.0](https://github.com/hopetambala/puente-reactnative-collect/compare/v8.3.4...v8.4.0) (2020-11-10)
+
+
+### Bug fixes
+
+* add missing identification form fields and their translations ([a986b15](https://github.com/hopetambala/puente-reactnative-collect/commit/a986b15a8e09259abf08edbc54d86e707a2a1e4b))
+
+
+### Chores
+
+* add in all required fields for ID ([6e65760](https://github.com/hopetambala/puente-reactnative-collect/commit/6e657604ab8e45ae0449fdec10a375cb9f9e70a5))
+* linting error with map() ([31ac1fa](https://github.com/hopetambala/puente-reactnative-collect/commit/31ac1fab7aeb36a0a0d6f92fae0ed4f3a69acf8c))
+* update changelog generation ([ff9eada](https://github.com/hopetambala/puente-reactnative-collect/commit/ff9eadadfc78d81034894782f6a8a54c71d6e528))
+
+
+### Code Refactors
+
+* linting ([ecce1fb](https://github.com/hopetambala/puente-reactnative-collect/commit/ecce1fbb4dc96004f4f3b622cfd256c657415299))
+
+### [8.3.4](https://github.com/hopetambala/puente-reactnative-collect/compare/v8.3.3...v8.3.4) (2020-11-09)
+
+
+### Bug fixes
+
+* stuff ([295998b](https://github.com/hopetambala/puente-reactnative-collect/commit/295998b3fe16ec42650f06074593db808151d91f))
+
+
+### Documentation changes
+
+* add ability to have better messages ([25d1d1e](https://github.com/hopetambala/puente-reactnative-collect/commit/25d1d1e3e5fa1eb5218ed51c9218bb8dab62438d))
+
+
+### Other chores
+
+* **release:** 8.3.3 ([58f73e7](https://github.com/hopetambala/puente-reactnative-collect/commit/58f73e71a2da77991516e632f31a08282a487cec))
+* readme ([d6b99c3](https://github.com/hopetambala/puente-reactnative-collect/commit/d6b99c3c66c708c6d8ceae0f225ea3ed405ee06c))
+
 ### [8.3.2](https://github.com/hopetambala/puente-reactnative-collect/compare/v8.3.1...v8.3.2) (2020-11-08)
 
 

diff --git a/app.json b/app.json
@@ -7,7 +7,7 @@
       "android",
       "web"
     ],
-    "version": "8.3.2",
+    "version": "8.4.0",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "myapp",
@@ -23,14 +23,14 @@
     ],
     "ios": {
       "supportsTablet": true,
-      "buildNumber": "8.3.2",
+      "buildNumber": "8.4.0",
       "bundleIdentifier": "io.ionic.starter1270348"
     },
     "web": {
       "favicon": "./assets/images/favicon.png"
     },
     "android": {
-      "versionCode": 380080302,
+      "versionCode": 380080400,
       "package": "io.ionic.starter1270348",
       "softwareKeyboardLayoutMode": "pan"
     },

diff --git a/components/FormikFields/PaperInputPicker/AutoFill/index.js b/components/FormikFields/PaperInputPicker/AutoFill/index.js
@@ -79,10 +79,12 @@ export default class AutoFill extends Component {
           }}
           renderItem={({ item }) => (
             // you can change the view you want to show in suggestion from here
-            <TouchableOpacity onPress={() => {
-              this.setState({ query: item });
-              formikProps.setFieldValue(formikKey, item);
-            }}
+            <TouchableOpacity
+              key={`${item}`}
+              onPress={() => {
+                this.setState({ query: item });
+                formikProps.setFieldValue(formikKey, item);
+              }}
             >
               <Text style={styles.itemText} key={item}>
                 {item}
@@ -104,19 +106,20 @@ export default class AutoFill extends Component {
 
 const styles = StyleSheet.create({
   container: {
-    backgroundColor: '#F5FCFF',
+    // backgroundColor: '#F5FCFF',
     flex: 1,
     padding: 16,
-    marginTop: 40,
+    // marginTop: 40,
     marginBottom: 40,
   },
   autocompleteContainer: {
     backgroundColor: '#ffffff',
-    borderWidth: 0,
+    borderWidth: 0
   },
   descriptionContainer: {
     flex: 1,
     justifyContent: 'center',
+    borderRadius: 20
   },
   itemText: {
     fontSize: 15,

diff --git a/components/FormikFields/YupValidation/index.js b/components/FormikFields/YupValidation/index.js
@@ -3,7 +3,7 @@ import I18n from '../../../modules/i18n';
 
 export default function yupValidationPicker(fields) {
   let validationSchema = yup.object().shape({});
-  fields.map((result) => {
+  fields.forEach((result) => {
     const {
       label, formikKey, fieldType, validation, options
     } = result;
@@ -20,7 +20,7 @@ export default function yupValidationPicker(fields) {
         const resultObjectGeo = yup.object().shape(resultSchemaGeo);
         validationSchema = validationSchema.concat(resultObjectGeo);
       } else if (fieldType === 'multiInputRow' || fieldType === 'multiInputRowNum') {
-        options.map((option) => {
+        options.forEach((option) => {
           const resultSchemaMultiInput = {};
           resultSchemaMultiInput[option.value] = yup.string().label(option.value).required();
           const resultObjectMultiInput = yup.object().shape(resultSchemaMultiInput);

diff --git a/domains/DataCollection/Forms/IdentificationForm/config/config.js b/domains/DataCollection/Forms/IdentificationForm/config/config.js
@@ -23,7 +23,7 @@ const configArray = [
     formikKey: 'nickname',
     value: '',
     fieldType: 'input',
-    validation: true
+    validation: false
   },
   {
     label: 'identificationForm.dob.label',
@@ -44,7 +44,7 @@ const configArray = [
         value: 'Year'
       }
     ],
-    validation: true
+    validation: false
   },
   {
     label: 'identificationForm.sex.label',
@@ -72,7 +72,7 @@ const configArray = [
     formikKey: 'telephoneNumber',
     value: '',
     fieldType: 'numberInput',
-    validation: true
+    validation: false
   },
   // {
   //   label: 'Demographic Information',
@@ -110,7 +110,7 @@ const configArray = [
     formikKey: 'occupation',
     value: '',
     fieldType: 'input',
-    validation: true
+    validation: false
   },
   {
     label: 'identificationForm.educationLevel.label',
@@ -149,29 +149,31 @@ const configArray = [
     label: 'identificationForm.location',
     fieldType: 'header',
     formikKey: 'none_location',
-    validation: true
+    validation: false
   },
   {
     label: 'global.commName',
     formikKey: 'communityname',
     value: '',
     fieldType: 'autofill',
     parameter: 'Communities',
-    validation: true
+    validation: false
   },
   {
     label: 'global.city',
     formikKey: 'city',
     value: '',
     fieldType: 'autofill',
     parameter: 'City',
+    validation: false
+  },
+  {
+    label: 'identificationForm.province',
+    formikKey: 'province',
+    value: '',
+    fieldType: 'input',
     validation: true
   },
-  // {
-  //   label: "Province",
-  //   formikKey: 'province',
-  //   value: ""
-  // },
   {
     label: 'identificationForm.insurance',
     fieldType: 'header',
@@ -182,50 +184,39 @@ const configArray = [
     formikKey: 'insuranceNumber',
     value: '',
     fieldType: 'numberInput',
-    validation: true
+    validation: false
   },
   {
     label: 'identificationForm.insProvider',
     formikKey: 'insuranceProvider',
     value: '',
     fieldType: 'input',
-    validation: true
+    validation: false
   },
   {
     label: 'identificationForm.clinicProvider',
     formikKey: 'clinicProvider',
     value: '',
     fieldType: 'input',
-    validation: true
+    validation: false
+  },
+  {
+    label: 'identificationForm.cedulaNumber',
+    formikKey: 'cedulaNumber',
+    value: '',
+    fieldType: 'input',
+    validation: false
   },
-  // {
-  //   label: "Cedula Number",
-  //   formikKey: 'cedulaNumber',
-  //   value: ""
-  // },
   {
     label: 'identificationForm.location',
     formikKey: 'location',
     value: {},
     fieldType: 'geolocation',
-    validation: true
+    validation: false
   },
-  // {
-  //   label: 'Latitude',
-  //   formikKey: 'latitude',
-  //   value: 0,
-  //   fieldType: 'geolocation'
-  // },
-  // {
-  //   label: 'Longitude',
-  //   formikKey: 'longitude',
-  //   value: 0,
-  //   fieldType: 'geolocation'
-  // },
   {
     label: 'identificationForm.household',
     fieldType: 'header',
-    formikKey: 'none_household'
   },
   {
     label: 'identificationForm.household',