fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,740 Commits 8 Branches 0 Tags 64 MiB
c99d96ecb8
Commit Graph

2009 Commits

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

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

See merge request !23
 2018-04-14 22:36:44 +02:00
Gregor Kleen
acce67d562 Fix sortable column attributes 2018-04-14 20:18:24 +02:00
Gregor Kleen
c78184a946 Automatically check isAuthorized for MenuItems 2018-04-13 15:49:26 +02:00
Gregor Kleen
9d65f94f51 Mark sortable columns 2018-04-13 15:28:04 +02:00
Gregor Kleen
05cd245102 Links to every page of table 2018-04-13 15:06:15 +02:00
Felix Hamann
e0b3f0921a signal to the user that a column is sortable 2018-04-12 23:23:35 +02:00
Felix Hamann
2a1c805d85 Merge branch 'master' into feat/pagination 
merged master into this to avoid databas conflicts when switching between master and feat/pagination
 2018-04-12 21:38:25 +02:00
Gregor Kleen
4c4cbd584c Fix build of Submission.hs 2018-04-11 15:09:20 +02:00
Gregor Kleen
08607a5e7c Fix javascript issues, 'directions' in sortable-header, sorted attrs 2018-04-11 14:28:33 +02:00
SJost
fcd6703752 Group Submissions mostly done, NOT COMPILING 2018-04-11 13:12:49 +02:00
SJost
5c1789786d Util-Sheet vergessen 2018-04-10 15:16:32 +02:00
SJost
a544c61be2 Submission upload (Sitzung mit Gregor) 2018-04-10 12:50:20 +02:00
SJost
4a7d35144a Merge remote-tracking branch 'origin/feat/pagination' into feat/exercises 2018-04-10 10:40:10 +02:00
SJost
380c57c578 Favourites working now (without PageActions). 2018-04-10 10:38:21 +02:00
Gregor Kleen
c2174161c5 Better name for templates/table/table 2018-04-04 15:28:55 +02:00
Gregor Kleen
e71864368c Implement links to toggle table sorting 2018-04-04 14:35:11 +02:00
Gregor Kleen
72b2b72f03 Implement table sorting 2018-04-04 12:54:00 +02:00
Gregor Kleen
951af369c8 Fewer newlines 2018-04-04 12:31:50 +02:00
Gregor Kleen
431adf0324 Add 'zipFileField' 2018-04-04 12:29:01 +02:00
Gregor Kleen
5e8698fee1 Revert "Allow overriding unpackZips-Checkbox" 
This reverts commit 8e43a314d3.
 2018-04-04 12:21:43 +02:00
SJost
fa6b04663e Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 18:50:51 +02:00
Gregor Kleen
8e43a314d3 Allow overriding unpackZips-Checkbox 2018-04-03 18:48:10 +02:00
SJost
ea5e04bd78 Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 18:04:13 +02:00
Gregor Kleen
3d98fe4736 Refactor utils 2018-04-03 17:56:55 +02:00
SJost
2714485dbd Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 16:58:25 +02:00
SJost
7e9e066e55 Quickfix sheet grading edit 2018-04-03 16:58:05 +02:00
SJost
f35579e20d Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 16:50:59 +02:00
SJost
d279a1a2c6 Minor messages 2018-04-03 16:49:41 +02:00
Gregor Kleen
54cd2bd266 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/pagination 2018-04-03 16:20:44 +02:00
Gregor Kleen
9a26d17c5e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/multi-file-field 2018-04-03 14:53:18 +02:00
Gregor Kleen
1b86abb46d MultiFileField Sheet 2018-04-03 14:51:25 +02:00
Felix Hamann
8bb71a5c3e Moved modals to standalones 2018-03-31 01:55:00 +02:00
Felix Hamann
33a99b0f62 changed menuItemType of Uebungsblaetter 2018-03-29 00:23:24 +02:00
Felix Hamann
6edc4d4a99 added page action bar for prime actions 
closes #34
 2018-03-25 23:47:02 +02:00
SJost
05a0f6b0bf CreatedBy/ChangeBy als eigene Tabellen überall eingeführt 2018-03-22 20:35:17 +01:00
SJost
6fe311ee78 Sheet edit times und fillDB angepasst 2018-03-22 19:49:33 +01:00
SJost
9f96e6dd35 PageActions added 2018-03-22 19:27:57 +01:00
SJost
5f6640148c Hierarchical Routes 2018-03-22 16:04:38 +01:00
Gregor Kleen
7ee2aac209 MultiFileField 2018-03-22 15:18:08 +01:00
SJost
217ae28d9e Merge branch 'master' into feat/exercises 2018-03-22 14:07:10 +01:00
SJost
ad2b7ae866 DeleteRedirct, fetchSheet caching, etc. 2018-03-22 12:19:40 +01:00
SJost
710b8334e5 convenience functions for authorisation, not yet used 2018-03-21 18:15:16 +01:00
SJost
023da918bb convenience functions for authorisation 2018-03-21 17:39:17 +01:00
SJost
85d128a244 Sheet Editing/Delete working now 2018-03-19 23:33:59 +01:00
SJost
5364190a38 Problem: getrennte get/post Handler funktionieren so nicht. Warum? 2018-03-19 22:57:24 +01:00
Gregor Kleen
28d9c5c95b Cleanup 2018-03-19 12:29:55 +01:00
Felix Hamann
e58851cd3c scollable tables for smaller screens 2018-03-18 17:55:02 +01:00
Felix Hamann
4f660f04c0 navbar rework, smooth breadcrumbs 2018-03-18 15:47:37 +01:00
Felix Hamann
3d36e5c957 icons, responsive navigation, breadcrumbs, design 2018-03-18 02:52:17 +01:00
Felix Hamann
d55b88d7cb Merge branch 'master' into initial_thoughts_on_frontend 2018-03-17 19:31:15 +01:00
Felix Hamann
d8f2ce6e90 added menu-icons and asidenavbar-styling 2018-03-17 19:23:45 +01:00
Felix Hamann
be383f84b8 reverted markup and js changes to buttonField 2018-03-17 15:30:27 +01:00
Felix Hamann
8fc53d879f split inputs-logic and form-logic in frontend 2018-03-16 20:54:35 +01:00
SJost
037c0cce20 Sheet editing working, except for files 2018-03-16 18:52:32 +01:00
SJost
daed94ae33 Several Cleanups 2018-03-16 17:54:28 +01:00
Gregor Kleen
170442cff0 Fix page indicator 2018-03-16 14:22:33 +01:00
Gregor Kleen
2cfd87de87 Page indicator 2018-03-16 14:09:12 +01:00
Gregor Kleen
ba918129c9 Identify paginated table with html-id 2018-03-16 13:30:58 +01:00
Gregor Kleen
907958baf4 Cleanup identified tables 2018-03-16 13:06:52 +01:00
Gregor Kleen
d47fa717a3 Identify tables 2018-03-16 12:58:49 +01:00
Gregor Kleen
96cdef2538 Better PSValidator 2018-03-16 12:54:18 +01:00
Gregor Kleen
a0ccae13b7 Intigrate pagination into term list 2018-03-16 10:28:43 +01:00
SJost
c35f718054 Sheet Download works 2018-03-16 10:26:54 +01:00
Gregor Kleen
b96411460c Start work on server side pagination 2018-03-16 10:25:55 +01:00
SJost
85f132295c minor changes toward sheet saving 2018-03-16 09:05:29 +01:00
SJost
40cf5ec858 CourseForm works without redirect only 2018-03-15 14:51:30 +01:00
SJost
075872dbbe Replace does not work either 2018-03-15 10:04:16 +01:00
SJost
8247c6c6d4 Fixes to Course New/Edit handling. Update not yet working! 2018-03-14 18:34:42 +01:00
Felix Hamann
475411bb4a localstorage for show-hides, sortable tables, more navigation 2018-03-11 23:53:06 +01:00
Felix Hamann
e4ddcd9e49 minor fixes for file-inputs and buttons 2018-03-08 11:06:12 +01:00
Felix Hamann
20b6828c96 Merge branch 'master' into initial_thoughts_on_frontend 2018-03-07 21:58:18 +01:00
Felix Hamann
ca582f8e8a widget-restructuring and new colors 2018-03-07 21:55:01 +01:00
SJost
1c052087fd Merge branch 'master' into feat/exercises 2018-03-07 15:47:54 +01:00
SJost
43cb2cfa73 Term template angepasst 2018-03-07 15:28:18 +01:00
SJost
f36d048dac Merge branch 'master' into feat/exercises 2018-03-07 14:17:02 +01:00
SJost
a29cefe7d2 MV: generic_form.hamlet -> formPage.hamlet 2018-03-07 14:16:08 +01:00
SJost
70a95b3e0b Beispiel Internationalisierung in Handler.Term 2018-03-07 13:59:50 +01:00
Felix Hamann
3f11dab6ab Merge branch 'master' into initial_thoughts_on_frontend 2018-03-07 13:35:58 +01:00
SJost
4c65d379af Merge branch 'master' into feat/exercises 2018-03-07 13:31:08 +01:00
Gregor Kleen
2fb478e8ff Merge branch 'feat/custom-renderers' 2018-03-07 13:30:06 +01:00
SJost
27507906d1 Minor comments 2018-03-07 13:01:23 +01:00
Felix Hamann
cd8b6d985b introduced BEM for CSS and aside-navigation 2018-03-06 22:29:17 +01:00
Felix Hamann
b9b5496ca7 added reactive input labels and general form styling 2018-03-05 00:40:10 +01:00
Felix Hamann
0a7328f969 added sortable tables 2018-03-04 22:48:54 +01:00
Felix Hamann
7b3915fa95 moved sticky navbar to StaticR and added show-hide-elements (only HomeR) 2018-03-04 22:19:25 +01:00
Felix Hamann
50cebd92bf Merge branch 'master' into initial_thoughts_on_frontend 2018-03-02 18:33:22 +01:00
Gregor Kleen
fe73d6cc22 Start work on customizable form renderer 2018-03-01 12:54:22 +01:00
Felix Hamann
349938b0e7 added navbar widget and did some cleanup to eventually get rid of bootstrap 2018-02-22 22:44:54 +01:00
Gregor Kleen
a548652b52 Bump yesod-colonnade 2018-02-21 13:33:28 +01:00
Gregor Kleen
937db06db2 Remove backup 2018-02-20 15:54:25 +01:00
SJost
c8c968a7e4 minor merge conflict resolved 2018-02-19 18:10:41 +01:00
SJost
a3f71a474b Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/exercises 2018-02-19 18:06:54 +01:00
SJost
8d221600d3 TermIdentifier -> TermId in routes 2018-02-19 17:58:55 +01:00
Felix Hamann
7cb64b765a introduced menu-widget 2018-02-19 17:28:28 +01:00
SJost
499315432a SheetFile Up/Download added 2018-02-19 16:57:12 +01:00
SJost
6070c9231b sheet display extended, not yet complete 2018-02-19 16:57:12 +01:00
SJost
3575e69123 Bug with SheetInfo Form fixed 2018-02-19 16:57:12 +01:00
SJost
06a29205cd Fileinfo in AForm type troubles :( 2018-02-19 16:57:12 +01:00
SJost
bc094dc813 Sheets still incomplete, show sheet list and working. sheetAdmin template is not yet working 2018-02-19 16:57:12 +01:00
SJost
2f47f12832 User Overview page added, no user-editing yet 2018-02-19 16:55:20 +01:00
SJost
9bad1b42ec Forgotten minor bugfixes that belong to master, but slipped into this branch. 2018-02-19 16:55:20 +01:00
SJost
272bc7f6c5 schoolField & termField in Utils 2018-02-19 16:54:10 +01:00
Gregor Kleen
a94a8e3f81 Support for partial templates 2018-02-19 16:08:50 +01:00
Gregor Kleen
fddd8bef4c Make CryptoIDKey implicit using new cryptoids-class 2018-02-09 14:22:01 +01:00
Gregor Kleen
b6dbd27eb0 Cleanup 2018-02-09 12:35:10 +01:00
Gregor Kleen
d37ee331f6 Use correct status header 2018-02-09 12:35:10 +01:00
Gregor Kleen
7c5c12dc6b Fix type error 2018-02-09 12:35:10 +01:00
Gregor Kleen
6bf0f321cf Check decryption before redirecting (as was intended) 2018-02-09 12:35:10 +01:00
Gregor Kleen
db92528884 Framework & dispatch submissions 2018-02-09 12:35:10 +01:00
SJost
14ccdb1e35 Bugfix: Infinite Loop in Authorization Code; Stubs for Exercise Sheet; Fixed several compiler warnings 2017-11-29 17:26:32 +01:00
SJost
b363c05c95 AdminSchool no longer nullable; Profile page displays granted rights 2017-11-29 15:17:31 +01:00
SJost
4686c63fd9 BUGFIX, Attempt 2: Authorization for Admins without schools fixed. 2017-11-27 16:54:12 +01:00
SJost
e3906672aa BUGFIXES: 1) Message status codes 2) Course editing could have cause uniqueness constraint violation, resulting in db exception. 2017-11-27 15:59:28 +01:00
SJost
70ad55f565 Course participant count working now, albeit inefficient through runDB per Collonade-Row 2017-11-27 13:21:11 +01:00
Gregor Kleen
c09b0d8619 Cleanup 2017-11-27 12:37:56 +01:00
Gregor Kleen
aa1e10e3e9 Remove redundant import 2017-11-27 09:24:28 +01:00
Gregor Kleen
e6f6e8c621 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-11-26 22:00:38 +01:00
Gregor Kleen
0293363e13 Copy more information from LDAP on login 2017-11-26 21:59:47 +01:00
SJost
39b3cd0bec defaultHandler gained argument for page navigation 2017-11-24 15:20:26 +01:00
SJost
1b272c6ee8 Form-Identifiers introduced 2017-11-17 16:59:48 +01:00
SJost
52be9e3198 Link-Buttons via CSS 2017-11-17 16:17:16 +01:00
SJost
05b912179f Buttons for Links utility added 2017-11-17 15:24:38 +01:00
SJost
4121b49c25 Minor changes to buttons 2017-11-16 13:23:50 +01:00
SJost
4bcbf963f1 Button CSS style added. 2017-11-15 18:04:32 +01:00
SJost
88e123f405 Button form cleaning 2017-11-15 16:37:19 +01:00
SJost
6b0f380808 Pure button Forms working 2017-11-15 16:27:15 +01:00
Gregor Kleen
8bffe66a6d Handle all cases in button accumulation 2017-11-15 13:38:06 +01:00
Gregor Kleen
725e00cf68 Really fix button accumulation, this time 2017-11-15 13:17:33 +01:00
Gregor Kleen
261f064d4e Accumulate button result correctly 2017-11-15 13:06:50 +01:00
SJost
faf5c1b2dc Fix for buttons does not work either 2017-11-15 12:16:14 +01:00
SJost
c71910f22e Buttons reworked after call; not yet working 2017-11-15 11:22:52 +01:00
SJost
25547be0fc Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-11-15 10:38:14 +01:00
Gregor Kleen
1b42873f12 Cleanup 
Fixes #15
 2017-11-15 10:10:24 +01:00
