3974 Commits

Author SHA1 Message Date
Emil Siverhall
58330a4f30 Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 15:01:13 +01:00
2f68d528e4 Suppressed unused private field due to Lombok. 2013-11-14 14:52:14 +01:00
Emil Siverhall
da34b36077 removed some logging 2013-11-14 14:49:07 +01:00
36148600c4 Removed unused hibernate imports. 2013-11-14 14:49:00 +01:00
be608a0e35 More logging from workers. 2013-11-14 14:35:59 +01:00
e3c8acf5ac Fixed builder. 2013-11-14 13:56:00 +01:00
Emil Siverhall
b2e8cff5fd Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 13:40:32 +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
18c64616b1 Fixed faulty compareTo in User. 2013-11-14 13:38:45 +01:00
51797a06c4 Fixed faulty builders. 2013-11-14 13:10:57 +01:00
fred-fri
0bdeef22f6 refactoring 2013-11-14 21:08:28 +09:00
d9457d0c3e Removed UserSettings. 2013-11-14 13:01:17 +01:00
fred-fri
fc80b03a7f refactoring 2013-11-14 20:54:42 +09:00
niklas3
11c9d381f0 More builders. 2013-11-14 12:31:48 +01:00
niklas3
a543ab5e62 Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 12:20:57 +01:00
niklas3
88ceed8828 More builders. 2013-11-14 12:20:52 +01:00
Emil Siverhall
ead5e1c463 made GradingReportExport serializable 2013-11-14 12:19:13 +01:00
fred-fri
097b38dcdd refactoring 2013-11-14 19:23:25 +09:00
Emil Siverhall
dcfe5c153c Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 11:15:59 +01:00
Emil Siverhall
996919f1fe added grading report export object to check if a grading report has been exported to daisy 2013-11-14 11:15:41 +01:00
fred-fri
13467f10d1 refactoring 2013-11-14 19:00:03 +09:00
fred-fri
39490f5f35 refactoring 2013-11-14 18:58:24 +09:00
fred-fri
155ee6a7c5 refactoring 2013-11-14 18:46:24 +09:00
d6968df7a9 Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 10:41:00 +01:00
24c272c937 Suppressed unused private fields due to Lombok. 2013-11-14 10:40:57 +01:00
niklas3
787683b7de Merge remote-tracking branch 'origin/develop' into develop 2013-11-14 10:20:35 +01:00
fred-fri
ef269152c8 refactoring filerepo + test 2013-11-14 18:05:46 +09:00
niklas3
0012014c87 Role is now sorted by user and not id. 2013-11-14 09:56:04 +01:00
7298670508 Implemented getFinishedGradingReports. 2013-11-14 09:40:25 +01:00
9295bda26d Deleted. unused methods.
Removed methods from the interface which was only used inside the implementation itself.
2013-11-13 21:41:12 +01:00
niklas3
25041e62f6 Merge remote-tracking branch 'origin/develop' into develop 2013-11-13 17:38:10 +01:00
niklas3
ac8f5f574d Project now has an extended Builder. 2013-11-13 17:37:57 +01:00
niklas3
bfcf66bb7d FinalThesis now has a Builder. Woop. 2013-11-13 16:54:35 +01:00
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
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
858c855a70 Fixed bug where isUploadAllowed returned wrong value. 2013-11-13 13:59:58 +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
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
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
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