Commit Graph

499 Commits

Author SHA1 Message Date
SJost
82b5315c36 Filtering refactored with prismAForm 2019-01-24 16:47:46 +01:00
Gregor Kleen
a03577f970 Expose runPaginationSettings' 2019-01-24 16:21:30 +01:00
SJost
f5f9dea342 Fix #215 and other minor improvements 2019-01-24 14:44:48 +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
b25d542f6b Corrector can always see sheet list. SheetList shows VisibleFrom 2019-01-16 10:25:52 +01:00
Gregor Kleen
5e6de82e1d Fix accidental form nesting 2018-12-29 14:51:08 +01:00
Gregor Kleen
f238759270 Hide FilterUI by default 2018-12-29 13:38:31 +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
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
Gregor Kleen
64dbfe3905 Identify auxiliary dbtable forms to prevent collisions 2018-12-19 11:18:35 +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
306fb351ad Error Handling für SinkSubmission 2018-12-12 12:05:22 +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
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
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
Gregor Kleen
bb4140fa3d avoid weird override by sending db-table-shortcircuit as header 2018-11-29 14:07:47 +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
160ec5a8dc Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-27 14:11:37 +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
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
4697efab5f Overhaul auth-predicates 2018-11-14 14:20:32 +01:00
Gregor Kleen
7bf3a52599 i18n MenuItems & Semantic support-referer
Addresses #228
2018-11-09 22:43:45 +01:00
SJost
7bc72505a4 Ratings are now validated, some refactoring 2018-11-09 13:59:14 +01:00
Gregor Kleen
77dcc02b9c iframe-based dynamic modals
Fixes #226, fixes #217
2018-11-09 11:53:22 +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
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
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
Gregor Kleen
eff7875c1c Cleanup language extensions 2018-10-28 19:11:40 +01: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
SJost
adde4ccdf6 Bugfix: delete user cd /home/jost/programming/Haskell/Yesod/uniworx/templates 2018-10-17 18:07:04 +02:00
Gregor Kleen
f07ad82c1d Pseudonym submission creation 2018-10-15 15:02:44 +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
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
Felix Hamann
18b3fe0e5d introduced icon for modals 2018-10-13 00:10:56 +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
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
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
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
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
66ab0f9be6 Major contributions towards #189 and #194 2018-09-28 17:22:22 +02:00
SJost
43598d05c4 Fixes #190, except for manipualted post-data (ok) 2018-09-21 16:29:26 +02:00
SJost
a20ff1468e First part of issue #187 implemented. 2018-09-20 16:49:19 +02:00
Gregor Kleen
899741bb41 Add UploadMode to Sheet
Fixes #181
2018-09-18 20:43:32 +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
c684692cc2 Fixes unformatted UTCTime displays; DisplayAble no longer available for all Show Types 2018-09-17 15:35:14 +02:00
SJost
fe926b116f Corrector duties shown in ProfileDataR page now. 2018-09-14 19:51:13 +02:00
SJost
9fff50983d Handler.Utils.Table.Cells cleaned 2018-09-12 11:54:25 +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
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
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
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
Gregor Kleen
67ad9c1176 Fix Course- & School-ids
Fixes #151
2018-08-13 11:49:05 +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
13b575b952 Course List features Course Descriptions now. fixes issue #80 now. fix #80 2018-08-03 11:46:13 +02:00
Gregor Kleen
5d53be7af9 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-08-01 15:44:34 +02:00
Gregor Kleen
3d920d1435 Framework for custom LDAP 2018-07-31 17:07:29 +02:00
SJost
118192c168 Kursliste zeigen Anmeldestatus 2018-07-31 16:42:34 +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
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
49ae1a3865 Propagate restriction on 'rated' to file downloads 2018-07-22 17:18:04 +02:00
Gregor Kleen
460c62dfe5 Better error messages for submission uploads 2018-07-20 12:57:27 +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
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
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
Gregor Kleen
c3b4a6aa95 Revamp sheet table
Also introduce `dbtProj`

Fixes #76
2018-07-18 12:19:00 +02:00
Gregor Kleen
1c78032f1e Additional information in rating files 2018-07-18 10:01:29 +02:00
SJost
e1c2e7efe0 Rating file: UniWorx -> Uni2work 2018-07-10 18:33:31 +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
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
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
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
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
21e0c5b4dc Bugfix: Weekdays correct now; Homepage edited. 2018-07-03 11:24:31 +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
Gregor Kleen
c72b9ef385 Hierarchical submission routes 2018-07-01 00:23:38 +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
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
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
6e0558d094 Merge branch 'master' into feat/assign-correctors 2018-06-29 10:51:56 +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
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
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
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
5ff0a3524d Profile prepared for Theme selection (incomplete, but compiles) 2018-06-26 11:04:59 +02:00