diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 59d594c029..42a3912d35 100644 --- 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 index d503a2b8ee..f46d1e7b3e 100644 --- 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 index 25640065ab..066ba2c778 100644 --- 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 @@ ] } ] -} \ No newline at end of file +} diff --git a/demo/src/main/assets/new-patient-registration-paginated.json.bak b/demo/src/main/assets/new-patient-registration-paginated.json.bak deleted file mode 100644 index bab5ce498e..0000000000 --- a/demo/src/main/assets/new-patient-registration-paginated.json.bak +++ /dev/null @@ -1,390 +0,0 @@ -{ - "resourceType": "Questionnaire", - "id": "client-registration-sample", - "language": "en", - "status": "active", - "date": "2020-11-18T07:24:47.111Z", - "subjectType": [ - "Patient" - ], - "extension": [ - { - "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemExtractionContext", - "valueExpression": { - "language": "application/x-fhir-query", - "expression": "Patient", - "name": "patient" - } - } - ], - "item": [ - { - "linkId": "PR", - "type": "group", - "text": "Client info", - "_text": { - "extension": [ - { - "extension": [ - { - "url": "lang", - "valueCode": "sw" - }, - { - "url": "content", - "valueString": "Maelezo ya mteja" - } - ], - "url": "http://hl7.org/fhir/StructureDefinition/translation" - } - ] - }, - "item": [ - { - "linkId": "PR-name", - "type": "group", - "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.name", - "item": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression", - "valueExpression": { - "language": "text/fhirpath", - "expression": "Patient.name.given", - "name": "patientName" - } - } - ], - "linkId": "PR-name-text", - "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.name.given", - "type": "string", - "required": true, - "text": "First Name", - "_text": { - "extension": [ - { - "extension": [ - { - "url": "lang", - "valueCode": "sw" - }, - { - "url": "content", - "valueString": "Jina la kwanza" - } - ], - "url": "http://hl7.org/fhir/StructureDefinition/translation" - } - ] - } - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression", - "valueExpression": { - "language": "text/fhirpath", - "expression": "Patient.name.family", - "name": "patientFamily" - } - } - ], - "linkId": "PR-name-family", - "definition": "http://hl7.org/fhir/StructureDefinition/datatypes#HumanName.family", - "type": "string", - "required": true, - "text": "Family Name", - "_text": { - "extension": [ - { - "extension": [ - { - "url": "lang", - "valueCode": "sw" - }, - { - "url": "content", - "valueString": "Jina la ukoo" - } - ], - "url": "http://hl7.org/fhir/StructureDefinition/translation" - } - ] - } - } - ] - }, - { - - "extension": [ - { - "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression", - "valueExpression": { - "language": "text/fhirpath", - "expression": "Patient.birthDate", - "name": "patientBirthDate" - } - } - ], - "linkId": "patient-0-birth-date", - "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.birthDate", - "type": "date", - "required": true, - "text": "Date of Birth", - "_text": { - "extension": [ - { - "extension": [ - { - "url": "lang", - "valueCode": "sw" - }, - { - "url": "content", - "valueString": "Tarehe ya kuzaliwa" - } - ], - "url": "http://hl7.org/fhir/StructureDefinition/translation" - } - ] - } - }, - { - "linkId": "patient-0-gender", - "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.gender", - "type": "choice", - "text": "Gender", - "extension": [ - { - "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression", - "valueExpression": { - "system": "http://hl7.org/fhir/administrative-gender", - "language": "text/fhirpath", - "expression": "Patient.gender", - "name": "patientGender" - } - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl", - "valueCodeableConcept": { - "coding": [ - { - "system": "http://hl7.org/fhir/questionnaire-item-control", - "code": "radio-button", - "display": "Radio Button" - } - ] - } - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-choiceOrientation", - "valueCode": "horizontal" - } - ], - "initial": [ - { - "valueCoding": { - "system": "http://hl7.org/fhir/administrative-gender", - "code": "female", - "display": "Female" - } - } - ], - "answerOption": [ - { - "valueCoding": { - "system": "http://hl7.org/fhir/administrative-gender", - "code": "female", - "display": "Female", - "designation": [ - { - "language": "sw", - "value": "Mwanamke" - }] - } - }, - { - "valueCoding": { - "system": "http://hl7.org/fhir/administrative-gender", - "code": "male", - "display": "Male", - "designation": [ - { - "language": "sw", - "value": "Mwanaume" - }] - } - } - ] - }, - { - "linkId": "PR-telecom", - "type": "group", - "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.telecom", - "item": [ - { - "linkId": "PR-telecom-system", - "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.telecom.system", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden", - "valueBoolean": true - } - ], - "type": "string", - "text": "system", - "initial": [ - { - "valueString": "phone" - } - ] - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression", - "valueExpression": { - "language": "text/fhirpath", - "expression": "Patient.telecom.value", - "name": "patientTelecom" - } - } - ], - "linkId": "PR-telecom-value", - "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.telecom.value", - "type": "string", - "required": true, - "text": "Phone Number", - "_text": { - "extension": [ - { - "extension": [ - { - "url": "lang", - "valueCode": "sw" - }, - { - "url": "content", - "valueString": "Nambari ya simu" - } - ], - "url": "http://hl7.org/fhir/StructureDefinition/translation" - } - ] - } - } - ] - }, - { - "linkId": "PR-address", - "type": "group", - "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.address", - "item": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression", - "valueExpression": { - "language": "text/fhirpath", - "expression": "Patient.address.city", - "name": "patientCity" - } - } - ], - "linkId": "PR-address-city", - "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.address.city", - "type": "string", - "required": true, - "text": "City", - "_text": { - "extension": [ - { - "extension": [ - { - "url": "lang", - "valueCode": "sw" - }, - { - "url": "content", - "valueString": "Mji" - } - ], - "url": "http://hl7.org/fhir/StructureDefinition/translation" - } - ] - } - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression", - "valueExpression": { - "language": "text/fhirpath", - "expression": "Patient.address.country", - "name": "patientCity" - } - } - ], - "linkId": "PR-address-country", - "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.address.country", - "type": "string", - "required": true, - "text": "Country", - "_text": { - "extension": [ - { - "extension": [ - { - "url": "lang", - "valueCode": "sw" - }, - { - "url": "content", - "valueString": "Nchi" - } - ], - "url": "http://hl7.org/fhir/StructureDefinition/translation" - } - ] - } - } - ] - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression", - "valueExpression": { - "language": "text/fhirpath", - "expression": "Patient.active", - "name": "patientActive" - } - } - ], - "linkId": "PR-active", - "definition": "http://hl7.org/fhir/StructureDefinition/Patient#Patient.active", - "type": "boolean", - "text": "Is Active?", - "_text": { - "extension": [ - { - "extension": [ - { - "url": "lang", - "valueCode": "sw" - }, - { - "url": "content", - "valueString": "Inatumika?" - } - ], - "url": "http://hl7.org/fhir/StructureDefinition/translation" - } - ] - } - } - ] - } - ] -} \ No newline at end of file