Skip to content

Merge develop into main#434

Merged
digitalhealthmartin merged 34 commits intostu1_mainfrom
stu1_develop
Dec 7, 2023
Merged

Merge develop into main#434
digitalhealthmartin merged 34 commits intostu1_mainfrom
stu1_develop

Conversation

@digitalhealthmartin
Copy link
Contributor

Merge develop into main

ryma2fhir and others added 30 commits October 24, 2023 09:25
Change to allow for GitHub actions to rerun after merge from this action. If not allowed, then PR gets hung-up waiting for checks to be done without actually running them.
* Update Status of CP-IS & FGM Assets

1. Change the status of CP-IS & FGM assets to active.
2. Change the published date to 2023-11-09 when they are due to be published.

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 space tab

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 spaces tab
Superseded by other find and replace ation
Delete .github/workflows/FindReplaceTabSpace.yml
* Create PFS CodeSystem as an NHS England IG Asset

* GitHub Action: Find and Replace

* IOPS2261 name, date and description updated

Rename of file, id, url, name and title.
date changed to 2023-11-20
description value changed to suggested text.

---------

Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>
…iodRequirement

iops 2266 ods typed period requirement
* NamingSystems and basic not-present CodeSystems

* Switch OrgRole to new codesystem url

* Fix duff id/name

* Remove spaces from name

* Remove spaces from name

* Set naming systems to draft

* GitHub Action: Find and Replace

* Remove namingsystems, tweak codesystems to have ODS contact details, and url for the codes

* GitHub Action: Find and Replace

* Tweaks following review

* GitHub Action: Find and Replace

* reword

* GitHub Action: Find and Replace

---------

Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>
digitalhealthmartin and others added 4 commits December 7, 2023 11:40
* Asset changes from Sprint 2 consolidation call

* Several updates to assets

* Updated ValueSet TypedDateTime

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>
Copy link
Contributor

