Gestaltung überarbeitet und an neue Vorgaben angepasst

calendar/calendar.tex

@@ -64,7 +64,18 @@
 	}
 }
 
-\begin{schulkalendar}{Schulkalendar}
+\ifthenelse{\boolean{printKalendar}}{%
-	\schulkal{\jahrEins-08-01 to \jahrZwei-01-31}{first}
+	\begin{schulkalendar}{Schulkalendar}
-	\schulkal{\jahrZwei-02-01 to \jahrZwei-07-31}{second}
+		\schulkal{\jahrEins-08-01 to \jahrZwei-01-31}{first}
-\end{schulkalendar}
+		\schulkal{\jahrZwei-02-01 to \jahrZwei-07-31}{second}
+	\end{schulkalendar}
+}{
+	\begin{center}
+		\Huge{Kalendar 1}
+	\end{center}
+		\clearpage
+	\begin{center}
+		\Huge{Kalendar 2}
+	\end{center}
+		\clearpage
+}

conf.tex

@@ -15,9 +15,15 @@
 \genordAI{--}
 \genordAII{Herr Häberle}
 \genordDL{Frau Dorsch}
+
 \genordSek{Frau Braatz}
+\genordSekZeiten{7:30--14:00\,Uhr}
+
 \genordSP{Herr Burt}
 
