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

544 Commits

Author SHA1 Message Date
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
Gregor Kleen
b6772a175b Make submission ids lower case 2018-06-28 09:09:11 +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
ceaf92996b Favourites updated immediately now; Links for Lecturers are shown 2018-06-27 13:15:17 +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
Felix Hamann
61ba8bf052 added tooltips 2018-06-25 22:28:17 +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
Felix Hamann
879e1717ee added font-awesome for icons 2018-06-23 13:22:56 +02:00
Felix Hamann
2c9c076213 started moving first lvl navi to top 2018-06-22 23:40:34 +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
SJost
f4dcd00669 Theme is now read from Database 2018-06-19 11:40:25 +02:00
SJost
f936453204 Minor refactor among utility modules 2018-06-19 11:05:02 +02:00
SJost
171f62ad8a Theme Datatype complete 2018-06-19 10:09:37 +02:00
SJost
cc9d0a7b9a ThemeDatatype plus TemplateHaskell Show implemented 2018-06-19 09:30:37 +02:00
Gregor Kleen
16681d594e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-12 19:42:39 +02:00
Gregor Kleen
9e017f8e84 Add some headings 2018-06-12 19:42:22 +02:00
SJost
5d57f5d58c Sidenavigation highlighting works now as intended. 2018-06-12 18:47:42 +02:00
SJost
a5428bfc30 Form Missing eliminated for GET request 2018-06-12 11:47:26 +02:00
SJost
af6d97454d Highlighting in Navigation of current favorite (Halfway-done without breadcrumbs) 2018-06-12 11:17:55 +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
SJost
21a96ce44d AlertMessage close working with i18n now. 2018-06-12 10:05:58 +02:00
Felix Hamann
5364aded5c fixed issue with date-format from datepicker 2018-06-10 23:25:28 +02:00
Felix Hamann
0188673e1f added datepicker globally 2018-06-10 20:52:29 +02:00
Felix Hamann
a1b6599a29 fixed deprecated alerts in backend. we need a template for alerts 2018-06-10 20:19:00 +02:00
Felix Hamann
c54495fe58 renamed a few pageactions 2018-06-10 19:36:39 +02:00
Felix Hamann
08be5ef699 added styling and behaviour for alerts 2018-06-10 01:21:08 +02:00
Felix Hamann
482ac4547a moved page actions to the top right 2018-06-09 22:11:30 +02:00
Felix Hamann
d16ed578bf request for more PageHeadings 2018-06-09 21:29:42 +02:00
Felix Hamann
6c03063029 added font "Roboto" and indented breadcrumbs slightly 2018-06-09 20:20:18 +02:00
Felix Hamann
07e5ca8b79 Merge branch 'master' into feat/datepicker 2018-06-09 19:20:47 +02:00
Felix Hamann
694ce90551 added themes and experimental theme-switcher 2018-06-09 11:59:15 +02:00
Gregor Kleen
64af1b155e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-08 09:19:11 +02:00
Gregor Kleen
c46d6e8545 minor cleanup 2018-06-08 09:18:53 +02:00
SJost
ae64b10d5c Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-07 17:04:33 +02:00
SJost
b558d8d314 Access tags isWrite isRead added 2018-06-07 17:04:17 +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
Felix Hamann
38b879eab8 Merge branch 'ui_optis_0606' 2018-06-07 11:48:30 +02:00
Felix Hamann
8c4b2d62d3 got rid of comments and added header for termsList 2018-06-07 11:48:14 +02:00
SJost
c5beac0eb1 Minor commenting 2018-06-07 11:46:01 +02:00
Gregor Kleen
18c3840276 Fix build 2018-06-07 11:39:08 +02:00
Gregor Kleen
f4b6d1e3f5 Introduce pageHeading function 2018-06-07 11:39:08 +02:00
Felix Hamann
0d2c5696c5 slight refinments for inputs and 2018-06-07 11:39:08 +02:00
Felix Hamann
2883dedff7 input field styles and less navigation items 2018-06-07 11:39:08 +02:00
Felix Hamann
99643ff089 page title above page actions -wip 2018-06-07 11:39:08 +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
SJost
a047d81584 Merge branch 'master' into feat/exercises 2018-06-07 10:47:10 +02:00
SJost
f00d2765c0 SheetMarking prohibited now for students. 2018-06-07 10:45:30 +02:00
SJost
ea6c7b7761 Fix for SheetMarking visible to students 2018-06-07 10:39:43 +02:00
Gregor Kleen
7db3d3f272 Merge branch 'master' into feat/exercises 2018-06-07 10:31:44 +02:00
Gregor Kleen
168e8bacb3 Merge branch 'feat/routes' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/routes 2018-06-07 10:29:44 +02:00
Gregor Kleen
44776e1506 refactor SubmissionR 2018-06-07 10:29:27 +02:00
SJost
5e5c980459 minor refactors 2018-06-05 08:34:14 +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
SJost
e418ad2c91 Merge branch 'feat/routes' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/routes 2018-05-30 23:46:51 +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
4c47289c00 Merge branch 'feat/routes' into feat/assign-correctors 2018-05-29 17:43:24 +02:00
Gregor Kleen
aea5ef41d1 (Preliminarily) Finish knownTags 2018-05-29 17:42:02 +02:00
Gregor Kleen
3fb7ff9f13 Merge branch 'feat/routes' into feat/assign-correctors 2018-05-29 15:19:00 +02:00
SJost
87ab470072 Minor refactor andAP and adminAP 2018-05-29 10:49:46 +02:00
Gregor Kleen
69ee7b1a81 Work on knownTags 2018-05-29 10:27:35 +02:00
SJost
e3566d9832 asidenav.hamlet restored to previous version, bug in Foundation fixed. 2018-05-28 18:36:56 +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
ad998b53d8 knownTags increased 2018-05-25 13:12:09 +02:00
SJost
59423832e6 evalAccess is complete now 2018-05-25 11:54:27 +02:00
SJost
d5edf5ee7b liftAR refactored to avoid unnecessary DB access 2018-05-25 10:11:06 +02:00
SJost
f4964dcb55 after Discussion today 2018-05-23 20:01:52 +02:00
SJost
f14bea4015 AccessScaffold 2018-05-23 15:43:12 +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
Gregor Kleen
0ec73bf454 CryptoUUIDUser 2018-05-17 14:17:32 +02:00
Gregor Kleen
ead6aacfc2 Monoid-instance for Load 2018-05-17 14:14:00 +02:00
SJost
03f9bc4f89 Merge branch 'master' into feat/exercises 2018-05-17 09:32:04 +02:00
Felix Hamann
8634ad6ada readded removed JavaScript libraries 2018-05-08 22:59:46 +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
a0d5589777 added static flatpickr js and css 2018-04-13 14:37:23 +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
Felix Hamann
4896330737 removed pure-JS sorting for sortable tables 2018-04-09 22:23:12 +02:00
Felix Hamann
dc45702f32 added JS and CSS for sortable tables 2018-04-09 22:22:38 +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
272c61b512 Favourites are pruned now 2018-04-04 09:17:26 +02:00
SJost
2dde6c67bc Favourites are tracked, but not yet used 2018-04-04 08:45:14 +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
be5d88b24b Merge branch 'feat/pageactions' 2018-03-29 00:08:34 +02:00
Felix Hamann
383eb3c620 added modal widget 2018-03-28 23:23:32 +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