Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TC 3.0.1 #102

Merged
merged 33 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7222210
Initial MD AMTS
MaxMTheilig Oct 27, 2023
8e54b47
further description User Stories and Use Cases
MaxMTheilig Oct 31, 2023
5f71364
added exsting standards in IG text
Nov 20, 2023
e9dd533
first analysis of existing specs
Nov 20, 2023
0dcd01b
Merge pull request #94 from gematik/AMTS-specs-SL
MaxMTheilig Nov 23, 2023
ec768a8
migrated ods to xlsx
patrick-werner Nov 24, 2023
a407411
Merge pull request #95 from gematik/AMTS-specs-SL
MaxMTheilig Nov 24, 2023
4960166
typos
MaxMTheilig Nov 28, 2023
5a60fc1
update scripts and version
f-peverali Jan 8, 2024
be5406f
Commit from GitHub Actions (CI (FHIR Validation))
f-peverali Jan 8, 2024
4b16454
update sentence on ISIKBasis Ressource usage (#103)
f-peverali Jan 8, 2024
039654b
update dependency Basis
f-peverali Jan 8, 2024
6f56334
update relwase notes
f-peverali Jan 8, 2024
114978f
Feature/devops automation (#106)
MaxMTheilig Jan 10, 2024
a08615d
Feature/devops automation (#107)
MaxMTheilig Jan 10, 2024
fbdadd8
workflow improvement
MaxMTheilig Jan 11, 2024
30f0bcf
Merge branch 'feature/AMTS' into TC_3.0.1
MaxMTheilig Jan 11, 2024
def5ad8
diagrams restructure
MaxMTheilig Jan 11, 2024
4357bb5
auto-generated diagrams by GitHub Action after source code change
MaxMTheilig Jan 11, 2024
3615c02
try with pdf
MaxMTheilig Jan 12, 2024
6d84a3a
embed logo svg
MaxMTheilig Jan 12, 2024
9a35164
move images folder
MaxMTheilig Jan 12, 2024
528b44e
images relocating
MaxMTheilig Jan 12, 2024
9fdc672
auto-generated diagrams by GitHub Action after source code change
MaxMTheilig Jan 12, 2024
3ffbf19
s
MaxMTheilig Jan 12, 2024
b8b026e
auto-generated diagrams by GitHub Action after source code change
MaxMTheilig Jan 12, 2024
dd44222
remove plantuml jar
MaxMTheilig Jan 12, 2024
502f2da
auto-generated diagrams by GitHub Action after source code change
MaxMTheilig Jan 12, 2024
12302d9
AMTS not part of TC3.0.1
MaxMTheilig Jan 12, 2024
7030ab9
Merge branch 'main-stufe-3' into TC_3.0.1
MaxMTheilig Jan 12, 2024
cbadd5a
clean folder structure
MaxMTheilig Jan 12, 2024
116d21c
updated version and date
MaxMTheilig Jan 12, 2024
aeb9f71
auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation)
MaxMTheilig Jan 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions .github/workflows/RenderAllDiagrams.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Render All Diagrams
on:
push:
paths:
- '**/Material/imgsrc/**/*.puml'
- '**/Material/imgsrc/**/*.drawio'
- '**/Material/images/src/**/*.puml'
- '**/Material/images/src/**/*.drawio'
branches-ignore:
- 'main**'

Expand Down Expand Up @@ -41,36 +41,41 @@ jobs:
# Clean Folder
- name: Ensure and clean folder
run: |
img_dir=ImplementationGuide/images/diagrams
img_dir=Material/images/diagrams
mkdir -p $img_dir
rm -rf ImplementationGuide/images/diagrams/*.svg
rm -rf Material/images/diagrams/*.svg

# Generate the SVGs from PUML
- name: Render PUML to SVG and Move files
run: |
FileNamePaths=$(find . -path "*/imgsrc/*/*.puml" -exec dirname {} \; | sort -u)
FileNamePaths=$(find . -path "*/images/src/*/*.puml" -exec dirname {} \; | sort -u)
for dir in $FileNamePaths
do
# Render SVGs from PUMLs
find $dir -name "*.puml" -exec java -jar plantuml.jar -tsvg {} \;
done

# Remove plantUML jar
- name: remove plantuml file
run: |
rm -f plantuml.jar

# Generate the SVGs from DrawIO
- name: Render DrawIO to SVG with predefined action
uses: rlespinasse/drawio-export-action@v2
with:
path: ./Material/imgsrc/drawio/
path: ./Material/images/src/drawio/
remove-page-suffix: true
output: .
format: svg
action-mode: all

# copies the created png & svg files to the images/diagrams folder and deletes the drawio files
# copies the created svg files to the images/diagrams folder and deletes the drawio files
- name: Move SVGs to target image folder
run: |
img_dir=ImplementationGuide/images/diagrams
# Find all unique directories containing *.svg files under any /imgsrc/ folder
FileNamePaths=$(find . -path "*/imgsrc/*/*.svg" -exec dirname {} \; | sort -u)
img_dir=Material/images/diagrams
# Find all unique directories containing *.SVG files under any /imgsrc/ folder
FileNamePaths=$(find . -path "*/images/src/*/*.svg" -exec dirname {} \; | sort -u)
for dir in $FileNamePaths
do
# Move SVGs to out directory
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.vscode/*
Binary file removed ImplementationGuide/images/Interaktionen.png
Binary file not shown.
Binary file removed ImplementationGuide/images/Klassendiagramm.png
Binary file not shown.
3 changes: 1 addition & 2 deletions ImplementationGuide/markdown/AkteureUndInteraktionen.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ Für jeden dieser Bereiche wurden jeweils drei Akteure identifiziert, die in ein
* **Consumer:** Liest die Informationen aus dem Repository, beispielsweise um sie dem Benutzer anzuzeigen oder anderweitig zu verarbeiten.

Die Interaktionen sind somit in allen drei Bereichen äquivalent:

{{render:implementationguide-images-interaktionen}}
<img src="https://github.com/gematik/spec-ISiK-Medikation/blob/main-stufe-3/Material/images/diagrams/Interaktionen.svg" alt="Interkationen" width="90%"/>
9 changes: 6 additions & 3 deletions ImplementationGuide/markdown/Datenobjekte.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# Datenobjekte

Folgende Datenobjekte und Interaktionen aus dem Modul [ISiK Basis Stufe 3](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Basismodul-Stufe-3/ImplementationGuide-markdown-Einfuehrung?version=current) sind in diesem Modul bestätigungsrelevant:
Folgende Datenobjekte aus dem Modul [ISiK Basis Stufe 3](https://simplifier.net/guide/implementierungsleitfaden-isik-basismodul-stufe-3?version=current) werden in diesem Modul verwendet:
* [Patient](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Basismodul-Stufe-3/ImplementationGuide-markdown-Datenobjekte-Datenobjekte-Patient?version=current)
* [Kontakt/Fall (Encounter)](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Basismodul-Stufe-3/ImplementationGuide-markdown-Datenobjekte-Datenobjekte-Kontakt?version=current)
* [Person im Gesundheitsberuf](https://simplifier.net/guide/Implementierungsleitfaden-ISiK-Basismodul-Stufe-3/markdown-Datenobjekte-Datenobjekte-PersonImGesundheitsberuf?version=current)

Die Verwendung in diesem Modul bedeutet:
Wenn dieses Modul auf Datenobjekte aus dem Basismodul referenziert, dann MÜSSEN die referenzierten FHIR-Ressourcen konform zu den Vorgaben aus dem Basismodul sein.
Die Referenzierung von im Basismodul spezifizierten Datenobjekten, bedeutet nicht, dass die Interaktionen für die entsprechenden Datenobjekte aus dem Basismodul auch im Modul Medikation bestätigungsrelevant sind.

Darüber hinaus gelten in diesem Modul folgende Datenobjekt-spezifische Festlegungen:

{{index:current}}

Die Kern-Zusammenhänge der Datenobjekte zeigt das (stark vereinfacht dargestellte) Diagramm:

{{render:implementationguide-images-klassendiagramm}}
<img src="https://github.com/gematik/spec-ISiK-Medikation/blob/main-stufe-3/Material/images/diagrams/Klassendiagramm.svg" alt="Klassendiagramm" width="90%"/>
Binary file not shown.
6 changes: 3 additions & 3 deletions ImplementationGuide/markdown/Einfuehrung.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Basismodul/master-isik-stufe-2/Material/Gematik_Logo_Flag.png" alt="gematik logo" width="400"/>
<img src="https://github.com/gematik/spec-ISiK-Medikation/blob/main-stufe-3/Material/images/Gematik_Logo_Flag.svg" alt="gematik logo" width="400"/>

----
Version: 3.0.0
Version: 3.0.1

Datum: 1.7.2023
Datum: 12.01.2024

Status: Aktiv

Expand Down
6 changes: 6 additions & 0 deletions ImplementationGuide/markdown/ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Im Rahmen der ISiK-Veröffentlichungen wird das [Semantic Versioning](https://se

Die erste Ziffer X bezeichnet ein Major-Release und regelt die Gültigkeit von Releases. Die dritte Ziffer Y (Release x.0.y) bezeichnet eine technische Korrektur und versioniert kleinere Änderungen (Packages) während eines Jahres, z. B. 1.0.1.

Version: 3.0.1

Datum: 08.01.2024

* Update dependency with Basis: https://github.com/gematik/spec-ISiK-Medikation/pull/102/commits/039654b03d5b159ed258c35b48c37cd2db3e4a81
* update sentence on ISIKBasis Ressource usage by @f-peverali in https://github.com/gematik/spec-ISiK-Medikation/pull/103
----
Version: 3.0.0

Expand Down
Binary file not shown.
40 changes: 40 additions & 0 deletions Material/images/Gematik_Logo_Flag.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Material/images/diagrams/Interaktionen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Material/images/diagrams/Klassendiagramm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading