fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove merge artifacts

Browse Source
This commit is contained in:
Sarah Vaupel 2022-06-10 16:49:11 +02:00
parent 5ede13824b
commit 99e39bc27a
8 changed files with 2 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
routes
View File

@ -272,26 +272,9 @@
/lms/#SchoolId/#QualificationShorthand/result LmsResultR GET POST /lms/#SchoolId/#QualificationShorthand/result LmsResultR GET POST
/lms/#SchoolId/#QualificationShorthand/result/upload LmsResultUploadR GET POST /lms/#SchoolId/#QualificationShorthand/result/upload LmsResultUploadR GET POST
/lms/#SchoolId/#QualificationShorthand/result/direct LmsResultDirectR POST /lms/#SchoolId/#QualificationShorthand/result/direct LmsResultDirectR POST
/api ApiDocsR GET !free /api ApiDocsR GET !free
/swagger SwaggerR GET !free /swagger SwaggerR GET !free
/swagger.json SwaggerJsonR GET !free /swagger.json SwaggerJsonR GET !free
!/*WellKnownFileName WellKnownR GET !free !/*WellKnownFileName WellKnownR 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/userlist LmsUserlistR GET POST
/lms/#SchoolId/#QualificationShorthand/userlist/upload LmsUserlistUploadR GET POST
/lms/#SchoolId/#QualificationShorthand/userlist/direct LmsUserlistDirectR POST
/lms/#SchoolId/#QualificationShorthand/result LmsResultR GET POST
/lms/#SchoolId/#QualificationShorthand/result/upload LmsResultUploadR GET POST
/lms/#SchoolId/#QualificationShorthand/result/direct LmsResultDirectR POST

2
src/Handler/Exam/Form.hs
View File

@ -346,8 +346,6 @@ examFormTemplate (Entity eId Exam{..}) = do
mAuthorshipStatement <- maybe (pure Nothing) getEntity examAuthorshipStatement mAuthorshipStatement <- maybe (pure Nothing) getEntity examAuthorshipStatement
mAuthorshipStatement <- maybe (pure Nothing) getEntity examAuthorshipStatement
return ExamForm return ExamForm
{ efName = examName { efName = examName
, efGradingRule = examGradingRule , efGradingRule = examGradingRule

1
src/Handler/Info.hs
View File

@ -42,7 +42,6 @@ getLegalR =
-- | Allgemeine Informationen -- | Allgemeine Informationen
getInfoR :: Handler Html getInfoR :: Handler Html
getInfoR = do getInfoR = do
AppSettings{..} <- getsYesod appSettings'
changelogEntries' <- runDB $ selectList [ ChangelogItemFirstSeenItem <-. universeF ] [] changelogEntries' <- runDB $ selectList [ ChangelogItemFirstSeenItem <-. universeF ] []
let changelogEntries = Map.fromListWith Set.union let changelogEntries = Map.fromListWith Set.union
[ (Down changelogItemFirstSeenFirstSeen, Set.singleton changelogItemFirstSeenItem) [ (Down changelogItemFirstSeenFirstSeen, Set.singleton changelogItemFirstSeenItem)

6
src/Handler/SystemMessage.hs
View File

@ -50,12 +50,6 @@ systemMessageVolatileClusterSettingsForm (fmap Set.toList -> mPrev) = wFormToAFo
fmap Set.fromList <$> massInputAccumEditW miAdd miEdit miButtonAction miLayout ("system-message-volatile-cluster-settings" :: Text) (fslI MsgSystemMessageOnVolatileClusterSettings) False mPrev fmap Set.fromList <$> massInputAccumEditW miAdd miEdit miButtonAction miLayout ("system-message-volatile-cluster-settings" :: Text) (fslI MsgSystemMessageOnVolatileClusterSettings) False mPrev
invalidateVisibleSystemMessages :: (MonadHandler m, HandlerSite m ~ UniWorX)
=> m ()
invalidateVisibleSystemMessages
= memcachedByInvalidate AuthCacheVisibleSystemMessages $ Proxy @(Map SystemMessageId (Maybe UTCTime, Maybe UTCTime))
getMessageR, postMessageR :: CryptoUUIDSystemMessage -> Handler Html getMessageR, postMessageR :: CryptoUUIDSystemMessage -> Handler Html
getMessageR = postMessageR getMessageR = postMessageR
postMessageR cID = do postMessageR cID = do

1
src/Jobs/Handler/Files.hs
View File

@ -34,6 +34,7 @@ import Control.Monad.Logger (askLoggerIO, runLoggingT)
import System.Clock import System.Clock
import qualified Data.Set as Set import qualified Data.Set as Set
import qualified Data.Sequence as Seq
import Jobs.Handler.Intervals.Utils import Jobs.Handler.Intervals.Utils

19
src/Utils/Form.hs
View File

@ -80,25 +80,6 @@ import qualified Data.ByteString as BS
-- Fields -- -- Fields --
------------ ------------
_olOptions :: Traversal' (OptionList a) (Option a)
_olOptions f = \case
x@OptionList{} -> (\olOptions -> x{olOptions}) <$> traverse f (olOptions x)
x@OptionListGrouped{} -> (\olOptionsGrouped -> x{olOptionsGrouped}) <$> traverseOf (traverse . _2 . traverse) f (olOptionsGrouped x)
_olOptionsGrouped :: Traversal' (OptionList a) (Text, [Option a])
_olOptionsGrouped f = \case
x@OptionList{} -> pure x
x@OptionListGrouped{} -> (\olOptionsGrouped -> x{olOptionsGrouped}) <$> traverse f (olOptionsGrouped x)
_olReadExternal :: Lens' (OptionList a) (Text -> Maybe a)
_olReadExternal f = \case
x@OptionList{} -> (\olReadExternal -> x{olReadExternal}) <$> f (olReadExternal x)
x@OptionListGrouped{} -> (\olReadExternalGrouped -> x{olReadExternalGrouped}) <$> f (olReadExternalGrouped x)
------------
-- Fields --
------------
_olOptions :: Traversal' (OptionList a) (Option a) _olOptions :: Traversal' (OptionList a) (Option a)
_olOptions f = \case _olOptions f = \case
x@OptionList{} -> (\olOptions -> x{olOptions}) <$> traverse f (olOptions x) x@OptionList{} -> (\olOptions -> x{olOptions}) <$> traverse f (olOptions x)

11
templates/i18n/changelog/workflows-archivation.de-de-formal.hamlet
View File

@ -1,11 +0,0 @@
$newline never
$maybe archived <- appWorkflowWorkflowArchiveAfter
Workflows werden nun automatisch archiviert, sobald sie #
$if archived /= 0
seit #{tshow (nominalDiffTimeToSeconds archived / 86400)} Tagen #
abgeschlossen sind.
$nothing
Workflows können nun archiviert werden.
<br>
Archivierte Workflows werden nicht mehr in der Liste laufender Workflows angezeigt, sondern sind über ein separates Archiv verfügbar.

13
templates/i18n/changelog/workflows-archivation.en-eu.hamlet
View File

@ -1,13 +0,0 @@
$newline never
$maybe archived <- appWorkflowWorkflowArchiveAfter
Workflows are now being archived automatically #
$if archived == 0
immediately #
$else
#{tshow (nominalDiffTimeToSeconds archived / 86400)} days #
after finalization.
$nothing
Workflow may now be archived.
<br>
Archived workflows are not shown among the list of running workflows, but can instead be accessed via a separate archive list.