Update with master

.gitignore

@@ -1,12 +1,13 @@
-bulk-import.py
 .DS_Store
 Thumbs.db
-/assembler
-# /fsh-generated
-/input-cache
-/node_modules
-/output
-/temp
-/template
-/.vscode
+bulk-import.py
+assembler/
+fsh-generated/fsh-index.*
+fsh-generated/includes/
+input-cache/
+node_modules/
+output/
+temp/
+template/
+.vscode/
 fhir.schema.json

bulk-import-ci.py

@@ -34,6 +34,17 @@
 
 HEADERS = {"Content-Type": "application/json"}
 
+# Print out more information if an error occurred
+def printErrorAdditionalDetails(e):
+    print(f"{ERROR_RED}*** Additional error details: ***{END_C}")
+    if e.response is not None:
+        print(f"{ERROR_RED}Status Code: {e.response.status_code}{END_C}")
+        print(f"{ERROR_RED}Reason: {e.response.reason}{END_C}")
+        print(f"{ERROR_RED}Response Text: {e.response.text}{END_C}")
+    else:
+        print(f"{ERROR_RED}No additional error information available.{END_C}")
+    print()
+
 # Get questionnaire resources from a defined output directory
 def getQuestionnairesFromLocalIg():
     questionnaires = {}
@@ -99,10 +110,13 @@ def updateRootAndSubquestionnaires(questionnaires, implementationGuide):
                 print(
                     f"{ERROR_RED}ERROR: Fail to find {reference} in local files, questionnaire not updated in server. {END_C}"
                 )
+                printErrorAdditionalDetails(e)
             except requests.exceptions.HTTPError as e:
                 print(f"{ERROR_RED}ERROR: HTTP ERROR THROWN:{END_C}", e, '\n')
+                printErrorAdditionalDetails(e)
             except Exception as e:
                 print(f"{ERROR_RED}ERROR: An error occurred, details:{END_C}", e, '\n')
+                printErrorAdditionalDetails(e)
 
 
 
@@ -126,7 +140,6 @@ def assembleQuestionnaire(questionnaires):
                 f"{OK_GREEN}POST request Questionnaire/$assemble successful at {formsServerEndpoint}: {response.status_code} OK{END_C}"
             )
             assembleOutputParams = response.json()
-            print(assembleOutputParams)
 
             # Return bare questionnaire
             if assembleOutputParams["resourceType"] == "Questionnaire":
@@ -143,6 +156,7 @@ def assembleQuestionnaire(questionnaires):
                     f"{ERROR_RED}ERROR: Unable to retrieve assembled questionnaire from output parameters{END_C}",
                     e, '\n'
                 )
+                printErrorAdditionalDetails(e)
 
         else:
             print(
@@ -151,8 +165,10 @@ def assembleQuestionnaire(questionnaires):
 
     except requests.exceptions.HTTPError as e:
         print(f"{ERROR_RED}ERROR: HTTP ERROR THROWN:{END_C}",e, '\n')
+        printErrorAdditionalDetails(e)
     except Exception as e:
         print(f"{ERROR_RED}ERROR: An error occurred, details:", e, '\n')
+        printErrorAdditionalDetails(e)
 
     return None
 
@@ -183,8 +199,10 @@ def updateAssembledQuestionnaire(questionnaire):
 
     except requests.exceptions.HTTPError as e:
         print(f"{ERROR_RED}ERROR: HTTP ERROR THROWN:{END_C}",e, '\n')
+        printErrorAdditionalDetails(e)
     except Exception as e:
         print(f"{ERROR_RED}ERROR: An error occurred, details:", e, '\n')
+        printErrorAdditionalDetails(e)
 
 
 # Main function

fsh-generated/resources/CodeSystem-HealthChecksSCTSupplement.json

@@ -0,0 +1,58 @@
+{
+  "resourceType": "CodeSystem",
+  "status": "draft",
+  "content": "supplement",
+  "name": "HealthChecksSCTSupplement",
+  "id": "HealthChecksSCTSupplement",
+  "title": "SNOMED CT Supplement for Aboriginal and Torres Strait Islander Health Check",
+  "description": "The SNOMED CT Supplement for Aboriginal and Torres Strait Islander Health Check code system supplement defines consumer friendly terms for use in the health check Questionnaire.",
+  "url": "https://smartforms.csiro.au/ig/CodeSystem/HealthChecksSCTSupplement",
+  "concept": [
+    {
+      "code": "736595007",
+      "display": "Declined"
+    },
+    {
+      "code": "171154002",
+      "display": "Not required"
+    },
+    {
+      "code": "171155001",
+      "display": "Up to date"
+    },
+    {
+      "code": "48031000119106",
+      "display": "Quit >12 months"
+    },
+    {
+      "code": "735128000",
+      "display": "Quit <12 months"
+    },
+    {
+      "code": "266919005",
+      "display": "Never smoked"
+    },
+    {
+      "code": "77176002",
+      "display": "Current smoker"
+    },
+    {
+      "code": "8517006",
+      "display": "Ex-smoker"
+    },
+    {
+      "code": "16090371000119103",
+      "display": "Exposure to second hand tobacco smoke"
+    },
+    {
+      "code": "394872000",
+      "display": "Wants to quit"
+    },
+    {
+      "code": "713914004",
+      "display": "Other tobacco use"
+    }
+  ],
+  "experimental": false,
+  "supplements": "http://snomed.info/sct|http://snomed.info/sct/32506021000036107"
+}