Commit Graph

755 Commits

Author SHA1 Message Date
Gregor Kleen
1b0825c763 Revert "fix(ratings): disallow ratings for graded sheets without point value"
This reverts commit 463b2b7878.
2019-07-04 10:18:28 +02:00
Steffen Jost
551c4cb23c fix(home): fix build 2019-07-03 14:32:58 +02:00
Sarah Vaupel
37db6256c1 Merge branch 'master' into course-teaser 2019-07-03 11:59:02 +02:00
Sarah Vaupel
b0ed911849 refactor(displayable): removed resolved TODOs 2019-07-03 10:05:53 +02:00
Sarah Vaupel
a6348f9b9c refactor: Replaced DisplayAble by RenderMessage/ToMessage
Removed DisplayAble typeclass; replaced DisplayAble instances by
RenderMessage or ToMessage instances; removed unnecessary tshow calls in
de.msg

Closes #184
2019-07-01 11:48:43 +02:00
Steffen Jost
8476314a46 Better fix for lecturer names 2019-06-27 19:53:26 +02:00
Gregor Kleen
b63d77ec7b Merge branch 'master' into 205-klausuren
Fix tests
2019-06-27 09:45:57 +02:00
Steffen Jost
96387cbed5 fix(many occurrences throughout the project): Fix typo: occurence -> occurrence everywhere
A typo between occurence in code and occurrence in tests prevented
deployment. I changed all occurrences of "occurence" to the correct
spelling, such that
2019-06-27 08:55:32 +02:00
Sarah Vaupel
39792580d4 Merge branch 'master' into 184-replace-displayable-by-rendermessage 2019-06-27 00:58:24 +02:00
Sarah Vaupel
a40456f2cd Removed DisplayAble instance for CryptoIDs 2019-06-26 19:03:13 +02:00
Sarah Vaupel
067c2b9caa Replaced display calls in most hamlet files 2019-06-26 14:36:01 +02:00
Gregor Kleen
0428e8b921 Merge branch 'master' into 205-klausuren 2019-06-26 13:40:02 +02:00
Steffen Jost
a4a3c14f9d Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-06-26 12:12:30 +02:00
Steffen Jost
2f7f733628 Abgaben Zuteilung überarbeitet 2019-06-26 12:12:19 +02:00
Sarah Vaupel
84070a5565 Replaced DisplayAble Text instance, started adding ToMarkup instances for keys, attempted adding interface for CryptoIDs (TODO) 2019-06-19 21:54:23 +02:00
Gregor Kleen
401489a877 Merge branch 'master' into 205-klausuren 2019-06-19 16:56:54 +02:00
Gregor Kleen
463b2b7878 fix(ratings): disallow ratings for graded sheets without point value 2019-06-19 16:52:00 +02:00
Gregor Kleen
6dc1d76f0a Merge branch 'master' into 205-klausuren 2019-06-19 15:40:45 +02:00
Gregor Kleen
67a50c9e87 feat(exams): CRU (no D) for exams 2019-06-19 15:34:09 +02:00
Steffen Jost
4f1b2886cd guards added as needed for plan generartion without exceptions 2019-06-16 13:16:01 +02:00
Steffen Jost
e33704dca4 Implementation okay, but throws NoCorrectors (FIXME) 2019-06-14 20:43:14 +02:00
Steffen Jost
718a2b026c Correction stats coded, but not yet used online 2019-06-14 17:05:45 +02:00
Steffen Jost
0185fd3c87 assignSubmission split into planning and assigning part 2019-06-13 09:49:17 +02:00
Gregor Kleen
d054370b29 Better exam table 2019-06-12 09:17:32 +02:00
Gregor Kleen
7deb994c16 Merge branch 'master' into 205-klausuren 2019-06-07 13:43:29 +02:00
Gregor Kleen
054ff5cdc3 Create new exams 2019-06-07 13:42:37 +02:00
Steffen Jost
2feb751afa Towards #298 2019-06-06 13:35:42 +02:00
Gregor Kleen
a5dcdaae0b Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-06-04 10:32:29 +02:00
Gregor Kleen
332e83a111 Fix handling of URL-encoded jsonFields
See #392
2019-06-04 10:08:57 +02:00
Steffen Jost
d34998ac04 automatic corrector assignment 2019-06-04 08:14:13 +02:00
Steffen Jost
669c803105 FilterUI for Submission (Part 1) 2019-05-29 14:09:29 +02:00
Steffen Jost
51e0502117 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-29 13:37:03 +02:00
Gregor Kleen
8f33d1590c defaultPagesize 2019-05-29 13:36:11 +02:00
Gregor Kleen
7a4f1cb76e massInputAccumEdit 2019-05-29 13:27:04 +02:00
Steffen Jost
ceace36abd MaterialVisible has an icon now and no more alert 2019-05-29 10:33:14 +02:00
Steffen Jost
6a242bc432 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-29 09:25:04 +02:00
Gregor Kleen
c2ab196b92 Fix handling of suggested UploadSpecificFiles 2019-05-28 22:30:38 +02:00
Steffen Jost
0fc9c326b9 fixes #394 2019-05-28 19:22:14 +02:00
Gregor Kleen
dbb208112f Aggressively refactor Model.Types 2019-05-27 14:23:58 +02:00
Gregor Kleen
e2315dd28e Fix sheetForm 2019-05-20 18:22:53 +02:00
Gregor Kleen
0c1c647189 Handle AssignSubmissionException in correctionsR
Fix #382
2019-05-20 14:10:12 +02:00
Gregor Kleen
7deba81320 Additional testing 2019-05-20 00:06:15 +02:00
Gregor Kleen
848dc7470a Additional testing 2019-05-19 20:19:46 +02:00
Gregor Kleen
27a5b83f55 Re-do assignSubmissions to pass tests 2019-05-19 17:18:29 +02:00
Gregor Kleen
9f101087ac Overhaul SubmissonMode extensively 2019-05-18 22:51:07 +02:00
Steffen Jost
7cda3e9f2e Towards #364 for task 1 2019-05-15 12:54:23 +02:00
Steffen Jost
06fcf4aa01 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-14 22:37:42 +02:00
Steffen Jost
0012e2a19c No header for simple select box. Fixes #363 2019-05-14 12:31:15 +02:00
Gregor Kleen
5176352a5e Merge branch 'master' into mobile-fixes 2019-05-13 22:28:08 +02:00
Steffen Jost
ae96c6269c Surpress MsgMassInputTip for common case of single submission sheets 2019-05-13 17:30:49 +02:00
Gregor Kleen
0568e8a3f6 Merge branch 'feat/course-participant-invitation' 2019-05-13 00:27:21 +02:00
Gregor Kleen
a50c31dd88 Allow customisation of file extension -> mimetype mapping 2019-05-12 19:43:57 +02:00
Gregor Kleen
4468519808 Debug output for sourceFiles 2019-05-12 18:03:05 +02:00
Gregor Kleen
e6e92ad42e Fix #361 2019-05-12 13:59:08 +02:00
Gregor Kleen
51a6cce2c2 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-10 21:43:59 +02:00
Gregor Kleen
801b92bccf Loosen tutorial-communication-recipient restrictions 2019-05-10 21:43:47 +02:00
Gregor Kleen
bf287a4a99 Redesign course-user 2019-05-10 21:32:16 +02:00
Steffen Jost
8679131cec i18n refactor; html field description added 2019-05-10 19:59:55 +02:00
Steffen Jost
97140775d8 SheetList even icon spacing @hamannf to check 2019-05-10 12:05:23 +02:00
Steffen Jost
86f10ae1ba Sheet List Convenience like in UniWorX 2019-05-10 11:25:43 +02:00
Gregor Kleen
f63e7dbb76 Remove type="search" 2019-05-09 22:27:55 +02:00
Gregor Kleen
ebbef3911e Send Alerts-Header when using async-massinput 2019-05-09 21:17:26 +02:00
Steffen Jost
aaedb64d36 Download Link für Material-Archive 2019-05-09 19:21:49 +02:00
Gregor Kleen
4f45cca614 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-09 14:57:15 +02:00
Gregor Kleen
06df42e43b Better UI for submission users & submission user invitations 2019-05-09 14:53:48 +02:00
Steffen Jost
b908fc4cf3 Sheet: icon mark unpublished files works now 2019-05-09 14:49:56 +02:00
Steffen Jost
6182e94143 Sheet: unpublished files marked with icon and class 2019-05-08 21:02:05 +02:00
Steffen Jost
6daaf68949 initial stub, does not compile 2019-05-08 15:04:57 +02:00
Steffen Jost
2dacc39486 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-08 10:52:26 +02:00
Gregor Kleen
ffa1206078 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-08 10:27:43 +02:00
Gregor Kleen
d2f0ffc899 Document deleteR 2019-05-08 10:27:30 +02:00
Steffen Jost
2aa73b7694 Minor clarifications 2019-05-08 10:14:49 +02:00
Steffen Jost
6743e3b4d7 Fixes #337 2019-05-07 10:26:19 +02:00
Gregor Kleen
d030ec1b5f Submit sheets from homepage 2019-05-05 21:02:43 +02:00
Gregor Kleen
b34a8467ed Fix typo 2019-05-05 18:42:29 +02:00
Gregor Kleen
b430eba9da Fix tutorial massinputs 2019-05-05 18:24:57 +02:00
Gregor Kleen
ee5caeb381 Merge branch 'master' into feat/generic-invitations 2019-05-05 16:56:51 +02:00
Gregor Kleen
22c01d988c Generic invitations for everything 2019-05-05 16:45:58 +02:00
Gregor Kleen
aa36bd88b7 Dispatch async-massinput by custom ident 2019-05-05 15:21:47 +02:00
Gregor Kleen
70d3ebcd2c Handle potentially multiple async massinputs per page 2019-05-05 13:21:00 +02:00
Felix Hamann
09b1d61458 Merge branch 'feat/asynchronous-mass-input' into 'master'
Basic short-circuit support for mass-input

