4004 Commits

Author SHA1 Message Date
Golrokh Moattar
26694ffc30 GenericDataPanel used in Admin->Statistics->Peers (Peer reviews) 2014-04-14 16:39:49 +02:00
Emil Siverhall
0c5748177d Merge remote-tracking branch 'origin/develop' into develop 2014-04-14 14:54:56 +02:00
Emil Siverhall
5bdb14ce9c removed unused methods from notification service 2014-04-14 14:54:46 +02:00
Golrokh Moattar
bf88eb934b GenericDataPanel used in Admin->Users->Roles 2014-04-14 14:49:08 +02:00
Emil Siverhall
0f9151bb03 replaced generic data panel on notifications tab 2014-04-14 14:19:00 +02:00
fred-fri
d8a563ac43 encoding 2014-04-11 16:03:53 +09:00
fred-fri
35ab1b0248 fixes 2014-04-11 13:47:06 +09:00
3c30091775 Bootstrap styled the form for adding new transactions.
Changed bean property to Integer to render the placeholder instead of 0.
2014-04-10 15:04:47 +02:00
b030ce04e6 Only peer checklists with the correct project type are displayed for selection when submitting a peer request. 2014-04-10 14:32:02 +02:00
7aa53717d8 Merge remote-tracking branch 'origin/develop' into develop 2014-04-10 10:48:22 +02:00
71b4a51d22 Removed stupid stuff that eventually did nothing. 2014-04-10 10:43:20 +02:00
fred-fri
b761a789b0 added budget module and annotated relevant components 2014-04-10 16:50:40 +09:00
fred-fri
76ccb01d91 sonar 2014-04-10 12:21:37 +09:00
fred-fri
b7bc57199d sonar 2014-04-10 12:20:03 +09:00
fred-fri
41a0b34db9 removed redundant stuff 2014-04-10 11:50:54 +09:00
Golrokh Moattar
f3d6ca9281 Merge remote-tracking branch 'origin/develop' into develop 2014-04-09 16:36:45 +02:00
Golrokh Moattar
20dce4e35f GenericDataPanel used in Admin->Match->Ideas 2014-04-09 16:36:40 +02:00
Emil Siverhall
e2d62ed668 file attachment on save instead of submit when handling opposition- and preliminary grading reports 2014-04-09 16:02:05 +02:00
Emil Siverhall
c285eef4b4 added second peer review event to milestone activator 2014-04-09 15:07:26 +02:00
fred-fri
e326d14b20 Merge remote-tracking branch 'origin/develop' into develop 2014-04-09 20:56:01 +09:00
0845bd9bf4 Merge remote-tracking branch 'origin/develop' into develop 2014-04-09 13:35:19 +02:00
4f9247d2c9 Changed Worker interface to fit our actual worker needs. Used the Worker interface instead of AbstractWorker everywhere. 2014-04-09 13:20:54 +02:00
Emil Siverhall
c48b719d2f Merge remote-tracking branch 'origin/develop' into develop 2014-04-09 13:11:39 +02:00
Emil Siverhall
414da2b6c6 fixed saving of active participant state on final seminars 2014-04-09 13:11:28 +02:00
d16822788d Refactoring. 2014-04-09 12:58:55 +02:00
9b275bfeeb Permuated 2014-04-09 12:54:49 +02:00
f4ebf75a37 Task now holds a reference to its schedule rather than period directly. 2014-04-09 12:48:13 +02:00
fred-fri
b04387d278 working on transactions 2014-04-09 19:31:05 +09:00
fred-fri
d1cc8ab1c7 working on transactions 2014-04-09 19:25:26 +09:00
7f0eabbccb Removed the generic parameter from Task. 2014-04-09 12:22:47 +02:00
2ed8a23a34 Refactoring. 2014-04-09 12:21:12 +02:00
fac068acc5 The scheduler now keeps track of running tasks. 2014-04-09 12:19:10 +02:00
1a7da89f18 Switched from int to long 2014-04-09 11:41:53 +02:00
d3e3c20a7f Refactored so that Scheduler exposes Tasks, not AbstractWorker. 2014-04-09 10:13:49 +02:00
400ea78dcc Manually starting tasks is now done via the scheduler. 2014-04-09 09:55:10 +02:00
275ae7afab Merge remote-tracking branch 'origin/develop' into develop 2014-04-09 09:51:31 +02:00
64a6d397bf Made execute a public method on the Scheduler interface. 2014-04-09 09:50:49 +02:00
c184fcb464 Renamed WorkerSchedule to Task 2014-04-09 09:30:23 +02:00
c833d238f2 Renamed timer to scheduledExecutorService. 2014-04-09 09:28:35 +02:00
bf07b0633f Added basic tests to the scheduler. 2014-04-09 09:27:34 +02:00
5ed17b0d8b Made the ScheduledExecutorService injected instead of created. 2014-04-09 09:00:20 +02:00
07c9044287 Renamed method. 2014-04-09 08:51:08 +02:00
83b040c512 Created two separate Schedule implementations (Repeating and Daily) so that the delay is not fixed at creation for the Daily schedule. 2014-04-09 08:49:01 +02:00
fred-fri
75d75c6eea creating transaction entity 2014-04-09 13:00:57 +09:00
Emil Siverhall
12e819b64c renamed migration script 2014-04-08 17:04:09 +02:00
Emil Siverhall
b00a5ee696 Merge remote-tracking branch 'origin/develop' into develop 2014-04-08 17:03:05 +02:00
07d0789c1e Small refactoring. 2014-04-08 16:49:21 +02:00
b0625753e9 Merge remote-tracking branch 'origin/develop' into develop 2014-04-08 16:46:11 +02:00
f0e097ba64 Scheduler/GuiceWebApplication is no longer responsible for scheduling workers. It is now done by the temporary (yeah right) TemporaryWorkerScheduler. 2014-04-08 16:44:35 +02:00
Emil Siverhall
6c794a1425 obladi oblada 2014-04-08 16:33:18 +02:00