diff --git a/nix/docker/default.nix b/nix/docker/default.nix index 8cefccbe8..9fec469d5 100644 --- a/nix/docker/default.nix +++ b/nix/docker/default.nix @@ -22,8 +22,8 @@ let uniworx.uniworx.components.exes.uniworx prev.dockerTools.binSh findutils coreutils cups # needed for interface with print center - # texlive.combined.scheme-medium # Causes container to be too large! However, might be needed by the pandoc library to produce PDFs, but nix ought to include the necessary parts already - texlive.combined.scheme-basic # for PDFLaTeX for pandoc PDF creation + texlive.combined.scheme-medium # Causes container to be too large! However, might be needed by the pandoc library to produce PDFs, but nix ought to include the necessary parts already + #texlive.combined.scheme-basic # for PDFLaTeX for pandoc PDF creation # pandoc # just for manual testing within the pod, remove for production, since we use the library instead! curl wget netcat # just for manual testing within the pod, remove for production! openldap # just for manual testing within the pod, remove for production! diff --git a/routes b/routes index 7bb7d7520..3633b1e03 100644 --- a/routes +++ b/routes @@ -54,8 +54,8 @@ !/users/functionary-invite AdminFunctionaryInviteR GET POST !/users/add AdminUserAddR GET POST /admin AdminR GET -/admin/test AdminTestR GET POST -/admin/test/pdf AdminTestPdfR GET +/admin/test AdminTestR GET POST +/admin/test/pdf AdminTestPdfR GET /admin/errMsg AdminErrMsgR GET POST /admin/tokens AdminTokensR GET POST /admin/crontab AdminCrontabR GET @@ -69,7 +69,7 @@ /info/glossary GlossaryR GET !free /info/faq FaqR GET !free /version VersionR GET !free -/status StatusR GET !free +/status StatusR GET !free /help HelpR GET POST !free @@ -96,7 +96,7 @@ /grades EEGradesR GET POST !exam-office /staff-invite EEStaffInviteR GET POST /correct EECorrectR GET POST - + /term TermShowR GET !free /term/current TermCurrentR GET !free @@ -110,7 +110,7 @@ !/school/new SchoolNewR GET POST /school/#SchoolId SchoolR: / SchoolEditR GET POST - + /allocation/ AllocationListR GET !free !/allocation/new AllocationNewR GET POST !allocation-admin @@ -255,17 +255,17 @@ !/*WellKnownFileName WellKnownR GET !free --- for users -/qualification QualificationAllR GET !free -/qualification/#SchoolId QualificationSchoolR GET !free +-- for users +/qualification QualificationAllR GET !free +/qualification/#SchoolId QualificationSchoolR GET !free -- TODO /qualification/#SchoolId/#QualificationShorthand QualificationR GET !free -- must be logged in though -- OSIS CSV Export Demo /lms LmsAllR GET POST /lms/#SchoolId LmsSchoolR GET /lms/#SchoolId/#QualificationShorthand LmsR GET POST /lms/#SchoolId/#QualificationShorthand/edit LmsEditR GET POST -/lms/#SchoolId/#QualificationShorthand/users LmsUsersR GET -/lms/#SchoolId/#QualificationShorthand/users/direct LmsUsersDirectR GET +/lms/#SchoolId/#QualificationShorthand/users LmsUsersR GET +/lms/#SchoolId/#QualificationShorthand/users/direct LmsUsersDirectR GET /lms/#SchoolId/#QualificationShorthand/userlist LmsUserlistR GET POST /lms/#SchoolId/#QualificationShorthand/userlist/upload LmsUserlistUploadR GET POST /lms/#SchoolId/#QualificationShorthand/userlist/direct LmsUserlistDirectR POST diff --git a/shell.nix b/shell.nix index 7b085f90e..b979dbf80 100644 --- a/shell.nix +++ b/shell.nix @@ -71,6 +71,6 @@ let in pkgs.mkShell { name = "uni2work"; nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] - ++ (with pkgs; [ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client gup skopeo texlive.combined.scheme-basic ]) + ++ (with pkgs; [ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client gup skopeo texlive.combined.scheme-medium ]) ++ (with pkgs.haskellPackages; [ stack yesod-bin hlint cabal-install weeder profiteur ]); } diff --git a/src/Handler/Admin/Test.hs b/src/Handler/Admin/Test.hs index 636f3d598..32230be1a 100644 --- a/src/Handler/Admin/Test.hs +++ b/src/Handler/Admin/Test.hs @@ -276,8 +276,8 @@ postAdminTestR = do getAdminTestPdfR :: Handler TypedContent getAdminTestPdfR = do - let -- typePDF = "application/pdf" :: ContentType - -- typePDF = Settings.Mime.mimeLookup "pdfdemo.pdf" + -- let -- typePDF = "application/pdf" :: ContentType + -- typePDF = Settings.Mime.mimeLookup "pdfdemo.pdf" content <- liftIO . P.runIO $ do tmpl <- P.compileDefaultTemplate "latex" let @@ -285,7 +285,8 @@ getAdminTestPdfR = do texopts = [] writeropts = def { P.writerTemplate = Just tmpl } doc <- P.readMarkdown def md - P.makePDF "pdflatex" texopts P.writeLaTeX writeropts doc + P.makePDF "pdflatex" texopts P.writeLaTeX writeropts doc -- xcolor.sty not found + -- P.makePDF "lualatex" texopts P.writeLaTeX writeropts doc -- unicode-math.sty not found case content of Right (Right bs) -> do liftIO $ L.writeFile "generated.pdf" bs diff --git a/templates/i18n/admin-test/de-de-formal.hamlet b/templates/i18n/admin-test/de-de-formal.hamlet index 49a1a0a8d..f381b6189 100644 --- a/templates/i18n/admin-test/de-de-formal.hamlet +++ b/templates/i18n/admin-test/de-de-formal.hamlet @@ -66,6 +66,9 @@ Some icons: ^{isVisible False} ^{hasComment True}
-

Download a generated PDF - Here is a - Download-Link \ No newline at end of file +

+ Erzeugtes PDF herunterladen: + Hier ist ein + + Download-Link + für eine PDF Vorschau. \ No newline at end of file diff --git a/templates/i18n/admin-test/en-eu.hamlet b/templates/i18n/admin-test/en-eu.hamlet index 0c4b856b0..c45ee9bb4 100644 --- a/templates/i18n/admin-test/en-eu.hamlet +++ b/templates/i18n/admin-test/en-eu.hamlet @@ -67,6 +67,9 @@ Some icons: ^{isVisible False} ^{hasComment True}
-

Download a generated PDF +

+ Download a generated PDF Here is a - Download-Link \ No newline at end of file + + Download-Link + for a preview. \ No newline at end of file