SJost
e138e42ae0 Button Stubs 2017-11-15 09:41:19 +01:00
Gregor Kleen
5070403ce8 Switch to newly released 'filepath-crypto' 2017-10-25 22:43:19 +02:00
SJost
772a5ee02c Esqueleto for Term Overview 2017-10-18 15:57:55 +02:00
Gregor Kleen
0cd0425903 Zip UTF8-support 2017-10-18 15:30:02 +02:00
Gregor Kleen
377d8667c2 Multiple submission upload 2017-10-16 15:52:20 +02:00
Gregor Kleen
b0e5f54b4d Download of multiple Submissions & Additional colonnade wrapper 2017-10-14 00:20:47 +02:00
Gregor Kleen
1afc2b4bad Clean up structure 2017-10-12 19:43:41 +02:00
Gregor Kleen
cb27038c6b Allow upload of single files 2017-10-12 16:58:59 +02:00
Gregor Kleen
d01404047f Graceful handling of undone corrections 2017-10-12 15:47:18 +02:00
Gregor Kleen
f6e7b3fe25 Include rating files again 2017-10-12 04:43:50 +02:00
Gregor Kleen
76c9e61167 Deletion within Submissions 2017-10-12 04:37:29 +02:00
Gregor Kleen
264ea52b58 Cleanup 
Closes #14
 2017-10-12 02:21:08 +02:00
