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

feat: show authorship statement requirement for sheet

Browse Source 
also default authorship statements for exam to on iff a default
definition exists for the school
This commit is contained in:
Gregor Kleen 2021-07-18 21:05:01 +02:00
parent 34b3e6ae21
commit 5e969825ad
6 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
messages/uniworx/categories/courses/sheet/de-de-formal.msg
View File

@ -164,4 +164,6 @@ SheetAuthorshipStatementExam: Zugeordnete Prüfung
SheetAuthorshipStatementMode: Eigenständigkeitserklärung SheetAuthorshipStatementMode: Eigenständigkeitserklärung
SheetAuthorshipStatementModeDisabled: Keine Eigenständigkeitserklärungen SheetAuthorshipStatementModeDisabled: Keine Eigenständigkeitserklärungen
SheetAuthorshipStatementModeExam: Einstellung folgt Prüfung SheetAuthorshipStatementModeExam: Einstellung folgt Prüfung
SheetAuthorshipStatementModeEnabled: Eigenständigkeitserklärungen fordern SheetAuthorshipStatementModeEnabled: Eigenständigkeitserklärungen fordern
SheetShowAuthorshipStatementsRequired: Eigenständigkeitserklärungen
SheetShowAuthorshipStatementsRequiredYes: Um eine Abgabe anzulegen muss eine Eigenständigkeitserklärung abgegeben werden

2
messages/uniworx/categories/courses/sheet/en-eu.msg
View File

@ -164,3 +164,5 @@ SheetAuthorshipStatementMode: Statements of Authorship
SheetAuthorshipStatementModeDisabled: No Statements of Authorship SheetAuthorshipStatementModeDisabled: No Statements of Authorship
SheetAuthorshipStatementModeExam: Setting follows exam SheetAuthorshipStatementModeExam: Setting follows exam
SheetAuthorshipStatementModeEnabled: Demand Statements of Authorship SheetAuthorshipStatementModeEnabled: Demand Statements of Authorship
SheetShowAuthorshipStatementsRequired: Statements of Authorship
SheetShowAuthorshipStatementsRequiredYes: To submit for this exercise sheet a Statement of Authorship is required

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

@ -169,7 +169,7 @@ examForm (Entity _ Course{..}) template csrf = hoist liftHandler $ do
*> case otherMode of *> case otherMode of
SchoolAuthorshipStatementModeOptional -> optionalActionA (fmapAForm (formResultUnOpt mr' MsgSheetAuthorshipStatementContent) $ contentField id) SchoolAuthorshipStatementModeOptional -> optionalActionA (fmapAForm (formResultUnOpt mr' MsgSheetAuthorshipStatementContent) $ contentField id)
(fslI MsgExamAuthorshipStatementRequired & setTooltip MsgExamAuthorshipStatementRequiredTip) (fslI MsgExamAuthorshipStatementRequired & setTooltip MsgExamAuthorshipStatementRequiredTip)
(is _Just . efAuthorshipStatement <$> template) ((is _Just . efAuthorshipStatement <$> template) <|> Just (is _Just mSchoolAuthorshipStatement))
SchoolAuthorshipStatementModeRequired -> contentField $ setTooltip MsgExamAuthorshipStatementRequiredForcedTip SchoolAuthorshipStatementModeRequired -> contentField $ setTooltip MsgExamAuthorshipStatementRequiredForcedTip
_none -> pure Nothing _none -> pure Nothing

3
src/Handler/Sheet/Show.hs
View File

@ -19,7 +19,7 @@ getSShowR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html
getSShowR tid ssh csh shn = do getSShowR tid ssh csh shn = do
now <- liftIO getCurrentTime now <- liftIO getCurrentTime
muid <- maybeAuthId muid <- maybeAuthId
Entity sid sheet <- runDB $ fetchSheet tid ssh csh shn sheetEnt@(Entity sid sheet) <- runDB $ fetchSheet tid ssh csh shn
seeAllModificationTimestamps <- hasReadAccessTo $ CSheetR tid ssh csh shn SIsCorrR -- ordinary users should not see modification dates older than visibility seeAllModificationTimestamps <- hasReadAccessTo $ CSheetR tid ssh csh shn SIsCorrR -- ordinary users should not see modification dates older than visibility
-- mayEdit <- hasWriteAccessTo $ CSheetR tid ssh csh shn SEditR -- mayEdit <- hasWriteAccessTo $ CSheetR tid ssh csh shn SEditR
@ -154,6 +154,7 @@ getSShowR tid ssh csh shn = do
return $ notification NotificationBroad =<< messageI Warning MsgSheetSubmissionModeNoneWithoutNotGraded return $ notification NotificationBroad =<< messageI Warning MsgSheetSubmissionModeNoneWithoutNotGraded
sTypeDesc <- runDB $ sheetTypeDescription (sheetCourse sheet) (sheetType sheet) sTypeDesc <- runDB $ sheetTypeDescription (sheetCourse sheet) (sheetType sheet)
authorshipStatementRequired <- fmap (is _Just) . runDB $ getSheetAuthorshipStatement sheetEnt
defaultLayout $ do defaultLayout $ do
setTitleI $ prependCourseTitle tid ssh csh $ SomeMessage shn setTitleI $ prependCourseTitle tid ssh csh $ SomeMessage shn

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

@ -2453,7 +2453,7 @@ i18nForm strForm onlyAppLanguages miButtonAction miIdent fSettings fRequired mPr
= all ((&&) <$> not . null <*> T.all Char.isAlpha) lParts = all ((&&) <$> not . null <*> T.all Char.isAlpha) lParts
&& not (null lParts) && not (null lParts)
(langRes, langView) <- mpopt (hoistField liftHandler langField' & isoField _Unwrapped) (def & addName (nudge "lang")) $ missingLangs liveliness ^? _head (langRes, langView) <- mpreq (hoistField liftHandler langField' & isoField _Unwrapped) (def & addName (nudge "lang")) $ missingLangs liveliness ^? _head
MsgRenderer mr <- getMsgRenderer MsgRenderer mr <- getMsgRenderer
let res = langRes <&> \newLang oldLangs -> if let res = langRes <&> \newLang oldLangs -> if

5
templates/sheetShow.hamlet
View File

@ -75,6 +75,11 @@ $# <dt .deflist__dt>
$# _{MsgSheetAuthorshipStatementSection} $# _{MsgSheetAuthorshipStatementSection}
$# <dd .deflist__dd> $# <dd .deflist__dd>
$# _{maybe MsgSheetAuthorshipStatementIsRequiredFalse (const MsgSheetAuthorshipStatementIsRequiredTrue) (sheetAuthorshipStatement sheet)} $# _{maybe MsgSheetAuthorshipStatementIsRequiredFalse (const MsgSheetAuthorshipStatementIsRequiredTrue) (sheetAuthorshipStatement sheet)}
$if authorshipStatementRequired
<dt .deflist__dt>
_{MsgSheetShowAuthorshipStatementsRequired}
<dd .deflist__dd>
_{MsgSheetShowAuthorshipStatementsRequiredYes}
$maybe marktxt <- markingText $maybe marktxt <- markingText
<section> <section>