6467 Commits

Author SHA1 Message Date
niklas3
46d3c0d28e refactored FinalThesisUploadFormPanel to be it's own public class. Will reuse in ApproveFinalThesisPanel. 2013-11-12 14:47:38 +01:00
Emil Siverhall
8e6dfcc5c0 Merge remote-tracking branch 'origin/develop' into develop 2013-11-12 14:00:23 +01:00
Emil Siverhall
de54f64423 started working on download of grading report 2013-11-12 14:00:08 +01:00
niklas3
c083306555 Added ThesisApprovedPanel and added approvedDate to FinalThesis 2013-11-12 13:37:45 +01:00
33e6cf40f1 Removed useless WMC wrapper. 2013-11-12 12:44:52 +01:00
Emil Siverhall
b784298f09 Merge remote-tracking branch 'origin/develop' into develop 2013-11-12 10:46:37 +01:00
Emil Siverhall
b472fc4ce3 make sure we display saved answers in grading report and added grading tab to supervisor project details 2013-11-12 10:42:35 +01:00
niklas3
4dc5fbb8a7 Merge remote-tracking branch 'origin/develop' into develop 2013-11-12 10:15:23 +01:00
niklas3
31dc667393 added alternative to cancel rejection of final thesis 2013-11-12 10:15:16 +01:00
fred-fri
ed7381f925 user wasnt shown until reload 2013-11-12 17:31:16 +09:00
fred-fri
77831e5aea removed and replaced selectkeywordsbasedonresearchareapanel 2013-11-12 13:06:53 +09:00
fred-fri
e62d3cc8f7 removed unused panels 2013-11-12 11:17:51 +09:00
b89cdb033f Changed <wicket:container> to <div> to prepare for the removal of the WebMarkupContainer from GenericDataPanel. 2013-11-11 21:28:38 +01:00
niklas3
9e88ca9c0c Merge remote-tracking branch 'origin/develop' into develop 2013-11-11 16:51:28 +01:00
niklas3
661c411c96 more detailed message about posting a rejection description 2013-11-11 16:51:22 +01:00
7d51880f69 Changed keyword filtering panel. 2013-11-11 16:50:49 +01:00
73089f344c Changed keyword filtering panel. 2013-11-11 16:42:34 +01:00
69d8a31b3f Changed keyword filtering panel. 2013-11-11 16:39:50 +01:00
niklas3
7ca4cf7740 added date of uploaded final thesis 2013-11-11 16:33:40 +01:00
07c73de785 Re-arranged filter. 2013-11-11 16:30:09 +01:00
Per Lundholm
3397d9add7 Merge remote-tracking branch 'origin/develop' into develop 2013-11-11 16:12:51 +01:00
Per Lundholm
0b9733e309 AbstractAdminPanel now uses KeywordFilterPanel 2013-11-11 16:12:44 +01:00
271cf5979d Merge remote-tracking branch 'origin/develop' into develop 2013-11-11 16:12:11 +01:00
dea7832da5 Added feedback when finished the report. 2013-11-11 16:11:37 +01:00
0699918632 Finish button saves answers. 2013-11-11 16:09:14 +01:00
1345bca75d Added link/method to mark a grading report as finished. 2013-11-11 16:07:07 +01:00
niklas3
e88aebc887 refactorization for downloadlinks 2013-11-11 16:05:42 +01:00
39b86ab3c2 Added feedback when saving changes to the grading report. 2013-11-11 16:01:27 +01:00
1c150c0f60 Minor changes. 2013-11-11 15:54:40 +01:00
c64786c60b Minor clean up. 2013-11-11 15:48:17 +01:00
Per Lundholm
e1651dab62 Created simple test for AbstractAdminIdeaPanel. 2013-11-11 15:38:42 +01:00
niklas3
5f2f89947d Merge remote-tracking branch 'origin/develop' into develop 2013-11-11 15:30:32 +01:00
niklas3
9c0329bbf7 added downloadlink and openlink ot ApproveFinalThesisPanel 2013-11-11 15:30:24 +01:00
2d7cd4772f Merge remote-tracking branch 'origin/develop' into develop 2013-11-11 15:30:14 +01:00
f46961d96b Added submit button. 2013-11-11 15:30:10 +01:00
f16b002e2a Renamed ASSESSMENT to COMMENT. 2013-11-11 15:21:56 +01:00
9447cb7769 Grading report saves comment. 2013-11-11 15:18:00 +01:00
Per Lundholm
d19a342719 Merge remote-tracking branch 'origin/develop' into develop 2013-11-11 15:11:10 +01:00
Per Lundholm
f0ed93dbd3 Made markup more like the panel we are replacing. 2013-11-11 15:11:03 +01:00
332295d759 Grading report saves points. 2013-11-11 14:52:04 +01:00
ea6fb415eb Submitting form saves all assessments. 2013-11-11 14:33:44 +01:00
Emil Siverhall
2c07a9fc09 Merge remote-tracking branch 'origin/develop' into develop 2013-11-11 14:31:21 +01:00
Emil Siverhall
229e1c7d2d loadable detachable model on final thesis panel to refresh correct on new upload. uploader does not refresh though.. 2013-11-11 14:22:16 +01:00
3b4eee7a0c Added assessment text area for every criterion. 2013-11-11 13:57:15 +01:00
f6fe320d1d Added points assignment field for every criterion. 2013-11-11 13:54:28 +01:00
5a8253db6f Displays each criterion's description. 2013-11-11 13:49:12 +01:00
26d3559ae2 Renamed GradingQuestion to GradingCriterion. 2013-11-11 13:43:48 +01:00
6b7219faa8 Merge remote-tracking branch 'origin/develop' into develop 2013-11-11 13:29:52 +01:00
58d9468d2b Grading report panel lists all criteria. 2013-11-11 13:29:47 +01:00
Per Lundholm
f5c1f25474 Merge remote-tracking branch 'origin/develop' into develop 2013-11-11 13:03:14 +01:00