4004 Commits

Author SHA1 Message Date
6bad58f4ea Now shows all final seminar approvals instead of only undecided. 2014-05-05 14:33:02 +02:00
Emil Siverhall
811850f5d2 latest events panel only take forum threads in consideration 2014-05-05 13:41:13 +02:00
026518a2d4 Added more tests. 2014-05-02 10:08:43 +02:00
0542a2f82e Supervisor can now upload a new version if the old one is rejected in the final seminar approval step. 2014-05-02 10:02:54 +02:00
0eb985cd24 Implemented ReviewerDecisionService. 2014-05-02 09:29:35 +02:00
50a9bb0d5d Added the ability to approve final seminar approvals by the reviewer. 2014-05-02 09:11:46 +02:00
062653d43d Added the ability to reject final seminar approvals by the reviewer. 2014-05-02 08:37:50 +02:00
fred-fri
21a9541ad6 Merge remote-tracking branch 'origin/develop' into develop 2014-05-01 15:31:20 +09:00
fred-fri
c2512fc67a hard coded description in property file 2014-05-01 15:30:58 +09:00
5867d72e56 Added table with undecided FinalSeminarApprovals to the reviewing page. 2014-04-30 15:21:12 +02:00
fred-fri
26a0d93cfe removing edit description stuff 2014-04-30 15:42:56 +09:00
Emil Siverhall
0713b85636 issues 2014-04-30 08:06:31 +02:00
Emil Siverhall
54de6ab54d renamed migration scripts and some minor changes 2014-04-29 22:46:47 +02:00
Emil Siverhall
f3b48c6bae Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.html
2014-04-29 22:23:10 +02:00
Emil Siverhall
1ab425cb59 do not notify if not forum thread being replied to 2014-04-29 16:45:42 +02:00
4cc659f711 Minor fixes. 2014-04-29 16:21:58 +02:00
38acc9e225 Implemented FinalSeminarApprovalService. 2014-04-29 16:17:42 +02:00
aa66690fb3 Panel to show the current ongoing process for approving final seminars. 2014-04-29 15:29:52 +02:00
Emil Siverhall
af13350b8b interaction page for reviewers 2014-04-29 14:56:40 +02:00
4431eef165 Panel for the supervisor to initiate the final seminar approval process. 2014-04-29 14:09:52 +02:00
f7626c7e1a Merge remote-tracking branch 'origin/develop' into develop 2014-04-29 13:08:03 +02:00
Emil Siverhall
6bcb331de2 renamed migration scripts and merged reviewer interaction page content 2014-04-29 12:19:51 +02:00
e4d35e202e Created new model for making decisions if final seminar is allowed. 2014-04-29 11:34:47 +02:00
Emil Siverhall
4cc4bbe4ea Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	core/src/main/java/modules/RepositoryModule.java
	view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java
	view/src/test/java/se/su/dsv/scipro/SciProTest.java
2014-04-29 11:31:01 +02:00
fred-fri
3bc95f1f39 added reviewer stuff 2014-04-29 17:48:01 +09:00
Emil Siverhall
6ea1a5e6b9 unthreaded forum shouldn't show reviewer interaction threads 2014-04-29 09:29:53 +02:00
Emil Siverhall
032bf9a19e test tweaking 2014-04-29 08:33:50 +02:00
fred-fri
85b863e380 adding draft to project (simplest possible solution) 2014-04-29 14:21:44 +09:00
fred-fri
e7fb72ab6e added points at reviewing page 2014-04-29 11:58:11 +09:00
fred-fri
438bbb1387 notification fixes 2014-04-29 11:14:39 +09:00
Emil Siverhall
f56cab5b9c service in the wrong root and redirected foreign key on forum_posts 2014-04-28 22:46:54 +02:00
Emil Siverhall
f6a6601304 wild and crazy with the threads 2014-04-28 21:05:52 +02:00
Emil Siverhall
f7b58c2588 thread refactoring 2014-04-28 15:01:11 +02:00
Emil Siverhall
dc5ac5a6cc abstractthread -> ForumThread / ReviewerThread 2014-04-28 08:43:48 +02:00
fred-fri
6d82ea908f filter fix 2014-04-28 13:00:58 +09:00
fred-fri
3785ae1b01 cleanup 2014-04-28 12:17:00 +09:00
fred-fri
22e6254e7c added example filtering 2014-04-25 21:32:27 +09:00
Emil Siverhall
b672af90a4 admin module 2014-04-23 14:34:44 +02:00
Emil Siverhall
823cecde44 new page for phd admin 2014-04-23 13:21:29 +02:00
fred-fri
180097efa3 sonar issues 2014-04-23 15:13:41 +09:00
fred-fri
32a1c74836 mail 2014-04-23 11:49:32 +09:00
Golrokh Moattar
329a3e8a14 Study plan like Research plan 2014-04-22 16:36:08 +02:00
Emil Siverhall
c0e719856e pageable provider, sortable columns, start date column added 2014-04-16 15:44:23 +02:00
Emil Siverhall
efa52f7304 column implementations 2014-04-16 15:24:28 +02:00
Emil Siverhall
0d64e2d3af service method to fetch seminars where grade is not set on active participants, opponents or respondents. 2014-04-16 14:13:43 +02:00
Emil Siverhall
9282e8cfd2 activity plan uploads now counts as project files 2014-04-15 14:28:04 +02:00
Emil Siverhall
e81bc4df6d FileSource.ACTIVITY_PLAN 2014-04-15 13:40:27 +02:00
Emil Siverhall
d8319c6be9 moved FileSource from FileDescription to ProjectFile since it's only being used for these files and default all uploaded files got FileSource.FILES. 2014-04-15 12:59:06 +02:00
Emil Siverhall
09ab424446 removed state-line from project mailevents 2014-04-15 08:57:02 +02:00
Golrokh Moattar
2c6c20c389 GenericDataPanel used in Admin->Statistics->Peers (Peer requests) 2014-04-14 17:12:59 +02:00