3974 Commits

Author SHA1 Message Date
niklas3
c083306555 Added ThesisApprovedPanel and added approvedDate to FinalThesis 2013-11-12 13:37:45 +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
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
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
Emil Siverhall
9ca76004cb removed error loggers from idea validation 2013-11-11 22:33:06 +01:00
Emil Siverhall
fd5860c1e2 implementation of assess in GradingReportService 2013-11-11 22:26:38 +01:00
niklas3
9e88ca9c0c Merge remote-tracking branch 'origin/develop' into develop 2013-11-11 16:51:28 +01:00
niklas3
7ca4cf7740 added date of uploaded final thesis 2013-11-11 16:33:40 +01:00
271cf5979d Merge remote-tracking branch 'origin/develop' into develop 2013-11-11 16:12:11 +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
Emil Siverhall
d8ba32f28b implementation of getCriteria in GradingReportService 2013-11-11 15:38:26 +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
Emil Siverhall
cfa5b94160 implemented getDescription in GradingReportService 2013-11-11 15:10:23 +01:00
332295d759 Grading report saves points. 2013-11-11 14:52:04 +01:00
cdd4cc4aa1 Added final method to GradingReportService to enable parallel development. 2013-11-11 14:31:32 +01:00
26d3559ae2 Renamed GradingQuestion to GradingCriterion. 2013-11-11 13:43:48 +01:00
58d9468d2b Grading report panel lists all criteria. 2013-11-11 13:29:47 +01:00
97bf968125 Merge remote-tracking branch 'origin/develop' into develop 2013-11-08 17:56:46 +01:00
ea63bc1dd6 Start of grading report gui used by supervisors for filling out grading report templates. 2013-11-08 17:56:42 +01:00
niklas3
430c165dc5 Notifications goes out to all concerned parties on final thesis approval. 2013-11-08 17:14:05 +01:00
niklas3
7587137dce Merge remote-tracking branch 'origin/develop' into develop 2013-11-08 17:11:31 +01:00
ff8cf4785d Retrieving a FileDescription by identifier now adds uploader information as well.
Checking for the existence of a file no longer throws exceptions, returns false.
2013-11-08 15:34:53 +01:00
Emil Siverhall
5452ed53dd Merge remote-tracking branch 'origin/develop' into develop 2013-11-08 14:14:56 +01:00
Emil Siverhall
625c32b3ed added bachelor grading report template to flyway migration script + feedback attribute to answers 2013-11-08 14:14:18 +01:00
niklas3
944834cbd5 Merge remote-tracking branch 'origin/develop' into develop 2013-11-08 14:12:36 +01:00
niklas3
44d585977a Added @Data to ForumPost. 2013-11-08 14:11:56 +01:00
niklas3
b921b8d4f1 Added @Data to ForumThread. 2013-11-08 14:07:34 +01:00
c90c8d1a18 Merge remote-tracking branch 'origin/develop' into develop 2013-11-08 09:58:49 +01:00
552a7fd006 Removed search index since there is no configuration for it and it is not used. 2013-11-08 09:58:45 +01:00
Emil Siverhall
e15f05e061 Merge remote-tracking branch 'origin/develop' into develop 2013-11-08 09:38:43 +01:00
Emil Siverhall
c208404ff8 grading report entities and migration script 2013-11-08 09:38:11 +01:00
Emil Siverhall
6aefd1a5e9 Started working on grading report entitites 2013-11-08 08:41:01 +01:00
fred-fri
6f442ff84d removed ehcache 2013-11-08 13:49:01 +09:00
fred-fri
7c46671c66 removed all cache annotations 2013-11-08 12:31:33 +09:00
819f6f4654 Fixed violations. 2013-11-07 17:01:31 +01:00
1daf8822dc Merge remote-tracking branch 'origin/develop' into develop 2013-11-07 16:16:41 +01:00
b195f10dd7 Fixed critical issues. 2013-11-07 16:16:36 +01:00
Emil Siverhall
e73cdd65e3 Merge remote-tracking branch 'origin/develop' into develop 2013-11-07 14:54:15 +01:00
Emil Siverhall
a2cabad87e removed unnecessary one-to-many relationship milestone phase -> milestone activities. 2013-11-07 14:53:34 +01:00