Merge branch 'main-stufe-4' of github.com:gematik/ISiK-Terminplanung …

…into TC_4.0.1

.github/workflows/TC-version-update.yml

@@ -0,0 +1,40 @@
+name: TC version update
+
+# Controls when the action will run. 
+on:
+    push:
+      branches:
+        - 'TC-*'
+        - 'TC_*'
+
+
+    # Allows you to run this workflow manually from the Actions tab
+    workflow_dispatch:        
+
+# setup python and run script 
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        steps:
+          - name: checkout repo content
+            uses: actions/checkout@v2 # checkout the repository content
+
+          - name: setup python
+            uses: actions/setup-python@v4
+            with:
+              python-version: '3.10' # install the python version needed
+
+          - name: install python packages
+            run: |
+              python -m pip install --upgrade pip
+              pip install pyyaml
+    
+          - name: execute py script # run main.py
+            run: python ./scripts/release_publish.py -b
+
+          - name: Add & Commit
+            uses: EndBug/add-and-commit@v9
+            with:
+              committer_name: GitHub Actions Bot
+              committer_email: ActionBot@github.com
+              message: auto-generated file update of TC version by GitHub Actions

.github/workflows/main.yml

@@ -33,7 +33,7 @@ jobs:
       # Java and .NET are already installed on ubuntu-latest
 
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/firely-terminal-pipeline@v0.4.1
+        uses: FirelyTeam/firely-terminal-pipeline@v0.4.2
         with:
           PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/
           #PATH_TO_EXAMPLES: Examples
@@ -46,7 +46,7 @@ jobs:
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: true
           SUSHI_OPTIONS: Resources/
-          SUSHI_VERSION: 3.8.0
+          SUSHI_VERSION: 3.11.1
           EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
 
       - name: Add & Commit

ImplementationGuide/markdown/Einfuehrung.md

@@ -1,9 +1,9 @@
-<img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Terminplanung/rc/main-stufe-4/Material/images/Gematik_Logo_Flag.svg" alt="gematik logo" width="400"/>
+<img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Terminplanung/main-stufe-4/Material/images/Gematik_Logo_Flag.svg" alt="gematik logo" width="400"/>
 
 ----
 Version: 4.0.0
 
-Datum: 26.06.2024
+Datum: 01.10.2024
 
 Status: Active
 

ImplementationGuide/markdown/ReleaseNotes.md

@@ -18,9 +18,9 @@ Datum: tbd.
 
 Version 4.0.0
 
-Datum: 09.09.2024
+Datum: 01.10.2024
 
-* Releaseversion, keine inhaltlichen Änderungen zu 4.0.0-rc2
+* Aktive Version ohne weitere Änderungen 
 
 ----
 

Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementTerminplanungServer.json

@@ -6,7 +6,7 @@
   "experimental": false,
   "publisher": "gematik GmbH",
   "version": "4.0.0",
-  "date": "2024-09-09",
+  "date": "2024-10-01",
   "implementationGuide": [
     "https://gematik.de/fhir/isik/ImplementationGuide/ISiK-Terminplanung"
   ],

Resources/fsh-generated/resources/OperationDefinition-ISiKAppointmentBookOperation.json

@@ -5,7 +5,7 @@
   "experimental": false,
   "publisher": "gematik GmbH",
   "version": "4.0.0",
-  "date": "2024-09-09",
+  "date": "2024-10-01",
   "name": "book",
   "url": "https://gematik.de/fhir/isik/OperationDefinition/AppointmentBook",
   "kind": "operation",

Resources/fsh-generated/resources/StructureDefinition-ISiKKalender.json

@@ -6,7 +6,7 @@
   "name": "ISiKKalender",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-09",
+  "date": "2024-10-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

Resources/fsh-generated/resources/StructureDefinition-ISiKMedizinischeBehandlungseinheit.json

@@ -6,7 +6,7 @@
   "name": "ISiKMedizinischeBehandlungseinheit",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-09",
+  "date": "2024-10-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

Resources/fsh-generated/resources/StructureDefinition-ISiKNachricht.json

@@ -6,7 +6,7 @@
   "name": "ISiKNachricht",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-09",
+  "date": "2024-10-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

Resources/fsh-generated/resources/StructureDefinition-ISiKNachrichtExtension.json

@@ -6,7 +6,7 @@
   "name": "ISiKNachrichtExtension",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-09",
+  "date": "2024-10-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "complex-type",

Resources/fsh-generated/resources/StructureDefinition-ISiKTermin.json

@@ -6,7 +6,7 @@
   "name": "ISiKTermin",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-09",
+  "date": "2024-10-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

Resources/fsh-generated/resources/StructureDefinition-ISiKTerminKontaktMitGesundheitseinrichtung.json

@@ -6,7 +6,7 @@
   "name": "ISiKTerminKontaktMitGesundheitseinrichtung",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-09",
+  "date": "2024-10-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

Resources/fsh-generated/resources/StructureDefinition-ISiKTerminPriorityExtension.json

@@ -6,7 +6,7 @@
   "name": "ISiKTerminPriorityExtension",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-09",
+  "date": "2024-10-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "complex-type",

Resources/fsh-generated/resources/StructureDefinition-ISiKTerminblock.json

@@ -6,7 +6,7 @@
   "name": "ISiKTerminblock",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-09",
+  "date": "2024-10-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

Resources/fsh-generated/resources/StructureDefinition-ScheduleName.json

@@ -6,7 +6,7 @@
   "name": "ScheduleName",
   "status": "active",
   "experimental": false,
-  "date": "2024-09-09",
+  "date": "2024-10-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "complex-type",

Resources/input/fsh/ruleset.fsh

@@ -3,14 +3,14 @@ RuleSet: Meta
 * ^experimental = false
 * ^publisher = "gematik GmbH"
 * ^version = "4.0.0"
-* ^date = "2024-09-09"
+* ^date = "2024-10-01"
 
 RuleSet: MetaInstance
 * status = #active
 * experimental = false
 * publisher = "gematik GmbH"
 * version = "4.0.0"
-* date = "2024-09-09"
+* date = "2024-10-01"
 
 RuleSet: Meta-CapabilityStatement
 * insert MetaInstance

scripts/release_publish.py

@@ -28,6 +28,13 @@ def get_new_release_version_from_branch_name() -> str:
     return git_branch
 
 
+def modify_TC_branch_name_to_version(git_branch): 
+    if git_branch.startswith('TC-'):
+        version = git_branch.lstrip('TC-')
+    elif git_branch.startswith('TC_'):
+        version = git_branch.lstrip('TC_')
+    return version
+
 def create_files_to_update_list(config):
     files_to_update = []
     for filename, replacements in config.items():
@@ -135,6 +142,8 @@ def main():
         new_release_version = args.version
     elif args.branch:
         new_release_version = get_new_release_version_from_branch_name()
+        if new_release_version.startswith('TC'):
+            new_release_version = modify_TC_branch_name_to_version(new_release_version)
     else:
         parser.error('No new release version specified. Please use either -v or -b to specify the new release version.')