Gregor Kleen
37a9836193 Submission Upload 2017-10-12 02:14:23 +02:00
Gregor Kleen
252168e61c Download ratings 2017-10-11 22:47:26 +02:00
Gregor Kleen
b552e2a0e3 Download of submission files (single & as archive) 2017-10-11 18:02:04 +02:00
SJost
68b3e578b4 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-10-11 10:13:12 +02:00
SJost
70ad7474fe PostButton Helpers added to HomeR 2017-10-11 10:13:03 +02:00
Gregor Kleen
b514ee3c92 Minor cleanup 2017-10-11 00:29:31 +02:00
Gregor Kleen
845369a27a Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-10-11 00:18:15 +02:00
Gregor Kleen
f7f7c7c592 Dump submissions 2017-10-11 00:18:09 +02:00
SJost
a11c542d64 Registering for courses works now. 2017-10-11 00:11:04 +02:00
Gregor Kleen
11895f6709 Bump CryptoID 2017-10-11 00:00:20 +02:00
Gregor Kleen
6bb8f1b49e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-10-10 19:21:02 +02:00
Gregor Kleen
28a65913cf Finish filtering of ratings from a stream of Files 2017-10-10 19:20:46 +02:00
SJost
2b78bce646 Temporary Homepage and Breadcrumbs working. 2017-10-10 18:35:43 +02:00
SJost
e85b130a0d Model changed according to discussion (compiles, but runs only after non-safe SQL migration) 2017-10-10 17:41:10 +02:00
SJost
586d411162 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-10-10 14:46:24 +02:00
SJost
1fe7362a30 Course display etwas erweitert. 2017-10-10 14:46:20 +02:00
Gregor Kleen
9de9032916 Bind to cryptoids 2017-10-10 14:30:48 +02:00
Gregor Kleen
62c2320aef Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-10-10 12:37:30 +02:00
Gregor Kleen
9dfe26b6c9 minor cleanup 2017-10-10 12:37:24 +02:00
SJost
3fbeed2682 Warning: some routes renamed; otherwise minor commit. 2017-10-10 07:42:24 +02:00
SJost
77e7e77e74 Course editing works now, deletion not due to SQLconstraints (lecturers need deletion). 2017-10-10 00:24:25 +02:00
SJost
00c0e1fbfe Course Edit compiles, but deletion/edit does not work yet. I think I need to separate Post/Get Handlers again. 2017-10-09 23:54:14 +02:00
SJost
26efab4506 Course Edit compiles, but deletion/edit does not work yet. I think I need to separate Post/Get Handlers again. 2017-10-09 23:28:21 +02:00
Gregor Kleen
0a40a8bf70 extractRatings 2017-10-09 23:19:51 +02:00
Gregor Kleen
710fec9b18 Test for rating formatting/parsing 2017-10-09 22:57:06 +02:00
Gregor Kleen
57ee32cc9c Instances for Rating 2017-10-09 22:42:02 +02:00
Gregor Kleen
674a17acbe Formatting & parsing of rating files 2017-10-09 22:40:05 +02:00
SJost
b980bab1b1 Course Form works; display not yet. 2017-10-09 22:17:49 +02:00
Gregor Kleen
3cebf133bf Merge branch 'zip-stream' 2017-10-09 19:26:58 +02:00
Gregor Kleen
93b2c72a7b Move Zip to Utils 2017-10-09 19:00:39 +02:00
SJost
d10a629fa2 Term Handler cleaned again; small changes to Model (Maybe added for some Text Types, courseOwner dropped). 2017-10-09 16:16:00 +02:00
Gregor Kleen
332be4d9ce Switch Zip to work on 'File's 2017-10-09 16:08:02 +02:00
Gregor Kleen
5742d21406 Address date confusion 2017-10-09 14:07:27 +02:00
SJost
df1398f756 JSON for showTerms 2017-10-09 07:47:34 +02:00
SJost
98c945b443 Numbering for colonnade tables provided. 2017-10-08 21:05:55 +02:00
SJost
930a478ee3 TermTable properly realised with Colonnade now. Additional dependencies were required. 2017-10-08 19:57:08 +02:00
SJost
99edd912dc Multi-Field Form Validation added. 2017-10-08 17:04:43 +02:00
SJost
b472f2ca27 Generic form button utility 2017-10-08 10:31:15 +02:00
SJost
e6ee9070ea Model change: term aware of lecturing times now 2017-10-08 08:51:22 +02:00
SJost
6d1c3bad06 MultiButton: Term deletion working 2017-10-08 08:42:59 +02:00
SJost
34df734b5e Bootstrap changes, gGeneric Form refined, Basic Term Sanity Checks 2017-10-07 19:22:21 +02:00
SJost
1bca71b720 Ord TermIdentifier changed 2017-10-06 23:43:12 +02:00
SJost
a71c7326a8 DateTimeLocale added and used 2017-10-06 23:19:54 +02:00
SJost
40fab9a362 Term Handler moved to its own module 2017-10-06 22:22:30 +02:00
SJost
d9c6380807 Term editing required third route :( 2017-10-06 18:38:18 +02:00
SJost
a871725d9c Creating and editing terms: basic functionality, still bery ugly 2017-10-06 17:14:56 +02:00
SJost
6d3df4f30b Term creation half-ways, problems with Custom Primary key for Terms 2017-10-06 16:49:43 +02:00
SJost
fcec208936 termField stub created, needs to be moved to common utils 2017-10-06 11:22:43 +02:00
Gregor Kleen
88493d34a0 Bugfixes 2017-10-06 04:09:45 +02:00
Gregor Kleen
6c1afb6919 more detailed tests 2017-10-05 20:17:37 +02:00
Gregor Kleen
15bd70f10a Test suite for zip handling 2017-10-05 19:11:05 +02:00
Gregor Kleen
4191d65fc5 More polymorphism. 2017-10-05 14:13:51 +02:00
Gregor Kleen
0f0f77344f consumeZip 2017-10-05 14:10:32 +02:00
Gregor Kleen
104b3ad397 produceZip 2017-10-05 13:37:54 +02:00
SJost
7209b69859 new course handler stub 2017-10-04 23:20:26 +02:00
Gregor Kleen
bb2dbc3b79 Move files around 2017-10-04 13:59:49 +02:00
SJost
bb946e1b11 Initial PostgreSQL Template 2017-09-11 09:53:42 +02:00