Commit Graph

287 Commits

Author SHA1 Message Date
SJost
85cc86e37f Minor refactoring 2018-07-03 10:24:04 +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
e3fc2ee5a8 Fix broken template & cleanup routes 2018-07-02 09:26:39 +02:00
Gregor Kleen
0da0c46b2e Merge branch 'master' into feat/corrections-upload 2018-07-02 09:11:00 +02:00
Gregor Kleen
1ec5802a1c Single correction view 2018-07-02 08:44:15 +02:00
Felix Hamann
7e7e08837c get rid of glyphicons 2018-07-01 23:02:03 +02:00
Gregor Kleen
1d49244d63 Merge branch 'master' into feat/corrections-upload 2018-07-01 18:49:36 +02:00
Gregor Kleen
0d01ac95ab Corrections upload 2018-07-01 14:49:15 +02:00
Gregor Kleen
4ca7ebd6f1 Logik für Abgabe ansehen/anlegen
Fixes #78
2018-07-01 12:32:26 +02:00
Felix Hamann
db0076a628 navbar now with lmu-boxes 2018-07-01 01:32:36 +02:00
Gregor Kleen
c72b9ef385 Hierarchical submission routes 2018-07-01 00:23:38 +02:00
Gregor Kleen
99832c1286 Cleanup submission download 2018-06-30 21:16:11 +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
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
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
0ab7bbd7eb Merge branch 'feat/assign-correctors' into feat/pagination 2018-06-29 11:53:16 +02:00
Gregor Kleen
6e0558d094 Merge branch 'master' into feat/assign-correctors 2018-06-29 10:51:56 +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
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
936b808aaf Merge branch 'master' into feat/pagination 2018-06-27 08:58:29 +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
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
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
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
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
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
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
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
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
0188673e1f added datepicker globally 2018-06-10 20:52:29 +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
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
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
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
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
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
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
Gregor Kleen
30b941eeec Mockup of SheetCorrectorsR 2018-05-17 15:39:50 +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
38e438b774 correctorForm just a stub 2018-05-04 12:55:23 +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
93c96ae620 Framework for Notifications 2018-04-29 13:55:09 +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
SJost
e98cf70400 MODEL REFACTOR: dropped ID suffixes throughout 2018-04-26 11:29:42 +02:00
SJost
56476ccb3e Uniwory und PageAction ExerciseSheet 2018-04-26 09:41:57 +02:00
Gregor Kleen
917d767d30 Cleanup SubmissionDownloadArchive 2018-04-19 13:31:47 +02:00
SJost
8725f935d0 Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-19 09:29:41 +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
c78184a946 Automatically check isAuthorized for MenuItems 2018-04-13 15:49:26 +02:00
Felix Hamann
a0d5589777 added static flatpickr js and css 2018-04-13 14:37:23 +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
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
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
Gregor Kleen
3d98fe4736 Refactor utils 2018-04-03 17:56:55 +02:00
Felix Hamann
8bb71a5c3e Moved modals to standalones 2018-03-31 01:55:00 +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
9f96e6dd35 PageActions added 2018-03-22 19:27:57 +01:00
SJost
5f6640148c Hierarchical Routes 2018-03-22 16:04:38 +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
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
910eb40c86 got rid of iconToText 2018-03-18 02:43:54 +01:00
Felix Hamann
d8f2ce6e90 added menu-icons and asidenavbar-styling 2018-03-17 19:23:45 +01:00
Felix Hamann
8fc53d879f split inputs-logic and form-logic in frontend 2018-03-16 20:54:35 +01:00
SJost
daed94ae33 Several Cleanups 2018-03-16 17:54:28 +01:00
SJost
c35f718054 Sheet Download works 2018-03-16 10:26:54 +01:00
SJost
40cf5ec858 CourseForm works without redirect only 2018-03-15 14:51:30 +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
ca582f8e8a widget-restructuring and new colors 2018-03-07 21:55:01 +01:00
Felix Hamann
56d949d57f Merge branch 'master' into initial_thoughts_on_frontend 2018-03-07 13:47:34 +01:00
Felix Hamann
cd8b6d985b introduced BEM for CSS and aside-navigation 2018-03-06 22:29:17 +01:00
Felix Hamann
50cebd92bf Merge branch 'master' into initial_thoughts_on_frontend 2018-03-02 18:33: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
2fa247826f Add support for internationalization 2018-02-21 13:19:27 +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
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
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