Commit Graph

1655 Commits

Author SHA1 Message Date
Gregor Kleen
4d242799d1 Merge branch '205-klausuren' 2019-07-16 11:58:13 +02:00
Sarah Vaupel
1be333a09a chore(course-teaser): focussing on course information
Using lenses to focus on course, lecturer list and register status. TODO: moved .julius file (no courseId available). TODO: overwrite default template mode for course list and define lenses there
2019-07-16 11:46:14 +02:00
Gregor Kleen
2218103cbd feat(exams): csv-export exercise data 2019-07-16 11:45:21 +02:00
Steffen Jost
9dbef1fe0f fix(sheet type info): give better tooltips and name to sheet types
Closes #402
2019-07-16 11:36:50 +02:00
Steffen Jost
ad825b66b8 fix(course and exam registration): distinguish registrations buttons
registration buttons for course and exam carry different texts and icons

Closes #416
2019-07-16 11:17:27 +02:00
Gregor Kleen
cf040ce686 feat(exams): filter on occurrence 2019-07-16 10:29:39 +02:00
Gregor Kleen
2b23600a22 feat(exams): show exam bonus in webinterface 2019-07-16 10:10:21 +02:00
Sarah Vaupel
2fb49ef4e3 refactor(course-teaser): new DBSTemplateMode datatype with lenses (stub) 2019-07-16 10:02:54 +02:00
Steffen Jost
643cc4165f feat(sheetlist): sort sheet file types in db by haskell Ord 2019-07-16 09:33:54 +02:00
Gregor Kleen
379a7edd12 feat(exams): introduce examOccurrenceName
BREAKING CHANGE: examOccurrenceName
2019-07-15 15:38:37 +02:00
Gregor Kleen
05e7b52f08 fix(exams): cleanup exam interface
BREAKING CHANGE: examStart and examPublishOccurrenceAssignments now optional
2019-07-15 11:27:56 +02:00
Sarah Vaupel
7404b7b63b Merge branch 'master' into course-teaser 2019-07-15 11:00:17 +02:00
Sarah Vaupel
25efa947c6 chore(course-teaser): widget template case distinction in DBStyle
First stub of case distinction on template widget name in DBStyle
2019-07-15 10:30:37 +02:00
Steffen Jost
a075b1648e fix(exam participant download): fix icon not being shown
icon should have worked, but did not. does now
2019-07-10 20:47:46 +02:00
Steffen Jost
49dc4139cf fix(build): fix build 2019-07-10 19:47:03 +02:00
Steffen Jost
f6f4266067 refactor(corrector assignment): remove unnecessary redudant filtering 2019-07-10 19:44:09 +02:00
Steffen Jost
16716d50d0 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-07-10 19:32:02 +02:00
Steffen Jost
de49a777eb fix(assign correctors): also show names of unenlisted correctors 2019-07-10 19:31:54 +02:00
Gregor Kleen
b231747b28 Merge branch 'feat/csv' 2019-07-10 19:24:53 +02:00
Gregor Kleen
631bbef0b8 feat(csv): introduce csv export 2019-07-10 19:24:10 +02:00
Steffen Jost
9c5ed5f842 fix(corrector handling): show correctors by a consistent order 2019-07-10 15:14:02 +02:00
Gregor Kleen
7a795daa57 Merge branch '205-klausuren' 2019-07-10 13:52:05 +02:00
Gregor Kleen
04bea764f4 feat(exams): show study features of registered users
BREAKING CHANGE: E.isInfixOf and E.hasInfix
2019-07-10 13:51:02 +02:00
Sarah Vaupel
34db033c95 Merge branch 'master' into course-teaser 2019-07-10 10:33:46 +02:00
Gregor Kleen
c0b90c4c4a fix(ratings): disallow ratings for graded sheets without point value
This reverts commit 1b0825c763.
2019-07-10 09:23:22 +02:00
Steffen Jost
d83b1f696f fix(correction): comment column made wide in online correction form
column width enlarged for online correction and attempt at issue #373
2019-07-04 14:31:01 +02:00
Steffen Jost
609821595b fix(number-input-fields): number inputs made HTML5 compatible
number inputs of rational fields allow rational inputs and optionally
provide min-max attributes for HTML5

Closes #412
2019-07-04 13:56:04 +02:00
Gregor Kleen
1b0825c763 Revert "fix(ratings): disallow ratings for graded sheets without point value"
This reverts commit 463b2b7878.
2019-07-04 10:18:28 +02:00
Gregor Kleen
78e4369afb feat(exam): save registration timestamp 2019-07-03 16:26:24 +02:00
Gregor Kleen
31931e708e feat(exam): audit exam registrations 2019-07-03 16:16:55 +02:00
Gregor Kleen
c78b9ff4d6 Merge branch 'master' into 302-transaction-log 2019-07-03 14:55:28 +02:00
Steffen Jost
551c4cb23c fix(home): fix build 2019-07-03 14:32:58 +02:00
Gregor Kleen
521b710436 Merge branch 'master' into 302-transaction-log 2019-07-03 14:26:01 +02:00
Gregor Kleen
75ec91d8ff Merge branch 'master' into 302-transaction-log 2019-07-03 14:25:29 +02:00
Steffen Jost
3ee9888901 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-07-03 13:59:27 +02:00
Steffen Jost
242cff3060 feat(home): show immediate exams on home page 2019-07-03 13:56:19 +02:00
Sarah Vaupel
37db6256c1 Merge branch 'master' into course-teaser 2019-07-03 11:59:02 +02:00
Gregor Kleen
05e74c7732 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-07-03 11:57:44 +02:00
Gregor Kleen
31e6b72c46 feat(exams): add extremely rudimentary registration table 2019-07-03 11:56:44 +02:00
Sarah Vaupel
b0ed911849 refactor(displayable): removed resolved TODOs 2019-07-03 10:05:53 +02:00
Steffen Jost
c2975ca06e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-07-03 09:42:03 +02:00
Sarah Vaupel
6aaa2d2093 Merge branch 'master' into 184-replace-displayable-by-rendermessage 2019-07-03 09:34:40 +02:00
Gregor Kleen
90c7d3c47b refactor: drop redundant do 2019-07-02 17:16:04 +02:00
Steffen Jost
b08777956a merged 2019-07-02 17:06:32 +02:00
Gregor Kleen
0f02a00053 Merge branch 'master' into changelog 2019-07-02 16:10:20 +02:00
Gregor Kleen
92f5d84431 chore(haddock): Fix haddock 2019-07-02 14:56:14 +02:00
Steffen Jost
ba280fe44a minor: table row tooltips, also see #407 2019-07-01 17:52:52 +02:00
Sarah Vaupel
a6348f9b9c refactor: Replaced DisplayAble by RenderMessage/ToMessage
Removed DisplayAble typeclass; replaced DisplayAble instances by
RenderMessage or ToMessage instances; removed unnecessary tshow calls in
de.msg

Closes #184
2019-07-01 11:48:43 +02:00
Steffen Jost
8476314a46 Better fix for lecturer names 2019-06-27 19:53:26 +02:00
Steffen Jost
16c556b852 fix(correction assignment): correcting lecturer's names are shown now
Table only shows sheet correctors, but lecturers may occasionally
correct too
2019-06-27 18:48:15 +02:00
Steffen Jost
d07f53e1d8 fix(corrector assignment): sheet tabel mixed up columns sorted
some columns did not belong to each other.
2019-06-27 16:51:38 +02:00
Gregor Kleen
24aacef6af fix(exam grading keys): Fix spacing 2019-06-27 11:09:44 +02:00
Gregor Kleen
6fb1399ef4 feat(exams): Form validation 2019-06-27 10:58:35 +02:00
Gregor Kleen
b63d77ec7b Merge branch 'master' into 205-klausuren
Fix tests
2019-06-27 09:45:57 +02:00
Steffen Jost
96387cbed5 fix(many occurrences throughout the project): Fix typo: occurence -> occurrence everywhere
A typo between occurence in code and occurrence in tests prevented
deployment. I changed all occurrences of "occurence" to the correct
spelling, such that
2019-06-27 08:55:32 +02:00
Sarah Vaupel
39792580d4 Merge branch 'master' into 184-replace-displayable-by-rendermessage 2019-06-27 00:58:24 +02:00
Sarah Vaupel
726dbe6b1a Removed DisplayAble class 2019-06-26 23:32:50 +02:00
Steffen Jost
89d5364c93 fix(Help Widget, Corrector Assignment): Modal Form closes in place; assign alerts
Closes #195
2019-06-26 19:35:49 +02:00
Gregor Kleen
f8d0b021ed feat(forms): Introduce more convenient form validation 2019-06-26 19:34:56 +02:00
Sarah Vaupel
f5b3dd4c3a Replaced DisplayAble instance for TermId and SchoolId with ToMessage instances 2019-06-26 19:27:41 +02:00
Sarah Vaupel
a40456f2cd Removed DisplayAble instance for CryptoIDs 2019-06-26 19:03:13 +02:00
Gregor Kleen
1684da07f2 fix(exams): Fix registration 2019-06-26 17:33:55 +02:00
Gregor Kleen
99184ff053 feat(exams): exam registration 2019-06-26 15:25:59 +02:00
Steffen Jost
228cd50749 feat(corrector-assignment): show load/submission percentages 2019-06-26 15:08:03 +02:00
Sarah Vaupel
067c2b9caa Replaced display calls in most hamlet files 2019-06-26 14:36:01 +02:00
Gregor Kleen
0428e8b921 Merge branch 'master' into 205-klausuren 2019-06-26 13:40:02 +02:00
Steffen Jost
a4a3c14f9d Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-06-26 12:12:30 +02:00
Steffen Jost
2f7f733628 Abgaben Zuteilung überarbeitet 2019-06-26 12:12:19 +02:00
Sarah Vaupel
84070a5565 Replaced DisplayAble Text instance, started adding ToMarkup instances for keys, attempted adding interface for CryptoIDs (TODO) 2019-06-19 21:54:23 +02:00
Gregor Kleen
401489a877 Merge branch 'master' into 205-klausuren 2019-06-19 16:56:54 +02:00
Gregor Kleen
463b2b7878 fix(ratings): disallow ratings for graded sheets without point value 2019-06-19 16:52:00 +02:00
Gregor Kleen
6dc1d76f0a Merge branch 'master' into 205-klausuren 2019-06-19 15:40:45 +02:00
Gregor Kleen
67a50c9e87 feat(exams): CRU (no D) for exams 2019-06-19 15:34:09 +02:00
Steffen Jost
782110a824 feat minor: E.isJust added 2019-06-19 11:11:55 +02:00
Steffen Jost
3bded5071b fix: filter submission by not having corrector 2019-06-19 10:49:22 +02:00
Steffen Jost
55468496e0 fix: minor heat correction for correction overview 2019-06-19 09:53:01 +02:00
Felix Hamann
1f34c72c23 Merge branch 'master' into changelog 2019-06-17 22:57:25 +02:00
Felix Hamann
7b8a3979bd chore: rename german changelog file to all uppercase 2019-06-17 22:42:00 +02:00
Felix Hamann
1256325a3e chore: rename german ChangeLog.md to ChangeLog_de.md 2019-06-17 22:42:00 +02:00
Steffen Jost
fedcc9a2ad Overview Corrections working now 2019-06-17 16:30:04 +02:00
Steffen Jost
55cd175f06 Minor Bugfix 2019-06-17 09:55:02 +02:00
Steffen Jost
d5b094d6b4 Corrector loads shown; BUG preview somehow missing now 2019-06-17 09:47:50 +02:00
Steffen Jost
8201aa84e5 Bugfix: only attemp to assign unassigned submissions 2019-06-17 08:33:15 +02:00
Steffen Jost
af00b06130 Compiles and works, but still needs some minor fixes 2019-06-16 16:38:28 +02:00
Steffen Jost
4f1b2886cd guards added as needed for plan generartion without exceptions 2019-06-16 13:16:01 +02:00
Steffen Jost
e33704dca4 Implementation okay, but throws NoCorrectors (FIXME) 2019-06-14 20:43:14 +02:00
Steffen Jost
718a2b026c Correction stats coded, but not yet used online 2019-06-14 17:05:45 +02:00
Steffen Jost
0185fd3c87 assignSubmission split into planning and assigning part 2019-06-13 09:49:17 +02:00
Gregor Kleen
d054370b29 Better exam table 2019-06-12 09:17:32 +02:00
Gregor Kleen
7deb994c16 Merge branch 'master' into 205-klausuren 2019-06-07 13:43:29 +02:00
Gregor Kleen
054ff5cdc3 Create new exams 2019-06-07 13:42:37 +02:00
Steffen Jost
ee58d61285 Fixes #257 2019-06-06 18:39:32 +02:00
Steffen Jost
fbd7c3947d Towards #257 2019-06-06 16:04:43 +02:00
Steffen Jost
cd70b8ffc4 Fixes #298 Fixes #281 2019-06-06 15:29:59 +02:00
Steffen Jost
2feb751afa Towards #298 2019-06-06 13:35:42 +02:00
Steffen Jost
1cc314b653 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-06-06 10:13:39 +02:00
Steffen Jost
ee7f2b534a minor refactor 2019-06-06 10:13:32 +02:00
Gregor Kleen
a5dcdaae0b Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-06-04 10:32:29 +02:00
Gregor Kleen
332e83a111 Fix handling of URL-encoded jsonFields
See #392
2019-06-04 10:08:57 +02:00
Steffen Jost
59d5f441c8 Alle Abgaben Verteilen Funktionalität eingerichtet 2019-06-04 09:24:06 +02:00
Steffen Jost
a71ac7139d Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-06-04 08:14:26 +02:00
Steffen Jost
d34998ac04 automatic corrector assignment 2019-06-04 08:14:13 +02:00
Gregor Kleen
98d76e30ea Make calls to unsafeHandler shorter lived 2019-05-30 23:37:48 +02:00
Steffen Jost
745feeac83 FilterUI for Submission (Part2) 2019-05-29 20:59:58 +02:00
Steffen Jost
669c803105 FilterUI for Submission (Part 1) 2019-05-29 14:09:29 +02:00
Steffen Jost
51e0502117 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-29 13:37:03 +02:00
Gregor Kleen
8f33d1590c defaultPagesize 2019-05-29 13:36:11 +02:00
Gregor Kleen
7a4f1cb76e massInputAccumEdit 2019-05-29 13:27:04 +02:00
Steffen Jost
ceace36abd MaterialVisible has an icon now and no more alert 2019-05-29 10:33:14 +02:00
Steffen Jost
6a242bc432 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-29 09:25:04 +02:00
Gregor Kleen
c2ab196b92 Fix handling of suggested UploadSpecificFiles 2019-05-28 22:30:38 +02:00
Steffen Jost
0fc9c326b9 fixes #394 2019-05-28 19:22:14 +02:00
Gregor Kleen
dbb208112f Aggressively refactor Model.Types 2019-05-27 14:23:58 +02:00
Gregor Kleen
30fe78ebdc Decouple HealthCheck intervals 2019-05-24 22:24:48 +02:00
Gregor Kleen
e2315dd28e Fix sheetForm 2019-05-20 18:22:53 +02:00
Gregor Kleen
0c1c647189 Handle AssignSubmissionException in correctionsR
Fix #382
2019-05-20 14:10:12 +02:00
Gregor Kleen
7deba81320 Additional testing 2019-05-20 00:06:15 +02:00
Gregor Kleen
848dc7470a Additional testing 2019-05-19 20:19:46 +02:00
Gregor Kleen
27a5b83f55 Re-do assignSubmissions to pass tests 2019-05-19 17:18:29 +02:00
Gregor Kleen
2b79b40bfb Fix Haddock 2019-05-19 00:40:54 +02:00
Gregor Kleen
813d446975 Divide sheetForm into sections 2019-05-18 23:14:21 +02:00
Gregor Kleen
9f101087ac Overhaul SubmissonMode extensively 2019-05-18 22:51:07 +02:00
Gregor Kleen
97eb18c5aa Cleanup file handling
* Use serve*File(s)-Utilities wherever possible
  * Stream Files from database through zip-encoder and to client whenever possible
  * Get rid of ZIPArchiveName and use Content-Disposition everywhere
  * Make Content-Disposition able to deal with non-ascii filenames
2019-05-18 15:58:29 +02:00
Steffen Jost
e676be8f3f Fixes #374 2019-05-17 18:51:55 +02:00
Steffen Jost
c0bc4dd8f3 Code DRY cleaning 2019-05-17 13:53:07 +02:00
Steffen Jost
601cbeab76 Fixes #381 2019-05-17 13:40:39 +02:00
Steffen Jost
86204f78e2 attempt at #374 failed 2019-05-16 13:58:07 +02:00
Steffen Jost
953f7af122 Avoid reported confusion of bookmark using users 2019-05-16 12:11:48 +02:00
Steffen Jost
5a9ca00ff6 Fix #379 2019-05-16 11:18:19 +02:00
Steffen Jost
05389fc27e Splitting Model.Types into three parts 2019-05-15 21:58:27 +02:00
Steffen Jost
e712552397 sheet list icons cleaned 2019-05-15 14:16:21 +02:00
Steffen Jost
7cda3e9f2e Towards #364 for task 1 2019-05-15 12:54:23 +02:00
Steffen Jost
db915f5736 Default Filter corrections inactivated, depends on issue #371 2019-05-15 09:49:42 +02:00
Steffen Jost
008db4f56c Tooltip course invitation 2019-05-15 09:39:06 +02:00
Gregor Kleen
48f9410fca Fix typo 2019-05-14 23:17:34 +02:00
Steffen Jost
f52b831f38 Fixes #368. Dauerte so lange wegen 2x Hlint Durchläufen :( 2019-05-14 22:58:49 +02:00
Steffen Jost
06fcf4aa01 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-14 22:37:42 +02:00
Steffen Jost
0012e2a19c No header for simple select box. Fixes #363 2019-05-14 12:31:15 +02:00
Gregor Kleen
5176352a5e Merge branch 'master' into mobile-fixes 2019-05-13 22:28:08 +02:00
Steffen Jost
0988ac0dd8 Rename HandIn Button. Fixes #340 2019-05-13 17:39:26 +02:00
Steffen Jost
ae96c6269c Surpress MsgMassInputTip for common case of single submission sheets 2019-05-13 17:30:49 +02:00
Steffen Jost
1a8d0fff57 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-05-13 16:29:04 +02:00
Steffen Jost
028c0eab32 Attempt filter UI subs 2019-05-13 16:29:00 +02:00
Gregor Kleen
c17588912f Fix data leak in CCommR 2019-05-13 15:48:38 +02:00
Steffen Jost
0cc1d7689f UX Hilfe Online Korrektur 2019-05-13 15:34:45 +02:00
Gregor Kleen
0568e8a3f6 Merge branch 'feat/course-participant-invitation' 2019-05-13 00:27:21 +02:00
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