See merge request !187
2019-05-04 22:16:09 +02:00
Gregor Kleen
95298f856e Fix hlint 2019-05-04 18:25:06 +02:00
Steffen Jost
f4b93644a8 PageActions done, all tested 2019-05-04 15:13:03 +02:00
Steffen Jost
fcd2b58281 Merge master, no surprises 2019-05-04 12:12:53 +02:00
Steffen Jost
3021435350 Material working; just links and right missing 2019-05-03 18:08:15 +02:00
Steffen Jost
d2546745da Workaround: hasFiles material-show not working 2019-05-03 14:39:16 +02:00
Steffen Jost
126381a409 fix db columns for files 2019-05-03 08:27:11 +02:00
Steffen Jost
88fc32e13f Material dbTable almost done, sorting type error 2019-05-02 17:13:32 +02:00
Gregor Kleen
369c2227a0 healthLDAPAdmins 2019-04-30 19:36:43 +02:00
Gregor Kleen
ae42f9be03 Merge branch 'master' into feat/generic-invitations 2019-04-29 13:52:38 +02:00
Gregor Kleen
aefe4c571f Additional Tutorial information for students 2019-04-29 11:39:09 +02:00
Gregor Kleen
eb0e1382d0 MsgMassInputTip 2019-04-29 09:44:39 +02:00
Gregor Kleen
64c45c515e Tutorials 2019-04-29 00:20:34 +02:00
Steffen Jost
80cf36bc37 Rounded time for visibility defaults 2019-04-27 14:46:08 +02:00
Felix Hamann
763499f9e3 Merge branch 'master' into feat/asynchronous-mass-input 2019-04-25 16:38:16 +02:00
Gregor Kleen
39f5c5ece2 Make new sorting stable wrt old settings
Fixes #317
2019-04-25 13:12:36 +02:00
Gregor Kleen
2a0bee58b5 More idiomatic usage of invRef 2019-04-23 11:18:14 +02:00
Gregor Kleen
dfe0b4de5e Rename fields of InvitationReference 2019-04-23 01:34:18 +02:00
Gregor Kleen
5bc0254f7f Implement lecturer invitations with new system 2019-04-23 01:22:36 +02:00
Gregor Kleen
8591306b14 Prototype of generic invitation infrastructure 2019-04-22 23:56:05 +02:00
Gregor Kleen
ea38ee422f Basic short-circuit support for mass-input 2019-04-22 12:48:40 +02:00
Gregor Kleen
07e8b5e203 Only include <fieldset> if recipient category has content 2019-04-21 17:36:52 +02:00
Gregor Kleen
07ff56e157 Mixed (external & direct) submissions 2019-04-21 13:57:03 +02:00
Gregor Kleen
04f6f89ada Fix build 2019-04-20 22:34:05 +02:00
Gregor Kleen
98026b2a40 Fix hlint 2019-04-20 22:17:17 +02:00
Gregor Kleen
b63a246109 Fix Haddock 2019-04-20 21:28:44 +02:00
Gregor Kleen
bd98f11ad5 Overhaul corrector interface 2019-04-20 21:21:20 +02:00
Gregor Kleen
feee06e80a Rework recipient UI 2019-04-20 12:20:35 +02:00
Gregor Kleen
2191272c43 Restructure recipient form 2019-04-20 00:21:30 +02:00
Gregor Kleen
11d2cc46a8 Minor refactor 2019-04-18 16:07:21 +02:00
Gregor Kleen
76f984420f Custom styling for massInput 2019-04-18 14:49:10 +02:00
Gregor Kleen
c10aff1c57 Merge branch 'master' into 328-formular-zum-kontakt-mit-kursteilnehmern 2019-04-18 14:42:35 +02:00
Gregor Kleen
60e95e8ef7 Cleanup & (maybe|require)BearerToken 2019-04-17 11:35:27 +02:00
Gregor Kleen
d037434dc2 Merge branch 'master' into feat/tokens 2019-04-17 09:09:20 +02:00
Gregor Kleen
8637847fc6 Working CCommR 2019-04-16 21:28:21 +02:00
Steffen Jost
c229a01376 cbody added 2019-04-16 15:39:21 +02:00
Steffen Jost
529b2f22c4 filter duplicate recipients silently 2019-04-16 15:22:16 +02:00
Steffen Jost
dd1cd6650f communication prototype 2019-04-16 15:03:37 +02:00
Steffen Jost
23029abec6 merge master 2019-04-16 11:14:52 +02:00
Gregor Kleen
5b6c35fedd Cleanup 2019-04-15 16:41:14 +02:00
Felix Hamann
5f6ab41ad8 Merge branch 'util-refactor' into 'master'
JS Utility refactor

