Merge develop into main (#26)

* Retrieve condition (#2) * Create retrieve-condition.md * Update sushi-config.yaml * Update retrieve-condition.md * Add files via upload * Update retrieve-condition.md * Delete input/images/retrieve.drawio.png * Add files via upload * Delete input/images/retrieve.drawio.png * Add files via upload * Update retrieve-condition.md * Delete input/images/retrieve.drawio.png * Add files via upload * Update retrieve-condition.md * Update retrieve-condition.md * Delete input/images/retrievecondition.drawio.png * Add files via upload * Update retrieve-condition.md * Delete input/images/retrievecondition.drawio.png * Add files via upload * Update retrieve-condition.md * Feature/add condition (#1) * Updated fsh, updated add guidance * Download fonts in pipeline * removed duplicate instance definitions from fsh * fix example link * fix some validation errors * fix jekll plantuml install * Generate query output in pipeline, change use case structure * Add server examples and data model. * Fix filename of query output in pipeline * Serpate load and query in pipeline. * fix alert icons * Added guidance how to access swagger in docker instance of HAPI server. * change initial interaction to be more generic, i.e. not just condition. * link to server examples * changed cardinatlity as per comments from Marcus, include (same) contained provenance in all RA record resources. --------- Co-authored-by: Declan Kieran <[email protected]> * fix sushi yaml merge conflict * script the generation of the examples/queries * explicit ordering in id and naming conventions * fix sushi yaml merge conflict (#3) Co-authored-by: Declan Kieran <[email protected]> * tidy up naming convention * Add a chained GET query for example 0002 * move creation of resources folder from pipeline to script * Feature/automate examples (#4) * fix sushi yaml merge conflict * script the generation of the examples/queries * explicit ordering in id and naming conventions * tidy up naming convention * Add a chained GET query for example 0002 * move creation of resources folder from pipeline to script --------- Co-authored-by: Declan Kieran <[email protected]> * Add files via upload * Update retrieve-condition.md * Update retrieve-condition.md * Update retrieve-condition.md * Update retrieve-condition.md * fix broken page references * Feature/automate examples (#5) * fix sushi yaml merge conflict * script the generation of the examples/queries * explicit ordering in id and naming conventions * tidy up naming convention * Add a chained GET query for example 0002 * move creation of resources folder from pipeline to script * fix broken page references --------- Co-authored-by: Declan Kieran <[email protected]> * Update retrieve-condition.md * Update retrieve-condition.md * Update sushi-config.yaml * Create remove-ra-record * Update remove-ra-record * Add files via upload * Update remove-ra-record * Delete input/pagecontent/remove-ra-record * Create remove-ra-record.md * Update remove-ra-record.md * Feature/postman page (#6) * all examples in one page, added more queries * fixed links * add flag detail extension examples * do extension in different branch * update server examples --------- Co-authored-by: Declan Kieran <[email protected]> * Update retrieve-condition.md * Update retrieve-condition.md * Update remove-ra-record.md * Update remove-ra-record.md * Add files via upload * Update retrieve-condition.md * Update remove-ra-record.md * Create remove-rarecord-example.fsh * Create remove-rarecord-example.md * Update remove-rarecord-example.md * Delete input/fsh/examples/remove-rarecord-example.fsh * Create 0000-remove-rarecord-example.fsh * Update 0000-remove-rarecord-example.fsh * Update 0000-remove-rarecord-example.fsh * Update remove-ra-record.md * Update remove-rarecord-example.md * Update remove-ra-record.md * Create 0001-remove-rarecord-transaction-example.fsh * Create remove-rarecord-transaction-example.md * Update remove-ra-record.md * Delete input/images/remove-rarecord.drawio.png * Add files via upload * Feature/refactor run script (#7) * all examples in one page, added more queries * fixed links * add flag detail extension examples * do extension in different branch * update server examples * simplify run script and naming * fix run script, remove sushi step from pipeline and add to script * change naming convention to handle ID's better * fix conflicts * fix conflicts --------- Co-authored-by: Declan Kieran <[email protected]> * Update remove-ra-record.md * Update remove-ra-record.md * Update remove-ra-record.md * Update remove-ra-record.md * Update remove-ra-record.md * Update remove-ra-record.md * Delete input/queries directory * Update remove-ra-record.md * Update remove-ra-record.md * Update retrieve-ra-record.md * Update retrieve-ra-record.md * Delete input/images/remove-rarecord.drawio.png * Add files via upload * Update remove-ra-record.md * Delete input/images/Remove-RA.drawio.png * Add files via upload * Update remove-ra-record.md * Update remove-ra-record.md * Create codesystem * Create RARecord-FlagCategory-1 * Update RARecord-FlagCategory-1 * Create RARecord-FlagCode-1 * Update and rename RARecord-FlagCode-1 to RARecord-FlagCode-1.fsh * Rename RARecord-FlagCategory-1 to RARecord-FlagCategory-1.fsh * Update RARecord-FlagCode-1.fsh * Create CareConnect-ConditionCategory-1.fsh * Update CareConnect-ConditionCategory-1.fsh * Create RARecord-ConditionCode-1.fsh * Update RARecord-ConditionCode-1.fsh * Delete input/resources directory * Create RARecord-FlagCategory-1.fsh * Update RARecord-FlagCategory-1.fsh * Create CareConnect-ConditionCategory-1.fsh * Update CareConnect-ConditionCategory-1.fsh * Create RARecord-ConditionCode-1.fsh * Delete input/fsh/codesystem/RARecord-ConditionCode-1.fsh1 * Create RARecord-ConditionCode-1.fsh * Update RARecord-ConditionCode-1.fsh * Create RARecord-ConsentPurpose-1.fsh * Update RARecord-ConsentPurpose-1.fsh * Create RARecord-AdjustmentCategory-1.fsh * Update RARecord-AdjustmentCategory-1.fsh * Create RARecord-AdjustmentCategory-1.fsh * Update RARecord-AdjustmentCategory-1.fsh * Update RARecord-AdjustmentCategory-1.fsh * Create RARecord-ConsentPurpose-1.fsh * Update RARecord-ConsentPurpose-1.fsh * Update and rename CareConnect-ConditionCategory-1.fsh to ValueSet-England-ConditionCategory.fsh * Update and rename RARecord-FlagCode-1.fsh to ValueSet-England-FlagCode.fsh * Update ValueSet-England-ConditionCategory.fsh * Update and rename RARecord-FlagCategory-1.fsh to ValueSet-England-FlagCategory.fsh * Update and rename RARecord-ConsentPurpose-1.fsh to ValueSet-England-ConsentPurpose.fsh * Update and rename RARecord-ConditionCode-1.fsh to ValueSet-England-ConditionCode.fsh * Update and rename RARecord-AdjustmentCategory-1.fsh to ValueSet-England-AdjustmentCategory.fsh * Update and rename CareConnect-ConditionCategory-1.fsh to CodeSystem-England-ConditionCategory.fsh * Update and rename RARecord-AdjustmentCategory-1.fsh to CodeSystem-England-AdjustmentCategory.fsh * Update and rename RARecord-ConditionCode-1.fsh to CodeSystem-England-ConditionCode.fsh * Rename RARecord-ConsentPurpose-1.fsh to CodeSystem-England-ConsentPurpose.fsh * Rename RARecord-FlagCategory-1.fsh to CodeSystem-England-FlagCategory.fsh * fixed fsh, some naming changes * Update RA-ConditionCode.fsh * Update RA-ConditionCategory.fsh * Update RA-ConsentPurpose.fsh * Update RA-ConditionCategory.fsh * SearchParameters not being index quickly enough, add call to -all-resources-for-reindexing * Always run SearchParameters first * Feature/gh pages (#11) * publish to github pages * add separate deply job * deploy still needs artefact uploaded * only deploy on write to development * separate build and deploy into different workflows --------- Co-authored-by: Declan Kieran <[email protected]> * Feature/gh pages (#12) * publish to github pages * add separate deply job * deploy still needs artefact uploaded * only deploy on write to development * separate build and deploy into different workflows * revert to single workflow --------- Co-authored-by: Declan Kieran <[email protected]> * Delete .github/workflows/deploy.yml Wasn't removed in previous commit * Feature/structuredefinitions (#14) * add profiles, extensions etc. * add contained provenance to condition profile --------- Co-authored-by: Declan Kieran <[email protected]> * fix RA-ProxyRole codesystem, valueset, link in consent profile (#15) Co-authored-by: Declan Kieran <[email protected]> * Fix/tidy examples (#16) * fix urls in examples, qa warnings etc... * use cannonical instead of localhost for searchparameters * cleared more warnings, move aliases to one file --------- Co-authored-by: Declan Kieran <[email protected]> * Update publish.yml Make it configurable from the pipeline whether the validator runs in offline or online mode. * Update publish.yml * Feature/consent to treatment (#17) * consent to treatment guidance * install graphviz in pipeline * paragraph formatting * Update consent-to-treatment.md Plantuml activity diagram example * corrections in guidance, added to example * corrections in guidance, added to example * corrections in guidance, added to example * Delete ig-template/package/content/assets/js/.index.json * delete .index.db * update usecase assocation line --------- Co-authored-by: Declan Kieran <[email protected]> * Feature/add record updates and examples (#18) * consent to treatment guidance * install graphviz in pipeline * paragraph formatting * Update consent-to-treatment.md Plantuml activity diagram example * corrections in guidance, added to example * corrections in guidance, added to example * corrections in guidance, added to example * Delete ig-template/package/content/assets/js/.index.json * delete .index.db * patient example, split flag profile * added individual examples, updated add record guidance * diagrams and scenarios for add record * change AdjustmentNotes extension to FlagNotes * update text in examples with flag notes extension * generalise master flag to patients not just ra --------- Co-authored-by: Declan Kieran <[email protected]> * Feature/retrieve record updates and examples (#20) * generalised flag profiles * generalised flag profiles * generalised flag profiles * generalised flag profiles * generalise condition, fix refs and names * profiles generalised, apply profiles to examples * examples validating against profiles * cpis and fgm examples, all validating * addtional example pages added * fix cpis consent category example * fix flag code for cpis and fgm * added careconnect deps, tidy diagrams, include contact via yml * licence section removed, redundant if using ip-statements * slight mod to intro * update retrieve record page to follow new format * updates as per Vicky's comments * updates as per Vicky's comments --------- Co-authored-by: Declan Kieran <[email protected]> * Update FlagProvenanceRole.fsh Update title to match others * updated ref to point to sequence instead of usecase (#22) Co-authored-by: Declan Kieran <[email protected]> * IOPS-2494(Guidance for Remove Reasonable Adjustment Record) Review (#21) * Create remove-record-usecase.plantuml * Update remove-reasonable-adjustment-record.md * Add files via upload * Delete input/images/remove-record-workflow.svg * Add files via upload * Update remove-reasonable-adjustment-record.md * Delete input/images/remove-record-workflow.bpmn * Delete input/images/remove-record-workflow.svg * Add files via upload * Update remove-record-usecase.plantuml * Delete input/images/remove-record-workflow.bpmn * Delete input/images/remove-record-workflow.svg * Add files via upload * Update remove-reasonable-adjustment-record.md * Update 0012-RemoveRARecordExample.fsh * Update 0012-RemoveRARecordExample.fsh * Update remove-reasonable-adjustment-record.md * Update 0012-RemoveRARecordExample.fsh * Create remove-record-sequence.plantuml * Delete input/images/remove-record-workflow.bpmn * Delete input/images/remove-record-workflow.svg * Add files via upload * Update remove-reasonable-adjustment-record.md * Update remove-reasonable-adjustment-record.md * Update remove-record-usecase.plantuml * Update remove-record-usecase.plantuml * Update remove-reasonable-adjustment-record.md * Update remove-reasonable-adjustment-record.md * Update remove-reasonable-adjustment-record.md * Update remove-reasonable-adjustment-record.md * Update remove-reasonable-adjustment-record.md * Update remove-reasonable-adjustment-record.md * Update _updatePublisher.sh * minor format fixes * spelling fix * fix alt text on bpmn diagrams --------- Co-authored-by: Declan Kieran <[email protected]> * Feature/generalise profiles (#19) * generalised flag profiles * generalised flag profiles * generalised flag profiles * generalised flag profiles * generalise condition, fix refs and names * profiles generalised, apply profiles to examples * examples validating against profiles * cpis and fgm examples, all validating * addtional example pages added * fix cpis consent category example * fix flag code for cpis and fgm * added careconnect deps, tidy diagrams, include contact via yml * licence section removed, redundant if using ip-statements * slight mod to intro --------- Co-authored-by: Declan Kieran <[email protected]> * update to maintain consent object for dissent/revoke and examples (#23) Co-authored-by: Declan Kieran <[email protected]> * add scenarios, tidied a few other things (#24) Co-authored-by: Declan Kieran <[email protected]> * Fix/remove experimental ci (#25) * fix references in transaction bundle in flag extension so they work with hapi starter * remove ci * tidy id's and updated postman collection * update example page * remove ci steps from pipeline --------- Co-authored-by: Declan Kieran <[email protected]> --------- Co-authored-by: vickyjaiswal0308 <[email protected]> Co-authored-by: Declan Kieran <[email protected]>
NHSDigital · Mar 28, 2024 · 750f11a · 750f11a
1 parent bcde676
commit 750f11a
Show file tree

Hide file tree

Showing 113 changed files with 7,218 additions and 363 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-  
+
       - name: Install Node
         uses: actions/setup-node@v3
         with:
@@ -34,17 +34,56 @@ jobs:
       - name: Install Jekyll
         run: sudo gem install jekyll jekyll-plantuml
 
+      - name: Install Graphvix
+        run: sudo apt install graphviz
+
       - name: Build IG
-        run: ./_genonce.sh
+        run: ./_genonce.sh ${{ vars.VALIDATOR_OFFLINE }}
+
+      - name: Download and unpack font-awesome
+        run: wget https://fontawesome.com/v4/assets/font-awesome-4.7.0.zip; unzip font-awesome-4.7.0.zip -d output
 
       - name: Publish IG Artefact
         uses: actions/upload-artifact@v3
         with:
           name: IG Archive
           path: ./output/
 
+      - name: Prepare files for GitHub Pages
+        run: |
+          cp -r output _site;
+          chmod -c -R +rX "_site/" | while read line; do
+            echo "::warning title=Invalid file permissions automatically fixed::$line"
+          done
+
+      - name: Publish IG to GitHub Pages
+        uses: actions/upload-pages-artifact@v3
+
       - name: Cache Node modules
         uses: actions/cache@v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}--build-cache-npm-packages-${{ hashFiles('**/package-lock.json') }}
+
+  # Deploy job (https://github.com/actions/deploy-pages)
+  deploy:
+    # Add a dependency to the build job
+    needs: build
+    # Only deploy on development branch
+    # if: github.ref == 'refs/heads/development'
+    # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
+    permissions:
+      pages: write      # to deploy to Pages
+      id-token: write   # to verify the deployment originates from an appropriate source
+
+    # Deploy to the github-pages environment
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    # Specify runner + deployment step
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4 # or specific "vX.X.X" version tag for this action
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,11 @@ _site/
 # Ignore folders generated by Bundler
 .bundle/
 vendor/
+input-cache
+node_modules
+output
+temp
+template
+font-awesome*
+fsh-generated
+input/resources/QUERY-OUTPUT*
diff --git a/_updatePublisher.sh b/_updatePublisher.sh
@@ -31,7 +31,7 @@ while [ "$#" -gt 0 ]; do
 done
 
 echo "Checking internet connection"
-curl -sSf tx.fhir.org > /dev/null
+curl -sSf raw.githubusercontent.com > /dev/null
 
 if [ $? -ne 0 ] ; then
   echo "Offline (or the terminology server is down), unable to update.  Exiting"

diff --git a/ig-template/package/content/assets/js/mermaid.min.js b/ig-template/package/content/assets/js/mermaid.min.js
diff --git a/ig-template/package/content/assets/postman/.index.db b/ig-template/package/content/assets/postman/.index.db
diff --git a/ig-template/package/content/assets/postman/.index.json b/ig-template/package/content/assets/postman/.index.json
@@ -0,0 +1,4 @@
+{
+  "index-version" : 2,
+  "files" : []
+}
diff --git a/ig-template/package/content/assets/postman/postman_collection.json b/ig-template/package/content/assets/postman/postman_collection.json
diff --git a/ig-template/package/content/diagram.bpmn b/ig-template/package/content/diagram.bpmn
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_149wjti" targetNamespace="http://bpmn.io/schema/bpmn" exporter="bpmn-js (https://demo.bpmn.io)" exporterVersion="16.4.0">
+  <bpmn:collaboration id="Collaboration_0q56fut">
+    <bpmn:participant id="Participant_18xshys" name="Consent to Treatment" processRef="Process_0q168hd" />
+    <bpmn:textAnnotation id="TextAnnotation_009927h">
+      <bpmn:text>Has capacity to consent?</bpmn:text>
+    </bpmn:textAnnotation>
+    <bpmn:association id="Association_171p978" associationDirection="None" sourceRef="Gateway_1ykpua9" targetRef="TextAnnotation_009927h" />
+  </bpmn:collaboration>
+  <bpmn:process id="Process_0q168hd">
+    <bpmn:laneSet id="LaneSet_1s0cwuu">
+      <bpmn:lane id="Lane_1qewygr" name="API" />
+      <bpmn:lane id="Lane_0vot896" name="Patient Advocate">
+        <bpmn:flowNodeRef>Activity_1s5y9xm</bpmn:flowNodeRef>
+      </bpmn:lane>
+      <bpmn:lane id="Lane_0s229l6" name="Patient">
+        <bpmn:flowNodeRef>Gateway_1ykpua9</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_1lxn6f7</bpmn:flowNodeRef>
+      </bpmn:lane>
+      <bpmn:lane id="Lane_0jp784q" name="Practitioner">
+        <bpmn:flowNodeRef>Event_03tz7z4</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_00yhqnr</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_05dlhv6</bpmn:flowNodeRef>
+      </bpmn:lane>
+    </bpmn:laneSet>
+    <bpmn:startEvent id="Event_03tz7z4">
+      <bpmn:outgoing>Flow_0ws129z</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:task id="Activity_00yhqnr" name="Request Consent">
+      <bpmn:incoming>Flow_0ws129z</bpmn:incoming>
+      <bpmn:outgoing>Flow_1ias2ec</bpmn:outgoing>
+    </bpmn:task>
+    <bpmn:exclusiveGateway id="Gateway_1ykpua9">
+      <bpmn:incoming>Flow_1ias2ec</bpmn:incoming>
+      <bpmn:outgoing>Flow_0c4r6vy</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:task id="Activity_05dlhv6" name="Record Consent" />
+    <bpmn:task id="Activity_1lxn6f7" name="Provide Consent">
+      <bpmn:incoming>Flow_0c4r6vy</bpmn:incoming>
+    </bpmn:task>
+    <bpmn:task id="Activity_1s5y9xm" name="Provide Consent" />
+    <bpmn:sequenceFlow id="Flow_0ws129z" sourceRef="Event_03tz7z4" targetRef="Activity_00yhqnr" />
+    <bpmn:sequenceFlow id="Flow_1ias2ec" sourceRef="Activity_00yhqnr" targetRef="Gateway_1ykpua9" />
+    <bpmn:sequenceFlow id="Flow_0c4r6vy" name="Yes" sourceRef="Gateway_1ykpua9" targetRef="Activity_1lxn6f7" />
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_0q56fut">
+      <bpmndi:BPMNShape id="Participant_18xshys_di" bpmnElement="Participant_18xshys" isHorizontal="true">
+        <dc:Bounds x="160" y="62" width="1370" height="998" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Lane_1qewygr_di" bpmnElement="Lane_1qewygr" isHorizontal="true">
+        <dc:Bounds x="190" y="810" width="1340" height="250" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Lane_0vot896_di" bpmnElement="Lane_0vot896" isHorizontal="true">
+        <dc:Bounds x="190" y="560" width="1340" height="250" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Lane_0s229l6_di" bpmnElement="Lane_0s229l6" isHorizontal="true">
+        <dc:Bounds x="190" y="312" width="1340" height="248" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Lane_0jp784q_di" bpmnElement="Lane_0jp784q" isHorizontal="true">
+        <dc:Bounds x="190" y="62" width="1340" height="250" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_03tz7z4_di" bpmnElement="Event_03tz7z4">
+        <dc:Bounds x="262" y="172" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_00yhqnr_di" bpmnElement="Activity_00yhqnr">
+        <dc:Bounds x="420" y="150" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1ykpua9_di" bpmnElement="Gateway_1ykpua9" isMarkerVisible="true">
+        <dc:Bounds x="445" y="395" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_05dlhv6_di" bpmnElement="Activity_05dlhv6">
+        <dc:Bounds x="900" y="150" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1lxn6f7_di" bpmnElement="Activity_1lxn6f7">
+        <dc:Bounds x="630" y="380" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1s5y9xm_di" bpmnElement="Activity_1s5y9xm">
+        <dc:Bounds x="420" y="640" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_1ias2ec_di" bpmnElement="Flow_1ias2ec">
+        <di:waypoint x="470" y="230" />
+        <di:waypoint x="470" y="395" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0ws129z_di" bpmnElement="Flow_0ws129z">
+        <di:waypoint x="298" y="190" />
+        <di:waypoint x="420" y="190" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0c4r6vy_di" bpmnElement="Flow_0c4r6vy">
+        <di:waypoint x="495" y="420" />
+        <di:waypoint x="630" y="420" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="554" y="402" width="18" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Association_171p978_di" bpmnElement="Association_171p978">
+        <di:waypoint x="450" y="415" />
+        <di:waypoint x="370" y="397" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="TextAnnotation_009927h_di" bpmnElement="TextAnnotation_009927h">
+        <dc:Bounds x="270" y="370" width="99.99998764470521" height="40.48582995951417" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/ig-template/package/includes/_append.fragment-header.html b/ig-template/package/includes/_append.fragment-header.html
@@ -1,4 +1,5 @@
 <link rel="stylesheet" href="../font-awesome-4.7.0/css/font-awesome.min.css">
+<link rel="stylesheet" href="./font-awesome-4.7.0/css/font-awesome.min.css">
 
 <!-- Left logo - typically the publisher's logo - project or affiliate -->
         <div id="project-nav">

diff --git a/ig-template/package/includes/fragment-footer.html b/ig-template/package/includes/fragment-footer.html
@@ -4,6 +4,6 @@
                  <a style="color: #81BEF7" href="qa.html">QA Report</a> 
                  <a style="color: #81BEF7" rel="license" href="{{site.data.fhir.path}}license.html"><img style="border-style: none;" alt="CC0" src="cc0.png"/></a>
 <div>
-</div>
 
-</div>
+<!--Include mermaid for creating diagrams.  Jekyll complains if its not local, possibly configurable...-->
+<script type="text/javascript" src="{{site.data.info.assets}}assets/js/mermaid.min.js"> </script>
diff --git a/input/fsh/aliases.fsh b/input/fsh/aliases.fsh
@@ -0,0 +1,24 @@
+Alias: $consentscope = http://terminology.hl7.org/CodeSystem/consentscope
+Alias: $sct = https://snomed.info/sct
+Alias: $condition-clinical = http://terminology.hl7.org/CodeSystem/condition-clinical
+Alias: $v3-DataOperation = http://terminology.hl7.org/CodeSystem/v3-DataOperation
+Alias: $condition-clinical = http://terminology.hl7.org/CodeSystem/condition-clinical
+Alias: $sct = https://snomed.info/sct
+Alias: $v3-DataOperation = http://terminology.hl7.org/CodeSystem/v3-DataOperation
+Alias: $contractsignertypecodes = http://terminology.hl7.org/CodeSystem/contractsignertypecodes
+Alias: $RoleClass = http://terminology.hl7.org/CodeSystem/v3-RoleClass
+Alias: $RoleCode = http://terminology.hl7.org/CodeSystem/v3-RoleCode
+Alias: $ParticipationFunction = http://terminology.hl7.org/CodeSystem/v3-ParticipationFunction
+Alias: $ParticipationType = http://terminology.hl7.org/CodeSystem/v3-ParticipationType
+Alias: $extra-security-role-type = http://terminology.hl7.org/CodeSystem/extra-security-role-type
+Alias: $CareConnect-SDSJobRoleName-1 = https://fhir.hl7.org.uk/STU3/CodeSystem/CareConnect-SDSJobRoleName-1
+Alias: $ValueSetPatientFlagCategory =  https://fhir.nhs.uk/England/ValueSet/PatientFlagCategory
+Alias: $ValueSetProgrammeFlagCategory =  https://fhir.nhs.uk/England/ValueSet/ProgrammeFlagCategory
+Alias: $ExtensionFlagDetail =  http://hl7.org/fhir/StructureDefinition/flag-detail
+Alias: $ValueSetFlagProvenanceRole =  https://fhir.nhs.uk/England/ValueSet/FlagProvenanceRole
+Alias: $ValueSetRAFlagCode =  https://fhir.nhs.uk/England/ValueSet/RA-FlagCode
+Alias: $ValueSetCPISFlagCode =  https://fhir.nhs.uk/England/ValueSet/CPIS-FlagCode
+Alias: $ValueSetFGMFlagCode =  https://fhir.nhs.uk/England/ValueSet/FGM-FlagCode
+Alias: $ValueSetProgrammeFlagCode =  https://fhir.nhs.uk/England/ValueSet/ProgrammeFlagCode
+Alias: $ValueSetFlagConditionCategory =  https://fhir.nhs.uk/England/ValueSet/FlagConditionCategory
+Alias: $ValueSetFlagConditionCode =  https://fhir.nhs.uk/England/ValueSet/FlagConditionCode
diff --git a/input/fsh/codesystem/CPIS-ConditionCategory.fsh b/input/fsh/codesystem/CPIS-ConditionCategory.fsh
@@ -0,0 +1,17 @@
+CodeSystem: CPIS-ConditionCategory
+Id: CPIS-ConditionCategory
+Title: "CPIS Condition Category"
+Description: "A CodeSystem to identify the category of a condition within CPIS."
+
+* ^name = "CPISConditionCategory"
+* ^url = "https://fhir.nhs.uk/England/CodeSystem/CPIS-ConditionCategory"
+* ^version = "0.1.0"
+* ^status = #draft
+* ^date = "2024-02-14"
+* ^experimental = false
+
+* insert NHSEngland-Copyright
+
+* ^caseSensitive = true
+* ^content = #complete
+* #cpis-example-condition-category "CPIS example condition category"
diff --git a/input/fsh/codesystem/CPIS-ConditionCode.fsh b/input/fsh/codesystem/CPIS-ConditionCode.fsh
@@ -0,0 +1,17 @@
+CodeSystem: CPIS-ConditionCode
+Id: CPIS-ConditionCode
+Title: "CPIS Condition Code"
+Description: "A CodeSystem to identify the SNOMED-CT concept representing an Impairment recorded as part of CPIS"
+
+* ^name = "CPISConditionCode"
+* ^url = "https://fhir.nhs.uk/England/CodeSystem/CPIS-ConditionCode"
+* ^version = "0.1.0"
+* ^status = #draft
+* ^date = "2024-02-14"
+* ^experimental = false
+
+* insert NHSEngland-Copyright
+
+* ^caseSensitive = true
+* ^content = #complete
+* #1 "CPIS example condition code"
diff --git a/input/fsh/codesystem/CPIS-ConsentPurpose.fsh b/input/fsh/codesystem/CPIS-ConsentPurpose.fsh
@@ -0,0 +1,17 @@
+CodeSystem: CPIS-ConsentPurpose
+Id: CPIS-ConsentPurpose
+Title: "CPIS Consent Purpose"
+Description: "A CodeSystem to identify the purpose of the consent given within CPIS"
+
+* ^name = "CPISConsentPurpose"
+* ^url = "https://fhir.nhs.uk/England/CodeSystem/CPIS-ConsentPurpose"
+* ^version = "0.1.0"
+* ^status = #draft
+* ^date = "2024-02-14"
+* ^experimental = false
+
+* insert NHSEngland-Copyright
+
+* ^caseSensitive = true
+* ^content = #complete
+* #CPISCONSENT "CPIS - Consent to record CPIS flags"
diff --git a/input/fsh/codesystem/CPIS-FlagCategory.fsh b/input/fsh/codesystem/CPIS-FlagCategory.fsh
@@ -0,0 +1,17 @@
+CodeSystem: CPIS-FlagCategory
+Id: CPIS-FlagCategory
+Title: "CPIS Flag Category"
+Description: "A CodeSystem containing CPIS flag categories"
+
+* ^name = "CPISFlagCategory"
+* ^url = "https://fhir.nhs.uk/England/CodeSystem/CPIS-FlagCategory"
+* ^version = "0.1.0"
+* ^status = #draft
+* ^date = "2024-02-14"
+* ^experimental = false
+
+* insert NHSEngland-Copyright
+
+* ^caseSensitive = true
+* ^content = #complete
+* #001 "Example CPIS category"
diff --git a/input/fsh/codesystem/FGM-ConditionCategory.fsh b/input/fsh/codesystem/FGM-ConditionCategory.fsh
@@ -0,0 +1,17 @@
+CodeSystem: FGM-ConditionCategory
+Id: FGM-ConditionCategory
+Title: "FGM Condition Category"
+Description: "A CodeSystem to identify the category of a condition within FGM."
+
+* ^name = "FGMConditionCategory"
+* ^url = "https://fhir.nhs.uk/England/CodeSystem/FGM-ConditionCategory"
+* ^version = "0.1.0"
+* ^status = #draft
+* ^date = "2024-02-14"
+* ^experimental = false
+
+* insert NHSEngland-Copyright
+
+* ^caseSensitive = true
+* ^content = #complete
+* #fgm-example-condition-category "FGM example condition category"
diff --git a/input/fsh/codesystem/FGM-ConditionCode.fsh b/input/fsh/codesystem/FGM-ConditionCode.fsh
@@ -0,0 +1,17 @@
+CodeSystem: FGM-ConditionCode
+Id: FGM-ConditionCode
+Title: "FGM Condition Code"
+Description: "A CodeSystem to identify the SNOMED-CT concept representing an Impairment recorded as part of FGM"
+
+* ^name = "FGMConditionCode"
+* ^url = "https://fhir.nhs.uk/England/CodeSystem/FGM-ConditionCode"
+* ^version = "0.1.0"
+* ^status = #draft
+* ^date = "2024-02-14"
+* ^experimental = false
+
+* insert NHSEngland-Copyright
+
+* ^caseSensitive = true
+* ^content = #complete
+* #1 "FGM example condition code"
diff --git a/input/fsh/codesystem/FGM-ConsentPurpose.fsh b/input/fsh/codesystem/FGM-ConsentPurpose.fsh
@@ -0,0 +1,17 @@
+CodeSystem: FGM-ConsentPurpose
+Id: FGM-ConsentPurpose
+Title: "FGM Consent Purpose"
+Description: "A CodeSystem to identify the purpose of the consent given within FGM"
+
+* ^name = "FGMConsentPurpose"
+* ^url = "https://fhir.nhs.uk/England/CodeSystem/FGM-ConsentPurpose"
+* ^version = "0.1.0"
+* ^status = #draft
+* ^date = "2024-02-14"
+* ^experimental = false
+
+* insert NHSEngland-Copyright
+
+* ^caseSensitive = true
+* ^content = #complete
+* #FGMCONSENT "FGM - Consent to record FGM flags"
diff --git a/input/fsh/codesystem/FGM-FlagCategory.fsh b/input/fsh/codesystem/FGM-FlagCategory.fsh
@@ -0,0 +1,17 @@
+CodeSystem: FGM-FlagCategory
+Id: FGM-FlagCategory
+Title: "FGM Flag Category"
+Description: "A CodeSystem containing FGM flag categories"
+
+* ^name = "FGMFlagCategory"
+* ^url = "https://fhir.nhs.uk/England/CodeSystem/FGM-FlagCategory"
+* ^version = "0.1.0"
+* ^status = #draft
+* ^date = "2024-02-14"
+* ^experimental = false
+
+* insert NHSEngland-Copyright
+
+* ^caseSensitive = true
+* ^content = #complete
+* #001 "Example FGM category"