|
|
037eaef3e7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-11-13 16:52:41 +01:00 |
|
|
|
85cb365956
|
Added worker to send grading reports as PDFs to daisy.
|
2013-11-13 16:52:29 +01:00 |
|
niklas3
|
c374eae818
|
fixed up some visibility logic
|
2013-11-13 16:30:34 +01:00 |
|
niklas3
|
177ce8190b
|
formatting for showing dateRejected and dateApproved
|
2013-11-13 15:44:24 +01:00 |
|
niklas3
|
42af42a095
|
added final thesis approved property
|
2013-11-13 15:24:19 +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
|
858c855a70
|
Fixed bug where isUploadAllowed returned wrong value.
|
2013-11-13 13:59:58 +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 |
|
|
|
83a2809351
|
Created new worker scheduler that uses javas scheduled thread pool to run its workers and it automatically finds all workers to schedule.
|
2013-11-13 11:24:20 +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
|
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 |
|