Closes #329, #331, and #326

See merge request !174
2019-04-12 22:37:58 +02:00
Felix Hamann
c98acacfec Merge branch 'master' into course-teaser 2019-04-12 22:27:40 +02:00
Gregor Kleen
ec3f816241 Merge branch 'master' into feat/tokens 2019-04-11 19:56:03 +02:00
Steffen Jost
a0f645d9c4 Hopefully fixes #333 2019-04-10 11:51:48 +02:00
Gregor Kleen
db8e527bbc Merge branch 'master' into 'util-refactor'
# Conflicts:
#   src/Handler/Home.hs
2019-04-09 22:47:19 +02:00
Felix Hamann
d48b335cb2 automatically setup checkboxes via js utility 2019-04-07 22:17:38 +02:00
Felix Hamann
8a33c7df34 remove obsolete manual inputs JS setup code 2019-04-07 12:54:32 +02:00
Gregor Kleen
a6b23a739f Merge branch 'master' into feat/tokens 2019-04-05 16:38:41 +02:00
Gregor Kleen
40c6f12968 Only set submission rated if it was assigned to uploader
Fixes #330
2019-04-05 13:31:01 +02:00
Gregor Kleen
680b674b09 Solidify design of BearerToken 2019-04-04 19:33:39 +02:00
Steffen Jost
4520c1be49 email page form incomplete 2019-04-04 15:59:45 +02:00
Gregor Kleen
f5fb82de3e Improve term creation/editing 2019-03-30 17:05:54 +01:00
Steffen Jost
df0b36a01b StudyTermCandidates Deletion Buttons 2019-03-29 15:24:16 +01:00
Gregor Kleen
68a0f7c566 Cleanup buttonForm & remove duplicate identifyForm calls 2019-03-28 12:06:50 +01:00
Gregor Kleen
d45d7fdbff Fix modals 2019-03-27 20:29:08 +01:00
Gregor Kleen
bd6ee78539 Remove redundant button from dbTable-pagesize 2019-03-27 17:02:37 +01:00
Gregor Kleen
520621f0a1 Fix dbTable-pagesize for FormAutoSubmit 2019-03-27 16:58:24 +01:00
Gregor Kleen
62e11a1ca1 Better handle FormFailure and allow de-duplication within miAdd 2019-03-27 15:52:04 +01:00
Steffen Jost
10351854cd Merge branch 'master' into 126-ubungsbetrieb-statistik-seiten-pro-kurs 2019-03-25 10:44:44 +01:00
Gregor Kleen
973eeb18c0 Documentation for Handler.Utils.Delete 2019-03-25 08:59:06 +01:00
Felix Hamann
7b8d1d3eec Merge branch 'master' into course-teaser 2019-03-24 20:59:05 +01:00
Steffen Jost
179cb735a2 weird fix build 2019-03-24 13:07:23 +01:00
Steffen Jost
291064c03b MINOR linter problems and curried rowWdgt -> uncurried rowWgt (obfuscates my Anwer to Felix' question, hence different commit) 2019-03-24 12:04:36 +01:00
Steffen Jost
e0bc7a5615 Beispiel für Felix' Frage zu !163 2019-03-24 11:46:46 +01:00
Gregor Kleen
57ba1c9e12 Use wrapForm everywhere 2019-03-23 23:00:32 +01:00
Gregor Kleen
6aeb134369 Merge branch 'master' into feat/wrapform 2019-03-23 14:37:59 +01:00
Steffen Jost
ca520b08f7 ButtonSave added 2019-03-23 12:25:02 +01:00
Steffen Jost
c9ab64e518 Course user notes working, but needs model refactor 2019-03-22 18:01:26 +01:00
Steffen Jost
21ba1f2afa users cannot delete themselves anymore 2019-03-22 11:39:59 +01:00
Gregor Kleen
6dbf8916a5 Remove log comment, which breaks haddock 2019-03-20 22:29:08 +01:00
Gregor Kleen
bd6df62599 Merge branch '284-massinput' 2019-03-20 21:23:02 +01:00
Gregor Kleen
7f403a5d98 Merge branch '284-massinput' of jost/UniWorX into 284-massinput 2019-03-20 21:22:32 +01:00
Gregor Kleen
4aaf9933aa Fixup 2019-03-20 21:20:51 +01:00
Gregor Kleen
aca5d180bc Feature complete MassInput 2019-03-20 20:53:10 +01:00
Gregor Kleen
1929c5cace Fix build 2019-03-20 18:44:58 +01:00
Steffen Jost
4d0a1e8020 minor 2019-03-20 18:35:47 +01:00
Steffen Jost
93fd8788bc rigid type problem with rendermessage 2019-03-20 18:30:08 +01:00
Steffen Jost
5f67c3ac00 Merge branch 'master' into 284-massinput 2019-03-20 15:57:43 +01:00
Gregor Kleen
4b2d6d3aa2 (Semi-)Working Prototype 2019-03-20 15:13:41 +01:00
Steffen Jost
1c1dc70066 Various minor fixes 2019-03-20 14:09:46 +01:00
Gregor Kleen
350dfa6c4a Merge branch '307-studiengange-behandeln' 2019-03-20 13:38:07 +01:00
Steffen Jost
d310e5a8c3 Inference tested and linted 2019-03-20 13:36:26 +01:00
Steffen Jost
c4aab6248a inference for studyterms works now 2019-03-20 13:15:23 +01:00
Gregor Kleen
6317ae92f0 Bessere Fehlermeldungen bei SortKey/FilterKey-Mismatch 2019-03-20 11:59:14 +01:00
Steffen Jost
d65b5918f0 Inferenz Studiengänge verdrahte, hat noch Fehler 2019-03-20 11:59:08 +01:00
Steffen Jost
8c221ad5e8 Term candidate inference handler added, not connected 2019-03-20 09:49:06 +01:00
Gregor Kleen
705fdec695 Merge branch 'master' into 284-massinput 2019-03-20 09:05:10 +01:00
Steffen Jost
23a1b883ac Merge branch 'master' into 307-studiengange-behandeln 2019-03-20 08:32:51 +01:00
Gregor Kleen
bbeb0e70be Identifiers for DBTable-Forms 2019-03-19 13:46:11 +01:00
Gregor Kleen
96303b156a Enforce structured identifyForm 2019-03-19 13:19:54 +01:00
Steffen Jost
9b944d70b8 StudyTermCandidate inference implemented needs tests 2019-03-18 18:57:36 +01:00
Steffen Jost
6cce5c05cc Forms for terms added, but buggy 2019-03-13 16:41:22 +01:00
Steffen Jost
b2bb30a429 Form for Degrees changes implemented 2019-03-13 14:50:58 +01:00
Steffen Jost
a02cf61c82 filter email name ui combined 2019-03-13 13:30:11 +01:00
Steffen Jost
579225b4d0 table for candidates added to admin-features 2019-03-13 11:20:08 +01:00
Gregor Kleen
332493f550 View-Prototype of MassInput 2019-03-13 09:25:00 +01:00
SJost
78ada75704 Filters for Participant List added 2019-03-12 10:54:32 +01:00
SJost
889c3ebb35 Merge and bugfix sorting by participants registration date 2019-03-12 09:20:07 +01:00
Felix Hamann
84237c4484 Merge branch 'async-form-responses' into 'master'
Async form responses

See merge request !161
2019-03-11 20:50:36 +01:00
Gregor Kleen
a4c8bcd10c Merge branch 'master' into 284-massinput 2019-03-11 13:00:09 +01:00
SJost
529c226ad6 Generic Join projections implemented 2019-03-10 18:01:17 +01:00
Gregor Kleen
101822fd21 MessageClassMessageStatus 2019-03-10 15:47:33 +01:00
SJost
e5d693e707 Generic columns filters and sorting 2019-03-10 11:43:59 +01:00
SJost
c4d77d665a Generic contains SQL filter for generic user column 2019-03-09 14:35:47 +01:00
SJost
2ddda4578e Generic Columns module allowing generic sorting and filtering.
Done for an initial part of course participant table.
2019-03-08 18:11:26 +01:00
SJost
4253390e93 Study-Features-Subquery extracted 2019-03-08 10:46:47 +01:00
SJost
729831b0bf Probably fixes the course participant list? 2019-03-06 17:50:22 +01:00
SJost
484d99305d Showing field and degrees compiles, join-on needs testing 2019-03-05 19:06:12 +01:00
SJost
56c25c133a Alternative Query Attempt 2019-03-05 17:20:34 +01:00
SJost
158cd180c5 Fixbuild linter 2019-03-04 10:21:30 +01:00
Gregor Kleen
c967399ab9 Override boolField 2019-03-03 17:22:21 +01:00
SJost
cf3a0b3d35 ToMarkup instances for StudyDegree and StudyTerms 2019-02-28 18:28:42 +01:00
SJost
e446641666 Default offered; unnecessarily complicated due using field studyFeature 2019-02-28 18:04:22 +01:00
SJost
933eaa7362 Registration takes Field of Studies now 2019-02-28 17:17:34 +01:00
SJost
d51608a1bf merge master 2019-02-28 11:12:39 +01:00
SJost
0745542867 All mailto-links use single hamlet file now; added mailto for lecturers 2019-02-28 11:03:02 +01:00
SJost
9ca91b5ec8 removed stubs for merge 2019-02-27 17:42:46 +01:00
SJost
801f1f1597 merge attempt 2019-02-27 17:37:42 +01:00
SJost
6a53a89faa does not compile, course register from broken 2019-02-27 17:36:39 +01:00
Gregor Kleen
5f7b134292 Write StudyTermCandidates during login 2019-02-27 17:29:17 +01:00