@KazeemHamzat KazeemHamzat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@digitalhealthmartin digitalhealthmartin merged commit 606393a into stu1_main Dec 7, 2023
KazeemHamzat added a commit that referenced this pull request Jul 4, 2025
* Merge develop into main (#432)

* Change line breaks to LF, replace tab with 2 spaces

* added find and replace workflow

* Find and Replace

* Update findAndReplace.yml

* changed to allow signed commits

* GitHub Action: Find and Replace

* Added England version of UKCore-TypedPeriod, extended OrgRole with it

* Update findAndReplace.yml

Change to allow for GitHub actions to rerun after merge from this action. If not allowed, then PR gets hung-up waiting for checks to be done without actually running them.

* Resolution of Sprint 1 Consolidation Call (#420)

* Update Status of CP-IS & FGM Assets

1. Change the status of CP-IS & FGM assets to active.
2. Change the published date to 2023-11-09 when they are due to be published.

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 space tab

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 spaces tab

* Delete .github/workflows/FindReplaceTabSpace.yml

Superseded by other find and replace ation

* Remove primary here rather than separate pr

* GitHub Action: Find and Replace

* Re add min 1 to period in Org role

* Review tweaks

* Remove another xml header tag

* Create PFS CodeSystem as an NHS England IG Asset (#427)

* Create PFS CodeSystem as an NHS England IG Asset

* GitHub Action: Find and Replace

* IOPS2261 name, date and description updated

Rename of file, id, url, name and title.
date changed to 2023-11-20
description value changed to suggested text.

---------

Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Extension sub url, and wording changes, valueset url include change

* Sprint2 ord/ods naming systems + not-present codesystems (#424)

* NamingSystems and basic not-present CodeSystems

* Switch OrgRole to new codesystem url

* Fix duff id/name

* Remove spaces from name

* Remove spaces from name

* Set naming systems to draft

* GitHub Action: Find and Replace

* Remove namingsystems, tweak codesystems to have ODS contact details, and url for the codes

* GitHub Action: Find and Replace

* Tweaks following review

* GitHub Action: Find and Replace

* reword

* GitHub Action: Find and Replace

---------

Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Re-add workflow

* Asset changes from Sprint 2 consolidation call (#431)

* Asset changes from Sprint 2 consolidation call

* Several updates to assets

* Updated ValueSet TypedDateTime

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Remove ORD duplicate assets

---------

Co-authored-by: Ryan May <ryan.may2@nhs.net>
Co-authored-by: ryma2fhir <ryma2fhir@users.noreply.github.com>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Page <adam.page2@nhs.net>
Co-authored-by: KazeemHamzat <113706558+KazeemHamzat@users.noreply.github.com>
Co-authored-by: Adam Page <115618858+APageNHS@users.noreply.github.com>
Co-authored-by: adrianhand2 <103494146+adrianhand2@users.noreply.github.com>
Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Merge develop into main (#434)

* Change line breaks to LF, replace tab with 2 spaces

* added find and replace workflow

* Find and Replace

* Update findAndReplace.yml

* changed to allow signed commits

* GitHub Action: Find and Replace

* Added England version of UKCore-TypedPeriod, extended OrgRole with it

* Update findAndReplace.yml

Change to allow for GitHub actions to rerun after merge from this action. If not allowed, then PR gets hung-up waiting for checks to be done without actually running them.

* Resolution of Sprint 1 Consolidation Call (#420)

* Update Status of CP-IS & FGM Assets

1. Change the status of CP-IS & FGM assets to active.
2. Change the published date to 2023-11-09 when they are due to be published.

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 space tab

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 spaces tab

* Delete .github/workflows/FindReplaceTabSpace.yml

Superseded by other find and replace ation

* Remove primary here rather than separate pr

* GitHub Action: Find and Replace

* Re add min 1 to period in Org role

* Review tweaks

* Remove another xml header tag

* Create PFS CodeSystem as an NHS England IG Asset (#427)

* Create PFS CodeSystem as an NHS England IG Asset

* GitHub Action: Find and Replace

* IOPS2261 name, date and description updated

Rename of file, id, url, name and title.
date changed to 2023-11-20
description value changed to suggested text.

---------

Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Extension sub url, and wording changes, valueset url include change

* Sprint2 ord/ods naming systems + not-present codesystems (#424)

* NamingSystems and basic not-present CodeSystems

* Switch OrgRole to new codesystem url

* Fix duff id/name

* Remove spaces from name

* Remove spaces from name

* Set naming systems to draft

* GitHub Action: Find and Replace

* Remove namingsystems, tweak codesystems to have ODS contact details, and url for the codes

* GitHub Action: Find and Replace

* Tweaks following review

* GitHub Action: Find and Replace

* reword

* GitHub Action: Find and Replace

---------

Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Re-add workflow

* Asset changes from Sprint 2 consolidation call (#431)

* Asset changes from Sprint 2 consolidation call

* Several updates to assets

* Updated ValueSet TypedDateTime

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Remove ORD duplicate assets

* Add missing file (#433)

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

---------

Co-authored-by: Ryan May <ryan.may2@nhs.net>
Co-authored-by: ryma2fhir <ryma2fhir@users.noreply.github.com>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Page <adam.page2@nhs.net>
Co-authored-by: KazeemHamzat <113706558+KazeemHamzat@users.noreply.github.com>
Co-authored-by: Adam Page <115618858+APageNHS@users.noreply.github.com>
Co-authored-by: adrianhand2 <103494146+adrianhand2@users.noreply.github.com>
Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Merge develop into main (#436)

* Change line breaks to LF, replace tab with 2 spaces

* added find and replace workflow

* Find and Replace

* Update findAndReplace.yml

* changed to allow signed commits

* GitHub Action: Find and Replace

* Added England version of UKCore-TypedPeriod, extended OrgRole with it

* Update findAndReplace.yml

Change to allow for GitHub actions to rerun after merge from this action. If not allowed, then PR gets hung-up waiting for checks to be done without actually running them.

* Resolution of Sprint 1 Consolidation Call (#420)

* Update Status of CP-IS & FGM Assets

1. Change the status of CP-IS & FGM assets to active.
2. Change the published date to 2023-11-09 when they are due to be published.

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 space tab

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 spaces tab

* Delete .github/workflows/FindReplaceTabSpace.yml

Superseded by other find and replace ation

* Remove primary here rather than separate pr

* GitHub Action: Find and Replace

* Re add min 1 to period in Org role

* Review tweaks

* Remove another xml header tag

* Create PFS CodeSystem as an NHS England IG Asset (#427)

* Create PFS CodeSystem as an NHS England IG Asset

* GitHub Action: Find and Replace

* IOPS2261 name, date and description updated

Rename of file, id, url, name and title.
date changed to 2023-11-20
description value changed to suggested text.

---------

Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Extension sub url, and wording changes, valueset url include change

* Sprint2 ord/ods naming systems + not-present codesystems (#424)

* NamingSystems and basic not-present CodeSystems

* Switch OrgRole to new codesystem url

* Fix duff id/name

* Remove spaces from name

* Remove spaces from name

* Set naming systems to draft

* GitHub Action: Find and Replace

* Remove namingsystems, tweak codesystems to have ODS contact details, and url for the codes

* GitHub Action: Find and Replace

* Tweaks following review

* GitHub Action: Find and Replace

* reword

* GitHub Action: Find and Replace

---------

Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Re-add workflow

* Asset changes from Sprint 2 consolidation call (#431)

* Asset changes from Sprint 2 consolidation call

* Several updates to assets

* Updated ValueSet TypedDateTime

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Remove ORD duplicate assets

* Add missing file (#433)

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Fix capitalisation for code values (#435)

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

---------

Co-authored-by: Ryan May <ryan.may2@nhs.net>
Co-authored-by: ryma2fhir <ryma2fhir@users.noreply.github.com>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Page <adam.page2@nhs.net>
Co-authored-by: KazeemHamzat <113706558+KazeemHamzat@users.noreply.github.com>
Co-authored-by: Adam Page <115618858+APageNHS@users.noreply.github.com>
Co-authored-by: adrianhand2 <103494146+adrianhand2@users.noreply.github.com>
Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Merge develop into main (#444)

* Create CodeSystem-England-MessageEventsBars.xml

Changes for url in Codesystem File.

* Create CodeSystem-England-MessageReasonBars.xml

Change in URL for Codesystem file

* Change in the description and file names.

Change in the description and file names.

* Change capitalisation and remove CS from base dir

* Changed from Bars to BARS.

Changed from Bars to BARS.

* Changed indentation from 4 spaces to 2

Changed indentation from 4 spaces to 2

* GitHub Action: Find and Replace

* Add CodeSystem England-HTTPErrorCode (#440)

* Add CodeSystem England-HTTPErrorCode

* Updated indentation and file name

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Add Extension LocationExtension (#442)

* Add LocationExtension

* Update LocationExtension URL, version, description and purpose

* Added missing contact, publisher and copyright to LocationExtension

* Update fixedUri in LocationExtension

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

---------

Co-authored-by: Sheena Sharma <sheena.sharma5@nhs.net>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>
Co-authored-by: Sheena Sharma <99985081+SheenaSharma@users.noreply.github.com>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Update Extension-England-TypedPeriod

Updated Extension-England-TypedPeriodExtension-England-TypedPeriod, CodeSystem-England-PeriodType  & ValueSet-England-PeriodType

* Update Extension-England-TypedPeriod

Extension-England-TypedPeriod

* Update CodeSystem-England-PeriodType

Update CodeSystem-England-PeriodType

* Update CodeSystem-England-PeriodType

Update CodeSystem-England-PeriodType

* Create-CodeSystem & ValueSet -CallbackConsent

Create-CodeSystem & ValueSet -CallbackConsent

* Rename ValueSet

* Update code display to Consent to Callback

Update code display to Consent to Callback

* link to codesystem oage fixed (#462)

* Update CodeSystem-England-PeriodType.

Update CodeSystem-England-PeriodType

* Renaming Assets

1. CodeSystem-England-ConsentType.xml
2. ValueSet-England-Consent-Type.xml

* Update CodeSystem-England-ConsentType

Update CodeSystem-England-ConsentType

* Changing Version No to 0.1.0 due to DRAFT Status

Changing Version No to 0.1.0 as the assets are still in DRAFT status

---------

Co-authored-by: Martin Fison <82446327+digitalhealthmartin@users.noreply.github.com>
Co-authored-by: Ryan May <ryan.may2@nhs.net>
Co-authored-by: ryma2fhir <ryma2fhir@users.noreply.github.com>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Page <adam.page2@nhs.net>
Co-authored-by: Adam Page <115618858+APageNHS@users.noreply.github.com>
Co-authored-by: adrianhand2 <103494146+adrianhand2@users.noreply.github.com>
Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>
Co-authored-by: Sheena Sharma <99985081+SheenaSharma@users.noreply.github.com>
Co-authored-by: NaminderSoorma <naminder.soorma@nhs.net>
KazeemHamzat added a commit that referenced this pull request Jul 8, 2025
* Create CodeSystem-England-MessageEventsBars.xml

Changes for url in Codesystem File.

* Create CodeSystem-England-MessageReasonBars.xml

Change in URL for Codesystem file

* Change in the description and file names.

Change in the description and file names.

* Change capitalisation and remove CS from base dir

* Changed from Bars to BARS.

Changed from Bars to BARS.

* Changed indentation from 4 spaces to 2

Changed indentation from 4 spaces to 2

* GitHub Action: Find and Replace

* Add CodeSystem England-HTTPErrorCode (#440)

* Add CodeSystem England-HTTPErrorCode

* Updated indentation and file name

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Add Extension LocationExtension (#442)

* Add LocationExtension

* Update LocationExtension URL, version, description and purpose

* Added missing contact, publisher and copyright to LocationExtension

* Update fixedUri in LocationExtension

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Update Extension-England-TypedPeriod (#463)

* Update Extension-England-TypedPeriod

Updated Extension-England-TypedPeriodExtension-England-TypedPeriod, CodeSystem-England-PeriodType  & ValueSet-England-PeriodType

* Update Extension-England-TypedPeriod

Extension-England-TypedPeriod

* Update CodeSystem-England-PeriodType

Update CodeSystem-England-PeriodType

* Update CodeSystem-England-PeriodType

Update CodeSystem-England-PeriodType

* Create-CodeSystem & ValueSet -CallbackConsent

Create-CodeSystem & ValueSet -CallbackConsent

* Rename ValueSet

* Update code display to Consent to Callback

Update code display to Consent to Callback

* Update CodeSystem-England-PeriodType.

Update CodeSystem-England-PeriodType

* Renaming Assets

1. CodeSystem-England-ConsentType.xml
2. ValueSet-England-Consent-Type.xml

* Update CodeSystem-England-ConsentType

Update CodeSystem-England-ConsentType

* Changing Version No to 0.1.0 due to DRAFT Status (#466)

* Merge develop into main (#432)

* Change line breaks to LF, replace tab with 2 spaces

* added find and replace workflow

* Find and Replace

* Update findAndReplace.yml

* changed to allow signed commits

* GitHub Action: Find and Replace

* Added England version of UKCore-TypedPeriod, extended OrgRole with it

* Update findAndReplace.yml

Change to allow for GitHub actions to rerun after merge from this action. If not allowed, then PR gets hung-up waiting for checks to be done without actually running them.

* Resolution of Sprint 1 Consolidation Call (#420)

* Update Status of CP-IS & FGM Assets

1. Change the status of CP-IS & FGM assets to active.
2. Change the published date to 2023-11-09 when they are due to be published.

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 space tab

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 spaces tab

* Delete .github/workflows/FindReplaceTabSpace.yml

Superseded by other find and replace ation

* Remove primary here rather than separate pr

* GitHub Action: Find and Replace

* Re add min 1 to period in Org role

* Review tweaks

* Remove another xml header tag

* Create PFS CodeSystem as an NHS England IG Asset (#427)

* Create PFS CodeSystem as an NHS England IG Asset

* GitHub Action: Find and Replace

* IOPS2261 name, date and description updated

Rename of file, id, url, name and title.
date changed to 2023-11-20
description value changed to suggested text.

---------

Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Extension sub url, and wording changes, valueset url include change

* Sprint2 ord/ods naming systems + not-present codesystems (#424)

* NamingSystems and basic not-present CodeSystems

* Switch OrgRole to new codesystem url

* Fix duff id/name

* Remove spaces from name

* Remove spaces from name

* Set naming systems to draft

* GitHub Action: Find and Replace

* Remove namingsystems, tweak codesystems to have ODS contact details, and url for the codes

* GitHub Action: Find and Replace

* Tweaks following review

* GitHub Action: Find and Replace

* reword

* GitHub Action: Find and Replace

---------

Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Re-add workflow

* Asset changes from Sprint 2 consolidation call (#431)

* Asset changes from Sprint 2 consolidation call

* Several updates to assets

* Updated ValueSet TypedDateTime

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Remove ORD duplicate assets

---------

Co-authored-by: Ryan May <ryan.may2@nhs.net>
Co-authored-by: ryma2fhir <ryma2fhir@users.noreply.github.com>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Page <adam.page2@nhs.net>
Co-authored-by: KazeemHamzat <113706558+KazeemHamzat@users.noreply.github.com>
Co-authored-by: Adam Page <115618858+APageNHS@users.noreply.github.com>
Co-authored-by: adrianhand2 <103494146+adrianhand2@users.noreply.github.com>
Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Merge develop into main (#434)

* Change line breaks to LF, replace tab with 2 spaces

* added find and replace workflow

* Find and Replace

* Update findAndReplace.yml

* changed to allow signed commits

* GitHub Action: Find and Replace

* Added England version of UKCore-TypedPeriod, extended OrgRole with it

* Update findAndReplace.yml

Change to allow for GitHub actions to rerun after merge from this action. If not allowed, then PR gets hung-up waiting for checks to be done without actually running them.

* Resolution of Sprint 1 Consolidation Call (#420)

* Update Status of CP-IS & FGM Assets

1. Change the status of CP-IS & FGM assets to active.
2. Change the published date to 2023-11-09 when they are due to be published.

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 space tab

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 spaces tab

* Delete .github/workflows/FindReplaceTabSpace.yml

Superseded by other find and replace ation

* Remove primary here rather than separate pr

* GitHub Action: Find and Replace

* Re add min 1 to period in Org role

* Review tweaks

* Remove another xml header tag

* Create PFS CodeSystem as an NHS England IG Asset (#427)

* Create PFS CodeSystem as an NHS England IG Asset

* GitHub Action: Find and Replace

* IOPS2261 name, date and description updated

Rename of file, id, url, name and title.
date changed to 2023-11-20
description value changed to suggested text.

---------

Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Extension sub url, and wording changes, valueset url include change

* Sprint2 ord/ods naming systems + not-present codesystems (#424)

* NamingSystems and basic not-present CodeSystems

* Switch OrgRole to new codesystem url

* Fix duff id/name

* Remove spaces from name

* Remove spaces from name

* Set naming systems to draft

* GitHub Action: Find and Replace

* Remove namingsystems, tweak codesystems to have ODS contact details, and url for the codes

* GitHub Action: Find and Replace

* Tweaks following review

* GitHub Action: Find and Replace

* reword

* GitHub Action: Find and Replace

---------

Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Re-add workflow

* Asset changes from Sprint 2 consolidation call (#431)

* Asset changes from Sprint 2 consolidation call

* Several updates to assets

* Updated ValueSet TypedDateTime

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Remove ORD duplicate assets

* Add missing file (#433)

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

---------

Co-authored-by: Ryan May <ryan.may2@nhs.net>
Co-authored-by: ryma2fhir <ryma2fhir@users.noreply.github.com>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Page <adam.page2@nhs.net>
Co-authored-by: KazeemHamzat <113706558+KazeemHamzat@users.noreply.github.com>
Co-authored-by: Adam Page <115618858+APageNHS@users.noreply.github.com>
Co-authored-by: adrianhand2 <103494146+adrianhand2@users.noreply.github.com>
Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Merge develop into main (#436)

* Change line breaks to LF, replace tab with 2 spaces

* added find and replace workflow

* Find and Replace

* Update findAndReplace.yml

* changed to allow signed commits

* GitHub Action: Find and Replace

* Added England version of UKCore-TypedPeriod, extended OrgRole with it

* Update findAndReplace.yml

Change to allow for GitHub actions to rerun after merge from this action. If not allowed, then PR gets hung-up waiting for checks to be done without actually running them.

* Resolution of Sprint 1 Consolidation Call (#420)

* Update Status of CP-IS & FGM Assets

1. Change the status of CP-IS & FGM assets to active.
2. Change the published date to 2023-11-09 when they are due to be published.

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 space tab

* Update ValueSet-England-ChildProtectionPlan.xml

Update ValueSet-England-ChildProtectionPlan to 2 spaces tab

* Delete .github/workflows/FindReplaceTabSpace.yml

Superseded by other find and replace ation

* Remove primary here rather than separate pr

* GitHub Action: Find and Replace

* Re add min 1 to period in Org role

* Review tweaks

* Remove another xml header tag

* Create PFS CodeSystem as an NHS England IG Asset (#427)

* Create PFS CodeSystem as an NHS England IG Asset

* GitHub Action: Find and Replace

* IOPS2261 name, date and description updated

Rename of file, id, url, name and title.
date changed to 2023-11-20
description value changed to suggested text.

---------

Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Extension sub url, and wording changes, valueset url include change

* Sprint2 ord/ods naming systems + not-present codesystems (#424)

* NamingSystems and basic not-present CodeSystems

* Switch OrgRole to new codesystem url

* Fix duff id/name

* Remove spaces from name

* Remove spaces from name

* Set naming systems to draft

* GitHub Action: Find and Replace

* Remove namingsystems, tweak codesystems to have ODS contact details, and url for the codes

* GitHub Action: Find and Replace

* Tweaks following review

* GitHub Action: Find and Replace

* reword

* GitHub Action: Find and Replace

---------

Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Re-add workflow

* Asset changes from Sprint 2 consolidation call (#431)

* Asset changes from Sprint 2 consolidation call

* Several updates to assets

* Updated ValueSet TypedDateTime

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Remove ORD duplicate assets

* Add missing file (#433)

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Fix capitalisation for code values (#435)

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

---------

Co-authored-by: Ryan May <ryan.may2@nhs.net>
Co-authored-by: ryma2fhir <ryma2fhir@users.noreply.github.com>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Page <adam.page2@nhs.net>
Co-authored-by: KazeemHamzat <113706558+KazeemHamzat@users.noreply.github.com>
Co-authored-by: Adam Page <115618858+APageNHS@users.noreply.github.com>
Co-authored-by: adrianhand2 <103494146+adrianhand2@users.noreply.github.com>
Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Merge develop into main (#444)

* Create CodeSystem-England-MessageEventsBars.xml

Changes for url in Codesystem File.

* Create CodeSystem-England-MessageReasonBars.xml

Change in URL for Codesystem file

* Change in the description and file names.

Change in the description and file names.

* Change capitalisation and remove CS from base dir

* Changed from Bars to BARS.

Changed from Bars to BARS.

* Changed indentation from 4 spaces to 2

Changed indentation from 4 spaces to 2

* GitHub Action: Find and Replace

* Add CodeSystem England-HTTPErrorCode (#440)

* Add CodeSystem England-HTTPErrorCode

* Updated indentation and file name

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

* Add Extension LocationExtension (#442)

* Add LocationExtension

* Update LocationExtension URL, version, description and purpose

* Added missing contact, publisher and copyright to LocationExtension

* Update fixedUri in LocationExtension

---------

Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>

---------

Co-authored-by: Sheena Sharma <sheena.sharma5@nhs.net>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>
Co-authored-by: Sheena Sharma <99985081+SheenaSharma@users.noreply.github.com>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>

* Update Extension-England-TypedPeriod

Updated Extension-England-TypedPeriodExtension-England-TypedPeriod, CodeSystem-England-PeriodType  & ValueSet-England-PeriodType

* Update Extension-England-TypedPeriod

Extension-England-TypedPeriod

* Update CodeSystem-England-PeriodType

Update CodeSystem-England-PeriodType

* Update CodeSystem-England-PeriodType

Update CodeSystem-England-PeriodType

* Create-CodeSystem & ValueSet -CallbackConsent

Create-CodeSystem & ValueSet -CallbackConsent

* Rename ValueSet

* Update code display to Consent to Callback

Update code display to Consent to Callback

* link to codesystem oage fixed (#462)

* Update CodeSystem-England-PeriodType.

Update CodeSystem-England-PeriodType

* Renaming Assets

1. CodeSystem-England-ConsentType.xml
2. ValueSet-England-Consent-Type.xml

* Update CodeSystem-England-ConsentType

Update CodeSystem-England-ConsentType

* Changing Version No to 0.1.0 due to DRAFT Status

Changing Version No to 0.1.0 as the assets are still in DRAFT status

---------

Co-authored-by: Martin Fison <82446327+digitalhealthmartin@users.noreply.github.com>
Co-authored-by: Ryan May <ryan.may2@nhs.net>
Co-authored-by: ryma2fhir <ryma2fhir@users.noreply.github.com>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Page <adam.page2@nhs.net>
Co-authored-by: Adam Page <115618858+APageNHS@users.noreply.github.com>
Co-authored-by: adrianhand2 <103494146+adrianhand2@users.noreply.github.com>
Co-authored-by: SheenaSharma <sheena.sharma5@nhs.net>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>
Co-authored-by: Sheena Sharma <99985081+SheenaSharma@users.noreply.github.com>
Co-authored-by: NaminderSoorma <naminder.soorma@nhs.net>

---------

Co-authored-by: Sheena Sharma <sheena.sharma5@nhs.net>
Co-authored-by: Martin Fison <MAFI8@hscic.gov.uk>
Co-authored-by: Sheena Sharma <99985081+SheenaSharma@users.noreply.github.com>
Co-authored-by: Ryan May <112563297+ryma2fhir@users.noreply.github.com>
Co-authored-by: Martin Fison <82446327+digitalhealthmartin@users.noreply.github.com>
Co-authored-by: Ryan May <ryan.may2@nhs.net>
Co-authored-by: ryma2fhir <ryma2fhir@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Page <adam.page2@nhs.net>
Co-authored-by: Adam Page <115618858+APageNHS@users.noreply.github.com>
Co-authored-by: adrianhand2 <103494146+adrianhand2@users.noreply.github.com>
Co-authored-by: NaminderSoorma <naminder.soorma@nhs.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants