Merge branch 'master' into master-release

opensrp · Sep 21, 2023 · 52ff928 · 52ff928
2 parents 283ad6e + 3baeac7
commit 52ff928
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 400 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,7 +14,7 @@ Choose one: (Bug fix | Feature | Documentation | Testing | Code health | Builds
 **Screenshots (if applicable)**
 
 **Checklist**
-- [ ] I have read and acknowledged the [Code of conduct](https://github.com/google/android-fhir/blob/master/docs/CODE_OF_CONDUCT.md).
+- [ ] I have read and acknowledged the [Code of conduct](https://github.com/google/android-fhir/blob/master/CODE_OF_CONDUCT.md).
 - [ ] I have read the [Contributing](https://github.com/google/android-fhir/wiki/Contributing) page.
 - [ ] I have signed the Google [Individual CLA](https://cla.developers.google.com/about/google-individual), or I am covered by my company's [Corporate CLA](https://cla.developers.google.com/about/google-corporate ).
 - [ ] I have discussed my proposed solution with code owners in the linked issue(s) and we have agreed upon the general approach.

diff --git a/catalog/src/main/assets/component_auto_complete.json b/catalog/src/main/assets/component_auto_complete.json
@@ -25,6 +25,26 @@
           }
         }
       ],
+      "item": [
+        {
+          "extension": [
+            {
+              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory",
+              "valueCodeableConcept": {
+                "coding": [
+                  {
+                    "system": "http://hl7.org/fhir/questionnaire-display-category",
+                    "code": "instructions"
+                  }
+                ]
+              }
+            }
+          ],
+          "linkId": "instruction",
+          "text": "Try typing Asthma, Chronic Lung Disease, Depression, Diabetes, Hypertension, High Blood Pressure, or High Cholesterol",
+          "type": "display"
+        }
+      ],
       "repeats": true,
       "linkId": "1",
       "text": "Do you have any existing conditions",
@@ -33,7 +53,8 @@
           "valueCoding": {
             "code": "asthma",
             "display": "Asthma"
-          }
+          },
+          "initialSelected": true
         },
         {
           "valueCoding": {
@@ -71,13 +92,7 @@
             "display": "High Cholesterol"
           }
         }
-      ],
-      "initial": {
-        "valueCoding": {
-          "code": "asthma",
-          "display": "Asthma"
-        }
-      }
+      ]
     }
   ]
 }
diff --git a/demo/src/main/assets/new-patient-registration-paginated.json b/demo/src/main/assets/new-patient-registration-paginated.json
@@ -206,6 +206,30 @@
                     "value": "Mwanaume"
                   }]
               }
+            },
+            {
+              "valueCoding": {
+                "system": "http://hl7.org/fhir/administrative-gender",
+                "code": "other",
+                "display": "Other",
+                "designation": [
+                  {
+                    "language": "sw",
+                    "value": "Nyingine"
+                  }]
+              }
+            },
+            {
+              "valueCoding": {
+                "system": "http://hl7.org/fhir/administrative-gender",
+                "code": "unknown",
+                "display": "Unknown",
+                "designation": [
+                  {
+                    "language": "sw",
+                    "value": "Haijulikani"
+                  }]
+              }
             }
           ]
         },
@@ -378,4 +402,4 @@
       ]
     }
   ]
-}
+}