Commit Graph

614 Commits

Author SHA1 Message Date
Gregor Kleen
62e11a1ca1 Better handle FormFailure and allow de-duplication within miAdd 2019-03-27 15:52:04 +01:00
Steffen Jost
10351854cd Merge branch 'master' into 126-ubungsbetrieb-statistik-seiten-pro-kurs 2019-03-25 10:44:44 +01:00
Gregor Kleen
973eeb18c0 Documentation for Handler.Utils.Delete 2019-03-25 08:59:06 +01:00
Gregor Kleen
57ba1c9e12 Use wrapForm everywhere 2019-03-23 23:00:32 +01:00
Gregor Kleen
6aeb134369 Merge branch 'master' into feat/wrapform 2019-03-23 14:37:59 +01:00
Steffen Jost
ca520b08f7 ButtonSave added 2019-03-23 12:25:02 +01:00
Steffen Jost
c9ab64e518 Course user notes working, but needs model refactor 2019-03-22 18:01:26 +01:00
Steffen Jost
21ba1f2afa users cannot delete themselves anymore 2019-03-22 11:39:59 +01:00
Gregor Kleen
6dbf8916a5 Remove log comment, which breaks haddock 2019-03-20 22:29:08 +01:00
Gregor Kleen
bd6df62599 Merge branch '284-massinput' 2019-03-20 21:23:02 +01:00
Gregor Kleen
7f403a5d98 Merge branch '284-massinput' of jost/UniWorX into 284-massinput 2019-03-20 21:22:32 +01:00
Gregor Kleen
4aaf9933aa Fixup 2019-03-20 21:20:51 +01:00
Gregor Kleen
aca5d180bc Feature complete MassInput 2019-03-20 20:53:10 +01:00
Gregor Kleen
1929c5cace Fix build 2019-03-20 18:44:58 +01:00
Steffen Jost
4d0a1e8020 minor 2019-03-20 18:35:47 +01:00
Steffen Jost
93fd8788bc rigid type problem with rendermessage 2019-03-20 18:30:08 +01:00
Steffen Jost
5f67c3ac00 Merge branch 'master' into 284-massinput 2019-03-20 15:57:43 +01:00
Gregor Kleen
4b2d6d3aa2 (Semi-)Working Prototype 2019-03-20 15:13:41 +01:00
Steffen Jost
1c1dc70066 Various minor fixes 2019-03-20 14:09:46 +01:00
Gregor Kleen
350dfa6c4a Merge branch '307-studiengange-behandeln' 2019-03-20 13:38:07 +01:00
Steffen Jost
d310e5a8c3 Inference tested and linted 2019-03-20 13:36:26 +01:00
Steffen Jost
c4aab6248a inference for studyterms works now 2019-03-20 13:15:23 +01:00
Gregor Kleen
6317ae92f0 Bessere Fehlermeldungen bei SortKey/FilterKey-Mismatch 2019-03-20 11:59:14 +01:00
Steffen Jost
d65b5918f0 Inferenz Studiengänge verdrahte, hat noch Fehler 2019-03-20 11:59:08 +01:00
Steffen Jost
8c221ad5e8 Term candidate inference handler added, not connected 2019-03-20 09:49:06 +01:00
Gregor Kleen
705fdec695 Merge branch 'master' into 284-massinput 2019-03-20 09:05:10 +01:00
Steffen Jost
23a1b883ac Merge branch 'master' into 307-studiengange-behandeln 2019-03-20 08:32:51 +01:00
Gregor Kleen
bbeb0e70be Identifiers for DBTable-Forms 2019-03-19 13:46:11 +01:00
Gregor Kleen
96303b156a Enforce structured identifyForm 2019-03-19 13:19:54 +01:00
Steffen Jost
9b944d70b8 StudyTermCandidate inference implemented needs tests 2019-03-18 18:57:36 +01:00
Steffen Jost
6cce5c05cc Forms for terms added, but buggy 2019-03-13 16:41:22 +01:00
Steffen Jost
b2bb30a429 Form for Degrees changes implemented 2019-03-13 14:50:58 +01:00
Steffen Jost
a02cf61c82 filter email name ui combined 2019-03-13 13:30:11 +01:00
Steffen Jost
579225b4d0 table for candidates added to admin-features 2019-03-13 11:20:08 +01:00
Gregor Kleen
332493f550 View-Prototype of MassInput 2019-03-13 09:25:00 +01:00
SJost
78ada75704 Filters for Participant List added 2019-03-12 10:54:32 +01:00
SJost
889c3ebb35 Merge and bugfix sorting by participants registration date 2019-03-12 09:20:07 +01:00
Felix Hamann
84237c4484 Merge branch 'async-form-responses' into 'master'
Async form responses

