From eb4e50b19cf19ff2e085500aa9bc777d9b141d70 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Tue, 17 Jan 2023 18:13:46 +0100 Subject: [PATCH] chore(avs): show avs config on test page --- src/Handler/Admin/Avs.hs | 8 +++++++- templates/avs.hamlet | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Handler/Admin/Avs.hs b/src/Handler/Admin/Avs.hs index 7749f8886..8f1ecd254 100644 --- a/src/Handler/Admin/Avs.hs +++ b/src/Handler/Admin/Avs.hs @@ -114,6 +114,13 @@ avsLicenceOptions = mkOptionList getAdminAvsR, postAdminAvsR :: Handler Html getAdminAvsR = postAdminAvsR postAdminAvsR = do + mbAvsConf <- getsYesod $ view _appAvsConf + let avsWgt = [whamlet| + $maybe avsConf <- mbAvsConf + AVS Konfiguration ist #{decodeUtf8 (avsUser avsConf)}@#{avsHost avsConf}:#{avsPort avsConf} + $nothing + AVS nicht konfiguriert! + |] mAvsQuery <- getsYesod $ view _appAvsQuery case mAvsQuery of Nothing -> return mempty @@ -405,7 +412,6 @@ getProblemAvsSynchR = do setTitleI MsgAvsTitleLicenceSynch $(i18nWidgetFile "avs-synchronisation") - type LicenceTableExpr = ( E.SqlExpr (Entity UserAvs) `E.InnerJoin` E.SqlExpr (Entity User) `E.LeftOuterJoin` E.SqlExpr (Maybe (Entity QualificationUser)) diff --git a/templates/avs.hamlet b/templates/avs.hamlet index a755e172f..5d4bd6bf8 100644 --- a/templates/avs.hamlet +++ b/templates/avs.hamlet @@ -52,4 +52,7 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later $maybe answer <- mbStatus

Unverarbeitete Antwort: # - ^{answer} \ No newline at end of file + ^{answer} + +

+ ^{modal "AVS Konfiguration" (Right avsWgt)} \ No newline at end of file