From f8c462fd03abf4085bbd225e6df10ff40249aa21 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 13 Nov 2019 17:02:52 +0100 Subject: [PATCH 01/11] chore(gitlab-ci): manually handle ssh key --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c998f0c9e..d4bad27ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -216,7 +216,7 @@ yesod:test: deploy:uniworx4: stage: deploy script: - - ssh root@uniworx4.ifi.lmu.de Date: Wed, 13 Nov 2019 17:03:43 +0100 Subject: [PATCH 02/11] chore(release): 7.21.5 --- CHANGELOG.md | 4 ++++ package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3539d11e..b4a2ad067 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [7.21.5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.4...v7.21.5) (2019-11-13) + + + ### [7.21.4](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.3...v7.21.4) (2019-11-13) diff --git a/package-lock.json b/package-lock.json index aa31e0341..c6e822607 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "7.21.4", + "version": "7.21.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 96ed901ca..6ad208149 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "7.21.4", + "version": "7.21.5", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index b00a30902..4570780fa 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 7.21.4 +version: 7.21.5 dependencies: - base >=4.9.1.0 && <5 From c799adcd2881df8fe7b43c7fbd4993558d62fe29 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 13 Nov 2019 17:07:23 +0100 Subject: [PATCH 03/11] chore(gitlab-ci): cache always --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4bad27ef..770718493 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ default: image: name: fpco/stack-build:lts-13.21 cache: - key: "${CI_COMMIT_REF_SLUG}" paths: - node_modules - .stack From d03fd4bee6d645624c30297907c91bf4697aa2f8 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 12 Nov 2019 12:15:48 +0100 Subject: [PATCH 04/11] feat(corrections-grade): basic filter UI with pseudonyms --- src/Handler/Corrections.hs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs index da2e47096..2da3ef67f 100644 --- a/src/Handler/Corrections.hs +++ b/src/Handler/Corrections.hs @@ -1015,6 +1015,23 @@ postCorrectionsGradeR = do , colPointsField , colCommentField ] -- Continue here + filterUI = Just $ \mPrev -> mconcat + [ prismAForm (singletonFilter "course" ) mPrev $ aopt (lift `hoistField` selectField courseOptions) (fslI MsgCourse) + , prismAForm (singletonFilter "term" ) mPrev $ aopt (lift `hoistField` selectField termOptions) (fslI MsgTerm) + , prismAForm (singletonFilter "school" ) mPrev $ aopt (lift `hoistField` selectField schoolOptions) (fslI MsgCourseSchool) + , Map.singleton "sheet-search" . maybeToList <$> aopt (lift `hoistField` textField) (fslI MsgSheet) (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev))) + , Map.singleton "pseudonym" . maybeToList <$> aopt (lift `hoistField` textField) (fslI MsgPseudonyms) (Just <$> listToMaybe =<< ((Map.lookup "pseudonym" =<< mPrev) <|> (Map.lookup "pseudonym" =<< mPrev))) + , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgRatingTime) + ] + courseOptions = runDB $ do + courses <- selectList [] [Asc CourseShorthand] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand) + optionsPairs $ map (id &&& id) $ nub $ map (CI.original . courseShorthand . entityVal) courses + termOptions = runDB $ do + courses <- selectList [] [Asc CourseTerm] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand) + optionsPairs $ map (id &&& id) $ nub $ map (termToText . unTermKey . courseTerm . entityVal) courses + schoolOptions = runDB $ do + courses <- selectList [] [Asc CourseSchool] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand) + optionsPairs $ map (id &&& id) $ nub $ map (CI.original . unSchoolKey . courseSchool . entityVal) courses psValidator = def & defaultSorting [SortDescBy "ratingtime"] :: PSValidator (MForm (HandlerFor UniWorX)) (FormResult (DBFormResult SubmissionId (Bool, Maybe Points, Maybe Text) CorrectionTableData)) unFormResult = getDBFormResult $ \DBRow{ dbrOutput = (Entity _ sub@Submission{..}, _, _, _, _, _) } -> (submissionRatingDone sub, submissionRatingPoints, submissionRatingComment) @@ -1023,7 +1040,7 @@ postCorrectionsGradeR = do void . assertM (== Authorized) . lift $ evalAccessDB (CSubmissionR tid ssh csh shn cID CorrectionR) True return i - (fmap unFormResult -> tableRes, table) <- runDB $ makeCorrectionsTable whereClause displayColumns mempty psValidator dbtProj' $ def + (fmap unFormResult -> tableRes, table) <- runDB $ makeCorrectionsTable whereClause displayColumns filterUI psValidator dbtProj' $ def { dbParamsFormAction = Just $ SomeRoute CorrectionsGradeR } From c4eb2c0f04adc6c7193b602b6bfa570c1ba3483b Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 12 Nov 2019 17:05:39 +0100 Subject: [PATCH 05/11] feat(corrections-grade): working additional filters --- src/Handler/Corrections.hs | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs index 2da3ef67f..91e5aa239 100644 --- a/src/Handler/Corrections.hs +++ b/src/Handler/Corrections.hs @@ -369,11 +369,22 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d E.where_ $ (\f -> f user $ Set.singleton needle) $ E.mkContainsFilter (E.^. UserMatrikelnummer) ) - -- , ( "pseudonym" - -- , FilterColumn $ E.mkExistsFilter $ \table needle -> E.from $ \(pseudonym) -> do - -- E.where_ $ querySheet table E.^. SheetId E.==. pseudonym E.^. SheetPseudonymSheet - -- E.where_ $ E.mkContainsFilter -- DB only stores Pseudonym == Word24. Conversion not possible in DB. - -- ) + , ( "rating-visible" + , FilterColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) criterion -> case getLast (criterion :: Last Bool) of + Nothing -> E.val True :: E.SqlExpr (E.Value Bool) + Just True -> E.isJust $ submission E.^. SubmissionRatingTime + Just False-> E.isNothing $ submission E.^. SubmissionRatingTime + ) + , ( "rating" + , FilterColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) pts -> if + | Set.null pts -> E.val True :: E.SqlExpr (E.Value Bool) + | otherwise -> E.maybe (E.val False :: E.SqlExpr (E.Value Bool)) (\p -> p `E.in_` E.valList (Set.toList pts)) (submission E.^. SubmissionRatingPoints) + ) + , ( "comment" + , FilterColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) comm -> case getLast (comm :: Last Text) of + Nothing -> E.val True :: E.SqlExpr (E.Value Bool) + Just needle -> E.maybe (E.val False :: E.SqlExpr (E.Value Bool)) (E.hasInfix $ E.val needle) (submission E.^. SubmissionRatingComment) + ) ] , dbtFilterUI = fromMaybe mempty dbtFilterUI , dbtStyle = def { dbsFilterLayout = maybe (\_ _ _ -> id) (\_ -> defaultDBSFilterLayout) dbtFilterUI } @@ -1020,8 +1031,10 @@ postCorrectionsGradeR = do , prismAForm (singletonFilter "term" ) mPrev $ aopt (lift `hoistField` selectField termOptions) (fslI MsgTerm) , prismAForm (singletonFilter "school" ) mPrev $ aopt (lift `hoistField` selectField schoolOptions) (fslI MsgCourseSchool) , Map.singleton "sheet-search" . maybeToList <$> aopt (lift `hoistField` textField) (fslI MsgSheet) (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev))) - , Map.singleton "pseudonym" . maybeToList <$> aopt (lift `hoistField` textField) (fslI MsgPseudonyms) (Just <$> listToMaybe =<< ((Map.lookup "pseudonym" =<< mPrev) <|> (Map.lookup "pseudonym" =<< mPrev))) , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgRatingTime) + , prismAForm (singletonFilter "rating-visible" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgRatingDone) + , prismAForm (singletonFilter "rating" . maybePrism _PathPiece) mPrev $ aopt (lift `hoistField` pointsField) (fslI MsgColumnRatingPoints) + , Map.singleton "comment" . maybeToList <$> aopt (lift `hoistField` textField) (fslI MsgRatingComment) (Just <$> listToMaybe =<< ((Map.lookup "comment" =<< mPrev) <|> (Map.lookup "comment" =<< mPrev))) ] courseOptions = runDB $ do courses <- selectList [] [Asc CourseShorthand] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand) From 4cb2d4f07ddc0d873601ae43636a76adfd5a481a Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 13 Nov 2019 11:36:37 +0100 Subject: [PATCH 06/11] feat(corrections-grade): additional column for sheetType --- src/Handler/Corrections.hs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs index 91e5aa239..570532b36 100644 --- a/src/Handler/Corrections.hs +++ b/src/Handler/Corrections.hs @@ -217,6 +217,9 @@ colPointsField = sortable (Just "rating") (i18nCell MsgColumnRatingPoints) $ for _other -> over (_1.mapped) (_2 .~) . over _2 fvInput <$> mopt (pointsFieldMax $ preview (_grading . _maxPoints) sheetType) (fsUniq mkUnique "points") (Just submissionRatingPoints) ) +colMaxPointsField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, Maybe Points, b) CorrectionTableData))) +colMaxPointsField = sortable (Just "maxPoints") (i18nCell MsgSheetType) $ i18nCell . (\DBRow{ dbrOutput=(_, Entity _ Sheet{sheetType}, _, _, _, _) } -> sheetType) + colCommentField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, b, Maybe Text) CorrectionTableData))) colCommentField = sortable (Just "comment") (i18nCell MsgRatingComment) $ fmap (cellAttrs <>~ [("style","width:60%")]) $ formCell id (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _, _) } -> return subId) @@ -1024,6 +1027,7 @@ postCorrectionsGradeR = do , colRated , colRatedField , colPointsField + , colMaxPointsField , colCommentField ] -- Continue here filterUI = Just $ \mPrev -> mconcat From 702fb1dfdb0bc9d9124d824efef56620b6666d33 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 13 Nov 2019 14:47:16 +0100 Subject: [PATCH 07/11] feat(corrections-grade): sorting by sheetType --- src/Database/Esqueleto/Utils.hs | 4 ++++ src/Handler/Corrections.hs | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Database/Esqueleto/Utils.hs b/src/Database/Esqueleto/Utils.hs index 2cdfc69d2..b9cc734bb 100644 --- a/src/Database/Esqueleto/Utils.hs +++ b/src/Database/Esqueleto/Utils.hs @@ -19,6 +19,7 @@ module Database.Esqueleto.Utils , sha256 , maybe , SqlProject(..) + , (->.) , module Database.Esqueleto.Utils.TH ) where @@ -246,3 +247,6 @@ instance (PersistEntity val, PersistField typ) => SqlProject val typ (E.Entity v instance (PersistEntity val, PersistField typ) => SqlProject val typ (Maybe (E.Entity val)) (Maybe typ) where sqlProject = (E.?.) unSqlProject _ _ = Just + +(->.) :: E.SqlExpr (E.Value a) -> Text -> E.SqlExpr (E.Value b) +(->.) expr t = E.unsafeSqlBinOp "->" expr $ E.val t diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs index 570532b36..16d284145 100644 --- a/src/Handler/Corrections.hs +++ b/src/Handler/Corrections.hs @@ -218,7 +218,7 @@ colPointsField = sortable (Just "rating") (i18nCell MsgColumnRatingPoints) $ for ) colMaxPointsField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, Maybe Points, b) CorrectionTableData))) -colMaxPointsField = sortable (Just "maxPoints") (i18nCell MsgSheetType) $ i18nCell . (\DBRow{ dbrOutput=(_, Entity _ Sheet{sheetType}, _, _, _, _) } -> sheetType) +colMaxPointsField = sortable (Just "sheet-type") (i18nCell MsgSheetType) $ i18nCell . (\DBRow{ dbrOutput=(_, Entity _ Sheet{sheetType}, _, _, _, _) } -> sheetType) colCommentField :: Colonnade Sortable CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, b, Maybe Text) CorrectionTableData))) colCommentField = sortable (Just "comment") (i18nCell MsgRatingComment) $ fmap (cellAttrs <>~ [("style","width:60%")]) $ formCell id @@ -279,6 +279,13 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d , ( "rating" , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> submission E.^. SubmissionRatingPoints ) + , ( "sheet-type" + , SortColumns $ \((_ `E.InnerJoin` sheet `E.InnerJoin` _) `E.LeftOuterJoin` _) -> + [ SomeExprValue ((sheet E.^. SheetType) E.->. "type" :: E.SqlExpr (E.Value Value)) + , SomeExprValue (((sheet E.^. SheetType) E.->. "grading" :: E.SqlExpr (E.Value Value)) E.->. "max" :: E.SqlExpr (E.Value Value)) + , SomeExprValue (((sheet E.^. SheetType) E.->. "grading" :: E.SqlExpr (E.Value Value)) E.->. "passing" :: E.SqlExpr (E.Value Value)) + ] + ) , ( "israted" , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> E.not_ . E.isNothing $ submission E.^. SubmissionRatingTime ) From 2c2dd8d3ff3334df675972bafc367349e13d7ef5 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 13 Nov 2019 15:11:25 +0100 Subject: [PATCH 08/11] fix(corrections-grade): fix inFix --- src/Handler/Corrections.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs index 16d284145..234c5eab1 100644 --- a/src/Handler/Corrections.hs +++ b/src/Handler/Corrections.hs @@ -393,7 +393,7 @@ makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' d , ( "comment" , FilterColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) comm -> case getLast (comm :: Last Text) of Nothing -> E.val True :: E.SqlExpr (E.Value Bool) - Just needle -> E.maybe (E.val False :: E.SqlExpr (E.Value Bool)) (E.hasInfix $ E.val needle) (submission E.^. SubmissionRatingComment) + Just needle -> E.maybe (E.val False :: E.SqlExpr (E.Value Bool)) (E.isInfixOf $ E.val needle) (submission E.^. SubmissionRatingComment) ) ] , dbtFilterUI = fromMaybe mempty dbtFilterUI @@ -1045,7 +1045,7 @@ postCorrectionsGradeR = do , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgRatingTime) , prismAForm (singletonFilter "rating-visible" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgRatingDone) , prismAForm (singletonFilter "rating" . maybePrism _PathPiece) mPrev $ aopt (lift `hoistField` pointsField) (fslI MsgColumnRatingPoints) - , Map.singleton "comment" . maybeToList <$> aopt (lift `hoistField` textField) (fslI MsgRatingComment) (Just <$> listToMaybe =<< ((Map.lookup "comment" =<< mPrev) <|> (Map.lookup "comment" =<< mPrev))) + , Map.singleton "comment" . maybeToList <$> aopt (lift `hoistField` textField) (fslI MsgRatingComment) (Just <$> listToMaybe =<< (Map.lookup "comment" =<< mPrev)) ] courseOptions = runDB $ do courses <- selectList [] [Asc CourseShorthand] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand) From 018082ec4a8d1fb90fb5fa874a9b971f6162716b Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 13 Nov 2019 16:03:38 +0100 Subject: [PATCH 09/11] feat(corrections): added missing titles; small message fixes --- messages/uniworx/de-de-formal.msg | 4 +++- messages/uniworx/en-eu.msg | 6 ++++-- src/Handler/Corrections.hs | 6 ++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg index b23d44074..d5615c318 100644 --- a/messages/uniworx/de-de-formal.msg +++ b/messages/uniworx/de-de-formal.msg @@ -347,6 +347,8 @@ CourseCorrectionsTitle: Korrekturen für diesen Kurs CorrectorsHead sheetName@SheetName: Korrektoren für #{sheetName} CorrectorAssignTitle: Korrektor zuweisen +CorrectionsGrade: Abgaben online korrigieren + MaterialName: Name MaterialType: Art MaterialTypePlaceholder: Folien, Code, Beispiel, ... @@ -958,7 +960,7 @@ NotificationTriggerKindEvaluation: Für Vorlesungsumfragen NotificationTriggerKindAllocationStaff: Für Zentralanmeldungen (Dozenten) NotificationTriggerKindAllocationParticipant: Für Zentralanmeldungen -CorrCreate: Abgaben erstellen +CorrCreate: Abgaben registrieren UnknownPseudonymWord pseudonymWord@Text: Unbekanntes Pseudonym-Wort "#{pseudonymWord}" InvalidPseudonym pseudonym@Text: Invalides Pseudonym "#{pseudonym}" InvalidPseudonymSubmissionIgnored oPseudonyms@Text iPseudonym@Text: Abgabe mit Pseudonymen „#{oPseudonyms}“ wurde ignoriert, da „#{iPseudonym}“ nicht automatisiert zu einem validen Pseudonym korrigiert werden konnte. diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg index f760368f4..99313f48a 100644 --- a/messages/uniworx/en-eu.msg +++ b/messages/uniworx/en-eu.msg @@ -346,6 +346,8 @@ CourseCorrectionsTitle: Corrections for this course CorrectorsHead sheetName: Correctors for #{sheetName} CorrectorAssignTitle: Assign corrector +CorrectionsGrade: Grade submissions online + MaterialName: Name MaterialType: Type MaterialTypePlaceholder: Slides, Code, Example, ... @@ -955,7 +957,7 @@ NotificationTriggerKindEvaluation: For course evaluations NotificationTriggerKindAllocationStaff: For central allocations (lecturers) NotificationTriggerKindAllocationParticipant: For central allocations -CorrCreate: Create submissions +CorrCreate: Register submissions UnknownPseudonymWord pseudonymWord: Invalid pseudonym-word “#{pseudonymWord}” InvalidPseudonym pseudonym: Invalid pseudonym “#{pseudonym}” InvalidPseudonymSubmissionIgnored oPseudonyms iPseudonym: The submission with pseudonyms “#{oPseudonyms}” has been ignored since “#{iPseudonym}” could not be automatically corrected to be a valid pseudonym. @@ -1114,7 +1116,7 @@ MenuSheetClone: Clone exercise sheet MenuCorrectionsUpload: Upload corrections MenuCorrectionsDownload: Download corrections MenuCorrectionsCreate: Register submissions -MenuCorrectionsGrade: Mark submissions online +MenuCorrectionsGrade: Grade submissions online MenuCorrectionsAssign: Assign corrections MenuCorrectionsAssignSheet name@Text: Assign corrections for #{name} MenuAuthPreds: Authorisation settings diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs index 234c5eab1..8a39796fc 100644 --- a/src/Handler/Corrections.hs +++ b/src/Handler/Corrections.hs @@ -1004,7 +1004,8 @@ postCorrectionsCreateR = do , formEncoding = pseudonymEncoding } - defaultLayout + siteLayoutMsg MsgCorrCreate $ do + setTitleI MsgCorrCreate $(widgetFile "corrections-create") where partitionEithers' :: [[Either a b]] -> ([[b]], [a]) @@ -1089,7 +1090,8 @@ postCorrectionsGradeR = do content = Right $(widgetFile "messages/correctionsUploaded") unless (null subs') $ addMessageModal Success trigger content - defaultLayout $ + siteLayoutMsg MsgCorrectionsGrade $ do + setTitleI MsgCorrectionsGrade $(widgetFile "corrections-grade") From 1075122a22988dd04524b3025e9d3f07e25e8d61 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 14 Nov 2019 08:42:33 +0100 Subject: [PATCH 10/11] chore(gitlab-ci): fix relative paths --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 770718493..19ba3fb20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -215,7 +215,7 @@ yesod:test: deploy:uniworx4: stage: deploy script: - - ssh -i .ssh/id root@uniworx4.ifi.lmu.de Date: Thu, 14 Nov 2019 08:43:29 +0100 Subject: [PATCH 11/11] chore(release): 7.22.0 --- CHANGELOG.md | 18 ++++++++++++++++++ package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4a2ad067..c77475fdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [7.22.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.5...v7.22.0) (2019-11-14) + + +### Bug Fixes + +* **corrections-grade:** fix inFix ([2c2dd8d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2c2dd8d)) + + +### Features + +* **corrections:** added missing titles; small message fixes ([018082e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/018082e)) +* **corrections-grade:** additional column for sheetType ([4cb2d4f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/4cb2d4f)) +* **corrections-grade:** basic filter UI with pseudonyms ([d03fd4b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d03fd4b)) +* **corrections-grade:** sorting by sheetType ([702fb1d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/702fb1d)) +* **corrections-grade:** working additional filters ([c4eb2c0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/c4eb2c0)) + + + ### [7.21.5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v7.21.4...v7.21.5) (2019-11-13) diff --git a/package-lock.json b/package-lock.json index c6e822607..5beb67181 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "7.21.5", + "version": "7.22.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6ad208149..49cf620a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "7.21.5", + "version": "7.22.0", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index 4570780fa..04a6230e4 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 7.21.5 +version: 7.22.0 dependencies: - base >=4.9.1.0 && <5