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
|
cefb818361
|
implementation of getAnswers
|
2013-11-12 15:37:05 +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 |
|
|
|
e0a9375f2f
|
Fixed version conflict of database migration scripts.
|
2013-11-12 09:50:06 +01:00 |
|
fred-fri
|
c60740a269
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-11-12 17:34:08 +09:00 |
|
Emil Siverhall
|
65fda74b04
|
implemented reportFinished in GradingReportService
|
2013-11-12 09:33:07 +01:00 |
|
fred-fri
|
d8ebb0df84
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2013-11-12 17:32:37 +09:00 |
|
fred-fri
|
ed7381f925
|
user wasnt shown until reload
|
2013-11-12 17:31:16 +09:00 |
|
Emil Siverhall
|
3d7da11ec8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-12 09:23:16 +01:00 |
|
Emil Siverhall
|
769c4bd179
|
added finished boolean to GradingReport
|
2013-11-12 09:22:58 +01:00 |
|
|
|
c6b76669de
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-12 09:09:37 +01:00 |
|
|
|
22a2f0a848
|
Fixed toString including lazy collections which caused Hibernate LIEs.
|
2013-11-12 09:09:31 +01:00 |
|
fred-fri
|
45ed3e8d06
|
removed useless columns
|
2013-11-12 16:21:08 +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 |
|
Emil Siverhall
|
9ca76004cb
|
removed error loggers from idea validation
|
2013-11-11 22:33:06 +01:00 |
|
Emil Siverhall
|
020f43affd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-11 22:27:18 +01:00 |
|
Emil Siverhall
|
fd5860c1e2
|
implementation of assess in GradingReportService
|
2013-11-11 22:26:38 +01: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
|
97c72234f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-11 16:05:49 +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 |
|
Emil Siverhall
|
75242a4e6a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-11 15:38:40 +01:00 |
|
Emil Siverhall
|
d8ba32f28b
|
implementation of getCriteria in GradingReportService
|
2013-11-11 15:38:26 +01:00 |
|