See merge request !161
2019-03-11 20:50:36 +01:00
Gregor Kleen
a4c8bcd10c Merge branch 'master' into 284-massinput 2019-03-11 13:00:09 +01:00
SJost
529c226ad6 Generic Join projections implemented 2019-03-10 18:01:17 +01:00
Gregor Kleen
101822fd21 MessageClassMessageStatus 2019-03-10 15:47:33 +01:00
SJost
e5d693e707 Generic columns filters and sorting 2019-03-10 11:43:59 +01:00
SJost
c4d77d665a Generic contains SQL filter for generic user column 2019-03-09 14:35:47 +01:00
SJost
2ddda4578e Generic Columns module allowing generic sorting and filtering.
Done for an initial part of course participant table.
2019-03-08 18:11:26 +01:00
SJost
4253390e93 Study-Features-Subquery extracted 2019-03-08 10:46:47 +01:00
SJost
729831b0bf Probably fixes the course participant list? 2019-03-06 17:50:22 +01:00
SJost
484d99305d Showing field and degrees compiles, join-on needs testing 2019-03-05 19:06:12 +01:00
SJost
56c25c133a Alternative Query Attempt 2019-03-05 17:20:34 +01:00
SJost
158cd180c5 Fixbuild linter 2019-03-04 10:21:30 +01:00
Gregor Kleen
c967399ab9 Override boolField 2019-03-03 17:22:21 +01:00
SJost
cf3a0b3d35 ToMarkup instances for StudyDegree and StudyTerms 2019-02-28 18:28:42 +01:00
SJost
e446641666 Default offered; unnecessarily complicated due using field studyFeature 2019-02-28 18:04:22 +01:00
SJost
933eaa7362 Registration takes Field of Studies now 2019-02-28 17:17:34 +01:00
SJost
d51608a1bf merge master 2019-02-28 11:12:39 +01:00
SJost
0745542867 All mailto-links use single hamlet file now; added mailto for lecturers 2019-02-28 11:03:02 +01:00
SJost
9ca91b5ec8 removed stubs for merge 2019-02-27 17:42:46 +01:00
SJost
801f1f1597 merge attempt 2019-02-27 17:37:42 +01:00
SJost
6a53a89faa does not compile, course register from broken 2019-02-27 17:36:39 +01:00
Gregor Kleen
5f7b134292 Write StudyTermCandidates during login 2019-02-27 17:29:17 +01:00
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
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
SJost
8dae9eb1d4 Course member list stub working, after daylong painful birth throes 2019-02-22 18:24:21 +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
f0ee524e9e Merge branch 'master' into formgroups 2019-02-22 07:48:16 +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
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
55c1385e3e Merge branch 'js-utils-cleanup' 2019-02-20 22:07:02 +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
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
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
99d958dade UX/UI polish in various places 2019-02-15 13:28:39 +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
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
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
Gregor Kleen
ccdb438862 Initial work on MassInput 2019-01-30 11:14:30 +01:00
Gregor Kleen
2bea5435bf Avoid divide by zero 2019-01-30 10:07:31 +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
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
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
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