diff --git a/.github/workflows/RenderAllDiagrams.yml b/.github/workflows/RenderAllDiagrams.yml index 08bdf0d..b1c51b7 100644 --- a/.github/workflows/RenderAllDiagrams.yml +++ b/.github/workflows/RenderAllDiagrams.yml @@ -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**' @@ -41,40 +41,40 @@ 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/*.png + rm -rf Material/images/diagrams/*.svg - # Generate the PNGs from PUML - - name: Render PUML to PNG and Move files + # 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 PNGs from PUMLs - find $dir -name "*.puml" -exec java -jar plantuml.jar -png {} \; + # Render SVGs from PUMLs + find $dir -name "*.puml" -exec java -jar plantuml.jar -tsvg {} \; done - # Generate the PNGs from DrawIO - - name: Render DrawIO to PNG with predefined action + # 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: png + format: svg action-mode: all - # copies the created png files to the images/diagrams folder and deletes the drawio files - - name: Move PNGs to target image folder + # 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 *.PNG files under any /imgsrc/ folder - FileNamePaths=$(find . -path "*/imgsrc/*/*.PNG" -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 PNGs to out directory - find $dir -name "*.png" -exec mv {} $img_dir \; + # Move SVGs to out directory + find $dir -name "*.svg" -exec mv {} $img_dir \; done ## add and commit the new generated files diff --git a/ImplementationGuide/markdown/AkteureUndInteraktionen.md b/ImplementationGuide/markdown/AkteureUndInteraktionen.md index fc4c8f1..77b8d9c 100644 --- a/ImplementationGuide/markdown/AkteureUndInteraktionen.md +++ b/ImplementationGuide/markdown/AkteureUndInteraktionen.md @@ -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-diagrams-interaktionen}} +Interkationen \ No newline at end of file diff --git a/ImplementationGuide/markdown/Datenobjekte.md b/ImplementationGuide/markdown/Datenobjekte.md index 64c250c..2e471c5 100644 --- a/ImplementationGuide/markdown/Datenobjekte.md +++ b/ImplementationGuide/markdown/Datenobjekte.md @@ -14,5 +14,4 @@ Darüber hinaus gelten in diesem Modul folgende Datenobjekt-spezifische Festlegu {{index:current}} Die Kern-Zusammenhänge der Datenobjekte zeigt das (stark vereinfacht dargestellte) Diagramm: - -{{render:implementationguide-images-diagrams-klassendiagramm}} +Klassendiagramm diff --git a/ImplementationGuide/markdown/Datenobjekte_MedikationsVerabreichung.pdf b/ImplementationGuide/markdown/Datenobjekte_MedikationsVerabreichung.pdf deleted file mode 100644 index f948dfa..0000000 Binary files a/ImplementationGuide/markdown/Datenobjekte_MedikationsVerabreichung.pdf and /dev/null differ diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md index ec5b12c..3a9751e 100644 --- a/ImplementationGuide/markdown/Einfuehrung.md +++ b/ImplementationGuide/markdown/Einfuehrung.md @@ -1,4 +1,4 @@ -gematik logo +gematik logo ---- Version: 3.0.1 diff --git a/Material/images/imgsrc/drawio/Interaktionen.drawio b/Material/images/src/drawio/Interaktionen.drawio similarity index 100% rename from Material/images/imgsrc/drawio/Interaktionen.drawio rename to Material/images/src/drawio/Interaktionen.drawio diff --git a/Material/images/imgsrc/drawio/Klassendiagramm.drawio b/Material/images/src/drawio/Klassendiagramm.drawio similarity index 100% rename from Material/images/imgsrc/drawio/Klassendiagramm.drawio rename to Material/images/src/drawio/Klassendiagramm.drawio diff --git a/plantuml.jar b/plantuml.jar deleted file mode 100644 index a532c84..0000000 Binary files a/plantuml.jar and /dev/null differ