12557 Commits

Author SHA1 Message Date
fred-fri
12f4705504 creating new page for preliminary grade report 2014-01-06 15:53:35 +09:00
fred-fri
ea1513935b creating new page for preliminary grade report 2014-01-06 15:25:00 +09:00
fred-fri
f00fdbf10f creating new page for preliminary grade report 2014-01-06 15:10:26 +09:00
fred-fri
a30e6e7d55 creating new page for preliminary grade report 2014-01-06 13:30:43 +09:00
fred-fri
e422524034 creating new page for preliminary grade report 2014-01-06 13:17:08 +09:00
Emil Siverhall
729be47ddf issues 2014-01-03 13:39:43 +01:00
Emil Siverhall
b3c5e33e89 some technical debt 2014-01-03 12:44:37 +01:00
Emil Siverhall
9989caa3fe Merge remote-tracking branch 'origin/develop' into develop 2014-01-03 10:17:55 +01:00
Emil Siverhall
16547719b1 beta annotations on grading tab and approve final thesis panel 2014-01-03 09:52:25 +01:00
fred-fri
1765d81b0f making checkbox usable by students if milestoneactivity iseditablebystudents 2014-01-03 17:33:10 +09:00
fred-fri
307fe88d0f added new boolean editablebystudents to milestoneactivity 2014-01-03 17:09:39 +09:00
fred-fri
62ef4289a8 removing project type unknown 2014-01-03 14:45:21 +09:00
fred-fri
2b18b37256 removing project type unknown 2014-01-03 14:37:58 +09:00
fred-fri
6779b50e12 removing project type unknown 2014-01-03 14:12:16 +09:00
Emil Siverhall
ae9e63c720 fixed import 2014-01-02 16:11:43 +01:00
Emil Siverhall
9e1544a7c2 new beta auth role 2014-01-02 15:58:25 +01:00
Emil Siverhall
3b366779ed Added new beta role entity 2014-01-02 15:34:33 +01:00
Emil Siverhall
06e365380d Merge remote-tracking branch 'origin/develop' into develop 2014-01-02 13:45:56 +01:00
Emil Siverhall
19637fd467 catch illegal state exception when trying to submit a form that's been changed between save and submit 2014-01-02 13:42:50 +01:00
fred-fri
f405cdd6f7 only import first and second cycle theses from daisy 2014-01-02 17:29:00 +09:00
Richard
cf00b56ffb Merge remote-tracking branch 'origin/develop' into develop 2013-12-20 17:32:03 +01:00
Richard
3c963be2d5 First styling of the reviewerGradingReport.
Minor style changes to the supervisorGradingReport.
2013-12-20 17:31:54 +01:00
f41dba3aef Removed unused code. 2013-12-20 17:19:45 +01:00
fedd9d708c Removed unused method. 2013-12-20 17:16:18 +01:00
82eb6e2a9f Removed unused methods. 2013-12-20 17:14:31 +01:00
21b47a5072 Removed unused method. 2013-12-20 17:12:53 +01:00
2ce58025de Merge remote-tracking branch 'origin/develop' into develop 2013-12-20 17:11:54 +01:00
6444407156 Removed unused method. 2013-12-20 17:11:50 +01:00
Leo
b766ccb2e4 Merge remote-tracking branch 'origin/develop' into develop 2013-12-20 17:04:42 +01:00
Leo
db6be5e9fd fixed a bug 2013-12-20 17:04:30 +01:00
d472c13c37 MailEventWorker does not delete MailEvent entities if the application is running in TEST mode. 2013-12-20 16:46:16 +01:00
24b031c06f When adding a project schedule to a project at start date now uses any specified default activity plan template for the projects type. 2013-12-20 16:20:21 +01:00
4f2b37281f Merge remote-tracking branch 'origin/develop' into develop 2013-12-20 16:11:01 +01:00
5cbf72537f Added reference to default activity plan template reference from ProjectType. 2013-12-20 16:10:56 +01:00
Leo
ade0be1f6f Merge remote-tracking branch 'origin/develop' into develop 2013-12-20 16:09:02 +01:00
Leo
7837a370d8 changed logic for activating download button because the previous was somewhat faulty 2013-12-20 16:08:47 +01:00
a2ffe38f82 Added column referencing schedule_template to ProjectType to enable setting a default activity plan template to be added to projects for that type. 2013-12-20 16:06:40 +01:00
Leo
fe024bfa3f Merge remote-tracking branch 'origin/develop' into develop 2013-12-20 15:47:55 +01:00
Leo
77cd6286c7 added confirmation dialogs to submit buttons in grading report 2013-12-20 15:47:47 +01:00
2b2bdf62b1 Copying a report now also copies the plagiarism feedback. 2013-12-20 15:41:43 +01:00
33179bc73e Merge remote-tracking branch 'origin/develop' into develop 2013-12-20 15:35:18 +01:00
ff74377b61 Removed stupid new Date() parameter from a bunch of methods in ApplicationPeriodService.
The tests are now stupid. Favor integration tests for simple methods only delegating all the sorting/ordering/filtering to the database.
2013-12-20 15:35:15 +01:00
Emil Siverhall
ac98d568e6 do not allow copying to submitted reports 2013-12-20 15:34:39 +01:00
Emil Siverhall
40c40ab160 component feedback panels on author idea submissions as well 2013-12-19 22:27:37 +01:00
Emil Siverhall
beae9fe35d CounterTextArea now has it's own component feedback panel 2013-12-19 22:13:25 +01:00
Emil Siverhall
1f0a03943c no need to pass co author to choice component since we don't allow editing of submitted ideas 2013-12-19 21:01:57 +01:00
Emil Siverhall
c1404fbb87 Merge remote-tracking branch 'origin/develop' into develop 2013-12-19 17:06:48 +01:00
Emil Siverhall
d040c56e1f component feedback panels on supervisor idea submission page 2013-12-19 17:06:37 +01:00
Richard
6850fedddc Added white-space: pre-wrap to grading report criterions. 2013-12-19 17:04:34 +01:00
69900e2498 Changed setSubmitted to a one-way method. No backsies! 2013-12-19 16:51:30 +01:00