refactor(messages): eliminated uniworx_new + hlint
This commit is contained in:
ros
commit
a1eaed8633
11
CHANGELOG.md
11
CHANGELOG.md
@ -2,6 +2,17 @@
|
||||
|
||||
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.
|
||||
|
||||
## [25.10.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v25.9.3...v25.10.0) (2021-04-15)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **workflows:** list involved users ([d8878a9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d8878a905e07f1b5fb5159ecdaf70f27e9c1dc37))
|
||||
|
||||
## [25.9.3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v25.9.2...v25.9.3) (2021-04-14)
|
||||
|
||||
## [25.9.2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v25.9.1...v25.9.2) (2021-04-14)
|
||||
|
||||
## [25.9.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v25.9.0...v25.9.1) (2021-04-14)
|
||||
|
||||
## [25.9.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v25.8.1...v25.9.0) (2021-04-13)
|
||||
|
||||
@ -137,3 +137,4 @@ YAMLFieldDecodeFailure yamlFailure@String: Konnte YAML nicht parsen: #{yamlFailu
|
||||
|
||||
WGFTextInput: Textfeld
|
||||
WGFFileUpload: Dateifeld
|
||||
WorkflowWorkflowListPersons: Beteiligte Benutzer
|
||||
@ -137,3 +137,4 @@ YAMLFieldDecodeFailure yamlFailure: Could not parse YAML: #{yamlFailure}
|
||||
|
||||
WGFTextInput: Text field
|
||||
WGFFileUpload: File field
|
||||
WorkflowWorkflowListPersons: Involved users
|
||||
@ -76,4 +76,4 @@ DefinitionCourseEvents: Course occurrences
|
||||
DefinitionCourseNews: Course news
|
||||
Invitations: Invitations
|
||||
FormFieldRequiredTip: Required fields
|
||||
FormFieldWorkflowDatasetTip: At least one of the marked fields must be filled
|
||||
FormFieldWorkflowDatasetTip: At least one of the marked fields must be filled
|
||||
|
||||
@ -73,7 +73,7 @@ UtilExamResultGrade: Note
|
||||
UtilExamResultPass: Bestanden/Nicht Bestanden
|
||||
UtilExamResultNoShow: Nicht erschienen
|
||||
UtilExamResultVoided: Entwertet
|
||||
CourseOption tid@TermId ssh@SchoolId coursen@CourseName: #{tid} - #{ssh} - #{coursen}
|
||||
CourseOption tid@TermId ssh@SchoolId csh@CourseShorthand coursen@CourseName: #{tid} - #{ssh} - #{csh}: #{coursen}
|
||||
RoomReferenceNone: —
|
||||
RoomReferenceSimple: Text
|
||||
RoomReferenceLink: Link & Anweisungen
|
||||
@ -73,7 +73,7 @@ UtilExamResultGrade: Grade
|
||||
UtilExamResultPass: Passed/Failed
|
||||
UtilExamResultNoShow: Not present
|
||||
UtilExamResultVoided: Voided
|
||||
CourseOption tid ssh coursen: #{tid} - #{ssh} - #{coursen}
|
||||
CourseOption tid ssh csh coursen: #{tid} - #{ssh} - #{csh}: #{coursen}
|
||||
RoomReferenceNone: —
|
||||
RoomReferenceSimple: Text
|
||||
RoomReferenceLink: Link & Instructions
|
||||
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "uni2work",
|
||||
"version": "25.9.1",
|
||||
"version": "25.10.0",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "uni2work",
|
||||
"version": "25.9.1",
|
||||
"version": "25.10.0",
|
||||
"description": "",
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: uniworx
|
||||
version: 25.9.1
|
||||
version: 25.10.0
|
||||
dependencies:
|
||||
- base
|
||||
- yesod
|
||||
|
||||
@ -143,41 +143,41 @@ maybeToMessage before (Just x) after = before <> toMessage x <> after
|
||||
-- Messages creates type UniWorXMessage and RenderMessage UniWorX instance
|
||||
mkMessage ''UniWorX "messages/uniworx/misc" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Test" "messages/uniworx/test" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Settings" "messages/uniworx/uniworx_new/categories/settings" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Help" "messages/uniworx/uniworx_new/categories/help" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Navigation" "messages/uniworx/uniworx_new/utils/navigation" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Workflow" "messages/uniworx/uniworx_new/categories/workflows" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Course" "messages/uniworx/uniworx_new/categories/courses/courses" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Allocation" "messages/uniworx/uniworx_new/categories/courses/allocation" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Exam" "messages/uniworx/uniworx_new/categories/courses/exam" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Sheet" "messages/uniworx/uniworx_new/categories/courses/sheet" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Admin" "messages/uniworx/uniworx_new/categories/admin" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Submission" "messages/uniworx/uniworx_new/categories/courses/submission" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Tutorial" "messages/uniworx/uniworx_new/categories/courses/tutorial" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Material" "messages/uniworx/uniworx_new/categories/courses/material" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Authorization" "messages/uniworx/uniworx_new/categories/authorization" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Health" "messages/uniworx/uniworx_new/categories/health" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Info" "messages/uniworx/uniworx_new/categories/info" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Metrics" "messages/uniworx/uniworx_new/categories/metrics" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "News" "messages/uniworx/uniworx_new/categories/news" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "School" "messages/uniworx/uniworx_new/categories/school" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "SystemMessage" "messages/uniworx/uniworx_new/categories/system_message" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Participants" "messages/uniworx/uniworx_new/categories/courses/participants" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Term" "messages/uniworx/uniworx_new/categories/term" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Error" "messages/uniworx/uniworx_new/categories/error" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "I18n" "messages/uniworx/uniworx_new/categories/I18n" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "JobsHandler" "messages/uniworx/uniworx_new/categories/jobs_handler" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "ModelTypes" "messages/uniworx/uniworx_new/categories/model_types" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Send" "messages/uniworx/uniworx_new/categories/send" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "YesodMiddleware" "messages/uniworx/uniworx_new/categories/yesod_middleware" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "User" "messages/uniworx/uniworx_new/categories/user" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Button" "messages/uniworx/uniworx_new/utils/buttons" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Form" "messages/uniworx/uniworx_new/utils/handler_form" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "TableColumn" "messages/uniworx/uniworx_new/utils/table_column" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "TablePagination" "messages/uniworx/uniworx_new/utils/table_pagination" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Util" "messages/uniworx/uniworx_new/utils/utils" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Rating" "messages/uniworx/uniworx_new/utils/rating" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "SiteLayout" "messages/uniworx/uniworx_new/utils/site_layout" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Settings" "messages/uniworx/categories/settings" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Help" "messages/uniworx/categories/help" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Navigation" "messages/uniworx/utils/navigation" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Workflow" "messages/uniworx/categories/workflows" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Course" "messages/uniworx/categories/courses/courses" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Allocation" "messages/uniworx/categories/courses/allocation" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Exam" "messages/uniworx/categories/courses/exam" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Sheet" "messages/uniworx/categories/courses/sheet" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Admin" "messages/uniworx/categories/admin" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Submission" "messages/uniworx/categories/courses/submission" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Tutorial" "messages/uniworx/categories/courses/tutorial" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Material" "messages/uniworx/categories/courses/material" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Authorization" "messages/uniworx/categories/authorization" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Health" "messages/uniworx/categories/health" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Info" "messages/uniworx/categories/info" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Metrics" "messages/uniworx/categories/metrics" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "News" "messages/uniworx/categories/news" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "School" "messages/uniworx/categories/school" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "SystemMessage" "messages/uniworx/categories/system_message" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Participants" "messages/uniworx/categories/courses/participants" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Term" "messages/uniworx/categories/term" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Error" "messages/uniworx/categories/error" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "I18n" "messages/uniworx/categories/I18n" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "JobsHandler" "messages/uniworx/categories/jobs_handler" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "ModelTypes" "messages/uniworx/categories/model_types" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Send" "messages/uniworx/categories/send" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "YesodMiddleware" "messages/uniworx/categories/yesod_middleware" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "User" "messages/uniworx/categories/user" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Button" "messages/uniworx/utils/buttons" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Form" "messages/uniworx/utils/handler_form" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "TableColumn" "messages/uniworx/utils/table_column" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "TablePagination" "messages/uniworx/utils/table_pagination" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Util" "messages/uniworx/utils/utils" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "Rating" "messages/uniworx/utils/rating" "de-de-formal"
|
||||
mkMessageAddition ''UniWorX "SiteLayout" "messages/uniworx/utils/site_layout" "de-de-formal"
|
||||
mkMessageVariant ''UniWorX ''CampusMessage "messages/auth/campus" "de"
|
||||
mkMessageVariant ''UniWorX ''DummyMessage "messages/auth/dummy" "de"
|
||||
mkMessageVariant ''UniWorX ''PWHashMessage "messages/auth/pw-hash" "de"
|
||||
|
||||
@ -4,7 +4,6 @@ module Foundation.Yesod.ErrorHandler
|
||||
|
||||
import Import.NoFoundation hiding (errorHandler)
|
||||
|
||||
|
||||
import Foundation.Type
|
||||
import Foundation.I18n
|
||||
import Foundation.Authorization
|
||||
|
||||
@ -109,7 +109,7 @@ getEShowR tid ssh csh examn = do
|
||||
showFinishWidget = lecturerInfoShown && is _Nothing examFinished
|
||||
showAutoOccurrenceCalculateWidget = lecturerInfoShown
|
||||
showRegisteredCount = lecturerInfoShown
|
||||
examFinishedMsg = if lecturerInfoShown then (SomeMessage MsgExamFinished) else (SomeMessage MsgExamFinishedParticipant)
|
||||
examFinishedMsg = if lecturerInfoShown then SomeMessage MsgExamFinished else SomeMessage MsgExamFinishedParticipant
|
||||
|
||||
sumMaxPoints = sum [ fromRational examPartWeight * mPoints | (Entity _ ExamPart{..}, _, _) <- examParts, mPoints <- examPartMaxPoints ^.. _Just ]
|
||||
|
||||
|
||||
@ -194,7 +194,7 @@ newsUpcomingSheets uid = do
|
||||
in (==b) <$> hasReadAccessTo (CSheetR tid ssh csh shn SShowR) :: DB Bool
|
||||
]
|
||||
, dbtFilterUI = mempty
|
||||
, dbtStyle = def { dbsEmptyStyle = DBESNoHeading, dbsEmptyMessage = (SomeMessage MsgNoUpcomingSheetDeadlines) }
|
||||
, dbtStyle = def { dbsEmptyStyle = DBESNoHeading, dbsEmptyMessage = SomeMessage MsgNoUpcomingSheetDeadlines }
|
||||
, dbtParams = def
|
||||
, dbtIdent = "upcoming-sheets" :: Text
|
||||
, dbtCsvEncode = noCsvEncode
|
||||
|
||||
@ -96,23 +96,21 @@ postParticipantsIntersectR = do
|
||||
}
|
||||
|
||||
intersectionsRes <- formResultMaybe coursesRes . fmap (fmap Just) $ \cids -> runDB $ do
|
||||
let coursePairs = do
|
||||
cid <- Set.toList cids
|
||||
other <- Set.toList . snd $ Set.split cid cids
|
||||
return (cid, other)
|
||||
intersections <- fmap Map.fromList . forM coursePairs $ \cidPair@(lCid, uCid) -> fmap (\[E.Value n] -> (cidPair, n)) . E.select . E.from $ \user -> do
|
||||
E.where_ . E.exists . E.from $ \courseParticipant ->
|
||||
E.where_ $ courseParticipant E.^. CourseParticipantUser E.==. user E.^. UserId
|
||||
E.&&. courseParticipant E.^. CourseParticipantCourse E.==. E.val lCid
|
||||
E.&&. courseParticipant E.^. CourseParticipantState E.==. E.val CourseParticipantActive
|
||||
E.where_ . E.exists . E.from $ \courseParticipant ->
|
||||
E.where_ $ courseParticipant E.^. CourseParticipantUser E.==. user E.^. UserId
|
||||
E.&&. courseParticipant E.^. CourseParticipantCourse E.==. E.val uCid
|
||||
E.&&. courseParticipant E.^. CourseParticipantState E.==. E.val CourseParticipantActive
|
||||
return E.countRows :: E.SqlQuery (E.SqlExpr (E.Value Int))
|
||||
selfIntersections <- fmap Map.fromList . forM (Set.toList cids) $ \cid -> ((cid, cid), ) <$> count [CourseParticipantCourse ==. cid, CourseParticipantState ==. CourseParticipantActive]
|
||||
let intersections' = Map.union intersections selfIntersections
|
||||
courseUsers <- flip mapFromSetM cids $ \cid -> fmap (Set.fromList . map E.unValue) . E.select . E.from $ \participant -> do
|
||||
E.where_ $ participant E.^. CourseParticipantCourse E.==. E.val cid
|
||||
E.&&. participant E.^. CourseParticipantState E.==. E.val CourseParticipantActive
|
||||
return $ participant E.^. CourseParticipantUser
|
||||
courses <- sortOn (view $ _entityVal . $(multifocusL 3) _courseTerm _courseSchool _courseShorthand) <$> forM (Set.toList cids) getEntity404
|
||||
|
||||
let coursePairs = Set.fromAscList $ do
|
||||
cid <- Set.toAscList cids
|
||||
other <- Set.toAscList . snd $ Set.split cid cids
|
||||
return (cid, other)
|
||||
intersections = flip Map.fromSet coursePairs $ \(lCid, uCid)
|
||||
-> Set.size $ Map.findWithDefault Set.empty lCid courseUsers `Set.intersection` Map.findWithDefault Set.empty uCid courseUsers
|
||||
selfIntersections = Map.mapKeysMonotonic (\cid -> (cid, cid)) $ Set.size <$> courseUsers
|
||||
intersections' = Map.union intersections selfIntersections
|
||||
|
||||
return (courses, intersections')
|
||||
|
||||
let
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user