diff --git a/shell.nix b/shell.nix index 5a22827d5..ab545842e 100644 --- a/shell.nix +++ b/shell.nix @@ -73,6 +73,8 @@ in pkgs.mkShell { nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] ++ (with pkgs; [ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client + #pdftk just for testing pdf-passwords + pdftk gup skopeo #texlive.combined.scheme-full # works #texlive.combined.scheme-medium diff --git a/src/Handler/PrintCenter.hs b/src/Handler/PrintCenter.hs index c3f6dca23..c540d1b27 100644 --- a/src/Handler/PrintCenter.hs +++ b/src/Handler/PrintCenter.hs @@ -201,11 +201,11 @@ mkPJTable = do dbtColonnade = mconcat [ dbSelectIf (applying _2) id (return . view (resultPrintJob . _entityKey)) (\r -> isNothing $ r ^. resultPrintJob . _entityVal . _printJobAcknowledged) , sortable (Just "pj-created") (i18nCell MsgPrintJobCreated) $ \( view $ resultPrintJob . _entityVal . _printJobCreated -> t) -> dateTimeCell t + , sortable (Just "pj-acknowledged") (i18nCell MsgPrintJobAcknowledged) $ \( view $ resultPrintJob . _entityVal . _printJobAcknowledged -> t) -> maybeDateTimeCell t , sortable (toNothingS "pdf") (i18nCell MsgPrintPDF) $ \( view $ resultPrintJob . _entityKey -> k) -> anchorCellM (PrintDownloadR <$> encrypt k) (showId k) -- , sortable (Just "pj-id") (i18nCell MsgPrintJobId) $ \( view $ resultPrintJob . _entityKey -> k) -> textCell (tshow . E.unSqlBackendKey $ unPrintJobKey k) -- , sortable (Just "pj-id") (i18nCell MsgPrintJobId) $ \( view $ resultPrintJob . _entityKey -> k) -> cell (showId k) - , sortable (Just "pj-name") (i18nCell MsgPrintJobName) $ \( view $ resultPrintJob . _entityVal . _printJobName -> n) -> textCell n - , sortable (Just "pj-acknowledged") (i18nCell MsgPrintJobAcknowledged) $ \( view $ resultPrintJob . _entityVal . _printJobAcknowledged -> t) -> maybeDateTimeCell t + , sortable (Just "pj-name") (i18nCell MsgPrintJobName) $ \( view $ resultPrintJob . _entityVal . _printJobName -> n) -> textCell n , sortable (Just "pj-recipient") (i18nCell MsgPrintRecipient) $ \(preview resultRecipient -> u) -> maybeCell u $ cellHasUserLink AdminUserR , sortable (Just "pj-sender") (i18nCell MsgPrintSender) $ \(preview resultSender -> u) -> maybeCell u $ cellHasUserLink AdminUserR , sortable (Just "pj-course") (i18nCell MsgPrintCourse) $ \(preview $ resultCourse . _entityVal -> c) -> maybeCell c courseCell diff --git a/templates/letter/din5008.latex b/templates/letter/din5008.latex index 4df5d78d2..488996ffc 100644 --- a/templates/letter/din5008.latex +++ b/templates/letter/din5008.latex @@ -1,5 +1,6 @@ %Based upon https://github.com/benedictdudel/pandoc-letter-din5008 \documentclass[ + paper=A4, foldmarks=BTm, % show foldmarks top, middle, bottom foldmarks=false, % don't print foldmarks fromalign=left, % letter head on the right @@ -71,7 +72,7 @@ $else$ \usepackage{unicode-math} $endif$ -\usepackage[a4paper, bmargin=8cm]{geometry} %%% TODO +%\usepackage[a4paper, bottom=8cm, top=3cm]{geometry} %%% THIS HAD NO EFFECT AT ALL \usepackage{parskip} @@ -86,22 +87,24 @@ $endif$ \usepackage{enumitem} \makeatletter + \setplength{firstheadvpos}{1.8cm} + \setplength{toaddrvpos}{5.5cm} \setlength{\@tempskipa}{-1.2cm}% - \@addtoplength{toaddrheight}{\@tempskipa} -\makeatother + \@addtoplength{toaddrheight}{\@tempskipa} +\makeatother \setlength{\oddsidemargin}{\useplength{toaddrhpos}} \addtolength{\oddsidemargin}{-1in} \setlength{\textwidth}{\useplength{firstheadwidth}} -\usepackage[absolute,showboxes,quiet,overlay]{textpos} +\usepackage[absolute,quiet,overlay]{textpos}%,showboxes \setlength{\TPHorizModule}{5mm} -\setlength{\TPVertModule}{\TPHorizModule} +\setlength{\TPVertModule}{5mm} \providecommand{\tightlist}{% \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} -\begin{document}% +\begin{document}% \setkomavar{fromname}{$author$}% \renewcommand*{\raggedsignature}{\raggedright}% \setkomavar{fromaddress}{% @@ -130,8 +133,8 @@ $endif$ \opening{$en-opening$} $endif$ - \begin{textblock}{13}(15,45) - \textcolor{gray}{ + \begin{textblock}{13}(19,46)%hpos,vpos + \textcolor{black!38}{ \begin{labeling}{Login:x} \item[Login:] $login$ \item[Pin:] $pin$ diff --git a/templates/letter/fraport_renewal.md b/templates/letter/fraport_renewal.md index c421a9c39..f86414576 100644 --- a/templates/letter/fraport_renewal.md +++ b/templates/letter/fraport_renewal.md @@ -52,10 +52,10 @@ $if(is-de)$ die Gültigkeit Ihres Vorfeldführerscheines läuft demnächst ab. Durch die erfolgreiche Teilnahme an einem E-Lernen können Sie -die Gültigkeit um 2 Jahre verlängern. Verwenden Sie dazu folgende -Login-Daten. +die Gültigkeit um 2 Jahre verlängern. Verwenden Sie dazu die +Login-Daten aus dem geschützen Sichtfenster weiter unten. -Name +Prüfling : $recipient$ @@ -76,9 +76,9 @@ $else$ your apron diving licence is about to expire soon. You may renew your apron driving licence by two years through successfully -completing an e-learning course. Please use the following login data. +completing an e-learning course. Please use the login data from the protected area below. -Name +Examinee : $recipient$