6886 Commits

Author SHA1 Message Date
1568581add Removed duplicate final thesis panel in supervisor project view. 2013-11-14 13:44:44 +01:00
Emil Siverhall
e9377dae99 supervisors is not allowed to see the grading tab if the projects project class doesn't have a grading report template 2013-11-14 13:40:22 +01:00
Richard
f7021b3ede Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 13:09:43 +01:00
Richard
61b36bff4b HTML changes to the activity plan templates panels and the activity plan panel. 2013-11-14 13:09:31 +01:00
d9457d0c3e Removed UserSettings. 2013-11-14 13:01:17 +01:00
niklas3
af63f3a134 pushing 2013-11-14 10:37:19 +01:00
niklas3
4b9b6ebec6 Fixd refactoring fail 2013-11-14 10:30:47 +01:00
c37efd5d0b Added final thesis panel to supervisor project details page. 2013-11-14 10:11:14 +01:00
Richard
96be2755f4 Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 09:46:30 +01:00
fred-fri
47a7d1819e hiding 2013-11-14 12:02:40 +09:00
niklas3
ac8f5f574d Project now has an extended Builder. 2013-11-13 17:37:57 +01:00
Richard
705167b234 Started to style final thesis panels. 2013-11-13 17:30:32 +01:00
niklas3
c374eae818 fixed up some visibility logic 2013-11-13 16:30:34 +01:00
niklas3
4647163491 More approved thesis info 2013-11-13 14:40:12 +01:00
niklas3
7c4e0b9705 Tests the correctness of the final thesis file name. 2013-11-13 14:22:59 +01:00
niklas3
d8e2cb4ec4 Added ApprovedPanel and RevisionPanel to FinalThesisPanel. 2013-11-13 13:59:21 +01:00
niklas3
63fdc78eaa Merge remote-tracking branch 'origin/develop' into develop 2013-11-13 13:12:49 +01:00
niklas3
c969d0c4c6 Clean up in aisle 4. 2013-11-13 13:12:41 +01:00
053c9f26ee Merge remote-tracking branch 'origin/develop' into develop 2013-11-13 11:24:26 +01:00
Emil Siverhall
b2de50b190 added missing call to ReviewPanel onConfigure() 2013-11-13 09:57:26 +01:00
2e8597d2a2 Merge remote-tracking branch 'origin/develop' into develop 2013-11-13 09:12:26 +01:00
Emil Siverhall
ee2cd801a5 minor refactoring to download 2013-11-12 23:16:16 +01:00
Emil Siverhall
279e8794cb text download of grading report 2013-11-12 22:46:33 +01:00
niklas3
7773ef4277 Merge remote-tracking branch 'origin/develop' into develop 2013-11-12 16:10:12 +01:00
niklas3
315fe341bf added upload forms for supervisor when student's have not uploaded a final thesis or their latest final thesis is rejected 2013-11-12 16:10:05 +01:00
c135574fa1 Merge remote-tracking branch 'origin/develop' into develop 2013-11-12 15:45:58 +01:00
Emil Siverhall
eeb032225e more work with download resource 2013-11-12 15:18:31 +01:00
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