From f9b7e0012cace615f633aca018e80652535f5120 Mon Sep 17 00:00:00 2001 From: use-to <13922835+use-to@users.noreply.github.com> Date: Wed, 18 Dec 2024 16:47:08 +0100 Subject: [PATCH 1/2] feat: add imprint --- .github/workflows/latex.yml | 19 ++++++++++++++++++- head.tex | 4 +++- imprint.tex | 23 +++++++++++++++++++++++ src/agb_app_zum_doc.tex | 9 ++------- src/agb_app_zum_doc_patient.tex | 9 ++------- src/agb_mediquu_chat.tex | 9 ++------- src/agb_mediquu_connect.tex | 9 ++------- src/agb_mediquu_netzmanager.tex | 10 ++-------- src/avv.tex | 9 ++------- src/avv_tasks.tex | 9 ++------- src/liability.tex | 10 ++-------- src/nda.tex | 12 +++--------- src/privacy_concept.tex | 7 ++----- src/privacy_concept_tasks.tex | 4 +--- src/privacy_confirmation.tex | 12 +++--------- src/product_termination.tex | 6 ++---- src/sub.tex | 3 +-- src/tom.tex | 3 +-- version.tex | 2 +- 19 files changed, 74 insertions(+), 95 deletions(-) create mode 100644 imprint.tex diff --git a/.github/workflows/latex.yml b/.github/workflows/latex.yml index eed1047..3e548b3 100644 --- a/.github/workflows/latex.yml +++ b/.github/workflows/latex.yml @@ -5,9 +5,11 @@ on: [push, pull_request] env: OUTPUT_DIR: "output" MAIN_TEX_FOLDER: "src" + IMPRINT_URL: "https://cdn.helpwave.de/imprint.json" DEPENDENCIES: | head.tex version.tex + imprint.tex logo.svg jobs: @@ -115,7 +117,22 @@ jobs: - name: Inject version run: | - sed -i "s/ffffff/${{ steps.get_commit_hash.outputs.commit_hash }}/" version.tex + sed -i "s/ffffff/${{ steps.get_commit_hash.outputs.commit_hash }}/g" version.tex + + - name: Download JSON file + run: | + curl -o imprint.json ${{ env.IMPRINT_URL }} + + - name: Replace placeholders in LaTeX file + run: | + FILE_TO_UPDATE="imprint.tex" + + for key in $(jq -r 'keys[]' imprint.json); do + value=$(jq -r --arg key "$key" '.[$key]' imprint.json) + + placeholder=$(echo $key | tr '.' '_') + sed -i "s|{$placeholder}|{$value}|g" $FILE_TO_UPDATE + done - name: Compile changed LaTeX documents if: env.changed_files != '' diff --git a/head.tex b/head.tex index 1658687..88b344c 100644 --- a/head.tex +++ b/head.tex @@ -8,7 +8,6 @@ \usepackage{fancyhdr} \usepackage{longtable} - \usepackage{inter} \renewcommand\familydefault{\sfdefault} @@ -36,3 +35,6 @@ \def\Year{\expandafter\YEAR\the\year} \def\YEAR#1#2#3#4{#1#2#3#4} + +\input{version} +\input{imprint} diff --git a/imprint.tex b/imprint.tex new file mode 100644 index 0000000..62c370b --- /dev/null +++ b/imprint.tex @@ -0,0 +1,23 @@ +\newcommand{\imprintURL}{imprint_url} +\newcommand{\companyName}{company_name} +\newcommand{\careOf}{care_of} +\newcommand{\street}{street} +\newcommand{\postalCode}{postal_code} +\newcommand{\city}{city} +\newcommand{\registrationNumber}{registration_number} +\newcommand{\registrationCourt}{registration_court} +\newcommand{\managingDirector}{managing_director} +\newcommand{\email}{email} +\newcommand{\vatIdentificationNumber}{vat_identification_number} + +\newcommand{\imprint}{ + \href{\imprintURL}{ + {\small + \companyName\\ + \careOf\\ + \street\\ + \postalCode\ \city\\ + \registrationNumber + } + } +} diff --git a/src/agb_app_zum_doc.tex b/src/agb_app_zum_doc.tex index 3f0493e..d71e6e4 100644 --- a/src/agb_app_zum_doc.tex +++ b/src/agb_app_zum_doc.tex @@ -1,7 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} \begin{document} @@ -12,11 +11,7 @@ \huge App zum Doc \\[1ex] \Large Erbringer-Anwendung}\\[2ex] \vspace{1em} - {\large - helpwave GmbH \\ - Jülicher Straße 209d \\ - 52070 Aachen \\ - HRB 27480}\\ + \imprint \\ \vspace{1em} Stand: \today \end{center} diff --git a/src/agb_app_zum_doc_patient.tex b/src/agb_app_zum_doc_patient.tex index c30e0ed..07515b5 100644 --- a/src/agb_app_zum_doc_patient.tex +++ b/src/agb_app_zum_doc_patient.tex @@ -1,7 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} \begin{document} @@ -12,11 +11,7 @@ \huge App zum Doc \\[1ex] \Large Erbringer-Anwendung}\\[2ex] \vspace{1em} - {\large - helpwave GmbH \\ - Jülicher Straße 209d \\ - 52070 Aachen \\ - HRB 27480}\\ + \imprint \\ \vspace{1em} Stand: \today \end{center} diff --git a/src/agb_mediquu_chat.tex b/src/agb_mediquu_chat.tex index 45a84f7..31ba7e2 100644 --- a/src/agb_mediquu_chat.tex +++ b/src/agb_mediquu_chat.tex @@ -1,7 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} \begin{document} @@ -12,11 +11,7 @@ \huge mediQuu Team: Chat}\\[2ex] \vspace{1em} - {\large - helpwave GmbH \\ - Jülicher Straße 209d \\ - 52070 Aachen \\ - HRB 27480}\\ + \imprint \\ \vspace{1em} Stand: \today \end{center} diff --git a/src/agb_mediquu_connect.tex b/src/agb_mediquu_connect.tex index 7600b57..977b9de 100644 --- a/src/agb_mediquu_connect.tex +++ b/src/agb_mediquu_connect.tex @@ -1,7 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} \begin{document} @@ -12,11 +11,7 @@ \huge mediQuu Connect}\\[2ex] \vspace{1em} - {\large - helpwave GmbH \\ - Jülicher Straße 209d \\ - 52070 Aachen \\ - HRB 27480}\\ + \imprint \\ \vspace{1em} Stand: \today \end{center} diff --git a/src/agb_mediquu_netzmanager.tex b/src/agb_mediquu_netzmanager.tex index 9b366d7..a8053b5 100644 --- a/src/agb_mediquu_netzmanager.tex +++ b/src/agb_mediquu_netzmanager.tex @@ -1,8 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} - +\input{head} \begin{document} @@ -13,11 +11,7 @@ \huge mediQuu Netzmanager}\\[2ex] \vspace{1em} - {\large - helpwave GmbH \\ - Jülicher Straße 209d \\ - 52070 Aachen \\ - HRB 27480}\\ + \imprint \\ \vspace{1em} Stand: \today \end{center} diff --git a/src/avv.tex b/src/avv.tex index a580215..db7503b 100644 --- a/src/avv.tex +++ b/src/avv.tex @@ -1,7 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} \begin{document} @@ -12,11 +11,7 @@ \vspace{1em} \Large gemäß Art. 28 DSGVO}\\ \vspace{1em} - {\large - helpwave GmbH \\ - Jülicher Straße 209s \\ - 52070 Aachen \\ - HRB 27480}\\ + \imprint \\ \vspace{1em} Stand: \today \end{center} diff --git a/src/avv_tasks.tex b/src/avv_tasks.tex index 56df2b1..e6a98ef 100644 --- a/src/avv_tasks.tex +++ b/src/avv_tasks.tex @@ -1,7 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} \begin{document} @@ -12,11 +11,7 @@ \vspace{1em} \Large gemäß Art. 28 DSGVO}\\ \vspace{1em} - {\large - helpwave GmbH \\ - Jülicher Straße 209d \\ - 52070 Aachen \\ - HRB 27480}\\ + \imprint \\ \vspace{1em} Stand: \today \end{center} diff --git a/src/liability.tex b/src/liability.tex index 8162dd1..fcb9474 100644 --- a/src/liability.tex +++ b/src/liability.tex @@ -1,7 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} \begin{document} @@ -9,12 +8,7 @@ \includesvg[width=0.2\linewidth]{logo.svg}\\[4ex] {\Huge \sffamily Haftungsvereinbarung}\\[2ex] \textcolor{gray}{{\large \sffamily zwischen}}\\[2ex] - {\small -helpwave GmbH \\ -mit Sitz in Aachen \\ -HRB 27480 \\ -(nachfolgend „Auftraggeber“) -}\\[2ex] + {\imprint \\ (nachfolgend „Auftraggeber“)}\\[2ex] {\textcolor{gray}{{\large \sffamily und}}}\\[2ex] {\small Vorname Nachname\\ diff --git a/src/nda.tex b/src/nda.tex index 63d2214..55688ff 100644 --- a/src/nda.tex +++ b/src/nda.tex @@ -1,7 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} \begin{document} @@ -9,13 +8,8 @@ \includesvg[width=0.2\linewidth]{logo.svg}\\[4ex] {\Huge \sffamily Vertraulichkeitsvereinbarung}\\[2ex] \textcolor{gray}{{\large \sffamily zwischen}}\\[2ex] - {\small -helpwave GmbH \\ -mit Sitz in Aachen \\ -HRB 27480 \\ -(nachfolgend „Inhaber“) -}\\[2ex] - {\textcolor{gray}{{\large \sffamily und}}}\\[2ex] + {\imprint \\ (nachfolgend „Inhaber“)}\\[2ex] + {\textcolor{gray}{{\large \sffamily und}}}\\[2ex] {\small \begin{Form} diff --git a/src/privacy_concept.tex b/src/privacy_concept.tex index defacd8..ee074b2 100644 --- a/src/privacy_concept.tex +++ b/src/privacy_concept.tex @@ -1,6 +1,7 @@ \documentclass[a4paper,10pt]{article} -\newcommand{\companyName}{helpwave GmbH} +\input{head} + \newcommand{\companyMail}{contact@helpwave.de} \newcommand{\companyAddress}{\companyName \\ c/o Collective Incubator \\ Jülicher Straße 209d \\ 52070 Aachen \\ Nordrhein-Westfalen \\ Deutschland} \newcommand{\dateOfCreation}{17.12.2024} @@ -8,9 +9,6 @@ \newcommand{\privacyPerson}{Felix Evers} \newcommand{\privacyPersonRole}{Geschäftführer} -\include{head} -\include{version} - \begin{document} \begin{center} @@ -18,7 +16,6 @@ \Large \textbf{Datenschutzkonzept nach DSGVO} \\ [1em] für\\[1em] \companyName\\[1em] - Version: \version\\[1em] Stand: \today \\[1em] Verantwortlicher: \privacyPerson \\[0.5em] Position: \privacyPersonRole diff --git a/src/privacy_concept_tasks.tex b/src/privacy_concept_tasks.tex index a495288..41345d5 100644 --- a/src/privacy_concept_tasks.tex +++ b/src/privacy_concept_tasks.tex @@ -1,9 +1,7 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} -\newcommand{\companyName}{helpwave GmbH} \newcommand{\companyMail}{contact@helpwave.de} \newcommand{\companyAddress}{\companyName \\ c/o Collective Incubator \\ Jülicher Straße 209d \\ 52070 Aachen \\ Nordrhein-Westfalen \\ Deutschland} \newcommand{\dateOfCreation}{17.12.2024} diff --git a/src/privacy_confirmation.tex b/src/privacy_confirmation.tex index 0e1c635..b59d5a3 100644 --- a/src/privacy_confirmation.tex +++ b/src/privacy_confirmation.tex @@ -1,7 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} \begin{document} @@ -9,13 +8,8 @@ \includesvg[width=0.2\linewidth]{logo.svg}\\[4ex] {\Huge \sffamily Bestätigung der Datenschutzschulung}\\[2ex] \textcolor{gray}{{\large \sffamily zwischen}}\\[2ex] - {\small -helpwave GmbH \\ -mit Sitz in Aachen \\ -HRB 27480 \\ -(nachfolgend „Auftraggeber“) -}\\[2ex] - {\textcolor{gray}{{\large \sffamily und}}}\\[2ex] + {\imprint \\(nachfolgend „Auftraggeber“)}\\[2ex] + {\textcolor{gray}{{\large \sffamily und}}}\\[2ex] {\small Vorname Nachname\\ (nachfolgend „Auftragnehmer“)}\\[2ex] diff --git a/src/product_termination.tex b/src/product_termination.tex index 312d52c..04e372b 100644 --- a/src/product_termination.tex +++ b/src/product_termination.tex @@ -1,6 +1,7 @@ \documentclass[a4paper,10pt]{article} -\newcommand{\companyName}{helpwave GmbH} +\input{head} + \newcommand{\companyAddress}{\companyName\\ c/o Collective Incubator\\ Jülicher Straße 209d\\ 52070 Aachen} \newcommand{\companyCEO}{Felix Evers} \newcommand{\companyEmail}{contact@helpwave.de} @@ -12,9 +13,6 @@ \newcommand{\terminationDate}{DD.MM.YYYY} \newcommand{\currentDate}{\today} -\include{head} -\include{version} - \begin{document} \vspace{0.5cm} diff --git a/src/sub.tex b/src/sub.tex index 085f443..5941537 100644 --- a/src/sub.tex +++ b/src/sub.tex @@ -1,7 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} \begin{document} diff --git a/src/tom.tex b/src/tom.tex index 341c46a..609a2d7 100644 --- a/src/tom.tex +++ b/src/tom.tex @@ -1,7 +1,6 @@ \documentclass[a4paper,10pt]{article} -\include{head} -\include{version} +\input{head} \begin{document} diff --git a/version.tex b/version.tex index c84babd..524c346 100644 --- a/version.tex +++ b/version.tex @@ -1 +1 @@ -\newcommand{\version}{\texttt{ffffff}} +\newcommand{\version}{\href{https://github.com/helpwave/legal/commit/ffffff}{\texttt{ffffff}}} From 565b2fa727e4fa4080874e991216f6c51587de12 Mon Sep 17 00:00:00 2001 From: use-to <13922835+use-to@users.noreply.github.com> Date: Wed, 18 Dec 2024 16:53:29 +0100 Subject: [PATCH 2/2] fix: remove table of contents in sub.tex --- src/liability.tex | 8 ++++++-- src/sub.tex | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/liability.tex b/src/liability.tex index fcb9474..4662269 100644 --- a/src/liability.tex +++ b/src/liability.tex @@ -2,6 +2,10 @@ \input{head} +\newcommand{\contractorFirstname}{VORNAME} +\newcommand{\contractorLastname}{NACHNAME} +\newcommand{\contractorCity}{STADT} + \begin{document} \begin{center} @@ -11,7 +15,7 @@ {\imprint \\ (nachfolgend „Auftraggeber“)}\\[2ex] {\textcolor{gray}{{\large \sffamily und}}}\\[2ex] {\small -Vorname Nachname\\ +\contractorFirstname \contractorLastname \\ (nachfolgend „Auftragnehmer“)}\\[2ex] {\small (nachfolgend beide Parteien auch bezeichnet als „Partei“ oder „Parteien“) @@ -54,7 +58,7 @@ \section{Schlussbestimmungen} \begin{center} \underline{\hspace{3in}} \\ -\hspace*{0mm}\small STADT, \today \\ +\hspace*{0mm}\small \contractorCity, \today \\ \hspace*{0mm}\Large Auftragnehmer \end{center} diff --git a/src/sub.tex b/src/sub.tex index 5941537..1da441a 100644 --- a/src/sub.tex +++ b/src/sub.tex @@ -12,8 +12,6 @@ \Large Stand: \today \end{center} -\newpage -\tableofcontents \newpage \begin{longtable}{|l|l|}