Merge branch 'master' of https://github.com/itCarl/osz-technik-teltow

itCarl · Apr 25, 2024 · 5d8f4b2 · 5d8f4b2
2 parents 60afbef + 9bb8478
commit 5d8f4b2
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 96 deletions.
diff --git a/example/assets/Projektantrag.pdf b/example/assets/Projektantrag.pdf
diff --git a/example/documentation/project-documentation.pdf b/example/documentation/project-documentation.pdf
diff --git a/example/documentation/project-documentation.tex b/example/documentation/project-documentation.tex
@@ -7,9 +7,9 @@
 \usepackage{graphicx}
 \usepackage{lmodern}
 \usepackage{url}
-\usepackage{subfiles}
-\usepackage{pdfpages}
-\usepackage{wrapfig}
+\usepackage{subfiles}       % enables including TeX files
+\usepackage{pdfpages}       % enables including pdf files
+\usepackage{wrapfig}        % inline images
 \usepackage{lipsum}			% Adds Lorem Ipsum placeholder
 
 % = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
@@ -38,6 +38,8 @@
 \begin{document}
 \makeIHKTitlePage%
 
+\includepdf[pages=-]{../assets/Projektantrag.pdf}
+
 % \subfile{../pages/test/test.tex} compile all .tex subpages with PowerShell Script: /helper/compile-all.ps1
 % OR
 \makeTimeNotesPage{
@@ -70,10 +72,21 @@
     \entry{13.02.2069}{... usw.}{2}
 }
 \tableofcontents
+
+\newpage
+\section*{Abkürzungsgsverzeichnis}
+\addcontentsline{toc}{section}{Abkürzungsgsverzeichnis}
+\begin{tabularx}{\linewidth}{lX}
+    DB & Database, zu Deutsch Datenbank \\
+    SQL & \textbf{S}tructured \textbf{Q}uery \textbf{L}anguage \\
+    IDE & \textbf{I}ntegrated \textbf{D}evelopment \textbf{E}nvironment, Entwicklungsumgebung \\
+\end{tabularx}
+
 \newpage
 \listoffigures
 \addcontentsline{toc}{section}{Abbildungsverzeichnis} % add page to toc
-\clearpage
+
+\newpage
 % \listoftables
 % \addcontentsline{toc}{section}{Tabellenverzeichnis} % add page to toc
 % \clearpage
@@ -86,56 +99,96 @@ \section{Einleitung}
         \caption[Beispiel Bild]{Beispiel Bild\footnotemark.}
     \end{figure}
     \footnotetext{Beispiel Bild. verfügbar unter \url{www.nowhere.de}, aufgerufen am: garnicht.2024 um 00:00Uhr}
-    \lipsum\
+    \lipsum[1]
     \subsection{Projektziel}
-    \lipsum[1-3]
+    \lipsum[1-2]
     \begin{wrapfigure}{l}{.3\textwidth}
         \centering
         \includegraphics[width=.3\textwidth]{example-image-a}
         \caption[Klickibunti Mockup]{Klickibunti Mockup\footnotemark.}
     \end{wrapfigure}
-    \lipsum[3-6]
+    \lipsum[2-3]
     \footnotetext{Klickibunti mockups. verfügbar unter \url{www.nowhere.de}, aufgerufen am: 100 v. Chr. um 07:00Uhr}
     \subsection{Projektumfeld}
-    \lipsum\
-    \subsection{Projektschnittstellen}
-    \lipsum\
+    \lipsum[1]
+
+\newpage
 \section{Projektplannung}
-    \subsection{Projektphasen}
-    \lipsum\
-    \subsection{Ressourcenplannung}
-    \lipsum\
+    \subsection{Lorem Ipsum}
+    \lipsum[1]
+    \begin{table}[!htb]
+        \centering
+        \caption{Projektphasen}
+        \begin{tabular}{|lr|}
+            \hline
+            \textbf{Projektphasen} & \textbf{Geplante Zeit} \\
+            \hline
+            Phase1 & 42h \\
+            Phase2 & 42h \\
+            Phase3 & 42h \\
+            Phase4 & 42h \\
+            Phase5 & 42h \\
+            Phase6 & 42h \\
+            \hline
+            Gesamt & 42h \\
+            \hline
+        \end{tabular}
+    \end{table}
+
 \section{Anlysephase}
-    \subsection{Anwendungsfälle}
-    \lipsum\
+    \subsection{Lorem Ipsum}
+    \lipsum[1-2]
+    \subsection{\glqq{}Make or Buy\grqq{}- Entscheidung}
+    \lipsum[1]
+    \subsection{Projektkosten}
+    \begin{table}[h]
+        \centering
+        \caption{Projektkosten}
+        \begin{tabularx}{\linewidth}{|lXrrrr|}
+            \hline
+            \textbf{Vorgang} & \textbf{Mitarbeiter} & \textbf{Zeit} & \textbf{Personalkosten} & \textbf{Ressourcen} & \textbf{Gesamt}\\
+            \hline
+            Plannung & 1x Auszubildender & 42h & 42,00€ & 2,00€ & 44,00€ \\
+            Entwicklung & 1x Auszubildender & 42h & 42,00€ & 2,00€ & 44,00€ \\
+            Code Review & 1x Mitarbeiter & 42h & 1,00€ & 2,00€ & 3,00€ \\
+            Abnahme & 1x Mitarbeiter & 42h & 1,00€ & 2,00€ & 3,00€ \\
+            \hline
+            & & & & & 2920,00€ \\
+            \hline
+        \end{tabularx}
+    \end{table}
+
 \section{Entwurfsphase}
