From db0a5244accbcfb1e96ddd840d0dfc5b7f3ba00a Mon Sep 17 00:00:00 2001 From: Frederik Beimgraben Date: Sun, 1 Dec 2024 19:42:49 +0000 Subject: [PATCH] Add simpler Presence Table --- Content/00_toc.tex | 9 --- Content/99_bib.tex | 3 - HSRTReport/Modules/MeetingPresence.tex | 2 +- Main.tex | 15 +++- TeX/Preamble.tex | 11 +-- TeX/Protocol.tex | 61 ++++++++++++++++ TeX/Settings/General.tex | 98 +++++++++++++++++++++----- 7 files changed, 162 insertions(+), 37 deletions(-) delete mode 100644 Content/00_toc.tex delete mode 100644 Content/99_bib.tex create mode 100644 TeX/Protocol.tex diff --git a/Content/00_toc.tex b/Content/00_toc.tex deleted file mode 100644 index e7d2afc..0000000 --- a/Content/00_toc.tex +++ /dev/null @@ -1,9 +0,0 @@ -% !TEX root = ../Main.tex -{ - \blenderfont - \tableofcontents -} - -\vspace{\fill} - -\pagebreak \ No newline at end of file diff --git a/Content/99_bib.tex b/Content/99_bib.tex deleted file mode 100644 index b9dd7a0..0000000 --- a/Content/99_bib.tex +++ /dev/null @@ -1,3 +0,0 @@ -% !TEX root = ../Main.tex -\newpage -\printbibliography \ No newline at end of file diff --git a/HSRTReport/Modules/MeetingPresence.tex b/HSRTReport/Modules/MeetingPresence.tex index 0c1bd82..5e584ed 100644 --- a/HSRTReport/Modules/MeetingPresence.tex +++ b/HSRTReport/Modules/MeetingPresence.tex @@ -1,6 +1,6 @@ % !TEX root = ../../Main.tex \DeclareRobustCommand{\tableDot}[1]{ - \strcompare{#1}{true}{ + \strcompare{#1}{1}{ $\bullet$ }{ \hspace{1em} diff --git a/Main.tex b/Main.tex index 0b2bbcb..d9290ff 100644 --- a/Main.tex +++ b/Main.tex @@ -14,14 +14,23 @@ % Title page \maketitle +% Set line spacing \setstretch{1.0} + +% Table of contents +{\blenderfont\tableofcontents}\vspace{\fill}\pagebreak + +% Presence table +\MakePresenceTable\pagebreak + % ===== Content ===== -\input{Content/00_toc.tex} \input{Content/01_content.tex} -\input{Content/99_bib.tex} + +% ===== Appendix ===== +\pagebreak +\printbibliography \pagebreak -% Print the glossary \printnoidxglossaries \end{document} diff --git a/TeX/Preamble.tex b/TeX/Preamble.tex index 111cb9f..a8c037a 100644 --- a/TeX/Preamble.tex +++ b/TeX/Preamble.tex @@ -1,15 +1,16 @@ % !TEX root = ../Main.tex +% ==== Imports ==== +\usepackage{hyperref} +\usepackage[nameinlink, noabbrev]{cleveref} +\input{TeX/Protocol} +% ==== /Imports ==== + % ==== Settings ==== \input{TeX/Settings/General} \input{TeX/Settings/Logos} % ==== /Settings ==== -% ==== Imports ==== -\usepackage{hyperref} -\usepackage[nameinlink, noabbrev]{cleveref} -% ==== /Imports ==== - % ==== Glossary ==== \input{Content/99_glossary.tex} \makenoidxglossaries diff --git a/TeX/Protocol.tex b/TeX/Protocol.tex new file mode 100644 index 0000000..e784820 --- /dev/null +++ b/TeX/Protocol.tex @@ -0,0 +1,61 @@ +% !TEX root = ../Main.tex +% ======================================================== +% Vereinfachung zur Darstellung von Tagesordnungspunkten +% (TOP) in einem Sitzungsprotokoll. +% ======================================================== + +\NewEnviron{TOP}[1]{ + \goodbreak + \section{#1} + \BODY + \vspace{1.5em} +} + +% tok for the committee members +\newtoks\committeeMembers + +% counters for: STUPA, AStA, Präsent, Online +\newcounter{stupaCounter} +\newcounter{astaCounter} +\newcounter{presentCounter} +\newcounter{onlineCounter} + +% Command to count based on flags: STUPA, AStA, Präsent, Online +\DeclareRobustCommand{\CountPresence}[4]{ + \ifthenelse{#1=1}{\stepcounter{stupaCounter}}{} + \ifthenelse{#2=1}{\stepcounter{astaCounter}}{} + \ifthenelse{#3=1}{\stepcounter{presentCounter}}{} + \ifthenelse{#4=1}{\stepcounter{onlineCounter}}{} +} + +% Command to add a line to the presence table +% Online ┑ +% Präsent ┑ │ +% ASTA ┑ │ │ ┍ Bis* +% STUPA ┑ │ │ │ ┍ Name ┍ Rolle(n) ┍ Ab* │ +% \AddCommitteeMember{1}{1}{1}{0}{Max Muster}{Musterrolle}{4:20}{6:09} +\DeclareRobustCommand{\AddCommitteeMember}[8]{ + \CountPresence{#1}{#2}{#3}{#4} + \committeeMembers=\expandafter{\the\committeeMembers + \PresenceTableLine{#5}{#6}{#7}{#8}{#1}{#2}{#3}{#4} + } +} + +\DeclareRobustCommand{\AddPresenceSeparator}[0]{ + \committeeMembers=\expandafter{\the\committeeMembers + \hdashline\addlinespace[1ex] + } +} + +% Command to make the final table +\DeclareRobustCommand{\MakePresenceTable}{ + \begin{CustomBox}{\faIcon{user}}{eggplant} + \chapter{Anwesenheitsliste} + \PresenceTable{ + \the\committeeMembers + \specialrule{.2em}{.05em}{.05em}\addlinespace[1ex] + \PresenceTableSums{\thestupaCounter}{\theastaCounter}{\thepresentCounter}{\theonlineCounter} + \specialrule{.2em}{.05em}{.05em} + } + \end{CustomBox} +} \ No newline at end of file diff --git a/TeX/Settings/General.tex b/TeX/Settings/General.tex index a53b7b5..9b31bd3 100644 --- a/TeX/Settings/General.tex +++ b/TeX/Settings/General.tex @@ -1,27 +1,93 @@ % !TEX root = ../../Main.tex -% Meeting date -\newcommand{\waterMarkText}{Stand \today} -% Current date and time -\createdon{\today} +\newcommand{\waterMarkText}{} +\newcommand{\meetingDate}{26.11.2024} +\newcommand{\meetingLocation}{ + % Online + % / Hybrid + - +} +\newcommand{\meetingStartTime}{19:29} +\newcommand{\meetingEndTime}{19:42} +\newcommand{\meetingType}{ + Ordentliche Sitzung + % Außerordentliche Sitzung + % Vollversammlung + % Informationsveranstaltung +} +% Sitzungsleitung +\newcommand{\meetingLeader}{Clara Schweiker} +% Schriftführung/Protokollführung +\newcommand{\meetingSecretary}{Frederik Beimgraben} +% Gremium: AStA, STUPA +\newcommand{\meetingCommitteeSelection}{AStA} +% Beschlussfähigkeit +\newcommand{\meetingQuorum}{gegeben} + +% Select the committee using if statements +\ifthenelse{\equal{\meetingCommitteeSelection}{AStA}}{ + \newcommand{\meetingCommittee}{Allgemeiner Studierendenausschuss (AStA)} + \newcommand{\meetingCommitteeGenitive}{des Allgemeinen Studierendenausschusses (AStA)} +}{ + \ifthenelse{\equal{\meetingCommitteeSelection}{STUPA}}{ + \newcommand{\meetingCommittee}{Studierendenparlament (STUPA)} + \newcommand{\meetingCommitteeGenitive}{des Studierendenparlaments (STUPA)} + }{ + \newcommand{\meetingCommittee}{\meetingCommitteeSelection} + \newcommand{\meetingCommitteeGenitive}{} + } +} + +\providecommand{\meetingCommittee}{-} +\providecommand{\meetingCommitteeGenitive}{} % Title -\title{HSRT \LaTeX\ Report Template of Frederik Beimgraben} +\title{Sitzung \meetingCommitteeGenitive~am \meetingDate} % Data fields for the title page -\makeatletter -\AddTitlePageDataLine{Titel}{\@title} +\AddTitlePageDataLine{Datum}{\meetingDate} +\AddTitlePageDataLine{Ort}{\meetingLocation} \AddTitlePageDataSpace{5pt} -\AddTitlePageDataLine{Autor:innen}{Frederik Beimgraben} -\AddTitlePageDataLine{}{Max Mustermann} -\AddTitlePageDataLine{}{Erika Musterfrau} +\AddTitlePageDataLine{Beginn}{\meetingStartTime} +\AddTitlePageDataLine{Ende}{\meetingEndTime} \AddTitlePageDataSpace{5pt} -\AddTitlePageDataLine{Studiengang}{Medizinisch Technische Informatik B.Sc.} -\AddTitlePageDataLine{Modul}{MTI.00.00 - Mustermodul} -\AddTitlePageDataLine{Dozent:in}{Prof. Dr. Max Mustermann} -\AddTitlePageDataLine{Semester}{Wintersemester 2024/2025} -\makeatother +\AddTitlePageDataLine{Art}{\meetingType} +\AddTitlePageDataSpace{5pt} +\AddTitlePageDataLine{Sitzungsleitung}{\meetingLeader} +\AddTitlePageDataLine{Schriftführung}{\meetingSecretary} % Disable indentation -\setlength{\parindent}{0pt} \ No newline at end of file +\setlength{\parindent}{0pt} + +% ============================================================================= +% Meeting Members +% Online ┑ +% Präsent ┑ │ +% ASTA ┑ │ │ +% STUPA ┑ │ │ │ +% ASTA-Mitglieder │ │ │ │ +\AddCommitteeMember{1}{1}{1}{0}{Clara Schweiker}{Vorsitzende}{}{} +\AddCommitteeMember{1}{1}{1}{0}{Luis Meyer}{Finanzreferent}{}{} +\AddCommitteeMember{1}{1}{1}{0}{Frederik Beimgraben}{Protokoll, IT-Referent}{}{} +\AddCommitteeMember{1}{1}{1}{0}{Quentin Walz}{1. Beisitz d. AStA}{}{} +\AddCommitteeMember{0}{1}{1}{0}{Pauline Pfeiffer}{2. Beisitz d. AStA}{}{} +% STUPA-Mitglieder +\iffalse +\AddPresenceSeparator +\AddCommitteeMember{1}{0}{1}{0}{Ignacio Arregui Lesser}{}{}{} +\AddCommitteeMember{1}{0}{1}{0}{Uwe Beisel}{}{}{} +\AddCommitteeMember{1}{0}{1}{0}{Monika Dang}{}{}{} +\AddCommitteeMember{1}{0}{1}{0}{Elias Dietenberger}{}{}{} +\AddCommitteeMember{1}{0}{1}{0}{Katharina Hofmann}{}{19:40}{20:18} +\AddCommitteeMember{1}{0}{1}{0}{Lea Hornberger}{}{}{} +\AddCommitteeMember{1}{0}{1}{0}{Clara Niggemeyer}{}{}{} +\AddCommitteeMember{1}{0}{1}{0}{Christopher Seitz}{}{}{} +\AddCommitteeMember{1}{0}{1}{0}{Tiphaine Reynaud}{}{}{} +\fi +% Gäste +\iffalse +\AddPresenceSeparator +\AddCommitteeMember{1}{1}{1}{0}{Nico Göbel}{}{}{} +\fi +% ============================================================================= \ No newline at end of file