Commit Graph

1103 Commits

Author SHA1 Message Date
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
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
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
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
Steffen Jost
68cc79e5f3 minor 2019-03-24 13:40:51 +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