Commit Graph

2009 Commits

Author SHA1 Message Date
Gregor Kleen
487c46a1ce Finish implementation of course participant invitations
Fixes #250
2019-05-13 00:17:12 +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
38e32b56fb Don't hide submission files that have no corrected version 2019-05-12 15:02:06 +02:00
Gregor Kleen
e6e92ad42e Fix #361 2019-05-12 13:59:08 +02:00
Gregor Kleen
4270e0a347 Re-tighten permissions on CNotesR 2019-05-10 21:49:52 +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
48b961cea8 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-10 20:04:09 +02:00
Steffen Jost
8679131cec i18n refactor; html field description added 2019-05-10 19:59:55 +02:00
Gregor Kleen
9f9312661d Slightly better system messages 2019-05-10 19:19:15 +02:00
Gregor Kleen
1b0a4762c9 Fix Submission 2019-05-10 16:16:48 +02:00
Gregor Kleen
7c4f577b78 More links to TUsersR 2019-05-10 15:40:03 +02:00
Gregor Kleen
e62780e6f3 Address #360 2019-05-10 14:50:39 +02:00
Steffen Jost
a341e9d426 Fix haddock 2019-05-10 12:56:55 +02:00
Steffen Jost
0129e6d534 avoid single file zip for material as well 2019-05-10 12:51:00 +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
6a68e1de79 show archive link on material show 2019-05-09 19:58:03 +02:00
Steffen Jost
36358af8be quiet hlint 2019-05-09 19:24:17 +02:00
Steffen Jost
aaedb64d36 Download Link für Material-Archive 2019-05-09 19:21:49 +02:00
Steffen Jost
a0de628d9b display tutors on course page 2019-05-09 17:00:01 +02:00
Steffen Jost
b0d23bca79 Fixes #357 2019-05-09 15:54:32 +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
Steffen Jost
f6e29a7fa7 Material Delete implemented 2019-05-08 10:52:21 +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
d1a8d9cc17 Minor reformulations 2019-05-06 18:47:01 +02:00
Gregor Kleen
a10f79bcc4 Merge branch 'master' into 298-alerts-sind-unlesbar 2019-05-06 18:31:09 +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
Steffen Jost
4a65312816 Bugfix: sorting materials visible from; updated info pages 2019-05-04 18:56:25 +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
dc4ec6148f Bugfix: MaterialShow empty table indicator working 2019-05-03 17:18:22 +02:00
Steffen Jost
d2546745da Workaround: hasFiles material-show not working 2019-05-03 14:39:16 +02:00
Steffen Jost
e0c9f4987a Showing material implemented, missing overview 2019-05-03 12:55:46 +02:00
Steffen Jost
5bf7c42a66 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-03 09:02:47 +02:00
Steffen Jost
af29707359 workaround: no get method for course registration 2019-05-03 09:02:41 +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
Steffen Jost
09467c21f3 Refactor Sheet Show: unnecessary join removed 2019-05-02 09:51:09 +02:00
Gregor Kleen
d2e10b8306 Fix tests & restore Common handlers 2019-05-01 19:14:08 +02:00
Gregor Kleen
c10dcde04a Some Caching & minor 2019-05-01 18:41:15 +02:00
Gregor Kleen
d0b2ffe936 Prettier human-readable health reports 2019-04-30 22:54:29 +02:00
Steffen Jost
09d8c0bb07 Deletion stub 2019-04-30 22:20:21 +02:00
Gregor Kleen
6871a695b4 500 instead of 204 when no report is available for too long 2019-04-30 20:44:54 +02:00
Gregor Kleen
369c2227a0 healthLDAPAdmins 2019-04-30 19:36:43 +02:00
Steffen Jost
3e00f4255a saving probably complete 2019-04-30 19:19:09 +02:00
Gregor Kleen
25badbe030 HealthReport 2019-04-30 17:19:42 +02:00
Steffen Jost
4bd26a2dae Hinweise zur Sichtbarkeit von Übungsblatt-Dateien 2019-04-30 10:51:24 +02:00
Steffen Jost
c4f47c4856 minor 2019-04-30 10:25:50 +02:00
Steffen Jost
22ffa3477d Saving material mostly implemented 2019-04-29 18:22:07 +02:00
Gregor Kleen
ae42f9be03 Merge branch 'master' into feat/generic-invitations 2019-04-29 13:52:38 +02:00
Gregor Kleen
4eda7d20a2 Further HTML cleanup 2019-04-29 13:44:08 +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
b40096db8a Cleanup 2019-04-29 00:45:08 +02:00
Gregor Kleen
64c45c515e Tutorials 2019-04-29 00:20:34 +02:00
Steffen Jost
212533d88e Stubs expanded 2019-04-27 20:33:28 +02:00
Steffen Jost
80cf36bc37 Rounded time for visibility defaults 2019-04-27 14:46:08 +02:00
Steffen Jost
454bee3834 merge master 2019-04-27 13:17:16 +02:00
Felix Hamann
763499f9e3 Merge branch 'master' into feat/asynchronous-mass-input 2019-04-25 16:38:16 +02:00
Steffen Jost
d5e1c92794 Initial Stubs 2019-04-25 14:01:24 +02:00
Gregor Kleen
dd6d41ca59 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-04-25 13:13:34 +02:00
Gregor Kleen
39f5c5ece2 Make new sorting stable wrt old settings
Fixes #317
2019-04-25 13:12:36 +02:00
Steffen Jost
ddd795d0a8 Bugfix participant note icon no longer crosscourse 2019-04-25 13:06:12 +02:00
Gregor Kleen
530eb09ebb Fix double identifyForm in ProfileR 2019-04-25 10:42:11 +02:00
Steffen Jost
54f6cf1679 Upload instructions 2019-04-25 10:40:40 +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
374cd9621d Refactor help.hamlet 2019-04-21 22:53:47 +02:00
Gregor Kleen
8db6ee8e57 Set uw-file-input on CorrectionsUploadR 2019-04-21 22:13:31 +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
6a85cbdf38 Hinweise zum Korrektur-Upload 2019-04-16 17:56:31 +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
ea658f65ce Lecturer invitations via e-mail 2019-04-12 14:08:55 +02:00
Gregor Kleen
ec3f816241 Merge branch 'master' into feat/tokens 2019-04-11 19:56:03 +02:00
Gregor Kleen
3b14a4f03d reinstate profile.hamlet 2019-04-11 12:52:27 +02:00
Steffen Jost
a0f645d9c4 Hopefully fixes #333 2019-04-10 11:51:48 +02:00
Gregor Kleen
41f228aaad Merge remote-tracking branch 'origin/master' into feat/tokens 2019-04-10 09:16:49 +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
559fb3fb9d refactor async form js util 2019-04-09 21:55:58 +02:00
Felix Hamann
d48b335cb2 automatically setup checkboxes via js utility 2019-04-07 22:17:38 +02:00
Gregor Kleen
f158735dd6 Fix build & minor cleanup 2019-04-07 16:38:26 +02:00
Gregor Kleen
bc76d858f8 More standard-conform emails 2019-04-07 16:18:36 +02:00
Felix Hamann
8a33c7df34 remove obsolete manual inputs JS setup code 2019-04-07 12:54:32 +02:00
Gregor Kleen
15fa8d1130 (Get|Post)Token → (Get|Post)Bearer 2019-04-05 22:45:03 +02:00
Gregor Kleen
efac923cc2 headerMessagesMiddleware 2019-04-05 21:08:39 +02:00
Gregor Kleen
a6b23a739f Merge branch 'master' into feat/tokens 2019-04-05 16:38:41 +02:00
Gregor Kleen
6e29d8ed89 Token revocation & Bugfixes 2019-04-05 16:37:39 +02:00
Gregor Kleen
af6821c7c8 UserNotificationR 2019-04-05 15:23:10 +02:00
Gregor Kleen
eedd4714f9 Fix colRated to use submissionRatingDone, as it should 2019-04-05 13:56:32 +02:00
Gregor Kleen
d36e9937be Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-04-05 13:32:02 +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
6da0850add Filter-UI course participants improved 2019-04-04 18:01:46 +02:00
Steffen Jost
4520c1be49 email page form incomplete 2019-04-04 15:59:45 +02:00
Steffen Jost
431affe6ec Course User Deregister 2019-04-04 14:20:20 +02:00
Steffen Jost
90c18b50cd minor 2019-04-04 10:50:55 +02:00
Gregor Kleen
8bedeeffa7 Enhance documentation 2019-04-03 18:51:34 +02:00
Gregor Kleen
37e4adc0db Modularize & clean up homepage
Fixes #306
2019-04-03 16:02:44 +02:00
Steffen Jost
9780030343 Session: newness for StudyTerms lasts longer 2019-03-31 21:15:46 +02:00
Steffen Jost
d8b3cdd245 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-03-31 20:26:15 +02:00
Steffen Jost
aea2f10e0f minor 2019-03-31 20:26:09 +02:00
Gregor Kleen
edea0a96aa Merge branch 'master' into feat/transaction-log 2019-03-31 14:24:01 +02:00
Gregor Kleen
9894dcd0fd Much cleaner storage of remote address within audit 2019-03-31 14:23:30 +02:00
Gregor Kleen
790c1b9433 Quiet hlint 2019-03-30 19:25:19 +01:00
Gregor Kleen
066328c56c TermHoliday Placeholder 2019-03-30 18:50:16 +01:00
Gregor Kleen
f5fb82de3e Improve term creation/editing 2019-03-30 17:05:54 +01:00
Steffen Jost
3bb5b6c7fb Minor refactor 2019-03-29 17:37:29 +01:00
Steffen Jost
bf083c9854 Fix sorting new studyterms 2019-03-29 17:24:00 +01:00
Steffen Jost
df0b36a01b StudyTermCandidates Deletion Buttons 2019-03-29 15:24:16 +01:00
Gregor Kleen
14efbd8656 First prototype of audit-log
Has auditing for term-edits as an example
2019-03-28 15:16:50 +01:00
Gregor Kleen
8af5ec822a Quiet hlint 2019-03-28 12:35:45 +01:00
Gregor Kleen
68a0f7c566 Cleanup buttonForm & remove duplicate identifyForm calls 2019-03-28 12:06:50 +01:00
Gregor Kleen
4dbeff18c0 Cleanup some redundant submitButtons 2019-03-28 11:43:42 +01:00
Gregor Kleen
543c15a50b Tooltip for identical lecturer rights 2019-03-27 23:51:38 +01:00
Gregor Kleen
8110e7ff6c Provisional check for user adding themselves as lecturer 2019-03-27 23:27:43 +01:00
Gregor Kleen
3a260804d9 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-03-27 20:29:28 +01:00
Gregor Kleen
d45d7fdbff Fix modals 2019-03-27 20:29:08 +01:00
Steffen Jost
45d273b6f8 Distinguish lecturers and assistants in course; polish FAQ and version history 2019-03-27 17:52:34 +01:00
Gregor Kleen
bd6ee78539 Remove redundant button from dbTable-pagesize 2019-03-27 17:02:37 +01:00
Gregor Kleen
ef132cc656 Fix build 2019-03-27 16:59:18 +01:00
Gregor Kleen
520621f0a1 Fix dbTable-pagesize for FormAutoSubmit 2019-03-27 16:58:24 +01:00
Gregor Kleen
955a951003 Make massInput-Buttons behave nicer on Course-edit-page 2019-03-27 16:16:29 +01:00
Gregor Kleen
62e11a1ca1 Better handle FormFailure and allow de-duplication within miAdd 2019-03-27 15:52:04 +01:00
Gregor Kleen
4a77be4f3c Minor cleanup
Fixes #322
2019-03-26 23:09:31 +01:00
Steffen Jost
31f635793d multiple lecturers for course, no verification 2019-03-25 15:38:03 +01:00
Steffen Jost
6a5437ce72 Lecturer toles added 2019-03-25 13:13:37 +01:00
Steffen Jost
10351854cd Merge branch 'master' into 126-ubungsbetrieb-statistik-seiten-pro-kurs 2019-03-25 10:44:44 +01:00
Steffen Jost
89d21580aa 42 removed (but current state is dangerous: works only for admins 2019-03-25 09:25:42 +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
68cc79e5f3 minor 2019-03-24 13:40:51 +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
Steffen Jost
ac3272e2b8 WIP: Deregister button for CUserPage 2019-03-24 11:27:49 +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
0751f23c8e i18n cleanups course user page 2019-03-22 19:13:42 +01:00
Steffen Jost
c2dc23c116 course user info shows study terms and matriclenr 2019-03-22 18:40:59 +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
Steffen Jost
2ddb637b6e Merge branch 'master' into 126-ubungsbetrieb-statistik-seiten-pro-kurs 2019-03-21 16:21:30 +01:00
Gregor Kleen
40bb0ddaf6 Quiet Hlint 2019-03-20 22:58:46 +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
Steffen Jost
0cc2f28089 Show fully info on StudyTerms in UserProfileDataR 2019-03-20 19:55:44 +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
90417441b3 Minor Typo 2019-03-20 14:52:06 +01:00
Steffen Jost
9350c93ea5 Merge from Master 2019-03-20 14:40:50 +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
7177631236 Merge branch '307-studiengange-behandeln' of gitlab.cip.ifi.lmu.de:jost/UniWorX into 307-studiengange-behandeln 2019-03-20 13:15:29 +01:00
Steffen Jost
c4aab6248a inference for studyterms works now 2019-03-20 13:15:23 +01:00
Gregor Kleen
6344017db3 Ensure better, that study_{degree,terms}.{shorthand,name} isn't "" 2019-03-20 12:15:04 +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
8d13d9278f Model descriptions mostly done 2019-03-15 10:56:25 +01:00
SJost
26375b1140 mend 2019-03-13 21:36:21 +01:00
SJost
40204d2424 mend 2019-03-13 21:18:38 +01:00
SJost
86086633ab Conflict detection for studyTermCandidates implemented 2019-03-13 21:17:30 +01:00
SJost
5a8fa8648f Created AdminR page to remove clutter from homepage 2019-03-13 20:35:46 +01:00
Steffen Jost
0917b2c580 testdata added for studytermcandidates 2019-03-13 18:18:31 +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
a76090a31f Stub for Studyfeature overview created 2019-03-12 22:52:28 +01:00
SJost
25019eec58 mend 2019-03-12 10:58:14 +01:00
SJost
78ada75704 Filters for Participant List added 2019-03-12 10:54:32 +01:00
SJost
913f4dea7c mend
merge from master
2019-03-12 09:20:53 +01:00
SJost
889c3ebb35 Merge and bugfix sorting by participants registration date 2019-03-12 09:20:07 +01:00
SJost
32e9bb63ca Minor title fix 2019-03-12 08:39:19 +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
c205fe1b74 mend 2019-03-10 18:13:39 +01:00
SJost
f6ace93795 participant list sorting completed 2019-03-10 18:08:36 +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
Gregor Kleen
6939b73802 old-style json-answers in admin email test 2019-03-10 14:40:44 +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
8aeeb1ddaa Fixes #310 2019-03-04 15:43:49 +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
382a34f970 commented to compile 2019-03-01 12:46:28 +01:00
SJost
fa0ce033ee Cannot Return a ValueList from a select. :( 2019-03-01 11:36:13 +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
3966ad9b24 Don't know why there are still changes after commit and push 2019-02-28 12:07:50 +01:00
SJost
7dcd3339a2 Name sorting fixed 2019-02-28 12:06:41 +01:00
SJost
0a49fb00e2 Merge branch '307-studiengange-behandeln' of gitlab.cip.ifi.lmu.de:jost/UniWorX into 307-studiengange-behandeln 2019-02-28 11:23:45 +01:00
SJost
407e40ce3d merge minor 2019-02-28 11:23:38 +01:00
SJost
61058b1f98 Fixbuild hlint. I hate those. 2019-02-28 11:14:17 +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
Gregor Kleen
ad02db27db Keep track of userLastAuthentication 2019-02-28 11:01:44 +01:00
SJost
4db9e5c18a fillDB adjusted for StudyFeatues 2019-02-28 10:02:23 +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
SJost
0fbed68915 wrapForm created, not used everywhere yet 2019-02-27 14:23:56 +01:00
Gregor Kleen
c0edc87926 Start on implementation 2019-02-27 13:07:22 +01:00
SJost
f20f2cb005 Minor clean up 2019-02-27 12:14:06 +01:00
SJost
2ce657fe5e stub for i18nWidgetFile created and used 2019-02-27 11:28:40 +01:00
SJost
66750f4c7d CourseParticipantsList in Hamlet ausgelagert 2019-02-26 08:56:16 +01:00
Felix Hamann
7e457c50fa Merge branch 'modal-migration' into 'master'
Move modal JS to static

Closes #304

See merge request !148
2019-02-25 20:50:32 +01:00
SJost
1553570d87 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-02-25 13:07:55 +01:00
SJost
42a8708bf5 minor update disclaimer and messages 2019-02-25 12:46:03 +01:00
SJost
ba7b49e2d3 dateTimeCell cleanup 2019-02-23 08:25:34 +01:00
SJost
787cf0d7cc Datumsformate hinzugefügt 2019-02-23 08:15:05 +01:00
SJost
84a5833c22 emailColumn added 2019-02-23 07:50:28 +01:00
Felix Hamann
1999b494c3 Merge branch 'master' into modal-migration 2019-02-22 22:58:14 +01:00
SJost
d9b11bc9a4 I h8 hlint 2019-02-22 18:50:46 +01:00
SJost
8dae9eb1d4 Course member list stub working, after daylong painful birth throes 2019-02-22 18:24:21 +01:00
SJost
d1c0b67627 Default sorting for TermListR added 2019-02-22 13:00:13 +01:00
SJost
d90093bed4 Hotfixes: default sorting of course lists was wrong 2019-02-22 12:45:35 +01:00
SJost
0938d93039 Code clean; abandoned utf8 tickmark in favour of font-awesome checkmark 2019-02-22 10:50:29 +01:00
SJost
8d29354818 Fix build for hlint once again 2019-02-22 08:15:45 +01:00
SJost
f0ee524e9e Merge branch 'master' into formgroups 2019-02-22 07:48:16 +01:00
SJost
68d36b2fe0 Course description as icon complete 2019-02-22 07:47:20 +01:00
SJost
f869876e12 Towards #303 2019-02-21 22:08:49 +01:00
SJost
7d72086fd9 minor refactor 2019-02-21 19:55:38 +01:00
SJost
89e6b17107 Build problem determined: crashes Haddock. Added similar Class manually. 2019-02-21 16:47:42 +01:00
SJost
bb552c472f TEST: Does ist build with everything except for makeClassy ''Entity? Probably the functional dependency is to blame?! 2019-02-21 16:12:11 +01:00
SJost
2550f74056 TEST: removing makeCLassyFor maybe build works then? 2019-02-21 14:53:45 +01:00
SJost
10237c4031 Merge and by accident info page 2019-02-21 11:35:04 +01:00
SJost
972bc11d46 new admin notfifications are sent to fellow school admins as well now 2019-02-21 11:15:02 +01:00
SJost
75e2210ae5 Fix build hlint 2019-02-20 23:57:51 +01:00
SJost
4f26973206 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-02-20 23:42:36 +01:00
SJost
91068bb558 NotficationUserRightsUpdate added 2019-02-20 23:42:12 +01:00
Felix Hamann
b8eb78d11a add data-ajax-submit to email-test-modal 2019-02-20 22:09:53 +01:00
Felix Hamann
55c1385e3e Merge branch 'js-utils-cleanup' 2019-02-20 22:07:02 +01:00
SJost
8024a9d9f0 Impressum and DSGV-Stub updated 2019-02-20 18:53:21 +01:00
SJost
33c81a64c0 Minor 2019-02-20 07:07:39 +01:00
SJost
a1896f3d1c Steps towards #126, compiling but incomplete 2019-02-19 20:30:18 +01:00
SJost
d3f1a49fde Courses are Classy now "HasCourse" with "hasCourse" 2019-02-19 15:41:09 +01:00
SJost
cc2eb6d475 Refactor for Database.Esqueleto.Utils 2019-02-19 09:37:44 +01:00
SJost
09844a6a78 Search user by partial matriclenumbers 2019-02-19 08:49:43 +01:00
SJost
cbd2a23a2c Fix built with workaround 2019-02-18 22:49:08 +01:00
SJost
1dd2b92374 attempt to fix build 2019-02-18 22:38:52 +01:00
SJost
f31a63422b Minor refactor schoolOption selection 2019-02-18 20:48:57 +01:00
SJost
90d3135f15 Fixes #291 2019-02-18 20:27:15 +01:00
SJost
ed8beb9e81 Minor refactor 2019-02-18 18:38:23 +01:00
SJost
bc0354da57 Towards #291 2019-02-18 18:08:01 +01:00
SJost
184ebaf064 Form error demonstration added to 'AdminTestR' 2019-02-18 09:36:25 +01:00
SJost
76ac563627 merged from master 2019-02-17 15:08:56 +01:00
SJost
8247cb6a50 Code cleaning done. 2019-02-17 15:03:56 +01:00
SJost
a5659aa737 Form section titles via fvId; working, but code cleanup needed. 2019-02-17 07:42:30 +01:00
Felix Hamann
3db08a841c refactoring: move each widget into its own subfolder 2019-02-16 23:35:57 +01:00
Felix Hamann
2b61d8f180 add behavior section headline to profile form 2019-02-16 18:30:56 +01:00
Felix Hamann
228aa8320d moved more js utils to static 2019-02-16 17:23:52 +01:00
SJost
e4f37a1bcc templates/widgets/form-section-title.shamlet created for @hamannf 2019-02-16 17:04:13 +01:00
SJost
9287d89e33 FormGroup example on profile data page implemented 2019-02-16 16:17:33 +01:00
SJost
1cc9ca119f Fix build linter 2019-02-16 14:35:14 +01:00
SJost
7ad95e7328 MFormGroups okay, AFormGroups just a silly workaround 2019-02-16 14:32:33 +01:00
SJost
d3f9425448 FIxbuild 2019-02-15 15:06:57 +01:00
SJost
99d958dade UX/UI polish in various places 2019-02-15 13:28:39 +01:00
SJost
4c4a0f538f LecturerInfoPage first draft 2019-02-14 21:03:55 +01:00
SJost
23706c36ce siteLayout instead of pageHeadings 2019-02-14 19:25:15 +01:00
SJost
ba45bc5883 Admins can change user access rights now 2019-02-14 18:34:26 +01:00
SJost
115e71365d First steps towards editable User Rights 2019-02-14 16:01:47 +01:00
SJost
5639ea0380 bugfix: adding weeks ignores timezone differences 2019-02-14 12:11:58 +01:00
SJost
d0ed667cf3 LecturerInfoPage Stub 2019-02-14 11:24:56 +01:00
SJost
67d6fad1d4 Fixbuild linter warnings 2019-02-11 10:55:04 +01:00
Felix Hamann
b98a751748 revert change to course description modal wording 2019-02-09 21:07:43 +01:00
Felix Hamann
6af0ebe400 remove modal trigger icon 2019-02-09 21:03:33 +01:00
Felix Hamann
ce5301e590 Merge branch 'master' into feat/modalicons 2019-02-09 20:07:50 +01:00
SJost
98994496a7 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-02-06 16:30:55 +01:00
SJost
26cc12127b Convenience for AuthPreds 2019-02-06 16:30:51 +01:00
SJost
fbfa4bdff2 Convenience New Term implemented 2019-02-06 16:12:30 +01:00
SJost
924831f3e4 Fixes #262 2019-02-05 23:25:18 +01:00
SJost
7a684f6cb6 FIxes #262 2019-02-05 23:11:31 +01:00
Felix Hamann
557b0e1e97 Merge branch 'pagination' into 'master'
Table and Pagesize Frontend Refinement

Closes #116

See merge request !132
2019-02-04 21:54:55 +01:00
Gregor Kleen
e9c69e6cfb Plan for MassInput-Controls being buttons 2019-01-31 11:54:28 +01:00
Gregor Kleen
7acba967d1 Merge branch 'master' into 284-massinput 2019-01-31 11:13:27 +01:00
Gregor Kleen
8684ca016f Button cleanup 2019-01-31 11:12:20 +01:00
SJost
73a19863b1 Fixbuild for hlint stupidty 2019-01-30 18:02:19 +01:00
SJost
e4324a1c9b Fixes #262 2019-01-30 17:50:44 +01:00
SJost
13b5671480 Fixes #267 and related bugs 2019-01-30 16:00:18 +01:00
SJost
39da549461 Towards #267 2019-01-30 14:48:16 +01:00
SJost
b2dd9f4214 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-01-30 11:20:57 +01:00
Gregor Kleen
ccdb438862 Initial work on MassInput 2019-01-30 11:14:30 +01:00
SJost
02a0dc1435 Minor Refactor 2019-01-30 10:58:57 +01:00
Gregor Kleen
71cbd3eacd Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-01-30 10:55:43 +01:00
Gregor Kleen
7a511b2c50 Minor cleanup 2019-01-30 10:55:31 +01:00
SJost
3ef6c08ac1 Fixes #272 2019-01-30 10:48:32 +01:00
Gregor Kleen
2bea5435bf Avoid divide by zero 2019-01-30 10:07:31 +01:00
Gregor Kleen
78fc27dc04 Introduce visibleWidget 2019-01-30 09:45:43 +01:00
Gregor Kleen
0b19730b1a Introduce visibleWidget 2019-01-30 09:44:16 +01:00
Gregor Kleen
19d46eb216 Show pagesize widget iff rowCount is larger than minimum pagesize 2019-01-28 14:20:34 +01:00
SJost
f8c13bf7bd Bugfix exercise sheet summaries 2019-01-26 14:20:43 +01:00
Gregor Kleen
85bdf8766b Minor cleanup (cellTell) 2019-01-25 18:55:20 +01:00
Gregor Kleen
593ec541b8 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-01-25 18:51:36 +01:00
Gregor Kleen
b10dba427b Integrate statistics into correctionsR 2019-01-25 18:51:28 +01:00
Gregor Kleen
c9ba51a0c9 Streamline monoidal summaries for dbtables containing forms 2019-01-25 17:35:24 +01:00
SJost
c0605024c9 Handler.Utils.Table.cellTell added, but does not work as intended. 2019-01-24 18:41:58 +01:00
SJost
b5ef2e13f9 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-01-24 18:05:36 +01:00
SJost
e0fe371971 Statistics for SheetList not working anymore 2019-01-24 18:05:21 +01:00
Gregor Kleen
1ccb8b7c32 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-01-24 17:08:08 +01:00
Gregor Kleen
9879c9f0d5 Revert "Expose runPaginationSettings'"
This reverts commit a03577f970.
2019-01-24 17:08:02 +01:00
SJost
10370f2567 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-01-24 16:54:04 +01:00
SJost
82b5315c36 Filtering refactored with prismAForm 2019-01-24 16:47:46 +01:00
Gregor Kleen
14c8aa5e30 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-01-24 16:21:41 +01:00
Gregor Kleen
a03577f970 Expose runPaginationSettings' 2019-01-24 16:21:30 +01:00
SJost
38a35a673a Fix #270 2019-01-24 15:12:23 +01:00
SJost
f5f9dea342 Fix #215 and other minor improvements 2019-01-24 14:44:48 +01:00
SJost
e19540556f Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-01-23 18:37:35 +01:00
SJost
55fed0f378 filter corrected towards #270 2019-01-23 14:48:17 +01:00
Gregor Kleen
4e718ee287 Cleanup & haddock 2019-01-17 11:44:18 +01:00
Gregor Kleen
7f103ec7a9 Additional tests & cleanup 2019-01-16 23:47:21 +01:00
Gregor Kleen
25252e867e Merge branch '268-formulare-in-dbtable' 2019-01-16 18:01:52 +01:00
Gregor Kleen
966c60acb1 Always reproduce sorting of previousKeys 2019-01-16 18:01:25 +01:00
Gregor Kleen
ff964ab9a5 Merge branch '268-formulare-in-dbtable' 2019-01-16 16:57:50 +01:00
Gregor Kleen
2dd5502af6 More robust handling of missing rows in forms within dbtable 2019-01-16 16:53:02 +01:00
SJost
ffda17ada0 Towards #270 2019-01-16 16:17:38 +01:00
SJost
b6b6cf75bb Towards #272 2019-01-16 15:58:52 +01:00
SJost
fdbec180db Filter Submissions by Course 2019-01-16 13:36:08 +01:00
SJost
54a1ea612d CourseList standardized 2019-01-16 10:46:02 +01:00
SJost
b25d542f6b Corrector can always see sheet list. SheetList shows VisibleFrom 2019-01-16 10:25:52 +01:00
SJost
ec3b4ec4dd Authorisation CUserR for !participant 2019-01-09 13:47:19 +01:00
SJost
509e7f974c Fix supportanfrage 2019-01-09 10:44:03 +01:00
Gregor Kleen
5e6de82e1d Fix accidental form nesting 2018-12-29 14:51:08 +01:00
Gregor Kleen
87ababdeb9 Slightly clean up course filter UI 2018-12-29 13:53:45 +01:00
Gregor Kleen
f238759270 Hide FilterUI by default 2018-12-29 13:38:31 +01:00
Gregor Kleen
74e87c6d54 Keep autoDistribute through sheet edits
Fixes #259
2018-12-21 21:19:34 +01:00
Gregor Kleen
3a0b79e137 Automagic corrections distribution 2018-12-21 14:59:28 +01:00
Gregor Kleen
1621ee1fe8 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-12-21 12:56:15 +01:00
Gregor Kleen
749d2e2a0a Bulk deletion of submissions 2018-12-21 12:56:01 +01:00
SJost
8b5c8fbc36 Merge remote-tracking branch 'origin/master' into 126-ubungsbetrieb-statistik-seiten-pro-kurs 2018-12-20 19:19:07 +01:00
SJost
fb8d0c049f Grading Summary Refactor finished 2018-12-20 19:18:48 +01:00
Gregor Kleen
54754c4dc3 Cleanup & apply revamp of deletionR 2018-12-20 17:44:58 +01:00
Gregor Kleen
282e0615cb Split deleteR for use with correctionsR 2018-12-20 12:12:38 +01:00
Gregor Kleen
38dbc0905c Single-submission deletion 2018-12-19 22:31:09 +01:00
Gregor Kleen
c6b7ad0580 Generic and "safe" deletion widget 2018-12-19 21:55:42 +01:00
Gregor Kleen
842d7d85e3 quiet hlint 2018-12-19 17:58:50 +01:00
Gregor Kleen
aa325f7fa9 Due to HasRoute-refactor CourseNewTemplateR is no longer needed 2018-12-19 17:51:00 +01:00
Gregor Kleen
45bfe771ad Embrace collisions in dbtable auxiliary tables 2018-12-19 16:24:23 +01:00
SJost
82aef8a254 refactor sheetGradeSummary part 2 2018-12-19 15:48:38 +01:00
SJost
47b2808dd4 SheetGradeSummary Refactor Attempt1 2018-12-19 11:35:36 +01:00
Gregor Kleen
64dbfe3905 Identify auxiliary dbtable forms to prevent collisions 2018-12-19 11:18:35 +01:00
SJost
b32654b720 Bugfix: Abgabengruppe nach Nachnamen sortieren 2018-12-19 09:26:12 +01:00
Gregor Kleen
db175ad907 Cleanup AdminHijackUserR 2018-12-16 18:17:32 +01:00
Gregor Kleen
3adab6ddbe Ensure selected pagesize is always shown 2018-12-14 22:04:35 +01:00
Gregor Kleen
f1f1cd9a36 Fix controls not responding after pagesize change 2018-12-14 21:52:42 +01:00
Gregor Kleen
ca5f9bffe0 Backend work for #116 2018-12-14 21:39:56 +01:00
Gregor Kleen
c6918affd5 Make dbtable-forms more robust against pagination & dataset changes 2018-12-13 23:05:52 +01:00
Gregor Kleen
fa9cf21c25 Quiet hlint 2018-12-13 16:01:08 +01:00
Gregor Kleen
0951b54533 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-12-13 15:13:29 +01:00
Gregor Kleen
19a25ec520 Rework dbtable forms, cleanup 2018-12-13 15:10:43 +01:00
SJost
553d14e809 single runDB for correction statistics ensures match 2018-12-12 15:20:13 +01:00
SJost
306fb351ad Error Handling für SinkSubmission 2018-12-12 12:05:22 +01:00
SJost
0407d10654 Fixes #253 2018-12-07 14:16:03 +01:00
SJost
5728d413cf refactored as suggested by Gregor in #253 2018-12-07 12:58:13 +01:00
SJost
59714bd3c7 Merge remote-tracking branch 'origin/master' into 126-ubungsbetrieb-statistik-seiten-pro-kurs 2018-12-07 11:39:47 +01:00
SJost
2d05c2c9a9 minor fixes 2018-12-07 11:39:39 +01:00
Gregor Kleen
01cee62b10 Work on #39 2018-12-06 19:30:29 +01:00
Gregor Kleen
3541c1dc40 Prevent user from locking themselves out (authpreds) 2018-12-06 18:55:06 +01:00
Gregor Kleen
1941338075 Cleanup pseudonym handling
Fixes #247
2018-12-05 21:52:37 +01:00
Gregor Kleen
7fc705730d Minor cleanup 2018-12-05 17:57:13 +01:00
Gregor Kleen
3f60f6391c Revert "Include preload hints about static content"
This reverts commit c757bf9a00.
2018-12-05 15:30:51 +01:00
Gregor Kleen
e94173acb1 Fix build 2018-12-05 15:13:12 +01:00
Gregor Kleen
dafb2389ba Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-12-05 15:07:39 +01:00
Gregor Kleen
c757bf9a00 Include preload hints about static content 2018-12-05 15:07:24 +01:00
SJost
3c90625d6f Merge remote-tracking branch 'origin/master' into 126-ubungsbetrieb-statistik-seiten-pro-kurs 2018-12-05 14:56:49 +01:00
Gregor Kleen
48080639b1 Memcached integration for widgets 2018-12-05 13:50:46 +01:00
Gregor Kleen
9ca0c1b0e3 Be less restrictive when creating submissions
Allow groups larger than maximum group submission size in principle
2018-12-05 12:06:16 +01:00
Gregor Kleen
2a19b9368e Minor cleanup 2018-12-05 12:05:18 +01:00
Gregor Kleen
1d51280ebf Fix check for maximum group size in correction creation 2018-12-05 12:03:38 +01:00
SJost
63de63f16c UniworxMessages allows combining messages 2018-12-05 11:57:28 +01:00
SJost
17ea26430f Sorting Corrections and UniWorXMessages Monoid 2018-12-05 11:41:25 +01:00
SJost
aa455d2bdd Statistik Abgaben/Blätter done 2018-12-02 16:47:56 +01:00
SJost
693acdce48 Merge remote-tracking branch 'origin/master' into 126-ubungsbetrieb-statistik-seiten-pro-kurs 2018-12-01 10:22:00 +01:00
SJost
b05f1ccc75 Rating type shown along rating in all corrections. 2018-11-30 21:51:16 +01:00
Gregor Kleen
5e911d22bc Handle AuthPredsR more elegantly 2018-11-30 18:24:56 +01:00
SJost
2ef4bbc014 Neue Statistik nun auch für Blattübersicht 2018-11-30 17:45:27 +01:00
SJost
16771ae8c5 Fix build. 2018-11-30 16:34:36 +01:00
SJost
24b1e18e90 merge from master 2018-11-30 16:23:12 +01:00
SJost
42915b3920 Proper statistics implemented for submission lists 2018-11-30 15:33:27 +01:00
SJost
81d8d8c017 NO COMPILE. Templates for summaries done, but nestes does not (still) work. Duh. 2018-11-30 14:44:23 +01:00
SJost
2308771350 NO COMPILE. Templates for summaries done, but nestes does not (still) work. Duh. 2018-11-30 14:31:05 +01:00
Gregor Kleen
8e4afc554b Fix #239 2018-11-30 13:28:20 +01:00
Gregor Kleen
bb4140fa3d avoid weird override by sending db-table-shortcircuit as header 2018-11-29 14:07:47 +01:00
Gregor Kleen
f126246a23 Fix build 2018-11-29 12:52:02 +01:00
Gregor Kleen
997403d6be Send pagination data in dbTable-Forms 2018-11-29 12:30:42 +01:00
Gregor Kleen
6c0f031c4e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-29 11:02:58 +01:00
Gregor Kleen
3ad8505489 Generalize encrypted error messages to encoded SecretBoxes 2018-11-29 11:01:49 +01:00
SJost
fed70610f0 Summary shown for all submission, but mislabelled 2018-11-28 12:01:14 +01:00
SJost
160ec5a8dc Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-27 14:11:37 +01:00
Gregor Kleen
0c3cf631a5 Fix check for existingSubUsers; no longer produces false positives 2018-11-27 10:12:44 +01:00
Gregor Kleen
52467723b8 Cleanup fuzzy pseudonym handling 2018-11-26 17:24:19 +01:00
Gregor Kleen
92da5a3123 minor cleanup 2018-11-24 15:30:18 +01:00
Gregor Kleen
179f003c32 Ajax'ed authpreds 2018-11-22 22:18:39 +01:00
Gregor Kleen
67f6103f87 Debug javascript setup 2018-11-22 20:56:49 +01:00
Gregor Kleen
213f3a39cc Fully ajaxified modals 2018-11-22 17:25:56 +01:00
Gregor Kleen
a627b7be72 Globally defined get parameters & headers 2018-11-22 14:55:27 +01:00
SJost
5a4ef4e13c Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-20 15:49:10 +03:00
SJost
b0732ae6c6 Mino 2018-11-20 15:48:29 +03:00
Gregor Kleen
417285f20d Fix #235 2018-11-19 14:26:31 +01:00
Gregor Kleen
c26897847c Show SheetSubmissionMode & cleanup 2018-11-19 13:53:05 +01:00
Gregor Kleen
bc12fcda2f Fix build 2018-11-14 14:38:03 +01:00
Gregor Kleen
27f2e077fe Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-14 14:23:09 +01:00
Gregor Kleen
4697efab5f Overhaul auth-predicates 2018-11-14 14:20:32 +01:00
SJost
94ee06d3c7 All routes with CryptoIds are verified now, see #233 2018-11-13 16:03:13 +01:00
SJost
dc4f37c921 Subtask for #233. Rights checked for Corrector assignment 2018-11-13 15:36:59 +01:00
SJost
673d98ff91 Single submission assign corrector 2018-11-12 17:12:24 +01:00
SJost
3aca9c115a Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-11 09:51:01 +01:00
Gregor Kleen
7bf3a52599 i18n MenuItems & Semantic support-referer
Addresses #228
2018-11-09 22:43:45 +01:00
SJost
af40d86de9 Bugfix: assignAction no longer delivers duplicate actions 2018-11-09 17:45:06 +01:00
SJost
626fcba2db Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-09 13:59:29 +01:00
SJost
7bc72505a4 Ratings are now validated, some refactoring 2018-11-09 13:59:14 +01:00
Gregor Kleen
a056690151 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-09 13:57:32 +01:00
Gregor Kleen
1d69bd8d07 Allow setting name when sending help request without account 2018-11-09 13:57:11 +01:00
SJost
d2194d5605 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-09 12:24:36 +01:00
Gregor Kleen
77dcc02b9c iframe-based dynamic modals
Fixes #226, fixes #217
2018-11-09 11:53:22 +01:00
SJost
b235541500 Submission form shows submitter now 2018-11-09 10:28:53 +01:00
SJost
ec06be2dfd Fixes #223, number of submission buddies, no longer ignore .vscode 2018-11-09 10:01:39 +01:00
Gregor Kleen
b81b7bf58c Fixes #225 2018-11-03 21:53:45 +01:00
Gregor Kleen
12c1a4ca71 Address hlint 2018-11-02 19:57:42 +01:00
Gregor Kleen
6cdfe0891b Address warnings 2018-11-02 14:32:47 +01:00
Gregor Kleen
455a239c8c Merge branch 'master' into tests 2018-11-02 14:24:20 +01:00
SJost
9aaee52ce1 BUGFIX: sort corrections by assigned time (undefined sortColumn) 2018-11-02 12:20:43 +01:00
Gregor Kleen
e5d3213efb Fix some hlint 2018-11-02 00:25:44 +01:00
Gregor Kleen
9ccc2e3149 Fix warnings 2018-11-01 22:06:00 +01:00
SJost
e4e5b543a5 Workaround for unfixed issue #223 2018-11-01 17:01:40 +01:00
SJost
af77f1cab3 Fixes #222. Fixes #213. Bug with Summary-Display (not summing up properly). 2018-11-01 16:04:46 +01:00
SJost
d6ef0c1b65 Tooltips clarifying sheetTypes and sheetGrading at sheet creation 2018-10-31 17:07:19 +01:00
SJost
73bd8bf9f0 Fixes #222 2018-10-31 15:48:34 +01:00
Gregor Kleen
75dcb120ed Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-31 13:21:00 +01:00
Gregor Kleen
8bce5b102a Merge branch 'master' into 85-entfernen-von-vorigen-aufgabenstellungen-eines-ubungsblattes-funktioniert-nicht 2018-10-31 13:20:42 +01:00
Gregor Kleen
3adac1f25b Fixes #85 2018-10-31 13:20:35 +01:00
SJost
9d71dd7d9a Fixes #213 2018-10-31 12:26:47 +01:00
SJost
db18b4bdba Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into sheet-type 2018-10-31 09:45:32 +01:00
SJost
1b021259cc SheetType refactoring (Halfway only) 2018-10-31 09:44:40 +01:00
Gregor Kleen
eff7875c1c Cleanup language extensions 2018-10-28 19:11:40 +01:00
Gregor Kleen
849e3eb347 Interface for decrypting error messages 2018-10-28 14:14:27 +01:00
Gregor Kleen
90e942f5b4 Better error messages, Store config in db
Fixes #197
Fixes #93
2018-10-27 22:24:43 +02:00
Gregor Kleen
712589192f Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-24 21:43:22 +02:00
Gregor Kleen
4c1c172ac5 Minor cleanup 2018-10-24 21:42:45 +02:00
SJost
028cc3586d Profile cleaned 2018-10-24 18:19:16 +02:00
SJost
a8262a4162 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-24 16:44:59 +02:00
Gregor Kleen
3342daa0e8 Fix SubmissionRatingDone 2018-10-24 16:39:45 +02:00
SJost
3b96d96838 NotificationSheetInactive 2018-10-24 14:59:46 +02:00
SJost
445ddb8ca6 minor 2018-10-22 21:41:39 +02:00
Gregor Kleen
b288b56e1d SystemMessage CRUD 2018-10-22 18:27:08 +02:00
Gregor Kleen
d663586516 CorrectionsGradeR 2018-10-22 10:34:38 +02:00
Gregor Kleen
353e958755 Display pseudonyms & anonymise submission page
Fixes #118
2018-10-21 12:08:01 +02:00
Gregor Kleen
bd260d1a38 Cleanup 2018-10-19 21:26:17 +02:00
SJost
38e37b8583 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-18 16:40:02 +02:00
SJost
4a394d2050 Labels adjusted, HelpForm not working before Login due to Modal-Login not being hidden properly, see #212 2018-10-18 16:38:54 +02:00
Gregor Kleen
1deefdc4a6 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-17 22:31:05 +02:00
Gregor Kleen
a23841e4f8 Start work on SystemMessages 2018-10-17 22:30:47 +02:00
SJost
adde4ccdf6 Bugfix: delete user cd /home/jost/programming/Haskell/Yesod/uniworx/templates 2018-10-17 18:07:04 +02:00
SJost
5a349f9b85 Bugfix: deletion deletes files now. 2018-10-17 14:49:53 +02:00
SJost
83c4210f8b Minor: delete as message 2018-10-17 14:05:45 +02:00
SJost
f556d158cc Stub for Help-Button via Modal added 2018-10-17 12:11:31 +02:00
SJost
2634774eef Löschen von festen Abgabegruppen implementiert. 2018-10-17 10:53:53 +02:00
SJost
832c007027 User deletion implemented, but not tested 2018-10-17 10:38:56 +02:00
Gregor Kleen
f07ad82c1d Pseudonym submission creation 2018-10-15 15:02:44 +02:00
Gregor Kleen
2d90eef867 Fix build & cleanup 2018-10-15 09:19:08 +02:00
Gregor Kleen
1f32f638f0 Fix pseudonym coding & new wordlist 2018-10-15 09:06:41 +02:00
Gregor Kleen
8e28c397fd Return existing in SPseudonymR 2018-10-15 08:44:12 +02:00
Gregor Kleen
788b53946a SheetSubmissionMode & generate pseudonyms 2018-10-15 01:04:49 +02:00
Gregor Kleen
9a94e48d40 Merge remote-tracking branch 'origin/master' into feat/jobs 2018-10-14 17:55:45 +02:00
Gregor Kleen
5332e22c13 img_modal_svg 2018-10-14 17:24:19 +02:00
Gregor Kleen
ffc20e6a4c Profile notification settings 2018-10-14 16:51:05 +02:00
Gregor Kleen
72f57e6595 YesodJobDB, cleanup
Fixes #204
2018-10-14 16:08:03 +02:00
Gregor Kleen
ff68ef7c9f pseudo-required fields
Fixes #207
2018-10-13 19:09:17 +02:00
Gregor Kleen
3297b56ebf cleanup 2018-10-13 16:23:39 +02:00
Felix Hamann
18b3fe0e5d introduced icon for modals 2018-10-13 00:10:56 +02:00
Gregor Kleen
9183ff9aa4 cleanup 2018-10-12 20:20:13 +02:00
Gregor Kleen
d743fd6536 Time formatting in emails 2018-10-12 19:40:52 +02:00
Gregor Kleen
f98939885b Wire in NotificationSubmissionRated 2018-10-11 21:44:58 +02:00
SJost
67ba5509b1 3rd tick for issue #187 2018-10-11 19:24:44 +02:00
SJost
b87c3c4ca7 Fixes #202. Not a bug actually. 2018-10-11 12:04:40 +02:00
SJost
39e96e6ccd Fixes #190 2018-10-11 11:14:56 +02:00
SJost
bef662d162 Fix build. 2018-10-11 10:39:28 +02:00
SJost
d937e3d894 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-11 10:35:26 +02:00
SJost
a6afd02a15 cannot remember 2018-10-11 10:19:25 +02:00
Gregor Kleen
0ca12cecdb Merge remote-tracking branch 'origin/master' into feat/jobs 2018-10-08 09:39:27 +02:00
Gregor Kleen
542ee8bb30 Minor cleanup 2018-10-08 08:24:13 +02:00
Gregor Kleen
7068b3462e Grand unification of modals 2018-10-05 13:11:00 +02:00
Gregor Kleen
1beeea5aa6 Working mail test 2018-10-04 19:48:07 +02:00
Gregor Kleen
74222dbcc8 Framework for email-test 2018-10-04 14:53:36 +02:00
Felix Hamann
b9ba2167aa add modalDynamic to modalStatic 2018-10-03 13:09:25 +02:00
Felix Hamann
7ea45e3a17 reintroducing dynmic modals 2018-10-03 13:09:25 +02:00
Felix Hamann
41167afb04 alerts from bottom and uniformely dark with color hints
closes #189
2018-10-03 13:09:25 +02:00
Felix Hamann
267abc939c fix non-exhaustive pattern for modals and remove remaining jquery integration
closes #188
2018-10-03 13:09:25 +02:00
Felix Hamann
4579fe56be modal adjustments 2018-10-03 13:09:25 +02:00
Gregor Kleen
7bafd767dd Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-09-28 21:34:07 +02:00
Gregor Kleen
857dc92ca2 Overhaul authentication
Fixes #186
2018-09-28 21:27:19 +02:00
SJost
2140c21560 Delete Data via Modal; stub. 2018-09-28 19:14:27 +02:00
SJost
e63a08e160 Warning: self-corrector added. 2018-09-28 17:59:36 +02:00
SJost
66ab0f9be6 Major contributions towards #189 and #194 2018-09-28 17:22:22 +02:00
SJost
4d96504fe7 Stubs for Lecture-User-Data 2018-09-24 14:14:34 +02:00
SJost
43598d05c4 Fixes #190, except for manipualted post-data (ok) 2018-09-21 16:29:26 +02:00
SJost
d696c7375e Code cleaning and bug fixes towards #187 2018-09-21 08:31:18 +02:00
SJost
a20ff1468e First part of issue #187 implemented. 2018-09-20 16:49:19 +02:00
SJost
7caad588f8 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-09-20 09:42:04 +02:00
SJost
f914963eb5 Fixes #183 2018-09-19 19:40:05 +02:00
SJost
0e6596889a Breadcrumbs shortened; Term warning added to sheet edit page. 2018-09-19 16:17:08 +02:00
Gregor Kleen
899741bb41 Add UploadMode to Sheet
Fixes #181
2018-09-18 20:43:32 +02:00
Gregor Kleen
47c97652f2 Show degree & field number, if no name is available 2018-09-18 17:16:17 +02:00
SJost
1095bc8a6f Fix nameWidget 2018-09-18 16:54:33 +02:00
SJost
a467307998 Fix for Surname in Foundation 2018-09-18 16:33:25 +02:00
SJost
1b79509b06 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-09-18 16:04:29 +02:00
SJost
7c0c70f241 users have surnames now! 2018-09-18 16:04:21 +02:00
Gregor Kleen
327b42902b Revamp i18nCell & textCell 2018-09-18 15:57:13 +02:00
SJost
4234824f20 Minor code cleaning cd /home/jost/programming/Haskell/Yesod/uniworx/templates 2018-09-18 15:08:21 +02:00
SJost
eed3cf51ae Convenience for new exercise sheets implemented. 2018-09-18 10:45:44 +02:00
SJost
c684692cc2 Fixes unformatted UTCTime displays; DisplayAble no longer available for all Show Types 2018-09-17 15:35:14 +02:00
SJost
27cbff2aaa Matrikelnummern bei Abgaben anzeigen, RenderMessage Instanz für Load überarbeitet. 2018-09-15 11:23:55 +02:00
SJost
fe926b116f Corrector duties shown in ProfileDataR page now. 2018-09-14 19:51:13 +02:00
SJost
cc4c8a897e Fixes #179 2018-09-14 17:54:13 +02:00
SJost
918141da4c Code cleaning; Table for SubmissionGroups. 2018-09-13 16:51:20 +02:00
SJost
9fff50983d Handler.Utils.Table.Cells cleaned 2018-09-12 11:54:25 +02:00
SJost
b98a5c2aa7 minor 2018-09-11 17:02:55 +02:00
SJost
b230ba870d Handler.Utils.Table.Convenience -> Cells; ProfileData clean refactored 2018-09-11 16:40:41 +02:00
SJost
f7f8514f5e minor 2018-09-11 14:18:07 +02:00
SJost
a575deda78 makeClassy_ changed to makeLenses_ in order to avoid nuerours warnings due to the entirely unused HasSomething class definitions. 2018-09-11 14:09:21 +02:00
SJost
b3bfffe1c6 minor 2018-09-11 11:23:14 +02:00
SJost
ee8990f244 Discuss: Convenience.submissionCell 2018-09-11 10:51:51 +02:00
SJost
3523549d0e Sort submissions by time, show lecturers in course 2018-09-11 09:00:25 +02:00
SJost
c4c5a6b05c Profile-Data: Submissions shown 2018-09-10 17:24:43 +02:00
SJost
f426739868 Minor: missing headings added for school pages 2018-09-10 15:12:48 +02:00
SJost
45563750ac School Handler Stub; Profile shows own courses with lean dbTable 2018-09-10 14:38:19 +02:00
SJost
bf3a12d09d Sorting/Filter refactro Profile Data 2018-09-09 11:31:59 +02:00
SJost
93a29d0ec9 SJ uses Lenses for great good or for havoc? Discuss! 2018-09-07 17:39:36 +02:00
SJost
a29255f87c Minor cleaning: Handler/Utils/Term removed 2018-09-06 13:37:02 +02:00
SJost
5feb6ff0f6 BUGFIX: schoolField working after SchoolId refactoring 2018-09-06 13:29:25 +02:00
SJost
0c10e7e0d9 More type annotations, still not enough 2018-09-03 17:30:11 +02:00
SJost
eda8289ce7 Initial attempt; does not type 2018-09-03 13:58:08 +02:00
Gregor Kleen
c27f8b390b Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-08-29 10:08:47 +02:00
Gregor Kleen
0a32a609b7 Fixes #164 2018-08-29 10:08:16 +02:00
Steffen Jost
d4de1da4e5 Merge branch 'feat/nonCourseShorts' into 'master'
Feat/non course shorts

See merge request !70
2018-08-29 10:04:45 +02:00
Gregor Kleen
0d36bed457 Fixes #163 2018-08-29 10:04:16 +02:00
SJost
1755edbfcf Compiles, fixes #162, but DB Migration is still missing. 2018-08-22 14:58:11 +02:00
SJost
5810dc5182 Work-in-progress, fixes #158 2018-08-22 13:38:13 +02:00
SJost
a4dacc8d01 Halfway through with #162, still todo 2018-08-21 13:34:32 +02:00
SJost
d153024e64 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-08-20 09:44:59 +02:00
SJost
3515500685 minor comments 2018-08-20 09:44:49 +02:00
Gregor Kleen
32da6b5585 Traverse submissions in random order 2018-08-17 17:03:29 +02:00
Gregor Kleen
508ed2ecd9 More sophisticated submission distribution
Fixes #77
2018-08-17 16:57:57 +02:00
Gregor Kleen
ceb1191a28 Fix #117 2018-08-14 20:35:45 +02:00
SJost
1361f4e0b8 Minor merge 2018-08-14 10:34:54 +02:00
SJost
f66935659c Minor 2018-08-14 10:34:11 +02:00
Gregor Kleen
67ad9c1176 Fix Course- & School-ids
Fixes #151
2018-08-13 11:49:05 +02:00
Gregor Kleen
28c7afe69c Cleanup Theme declaration 2018-08-06 22:16:33 +02:00
Gregor Kleen
d2242f21ff Always form a monoidal sum during a run of dbTable
Fixes #142
2018-08-06 17:39:31 +02:00
Gregor Kleen
8d70518fbb Better detect if dbTable-sorting is set by user
Fixes #113
2018-08-06 16:46:01 +02:00
Gregor Kleen
430ca30c7f Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-08-06 11:47:06 +02:00
Gregor Kleen
747362c261 Cleanup Settings & add option for content-disposition 2018-08-06 11:46:46 +02:00
SJost
cb62d48f0e Minor renaming 2018-08-03 16:57:18 +02:00
SJost
460144df6a Fix #146 2018-08-03 16:10:05 +02:00
SJost
c8d6e72194 fixes #144 #146 2018-08-03 15:40:34 +02:00
SJost
2820588913 Minor beauty fix, removes a leftover from debugging. 2018-08-03 12:03:47 +02:00
SJost
13b575b952 Course List features Course Descriptions now. fixes issue #80 now. fix #80 2018-08-03 11:46:13 +02:00
SJost
04ac80a8ba CourseDescription not working properly in CourseList 2018-08-02 16:55:49 +02:00
SJost
f6ade63d1e Fix #81 2018-08-02 15:08:28 +02:00
SJost
a67a94468c Minor cleaning of redundant alerts 2018-08-02 09:58:43 +02:00
SJost
99354919ba Courselist must show school as well! 2018-08-01 19:24:18 +02:00
SJost
47d74577bc Merge conflicts resolved 2018-08-01 18:54:29 +02:00
SJost
f311ce36aa Statistik für Übungsblätter 2018-08-01 18:43:50 +02:00
SJost
85b57654a5 Statistik für Übungsblätter 2018-08-01 18:37:29 +02:00
Gregor Kleen
5d53be7af9 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-08-01 15:44:34 +02:00
SJost
bd2b9333e8 Minor fixes toward percentage column, unfinished but compiles. 2018-08-01 12:26:47 +02:00
SJost
f92001510b Minor fixes toward percentage column, unfinished but compiles. 2018-08-01 12:26:26 +02:00
Gregor Kleen
69ca22fdde Form cleanup 2018-08-01 11:27:23 +02:00
SJost
d05ccc9c6d Fixes #132 2018-08-01 10:45:34 +02:00
Gregor Kleen
3d920d1435 Framework for custom LDAP 2018-07-31 17:07:29 +02:00
SJost
fdeec42d36 Bugfix overloaded Lists in Course 2018-07-31 16:48:39 +02:00
SJost
118192c168 Kursliste zeigen Anmeldestatus 2018-07-31 16:42:34 +02:00
SJost
e9b504473c Courselist for all courses 2018-07-31 15:35:35 +02:00
SJost
aec528d94c Übersicht Übunbgsblätter enthält links für Korrektur und Rating 2018-07-31 14:08:59 +02:00
Gregor Kleen
534c7183ff Two-digit years 2018-07-30 23:29:58 +02:00
Gregor Kleen
c1cff156a1 Normalize paths & CryptoFileNameSubmission-prefix 2018-07-30 22:35:31 +02:00
Gregor Kleen
6a53fb1401 Display submission users 2018-07-30 16:30:38 +02:00
Gregor Kleen
2ddc0a03cb Merge branch 'live' into 'master'
# Conflicts:
#   src/Handler/Utils/Submission.hs
2018-07-23 16:05:19 +02:00
Gregor Kleen
b80f9e79e4 Stop emitting SubmissionFilesIgnored when nothing was ignored 2018-07-23 13:10:04 +02:00
Gregor Kleen
e7e3404de0 Better error messages for submission uploads 2018-07-23 13:09:44 +02:00
Gregor Kleen
d1b806ade2 Fix alert historical alert class 2018-07-23 13:08:49 +02:00
Gregor Kleen
5beb46708f Implement submission blacklist
Fixes #130
2018-07-23 13:08:42 +02:00
Gregor Kleen
51c04aec20 Make a bunch of things case insensitive in database
Fixes #96

Might require manual database migration
2018-07-22 18:49:39 +02:00
Gregor Kleen
969ada63d8 Stop emitting SubmissionFilesIgnored when nothing was ignored 2018-07-22 17:44:52 +02:00
Gregor Kleen
cc285e953d Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-22 17:20:07 +02:00
Gregor Kleen
49ae1a3865 Propagate restriction on 'rated' to file downloads 2018-07-22 17:18:04 +02:00
Gregor Kleen
cc28e6f786 Introduce 'submissionRatingDone'
Resolves #129
2018-07-22 17:16:10 +02:00
SJost
d5064151ee Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
Refactoring for FileTypes complete
2018-07-21 13:09:15 +02:00
SJost
ea118d3713 Refactor fileIdTables done 2018-07-21 13:05:45 +02:00
Gregor Kleen
460c62dfe5 Better error messages for submission uploads 2018-07-20 12:57:27 +02:00
Gregor Kleen
29fe30b90e Fix alert historical alert class 2018-07-20 11:49:22 +02:00
Gregor Kleen
69125f5704 Implement submission blacklist
Fixes #130
2018-07-20 11:48:33 +02:00
Gregor Kleen
648d4b8c33 Make rating parse expect more rigid structure
Fixes #127
2018-07-18 19:54:57 +02:00
Gregor Kleen
65b12d31d3 Include git hash in deployed site 2018-07-18 18:39:10 +02:00
Gregor Kleen
d2411b564a Work around format producing multiple rating lines 2018-07-18 17:01:32 +02:00
Gregor Kleen
e98d7849f6 Additional info in sinkSubmission-Exceptions 2018-07-18 16:52:10 +02:00
Gregor Kleen
9a6ae9dc49 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-18 15:06:03 +02:00
Gregor Kleen
984b325dcd dbTable now handles form csrf & identification
Fixes #124
2018-07-18 15:05:28 +02:00
Gregor Kleen
cb0ac4b7e9 Fix PSLimitNonPositive 2018-07-18 14:52:41 +02:00
SJost
0bd86730d3 Minor comment 2018-07-18 13:58:33 +02:00
SJost
82add31a86 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-18 13:15:20 +02:00
SJost
2184699b12 Minor typos fixed. 2018-07-18 13:15:13 +02:00
Gregor Kleen
b86d4de7ab Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-18 13:13:24 +02:00
Gregor Kleen
6d9b1dfa21 Fix calls to dbTable 2018-07-18 13:13:19 +02:00
Gregor Kleen
fcb50859fc Fix sheet table 2018-07-18 13:13:09 +02:00
SJost
ab80b9207d Multifile fields for Hints,Solutions,Markings 2018-07-18 13:10:24 +02:00
SJost
9feb4b7d5d Minor message cleaning 2018-07-18 12:30:32 +02:00
SJost
e9c8da1b85 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-18 12:27:07 +02:00
SJost
e42e59242f Sheet Form validation and tooltips augmented 2018-07-18 12:21:16 +02:00
Gregor Kleen
c3b4a6aa95 Revamp sheet table
Also introduce `dbtProj`

Fixes #76
2018-07-18 12:19:00 +02:00
Gregor Kleen
2be22a1ba8 Merge branch 'master' into feat/exercises 2018-07-18 10:06:39 +02:00
Gregor Kleen
1c78032f1e Additional information in rating files 2018-07-18 10:01:29 +02:00
Gregor Kleen
584d711cbc Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/exercises 2018-07-18 08:51:30 +02:00
SJost
9ab469311c MatrikelNr display in UserList 2018-07-11 12:38:16 +02:00
SJost
e1c2e7efe0 Rating file: UniWorx -> Uni2work 2018-07-10 18:33:31 +02:00
Gregor Kleen
a7fb5a7d9e Only show submission form if authorized 2018-07-10 13:47:26 +02:00
Gregor Kleen
86e28f6f52 Add dateTime-Format customization to Profile 2018-07-10 11:57:03 +02:00
Gregor Kleen
9975d33101 Fix utcTimeField 2018-07-10 11:49:14 +02:00
Gregor Kleen
2882b02214 Split DateTimeFormat up into three fields 2018-07-10 10:51:31 +02:00
Gregor Kleen
239c96d907 Timezones, date formatting & minor cleanup 2018-07-09 23:07:26 +02:00
SJost
43f52fb9eb Merge branch 'master' into feat/exercises 2018-07-09 12:38:27 +02:00
SJost
f62fcdded6 minor changes 2018-07-08 22:49:22 +02:00
Gregor Kleen
71e57b767d Use comma-separated in AdminUsersR 2018-07-08 22:10:46 +02:00
Gregor Kleen
a02e2cdc98 Prevent admins elevating rights to more schools by session-hijacking 2018-07-08 20:12:07 +02:00
Gregor Kleen
dc03afa84d Functionality to hijack users 2018-07-08 15:38:52 +02:00
Gregor Kleen
ed4df0ef4d Use dbTable in /users 2018-07-08 15:15:41 +02:00
Gregor Kleen
96eea52344 Introduce DBCell-Constructor and dbColonnade 2018-07-08 14:51:05 +02:00
Gregor Kleen
d0fcf2e9e3 Allow customizing behaviour of dbTable when empty
Resolves #104
2018-07-08 13:52:25 +02:00
Gregor Kleen
7da8d89a5c Course capacity now verified by route tag
Resolves #98
2018-07-08 10:44:09 +02:00
Gregor Kleen
d60ef89bca Revert "Course Capacity is verified now, in CRegister Handler that also checks secret"
This reverts commit 9fc50e8736.
2018-07-08 10:31:41 +02:00
Gregor Kleen
143b4d6116 Fix deployment build 2018-07-06 18:43:58 +02:00
Gregor Kleen
4911cdb29b Fix dbTable
- Row numbering now works as expected
  - Default sorting & filtering now actually gets applied
2018-07-06 18:33:33 +02:00
Gregor Kleen
1787dc1dcb Convert CourseListR to dbTable 2018-07-06 18:08:47 +02:00
Gregor Kleen
25112a5f67 Cleanup AdHoc-Group logic
- Submitting user is no longer checked during validity checks for participants
  - Better error message if too many participants are submitted
  - Having submitted the focused submission is no longer counted as already
    having a submission during updates
2018-07-06 17:24:23 +02:00
SJost
2919162986 BUGFIX: Blattliste 2018-07-06 13:38:59 +02:00
SJost
f49001993c Minor refactor 2018-07-06 11:13:40 +02:00
SJost
eb4239b728 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-05 16:00:53 +02:00
SJost
0341f8347e Bugfix: Homepage show multiple sheets 2018-07-05 16:00:41 +02:00
Gregor Kleen
cf76466517 Further refine links in dbTable 2018-07-05 11:55:26 +02:00
Gregor Kleen
68bf10f72f Cleanup links in dbTable 2018-07-05 11:43:01 +02:00
SJost
9fc50e8736 Course Capacity is verified now, in CRegister Handler that also checks secret 2018-07-04 22:03:21 +02:00
Gregor Kleen
5f9dc4a8b1 Move ChangeLog to standard location 2018-07-04 19:13:04 +02:00
SJost
00a5f44d8b Freigabedaten für Sheet-Files 2018-07-03 19:16:34 +02:00
SJost
58010fec3b mino fixes 2018-07-03 18:52:37 +02:00
SJost
828ad4f86f Course Deregister and Material Visible now added to CourseEdit 2018-07-03 17:52:37 +02:00
SJost
e905c7b5d6 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-03 17:24:15 +02:00
SJost
8c9e150483 Headings and Breadcrumbs added. 2018-07-03 17:24:08 +02:00
Gregor Kleen
3f5fab8d2f Permit downloading original archives 2018-07-03 17:18:28 +02:00
Gregor Kleen
50c733cc9c Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-03 16:55:39 +02:00
Gregor Kleen
429869b58a Show files that were deleted during correction properly 2018-07-03 16:54:58 +02:00
SJost
7fa1eaf8d6 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-03 16:51:34 +02:00
SJost
aeeacb3bfb Bugfix: Sheet Edit Button and some Page Headings 2018-07-03 16:50:03 +02:00
Gregor Kleen
115eaa70f2 Work on single correction upload 2018-07-03 16:47:55 +02:00
Gregor Kleen
f64bdba774 Prettify single submission view 2018-07-03 15:55:45 +02:00
SJost
1b88f41112 Commit to testwork 2018-07-03 13:42:31 +02:00
SJost
0944b5984e Homepage shows all Deadlines correctly now. 2018-07-03 13:39:02 +02:00
SJost
aa6f35d9c8 OuterJoin for homeUser startet 2018-07-03 12:09:52 +02:00
SJost
c7e02a1c0d keter.yml updated 2018-07-03 12:08:52 +02:00
SJost
21e0c5b4dc Bugfix: Weekdays correct now; Homepage edited. 2018-07-03 11:24:31 +02:00
SJost
a628519922 Corrector removed 2018-07-03 09:20:43 +02:00
SJost
47bc1ff604 Stub vor Version History and Impressum added 2018-07-03 08:56:26 +02:00
Gregor Kleen
0da0c46b2e Merge branch 'master' into feat/corrections-upload 2018-07-02 09:11:00 +02:00
Gregor Kleen
d1aca43b2a Use submission.hamlet, again
Fixes #87
2018-07-02 09:04:31 +02:00
Gregor Kleen
1ec5802a1c Single correction view 2018-07-02 08:44:15 +02:00
Gregor Kleen
1d49244d63 Merge branch 'master' into feat/corrections-upload 2018-07-01 18:49:36 +02:00
Gregor Kleen
957f0fe9da More aggressively normalise fileTitles 2018-07-01 15:02:15 +02:00
Gregor Kleen
0d01ac95ab Corrections upload 2018-07-01 14:49:15 +02:00
SJost
12e52becbd Minor fixes. 2018-07-01 14:14:15 +02:00
SJost
e5d62abbaf Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-01 13:53:36 +02:00
SJost
ba813dd5ac Minor message cleaning. 2018-07-01 13:53:33 +02:00
Felix Hamann
f1806ffed2 live-preview of selected theme on profile-page 2018-07-01 09:43:44 +02:00
Gregor Kleen
c72b9ef385 Hierarchical submission routes 2018-07-01 00:23:38 +02:00
Gregor Kleen
a3234e1ea5 formnorequired 2018-06-30 21:37:56 +02:00
Gregor Kleen
807c0fb28d Fix build 2018-06-30 21:37:50 +02:00
Gregor Kleen
d69f81aeae We don't use CryptoUUIDSubmission any more 2018-06-30 21:34:41 +02:00
Gregor Kleen
9a1644f68e minor submission cleanup (correct charset) 2018-06-30 21:30:21 +02:00
Gregor Kleen
9e1111f654 Don't display empty multiAction-Widgets 2018-06-30 21:24:13 +02:00
Gregor Kleen
99832c1286 Cleanup submission download 2018-06-30 21:16:11 +02:00
Gregor Kleen
fee96e448f Use existing withFragment 2018-06-30 19:13:21 +02:00
Gregor Kleen
60b250f5b3 Merge branch 'master' into feat/pagination 2018-06-30 18:54:19 +02:00
SJost
d240c0f680 Renamed to: Uni2work 2018-06-30 13:16:38 +02:00
Gregor Kleen
89f83925ba Automatisierte Korrektur-Zuteilung 2018-06-29 20:55:06 +02:00
Gregor Kleen
1dce109ac1 corrections list for sheet 2018-06-29 20:29:05 +02:00
SJost
80fad27692 Breadcrumbs and Headings all fixed 2018-06-29 20:24:15 +02:00
Gregor Kleen
f367c7347b additional doc 2018-06-29 19:18:55 +02:00
Gregor Kleen
f93c3d6e47 Helpers for PSValidator 2018-06-29 19:18:10 +02:00
SJost
14d37203f8 Breadcrumbs and Headings fixed 2018-06-29 18:28:41 +02:00
Gregor Kleen
b334df4939 Further work on correction tables 2018-06-29 15:41:05 +02:00
Gregor Kleen
0241e046ca Minor cleanup & restrict assignSubmissions 2018-06-29 12:37:26 +02:00
Gregor Kleen
0ab7bbd7eb Merge branch 'feat/assign-correctors' into feat/pagination 2018-06-29 11:53:16 +02:00
Gregor Kleen
9793141090 Fix behaviour of correctors-form 2018-06-29 11:49:03 +02:00
Gregor Kleen
6e0558d094 Merge branch 'master' into feat/assign-correctors 2018-06-29 10:51:56 +02:00
Gregor Kleen
1758a1d1ce cleanup multiAction 2018-06-29 09:58:17 +02:00
Gregor Kleen
9290052fe7 Use fieldests for what they're meant to do 2018-06-29 09:32:37 +02:00
Gregor Kleen
7aaaa1691c Correction download 2018-06-28 15:47:25 +02:00
SJost
8d69904d47 Tooltip problem? 2018-06-28 09:35:22 +02:00
SJost
30eced3708 Tooltip problem? cd /home/jost/programming/Haskell/Yesod/uniworx 2018-06-28 09:34:28 +02:00
SJost
afe8a92111 Minor; comments added. 2018-06-28 09:29:05 +02:00
SJost
2a33895d69 BUGFIX: Register Button requires passphrase now (if lecture has one). 2018-06-27 15:42:03 +02:00
SJost
bed7fb91b7 BUGFIX: Register Button for Lectures works as intended now! 2018-06-27 15:34:48 +02:00
Gregor Kleen
3c8f13b4dc Merge branch 'feat/exercises' into feat/pagination 2018-06-27 15:05:00 +02:00
Gregor Kleen
1d116814cb formCell 2018-06-27 14:22:54 +02:00
SJost
882b30951b Übungsblätter not shown if none exists 2018-06-27 12:17:38 +02:00
Gregor Kleen
0ab81d3fc1 Show note if table is empty 2018-06-27 11:41:53 +02:00
SJost
ac5e1b6f4b Keter Deploy 27.07.18 2018-06-27 10:00:23 +02:00
SJost
1379fffcd1 minor 2018-06-27 09:03:59 +02:00
Gregor Kleen
936b808aaf Merge branch 'master' into feat/pagination 2018-06-27 08:58:29 +02:00
Gregor Kleen
146abce346 runDbTable & slight cleanup 2018-06-27 08:45:15 +02:00
Gregor Kleen
7b336dd5a6 Framework for forms in dbTable 2018-06-26 23:31:18 +02:00
SJost
5103974980 Changing Favourite Setting immediately deletes superfluous favorites. 2018-06-26 18:22:16 +02:00
SJost
2525ad553f Themes and Favorites work now, but need reload or page change. 2018-06-26 14:00:41 +02:00
SJost
097e0c45e7 Profile: theme select form available, but still buggy somehow 2018-06-26 12:05:19 +02:00
SJost
5ff0a3524d Profile prepared for Theme selection (incomplete, but compiles) 2018-06-26 11:04:59 +02:00
SJost
3ea175d315 Homepage unlogged fixed. 2018-06-26 10:25:18 +02:00
SJost
808d27d321 Merge branch 'master' into feat/exercises 2018-06-25 19:29:42 +02:00
SJost
ded0f19c80 Profile page cleaned; explicit table now for Felix to refactor. 2018-06-25 19:29:14 +02:00
SJost
15291cda7c Merge branch 'master' into feat/exercises 2018-06-25 16:01:33 +02:00
SJost
adcaef4642 Homepage made almost presentable 2018-06-25 15:59:42 +02:00
SJost
4d3ad78b53 correctionsTable features links everywhere now 2018-06-22 23:08:09 +02:00
SJost
b2a97d926d correctionsTable generalized for various purposes, but needs bigger query 2018-06-22 22:59:59 +02:00
SJost
c6784a0b13 Minor. Puny attempts to resuse corrections table in several ways. 2018-06-22 18:31:47 +02:00
SJost
a3afbbc26d Merge branch 'master' into feat/exercises 2018-06-22 07:55:36 +02:00
SJost
20c50b1a45 Minor adjustments to Fieldsettings 2018-06-21 17:08:28 +02:00
SJost
1c9b121edb Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-21 16:47:47 +02:00
SJost
07c44c966b BUGFIX: Exercise had no VisibleFrom Date defaultet to always False, now True if ActiveFrom time has been reached. 2018-06-21 16:46:43 +02:00
Gregor Kleen
90adb8cab6 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-21 14:35:10 +02:00
Gregor Kleen
4a5508c66f Cleanup cryptoids 2018-06-21 14:34:58 +02:00
SJost
f232e4d149 Corrections: Link for UUIDs 2018-06-21 14:07:21 +02:00
SJost
2ea2968e43 Missing files for Corrections Page added 2018-06-21 14:02:03 +02:00
SJost
e90f2fc49e Corrections Route added that shows assigned corrections 2018-06-21 14:00:22 +02:00
SJost
61161b0a29 RenderMessage & Display instanzen für SheetFileType 2018-06-21 11:22:14 +02:00
Gregor Kleen
82eab97775 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-21 11:18:20 +02:00
Gregor Kleen
0a433f06a5 examplary course-shorthand-filter in terms-list 2018-06-21 11:18:01 +02:00
SJost
67927742bb leading zero date format fixed 2018-06-21 10:27:09 +02:00
SJost
5cc3920059 DisplayAble vs Show for Theme completed. 2018-06-20 22:58:12 +02:00
SJost
8b46a690a8 Show Participant association on profile page 2018-06-20 15:31:45 +02:00
SJost
b5e849af64 Show Lecture/Corrector associations on profile page 2018-06-20 15:09:44 +02:00
SJost
a12d3457c0 class DisplayAble added to display anything 2018-06-20 14:29:11 +02:00
SJost
11ec8f4f03 Profile page extendend, yet incomplete 2018-06-19 19:14:50 +02:00
Gregor Kleen
9e017f8e84 Add some headings 2018-06-12 19:42:22 +02:00
SJost
a5428bfc30 Form Missing eliminated for GET request 2018-06-12 11:47:26 +02:00
SJost
66f066fc95 Theme now used in wrapper, but not set from DB in Haskell yet. 2018-06-12 10:30:04 +02:00
Felix Hamann
5364aded5c fixed issue with date-format from datepicker 2018-06-10 23:25:28 +02:00
Felix Hamann
a1b6599a29 fixed deprecated alerts in backend. we need a template for alerts 2018-06-10 20:19:00 +02:00
Gregor Kleen
c46d6e8545 minor cleanup 2018-06-08 09:18:53 +02:00
Gregor Kleen
d5f773317f Merge branch 'feat/pagination' 2018-06-07 15:02:34 +02:00
Gregor Kleen
276881957e Support for dbTable filters 2018-06-07 15:01:53 +02:00
Felix Hamann
c213b8590f changed buttons in submission list to simple links 2018-06-07 12:24:04 +02:00
SJost
4383f46409 Merge with exercises and getCurrentRoute 2018-06-07 11:37:59 +02:00
SJost
5cf1840f09 new route: getCurrentTerm 2018-06-07 11:35:38 +02:00
Gregor Kleen
7db3d3f272 Merge branch 'master' into feat/exercises 2018-06-07 10:31:44 +02:00
Gregor Kleen
44776e1506 refactor SubmissionR 2018-06-07 10:29:27 +02:00
Gregor Kleen
7badb3536a Don't allow uploads to shadow rating file 2018-06-01 12:19:31 +02:00
Gregor Kleen
e80d883ebd Adjust submission file-dbtTable for new SQL 2018-06-01 12:01:34 +02:00
Gregor Kleen
fde8d2a307 Merge branch 'fix/pagination/counts' into feat/exercises
Fixes #47
2018-06-01 12:01:09 +02:00
Gregor Kleen
457f63ad19 Use deep sql magic (window functions) instead of multiple queries 2018-06-01 11:56:40 +02:00
Gregor Kleen
0644dae938 Corrector placeholder 2018-05-29 17:53:50 +02:00
Gregor Kleen
cbc145a56c minor fixes 2018-05-29 17:48:40 +02:00
Gregor Kleen
3fb7ff9f13 Merge branch 'feat/routes' into feat/assign-correctors 2018-05-29 15:19:00 +02:00
SJost
c45fea6df3 New Rights Managament compiles and seems to work (apart from TODOs); Problem with ASIDENAV 2018-05-28 18:27:30 +02:00
Gregor Kleen
9260024676 Replace SheetCorrectors 2018-05-28 16:41:47 +02:00
SJost
546c7bde95 Minor 2018-05-23 12:14:59 +02:00
Gregor Kleen
30b941eeec Mockup of SheetCorrectorsR 2018-05-17 15:39:50 +02:00
SJost
e4c0913c12 datatype Load refactored as discussed 2018-05-04 18:12:54 +02:00
SJost
38e438b774 correctorForm just a stub 2018-05-04 12:55:23 +02:00
SJost
26c5ba5183 Colonnade for Sheet Files 2018-05-04 11:13:39 +02:00
SJost
1218f93944 Sheet file edit times shown 2018-05-04 10:36:50 +02:00
SJost
4862337a01 Merge branch 'feat/exercises' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/exercises 2018-05-04 10:25:16 +02:00
SJost
967fb666d9 assign submission reports results now 2018-05-04 10:24:58 +02:00
Gregor Kleen
f00a1925e5 Allow changing buddies without re-uploading submission 2018-05-04 10:02:54 +02:00
SJost
fcc2f68cea Merged new pageActions from master 2018-05-04 10:01:05 +02:00
SJost
afc022eee7 Merge branch 'master' into feat/exercises 2018-05-04 09:52:17 +02:00
Gregor Kleen
6644af809e Migrate everything to new system of pageActions 2018-04-29 13:49:31 +02:00
Gregor Kleen
ad6f1ab199 Introduce pageActions and use in favourites 2018-04-29 13:48:40 +02:00
Gregor Kleen
99d112b31c Don't attempt to dequeue corrector who isn't (also) proportional 2018-04-26 18:28:26 +02:00
Gregor Kleen
6d7522410a Implement assignSubmissions 2018-04-26 17:48:08 +02:00
SJost
071e8c2de1 assignment of submissions halfway done 2018-04-26 14:16:22 +02:00
SJost
988ee74fa8 Bugfix: edit submission buddies 2018-04-26 11:57:28 +02:00
SJost
e98cf70400 MODEL REFACTOR: dropped ID suffixes throughout 2018-04-26 11:29:42 +02:00
SJost
0e8ed257f8 PageAction: newSubmission working 2018-04-26 09:59:47 +02:00
SJost
56476ccb3e Uniwory und PageAction ExerciseSheet 2018-04-26 09:41:57 +02:00
SJost
f3aa2b32c9 Submission edit times are shown now. 2018-04-19 17:43:42 +02:00
Gregor Kleen
917d767d30 Cleanup SubmissionDownloadArchive 2018-04-19 13:31:47 +02:00
SJost
3bd9a2a483 minor 2018-04-19 11:27:10 +02:00
SJost
7329c84304 SubmissionEdit page offers downloads now. 2018-04-19 11:22:35 +02:00
SJost
11c17e3dc8 ExcerciseBuddies for DefinedGroups are forced 2018-04-19 10:56:32 +02:00
SJost
780201703c Merge branch 'feat/exercises' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/exercises 2018-04-19 10:45:10 +02:00
SJost
efcbb82d25 ExcerciseBuddies working 2018-04-19 10:45:05 +02:00
Gregor Kleen
d741dabc25 mforced & aforced 2018-04-19 10:11:52 +02:00
SJost
8725f935d0 Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-19 09:29:41 +02:00
SJost
cdf2cec832 minor comment added 2018-04-19 09:29:16 +02:00
Felix Hamann
e27a88c237 Merge branch 'feat/pagination' into 'master'
Feat/pagination

See merge request !23
2018-04-14 22:36:44 +02:00
Gregor Kleen
acce67d562 Fix sortable column attributes 2018-04-14 20:18:24 +02:00
Gregor Kleen
c78184a946 Automatically check isAuthorized for MenuItems 2018-04-13 15:49:26 +02:00
Gregor Kleen
9d65f94f51 Mark sortable columns 2018-04-13 15:28:04 +02:00
Gregor Kleen
05cd245102 Links to every page of table 2018-04-13 15:06:15 +02:00
Felix Hamann
e0b3f0921a signal to the user that a column is sortable 2018-04-12 23:23:35 +02:00
Felix Hamann
2a1c805d85 Merge branch 'master' into feat/pagination
merged master into this to avoid databas conflicts when switching between master and feat/pagination
2018-04-12 21:38:25 +02:00
Gregor Kleen
4c4cbd584c Fix build of Submission.hs 2018-04-11 15:09:20 +02:00
Gregor Kleen
08607a5e7c Fix javascript issues, 'directions' in sortable-header, sorted attrs 2018-04-11 14:28:33 +02:00
SJost
fcd6703752 Group Submissions mostly done, NOT COMPILING 2018-04-11 13:12:49 +02:00
SJost
5c1789786d Util-Sheet vergessen 2018-04-10 15:16:32 +02:00
SJost
a544c61be2 Submission upload (Sitzung mit Gregor) 2018-04-10 12:50:20 +02:00
SJost
4a7d35144a Merge remote-tracking branch 'origin/feat/pagination' into feat/exercises 2018-04-10 10:40:10 +02:00
SJost
380c57c578 Favourites working now (without PageActions). 2018-04-10 10:38:21 +02:00
Gregor Kleen
c2174161c5 Better name for templates/table/table 2018-04-04 15:28:55 +02:00
Gregor Kleen
e71864368c Implement links to toggle table sorting 2018-04-04 14:35:11 +02:00
Gregor Kleen
72b2b72f03 Implement table sorting 2018-04-04 12:54:00 +02:00
Gregor Kleen
951af369c8 Fewer newlines 2018-04-04 12:31:50 +02:00
Gregor Kleen
431adf0324 Add 'zipFileField' 2018-04-04 12:29:01 +02:00
Gregor Kleen
5e8698fee1 Revert "Allow overriding unpackZips-Checkbox"
This reverts commit 8e43a314d3.
2018-04-04 12:21:43 +02:00
SJost
fa6b04663e Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 18:50:51 +02:00
Gregor Kleen
8e43a314d3 Allow overriding unpackZips-Checkbox 2018-04-03 18:48:10 +02:00
SJost
ea5e04bd78 Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 18:04:13 +02:00
Gregor Kleen
3d98fe4736 Refactor utils 2018-04-03 17:56:55 +02:00
SJost
2714485dbd Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 16:58:25 +02:00
SJost
7e9e066e55 Quickfix sheet grading edit 2018-04-03 16:58:05 +02:00
SJost
f35579e20d Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 16:50:59 +02:00
SJost
d279a1a2c6 Minor messages 2018-04-03 16:49:41 +02:00
Gregor Kleen
54cd2bd266 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/pagination 2018-04-03 16:20:44 +02:00
Gregor Kleen
9a26d17c5e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/multi-file-field 2018-04-03 14:53:18 +02:00
Gregor Kleen
1b86abb46d MultiFileField Sheet 2018-04-03 14:51:25 +02:00
Felix Hamann
8bb71a5c3e Moved modals to standalones 2018-03-31 01:55:00 +02:00
Felix Hamann
33a99b0f62 changed menuItemType of Uebungsblaetter 2018-03-29 00:23:24 +02:00
Felix Hamann
6edc4d4a99 added page action bar for prime actions
closes #34
2018-03-25 23:47:02 +02:00
SJost
05a0f6b0bf CreatedBy/ChangeBy als eigene Tabellen überall eingeführt 2018-03-22 20:35:17 +01:00
SJost
6fe311ee78 Sheet edit times und fillDB angepasst 2018-03-22 19:49:33 +01:00
SJost
9f96e6dd35 PageActions added 2018-03-22 19:27:57 +01:00
SJost
5f6640148c Hierarchical Routes 2018-03-22 16:04:38 +01:00
Gregor Kleen
7ee2aac209 MultiFileField 2018-03-22 15:18:08 +01:00
SJost
217ae28d9e Merge branch 'master' into feat/exercises 2018-03-22 14:07:10 +01:00
SJost
ad2b7ae866 DeleteRedirct, fetchSheet caching, etc. 2018-03-22 12:19:40 +01:00
SJost
710b8334e5 convenience functions for authorisation, not yet used 2018-03-21 18:15:16 +01:00
SJost
023da918bb convenience functions for authorisation 2018-03-21 17:39:17 +01:00
SJost
85d128a244 Sheet Editing/Delete working now 2018-03-19 23:33:59 +01:00
SJost
5364190a38 Problem: getrennte get/post Handler funktionieren so nicht. Warum? 2018-03-19 22:57:24 +01:00
Gregor Kleen
28d9c5c95b Cleanup 2018-03-19 12:29:55 +01:00
Felix Hamann
e58851cd3c scollable tables for smaller screens 2018-03-18 17:55:02 +01:00
Felix Hamann
4f660f04c0 navbar rework, smooth breadcrumbs 2018-03-18 15:47:37 +01:00
Felix Hamann
3d36e5c957 icons, responsive navigation, breadcrumbs, design 2018-03-18 02:52:17 +01:00
Felix Hamann
d55b88d7cb Merge branch 'master' into initial_thoughts_on_frontend 2018-03-17 19:31:15 +01:00
Felix Hamann
d8f2ce6e90 added menu-icons and asidenavbar-styling 2018-03-17 19:23:45 +01:00
Felix Hamann
be383f84b8 reverted markup and js changes to buttonField 2018-03-17 15:30:27 +01:00
Felix Hamann
8fc53d879f split inputs-logic and form-logic in frontend 2018-03-16 20:54:35 +01:00
SJost
037c0cce20 Sheet editing working, except for files 2018-03-16 18:52:32 +01:00
SJost
daed94ae33 Several Cleanups 2018-03-16 17:54:28 +01:00
Gregor Kleen
170442cff0 Fix page indicator 2018-03-16 14:22:33 +01:00
Gregor Kleen
2cfd87de87 Page indicator 2018-03-16 14:09:12 +01:00
Gregor Kleen
ba918129c9 Identify paginated table with html-id 2018-03-16 13:30:58 +01:00
Gregor Kleen
907958baf4 Cleanup identified tables 2018-03-16 13:06:52 +01:00
Gregor Kleen
d47fa717a3 Identify tables 2018-03-16 12:58:49 +01:00
Gregor Kleen
96cdef2538 Better PSValidator 2018-03-16 12:54:18 +01:00
Gregor Kleen
a0ccae13b7 Intigrate pagination into term list 2018-03-16 10:28:43 +01:00
SJost
c35f718054 Sheet Download works 2018-03-16 10:26:54 +01:00
Gregor Kleen
b96411460c Start work on server side pagination 2018-03-16 10:25:55 +01:00
SJost
85f132295c minor changes toward sheet saving 2018-03-16 09:05:29 +01:00
SJost
40cf5ec858 CourseForm works without redirect only 2018-03-15 14:51:30 +01:00
SJost
075872dbbe Replace does not work either 2018-03-15 10:04:16 +01:00
SJost
8247c6c6d4 Fixes to Course New/Edit handling. Update not yet working! 2018-03-14 18:34:42 +01:00
Felix Hamann
475411bb4a localstorage for show-hides, sortable tables, more navigation 2018-03-11 23:53:06 +01:00
Felix Hamann
e4ddcd9e49 minor fixes for file-inputs and buttons 2018-03-08 11:06:12 +01:00
Felix Hamann
20b6828c96 Merge branch 'master' into initial_thoughts_on_frontend 2018-03-07 21:58:18 +01:00
Felix Hamann
ca582f8e8a widget-restructuring and new colors 2018-03-07 21:55:01 +01:00
SJost
1c052087fd Merge branch 'master' into feat/exercises 2018-03-07 15:47:54 +01:00
SJost
43cb2cfa73 Term template angepasst 2018-03-07 15:28:18 +01:00
SJost
f36d048dac Merge branch 'master' into feat/exercises 2018-03-07 14:17:02 +01:00
SJost
a29cefe7d2 MV: generic_form.hamlet -> formPage.hamlet 2018-03-07 14:16:08 +01:00
SJost
70a95b3e0b Beispiel Internationalisierung in Handler.Term 2018-03-07 13:59:50 +01:00
Felix Hamann
3f11dab6ab Merge branch 'master' into initial_thoughts_on_frontend 2018-03-07 13:35:58 +01:00
SJost
4c65d379af Merge branch 'master' into feat/exercises 2018-03-07 13:31:08 +01:00
Gregor Kleen
2fb478e8ff Merge branch 'feat/custom-renderers' 2018-03-07 13:30:06 +01:00
SJost
27507906d1 Minor comments 2018-03-07 13:01:23 +01:00
Felix Hamann
cd8b6d985b introduced BEM for CSS and aside-navigation 2018-03-06 22:29:17 +01:00
Felix Hamann
b9b5496ca7 added reactive input labels and general form styling 2018-03-05 00:40:10 +01:00
Felix Hamann
0a7328f969 added sortable tables 2018-03-04 22:48:54 +01:00
Felix Hamann
7b3915fa95 moved sticky navbar to StaticR and added show-hide-elements (only HomeR) 2018-03-04 22:19:25 +01:00
Felix Hamann
50cebd92bf Merge branch 'master' into initial_thoughts_on_frontend 2018-03-02 18:33:22 +01:00
Gregor Kleen
fe73d6cc22 Start work on customizable form renderer 2018-03-01 12:54:22 +01:00
Felix Hamann
349938b0e7 added navbar widget and did some cleanup to eventually get rid of bootstrap 2018-02-22 22:44:54 +01:00
Gregor Kleen
a548652b52 Bump yesod-colonnade 2018-02-21 13:33:28 +01:00
Gregor Kleen
937db06db2 Remove backup 2018-02-20 15:54:25 +01:00
SJost
c8c968a7e4 minor merge conflict resolved 2018-02-19 18:10:41 +01:00
SJost
a3f71a474b Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/exercises 2018-02-19 18:06:54 +01:00
SJost
8d221600d3 TermIdentifier -> TermId in routes 2018-02-19 17:58:55 +01:00
Felix Hamann
7cb64b765a introduced menu-widget 2018-02-19 17:28:28 +01:00
SJost
499315432a SheetFile Up/Download added 2018-02-19 16:57:12 +01:00
SJost
6070c9231b sheet display extended, not yet complete 2018-02-19 16:57:12 +01:00
SJost
3575e69123 Bug with SheetInfo Form fixed 2018-02-19 16:57:12 +01:00
SJost
06a29205cd Fileinfo in AForm type troubles :( 2018-02-19 16:57:12 +01:00
SJost
bc094dc813 Sheets still incomplete, show sheet list and working. sheetAdmin template is not yet working 2018-02-19 16:57:12 +01:00
SJost
2f47f12832 User Overview page added, no user-editing yet 2018-02-19 16:55:20 +01:00
SJost
9bad1b42ec Forgotten minor bugfixes that belong to master, but slipped into this branch. 2018-02-19 16:55:20 +01:00
SJost
272bc7f6c5 schoolField & termField in Utils 2018-02-19 16:54:10 +01:00
Gregor Kleen
a94a8e3f81 Support for partial templates 2018-02-19 16:08:50 +01:00
Gregor Kleen
fddd8bef4c Make CryptoIDKey implicit using new cryptoids-class 2018-02-09 14:22:01 +01:00
Gregor Kleen
b6dbd27eb0 Cleanup 2018-02-09 12:35:10 +01:00
Gregor Kleen
d37ee331f6 Use correct status header 2018-02-09 12:35:10 +01:00
Gregor Kleen
7c5c12dc6b Fix type error 2018-02-09 12:35:10 +01:00
Gregor Kleen
6bf0f321cf Check decryption before redirecting (as was intended) 2018-02-09 12:35:10 +01:00
Gregor Kleen
db92528884 Framework & dispatch submissions 2018-02-09 12:35:10 +01:00
SJost
14ccdb1e35 Bugfix: Infinite Loop in Authorization Code; Stubs for Exercise Sheet; Fixed several compiler warnings 2017-11-29 17:26:32 +01:00
SJost
b363c05c95 AdminSchool no longer nullable; Profile page displays granted rights 2017-11-29 15:17:31 +01:00
SJost
4686c63fd9 BUGFIX, Attempt 2: Authorization for Admins without schools fixed. 2017-11-27 16:54:12 +01:00
SJost
e3906672aa BUGFIXES: 1) Message status codes 2) Course editing could have cause uniqueness constraint violation, resulting in db exception. 2017-11-27 15:59:28 +01:00
SJost
70ad55f565 Course participant count working now, albeit inefficient through runDB per Collonade-Row 2017-11-27 13:21:11 +01:00
Gregor Kleen
c09b0d8619 Cleanup 2017-11-27 12:37:56 +01:00
Gregor Kleen
aa1e10e3e9 Remove redundant import 2017-11-27 09:24:28 +01:00
Gregor Kleen
e6f6e8c621 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-11-26 22:00:38 +01:00
Gregor Kleen
0293363e13 Copy more information from LDAP on login 2017-11-26 21:59:47 +01:00
SJost
39b3cd0bec defaultHandler gained argument for page navigation 2017-11-24 15:20:26 +01:00
SJost
1b272c6ee8 Form-Identifiers introduced 2017-11-17 16:59:48 +01:00
SJost
52be9e3198 Link-Buttons via CSS 2017-11-17 16:17:16 +01:00
SJost
05b912179f Buttons for Links utility added 2017-11-17 15:24:38 +01:00
SJost
4121b49c25 Minor changes to buttons 2017-11-16 13:23:50 +01:00
SJost
4bcbf963f1 Button CSS style added. 2017-11-15 18:04:32 +01:00
SJost
88e123f405 Button form cleaning 2017-11-15 16:37:19 +01:00
SJost
6b0f380808 Pure button Forms working 2017-11-15 16:27:15 +01:00
Gregor Kleen
8bffe66a6d Handle all cases in button accumulation 2017-11-15 13:38:06 +01:00
Gregor Kleen
725e00cf68 Really fix button accumulation, this time 2017-11-15 13:17:33 +01:00
Gregor Kleen
261f064d4e Accumulate button result correctly 2017-11-15 13:06:50 +01:00
SJost
faf5c1b2dc Fix for buttons does not work either 2017-11-15 12:16:14 +01:00
SJost
c71910f22e Buttons reworked after call; not yet working 2017-11-15 11:22:52 +01:00
SJost
25547be0fc Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-11-15 10:38:14 +01:00
Gregor Kleen
1b42873f12 Cleanup
Fixes #15
2017-11-15 10:10:24 +01:00
SJost
e138e42ae0 Button Stubs 2017-11-15 09:41:19 +01:00
Gregor Kleen
5070403ce8 Switch to newly released 'filepath-crypto' 2017-10-25 22:43:19 +02:00
SJost
772a5ee02c Esqueleto for Term Overview 2017-10-18 15:57:55 +02:00
Gregor Kleen
0cd0425903 Zip UTF8-support 2017-10-18 15:30:02 +02:00
Gregor Kleen
377d8667c2 Multiple submission upload 2017-10-16 15:52:20 +02:00
Gregor Kleen
b0e5f54b4d Download of multiple Submissions & Additional colonnade wrapper 2017-10-14 00:20:47 +02:00
Gregor Kleen
1afc2b4bad Clean up structure 2017-10-12 19:43:41 +02:00
Gregor Kleen
cb27038c6b Allow upload of single files 2017-10-12 16:58:59 +02:00
Gregor Kleen
d01404047f Graceful handling of undone corrections 2017-10-12 15:47:18 +02:00
Gregor Kleen
f6e7b3fe25 Include rating files again 2017-10-12 04:43:50 +02:00