+\genordBerAI{Frau Meyer-Kuczera}
+\genordBerAII{--}
+
 \hypersetup{%
 	pdftitle = {\Title},%
 	pdfsubject = {},%

logbuch.tex

@@ -41,8 +41,13 @@
 \date{\today}
 %\onehalfspacing
 
+% printDraft true: keine Kalendar berechnet
+% printDraft false: Kalendar werden gesetzt (zeitaufwendig)
+\setboolean{printDraft}{false}
 \input{conf.tex}
 
+\procOpts
+
 \begin{document}
 	\front
 		\maketitle

schuleModul/GENordLogbuch/code.tex

@@ -39,6 +39,15 @@
 	\huge{\bfseries #2}
 }
 
+\providecommand{\procOpts}{%
+	\ifthenelse{\boolean{printDraft}}{%
+		\setboolean{printKalendar}{false}
+		\setboolean{printWochen}{false}
+	}{
+		\setboolean{printKalendar}{true}
+		\setboolean{printWochen}{true}
+	}
+}
 
 \providecommand{\front}{%
 	\frontmatter
@@ -78,15 +87,24 @@
 \WithSuffix\providecommand\mkUrl*[2][]{%
 	\hyperlink{#1#2}{#2}
 }
-\ProvideDocumentCommand{\mkUrlCode}{O{} m o}{%
+\ProvideDocumentCommand{\mkUrlCode}{O{} m o O{5em} O{4em}}{%
-	\begin{minipage}{5em}
+	\begin{minipage}{#4}
 		\centering
-		\qrcode[height=4em,nolinks]{#1#2}
+		\qrcode[height=#5,nolinks]{#1#2}
 		\IfNoValueF{#3}{
 			\tiny #3
 		}
 	\end{minipage}	
 }
+% **********************************************************************
+% Macros für Kontakt
+% **********************************************************************
+\newtcolorbox{kontaktbox}[2][]{%
+	left=2mm,
+	fonttitle=\bfseries,
+	title={#2},
+	#1
+}
 
 % **********************************************************************
 % Macros für Wochenübersicht
@@ -120,6 +138,21 @@
 			\end{logbuchTag}
 		\end{minipage}
 }
+\providecommand{\printLogbuchZiel}{%
+	%\vspace{-0.25em}%
+	\begin{center}
+		\tcbox[%
+			enhanced,
+			attach boxed title to top left = {xshift=2mm,yshift=-2mm},
+			colback=white!98!black,%
+			height=1.5cm,	
+			left=1mm,
+			right=1mm,
+			fonttitle=\bfseries,
+			title={Mein Wochenziel:},
+			]{\hspace{0.95\linewidth} }%
+	\end{center}\vspace*{-3em}%
+}
 \newtcolorbox{logbuchZusatz}[1]{%
 	colback=white!98!black,%	
 	left=1mm,
@@ -139,6 +172,10 @@
 	attach boxed title to top left = {xshift=2mm,yshift=-2mm},
 	sharp corners=downhill,
 	colback=white!93!black,	
+	sidebyside=true,
+	righthand width=0.8cm,
+	sidebyside gap=3mm,
+	flushright lower,
 	left=1mm,
 	right=1mm,
 	top=4mm,
@@ -154,10 +191,16 @@
 		\begin{logbuchFach}{\n.\,Stunde}
 			\textbf{Fach:} 
 
-			\feldLin[0.6cm]{2}
+			\feldLin[0.6cm]{3}
-
+			\vspace{-0.5cm}
 			\tcblower
-			\usym{1F641} \hfil \usym{1F610} \hfil \usym{1F642} \hfil \usym{1F603}
+			\usym{1F641}
+			
+			\usym{1F610} 
+			
+			\usym{1F642} 
+			
+			\usym{1F603}
 		\end{logbuchFach}
 	}
 }

schuleModul/GENordLogbuch/optionen.tex

@@ -1,3 +1,6 @@
+\newboolean{printWochen}
+\newboolean{printKalendar}
+\newboolean{printDraft}
 
 % ALLGEMEINE OPTIONEN
 \providecommand{\Title}{Logbuch\xspace}
@@ -39,6 +42,8 @@
 \providecommand{\genordMail}[1]{\renewcommand{\GenordMail}{#1}}
 \providecommand{\GenordUrl}{http://www.ge-nord.de}
 \providecommand{\genordUrl}[1]{\renewcommand{\GenordUrl}{#1}}
+\providecommand{\GenordUrlABC}{http://www.ge-nord.de/ABC}
+\providecommand{\genordUrlABC}[1]{\renewcommand{\GenordUrlABC}{#1}}
 
 \providecommand{\GenordSL}{--}
 \providecommand{\genordSL}[1]{\renewcommand{\GenordSL}{#1}}
@@ -50,7 +55,16 @@
 \providecommand{\genordAII}[1]{\renewcommand{\GenordAII}{#1}}
 \providecommand{\GenordDL}{--}
 \providecommand{\genordDL}[1]{\renewcommand{\GenordDL}{#1}}
+
 \providecommand{\GenordSek}{--}
 \providecommand{\genordSek}[1]{\renewcommand{\GenordSek}{#1}}
+\providecommand{\GenordSekZeiten}{--}
+\providecommand{\genordSekZeiten}[1]{\renewcommand{\GenordSekZeiten}{#1}}
+
 \providecommand{\GenordSP}{--}
 \providecommand{\genordSP}[1]{\renewcommand{\GenordSP}{#1}}
+
+\providecommand{\GenordBerAI}{--}
+\providecommand{\genordBerAI}[1]{\renewcommand{\GenordBerAI}{#1}}
+\providecommand{\GenordBerAII}{--}
+\providecommand{\genordBerAII}[1]{\renewcommand{\GenordBerAII}{#1}}

schuleModul/GENordLogbuch/pakete.tex

@@ -1,5 +1,5 @@
 \RequirePackage{tcolorbox}
-\tcbuselibrary{skins,breakable}
+\tcbuselibrary{skins,breakable,xparse,raster}
 
 \RequirePackage{translator}	% German Month and Day names
 \usetikzlibrary{calc}

wochenUebersicht.tex

@@ -1,26 +1,52 @@
-\newgeometry{%includefoot,includehead,
+\ifthenelse{\boolean{printWochen}}{%
-	top=0.75cm,
+	\newgeometry{%includefoot,includehead,
-	bottom=0.75cm,
+		top=0.75cm,
-	inner=1.5cm,
+		bottom=0.75cm,
-	outer=1cm,
+		inner=1.5cm,
-}
+		outer=1cm,
-\pagestyle{empty}
+	}
+	\pagestyle{empty}
 
-%\printLogbuchWoche{\jahrEins-09-04}{\jahrEins-09-09}
+	%\printLogbuchWoche{\jahrEins-09-04}{\jahrEins-09-09}
-\pgfcalendar{}{\jahrEins-09-04}{\jahrEins-09-16}
+	\pgfcalendar{}{\jahrEins-09-04}{\jahrEins-09-16}
-{\ifdate{workday}{\ifdate{Tuesday}{\printLogbuchTagDi{%
+	{\ifdate{Monday}{\printLogbuchZiel\printLogbuchTag{%
 					\pgfcalendarweekdayname{\pgfcalendarcurrentweekday},%
 					\pgfcalendarcurrentday.\pgfcalendarcurrentmonth%
-				}
+				}\hfil%
-			}{\printLogbuchTag{%
+		}{}%
-				\pgfcalendarweekdayname{\pgfcalendarcurrentweekday},%
+		\ifdate{Tuesday}{\printLogbuchTagDi{%
-				\pgfcalendarcurrentday.\pgfcalendarcurrentmonth%
+						\pgfcalendarweekdayname{\pgfcalendarcurrentweekday},%
-			}%
+						\pgfcalendarcurrentday.\pgfcalendarcurrentmonth%
-		}\ifdate{Wednesday}{\pagebreak}{\hfil}%
+					}\hfil%
-	}{}%
+		}{}%
-	\ifdate{Friday}{\printLogbuchSpalte{Rest}\pagebreak}{}%
+		\ifdate{Wednesday}{\printLogbuchTag{%
-}
+					\pgfcalendarweekdayname{\pgfcalendarcurrentweekday},%
+					\pgfcalendarcurrentday.\pgfcalendarcurrentmonth%
+				}\pagebreak%
+		}{}%
+		\ifdate{Thursday}{\printLogbuchTag{%
+						\pgfcalendarweekdayname{\pgfcalendarcurrentweekday},%
+						\pgfcalendarcurrentday.\pgfcalendarcurrentmonth%
+					}\hfil%
+		}{}%
+		\ifdate{Friday}{\printLogbuchTag{%
+						\pgfcalendarweekdayname{\pgfcalendarcurrentweekday},%
+						\pgfcalendarcurrentday.\pgfcalendarcurrentmonth%
+					}\hfil%
+		\printLogbuchSpalte{Rest}\pagebreak}{}%
+	}
 
-\clearpage
+	\clearpage
-\pagestyle{scrheadings}
+	\pagestyle{scrheadings}
-\restoregeometry
+	\restoregeometry
+}{
+	\clearpage	
+	\begin{center}
+		\Huge{Wochenübersicht 1}
+	\end{center}
+		\clearpage
+	\begin{center}
+		\Huge{Wochenübersicht 2}
+	\end{center}
+		\clearpage
+}