diff --git a/logbuch.pdf b/logbuch.pdf index 1d9795d..3df41cd 100644 Binary files a/logbuch.pdf and b/logbuch.pdf differ diff --git a/logbuch.tex b/logbuch.tex index 3116286..6563f80 100644 --- a/logbuch.tex +++ b/logbuch.tex @@ -1,4 +1,4 @@ -\documentclass[a4paper,11pt,titlepage,ngerman]{scrbook} +\documentclass[a4paper,11pt,titlepage,ngerman,openany]{scrbook} \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage[ngerman]{babel} @@ -22,7 +22,7 @@ %seitenzahlen=autoGesamt, %loesungen=seite, %fach={}, - module={Kuerzel,Symbole,GENord,GENordLogbuch}, + module={Kuerzel,Symbole,Aufgaben,Papiertypen,GENord,GENordLogbuch}, %lerngruppe={Lernbüro 5}, farbig ]{schule} diff --git a/schuleModul/GENordLogbuch/code.tex b/schuleModul/GENordLogbuch/code.tex index aa58390..8fddf9c 100644 --- a/schuleModul/GENordLogbuch/code.tex +++ b/schuleModul/GENordLogbuch/code.tex @@ -48,8 +48,12 @@ \cfoot{} } \providecommand{\hauptteil}{% - \clearpage - \mainmatter + %\clearpage + { + \let\cleardoublepage\relax + \let\clearpage\relax + \mainmatter + } } \providecommand{\anhang}{% \clearpage @@ -57,12 +61,12 @@ } \providecommand{\wochen}[2][]{% - \clearpage + %\clearpage \addcontentsline{toc}{chapter}{Wochenübersichten} \input{#2} } -\ProvideDocumentCommand{\mkUrl}{o m o}{% +\ProvideDocumentCommand{\mkUrl}{O{} m o}{% \url{#1#2} \marginpar{% \qrcode[height=4em,nolinks]{#1#2} \IfNoValueF{#3}{ @@ -74,7 +78,7 @@ \WithSuffix\providecommand\mkUrl*[2][]{% \hyperlink{#1#2}{#2} } -\ProvideDocumentCommand{\mkUrlCode}{o m o}{% +\ProvideDocumentCommand{\mkUrlCode}{O{} m o}{% \begin{minipage}{5em} \centering \qrcode[height=4em,nolinks]{#1#2} @@ -85,9 +89,94 @@ } % ********************************************************************** -% Macros für Kontakt +% Macros für Wochenübersicht % ********************************************************************** +\providecommand{\printLogbuchTag}[2][]{% + \begin{minipage}{0.32\textwidth} + \centering + \begin{logbuchTag}{#2} + \faecher + \end{logbuchTag} + \end{minipage} +} +\providecommand{\printLogbuchTagDi}[2][]{% + \begin{minipage}{0.32\textwidth} + \centering + \begin{logbuchTag}{#2} + \faecher[4] + \end{logbuchTag} + \begin{logbuchZusatz}{Extras} + something awesome will appear here + \vspace{6.5cm} + \end{logbuchZusatz} + \end{minipage} +} +\providecommand{\printLogbuchSpalte}[2][6]{% + \begin{minipage}{0.32\textwidth} + \centering + \begin{logbuchTag}{#2} + something awesome will appear here + \vspace{0.9\textheight} + \end{logbuchTag} + \end{minipage} +} +\newtcolorbox{logbuchZusatz}[1]{% + colback=white!98!black,% + left=1mm, + right=1mm, + fonttitle=\bfseries, + title={#1}, +} +\newtcolorbox{logbuchTag}[1]{% + colback=white!98!black,% + left=1mm, + right=1mm, + fonttitle=\bfseries, + title={#1}, +} +\newtcolorbox{logbuchFach}[1]{% + enhanced, + attach boxed title to top left = {xshift=2mm,yshift=-2mm}, + sharp corners=downhill, + colback=white!93!black, + left=1mm, + right=1mm, + top=4mm, + skin=bicolor, + colbacklower=white!85!black, + halign lower=center, + leftlower=4mm, + rightlower=4mm, + title=#1, +} +\providecommand{\faecher}[1][6]{% + \foreach\n in {1,...,#1}{% + \begin{logbuchFach}{\n.\,Stunde} + \textbf{Fach:} + \feldLin[0.6cm]{2} + + \tcblower + \usym{1F641} \hfil \usym{1F610} \hfil \usym{1F642} \hfil \usym{1F603} + \end{logbuchFach} + } +} +\providecommand{\logbuchWoche}[6][3]{% + \newcounter{logbuchTagNummer} + \setcounter{logbuchTagNummer}{0} + \foreach\name in {#2,#3,#4,#5,#6}{% + \refstepcounter{logbuchTagNummer} + \begin{minipage}{0.32\textwidth} + \centering + \begin{logbuchTag}{\name} + \faecher + \end{logbuchTag} + \end{minipage} + \ifthenelse{\value{logbuchTagNummer}<#1\OR\(\value{logbuchTagNummer}>#1\AND\value{logbuchTagNummer}<5\)}{% + \hfil + }{} + } +} % ********************************************************************** % Macros für den Kalendar diff --git a/schuleModul/GENordLogbuch/pakete.tex b/schuleModul/GENordLogbuch/pakete.tex index 5c09e90..7f233dd 100644 --- a/schuleModul/GENordLogbuch/pakete.tex +++ b/schuleModul/GENordLogbuch/pakete.tex @@ -16,3 +16,5 @@ % wegen listings \RequirePackage{scrhack} + +\RequirePackage[calc]{datetime2} diff --git a/wochenUebersicht.tex b/wochenUebersicht.tex index e69de29..a43aaff 100644 --- a/wochenUebersicht.tex +++ b/wochenUebersicht.tex @@ -0,0 +1,26 @@ +\newgeometry{%includefoot,includehead, + top=0.75cm, + bottom=0.75cm, + inner=1.5cm, + outer=1cm, +} +\pagestyle{empty} + +%\printLogbuchWoche{\jahrEins-09-04}{\jahrEins-09-09} +\pgfcalendar{}{\jahrEins-09-04}{\jahrEins-09-16} +{\ifdate{workday}{\ifdate{Tuesday}{\printLogbuchTagDi{% + \pgfcalendarweekdayname{\pgfcalendarcurrentweekday},% + \pgfcalendarcurrentday.\pgfcalendarcurrentmonth% + } + }{\printLogbuchTag{% + \pgfcalendarweekdayname{\pgfcalendarcurrentweekday},% + \pgfcalendarcurrentday.\pgfcalendarcurrentmonth% + }% + }\ifdate{Wednesday}{\pagebreak}{\hfil}% + }{}% + \ifdate{Friday}{\printLogbuchSpalte{Rest}\pagebreak}{}% +} + +\clearpage +\pagestyle{scrheadings} +\restoregeometry