-    \subsection{Zielplattform}
-    \lipsum\
-    \subsection{Architekturdesign}
-    \lipsum\
-    \subsection{Entwurf der Benutzeroberfläche}
-    \lipsum\
-    \subsection{Datenmodell}
-    \lipsum\
-    \subsection{Geschäftslogik}
-    \lipsum\
+    \subsection{Lorem Ipsum}
+    \lipsum[2-3]
+
 \section{Implementierungsphase}
-\newpage
+    \subsection{Lorem Ipsum}
+    \lipsum[3-4]
+
 \section{Dokumentation}
-\newpage
+    \subsection{Entwicklerdokumentation}
+    Im \fullref{anhang:Anhang1} ist die Dokumentation für Entwickler zu finden.
+
 \section{Fazit}
 
-\newpage
-\begin{alphasection}
+\clearpage
+\appendix
 \section{Anhang}
-\end{alphasection}
 
-%
-%       Stats
-%
-% \newpage
-% {\Large Statistics \par}
-% \vspace{.5cm}
-% \verb|Total Reports:|\arabic{reportID}
+    \subsection{Anhang 1}\label{anhang:Anhang1}
+    \begin{figure}[htb]
+        \centering
+        \includegraphics[width=.95\textwidth]{example-image}
+        \caption{Beispiel Anhang1}
+    \end{figure}
 
+    \clearpage
+    \subsection{Anhang 2}\label{anhang:Anhang2}
+    \begin{figure}[htb]
+        \centering
+        \includegraphics[width=.95\textwidth]{example-image}
+        \caption{Beispiel Anhang2}
+    \end{figure}
+
 \end{document}
diff --git a/example/packages/teltowPack.sty b/example/packages/teltowPack.sty
@@ -7,6 +7,7 @@
 %%
 %% History:     2024-03-19     mewesm      Created
 %%              2024-03-21     mewesm      Refactoring
+%%              2024-04-25     mewesm      Removed AlphaSection
 %%
 %%
 % ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -25,6 +26,7 @@
 \usepackage{graphicx}
 \usepackage{setspace}
 \usepackage{tabularray}
+\usepackage{tabularx}
 \usepackage{verbatim}
 \usepackage{hyperref}
 \usepackage{fancyhdr}
@@ -356,35 +358,7 @@
 % = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
 % |		HELPER COMMANDS AND DEFINITIONS
 % = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
-\newcounter{alphasect}
-\def\alphainsection{0}
-
-\let\oldsection=\section
-\def\section{
-  \ifnum\alphainsection=1
-    \addtocounter{alphasect}{1}
-  \fi
-\oldsection}
-
-\renewcommand\thesection{
-  \ifnum\alphainsection=1
-    \Alph{alphasect}
-  \else
-    \arabic{section}
-  \fi
-}
-
-\newenvironment{alphasection}{
-  \ifnum\alphainsection=1
-    \errhelp={Let other blocks end at the beginning of the next block.}
-    \errmessage{Nested Alpha section not allowed}
-  \fi
-  \setcounter{alphasect}{0}
-  \def\alphainsection{1}
-}{
-  \setcounter{alphasect}{0}
-  \def\alphainsection{0}
-}
+\newcommand*{\fullref}[1]{\hyperref[{#1}]{\autoref*{#1} \nameref*{#1}}}
 
 % handle unkown package options
 \DeclareOption*{

diff --git a/teltowPack.sty b/teltowPack.sty
@@ -7,6 +7,7 @@
 %%
 %% History:     2024-03-19     mewesm      Created
 %%              2024-03-21     mewesm      Refactoring
+%%              2024-04-25     mewesm      Removed AlphaSection
 %%
 %%
 % ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -25,6 +26,7 @@
 \usepackage{graphicx}
 \usepackage{setspace}
 \usepackage{tabularray}
+\usepackage{tabularx}
 \usepackage{verbatim}
 \usepackage{hyperref}
 \usepackage{fancyhdr}
@@ -356,35 +358,7 @@
 % = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
 % |		HELPER COMMANDS AND DEFINITIONS
 % = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
-\newcounter{alphasect}
-\def\alphainsection{0}
-
-\let\oldsection=\section
-\def\section{
-  \ifnum\alphainsection=1
-    \addtocounter{alphasect}{1}
-  \fi
-\oldsection}
-
-\renewcommand\thesection{
-  \ifnum\alphainsection=1
-    \Alph{alphasect}
-  \else
-    \arabic{section}
-  \fi
-}
-
-\newenvironment{alphasection}{
-  \ifnum\alphainsection=1
-    \errhelp={Let other blocks end at the beginning of the next block.}
-    \errmessage{Nested Alpha section not allowed}
-  \fi
-  \setcounter{alphasect}{0}
-  \def\alphainsection{1}
-}{
-  \setcounter{alphasect}{0}
-  \def\alphainsection{0}
-}
+\newcommand*{\fullref}[1]{\hyperref[{#1}]{\autoref*{#1} \nameref*{#1}}}
 
 % handle unkown package options
 \DeclareOption*{