fred-fri
|
c8caab2e64
|
working on transactions
|
2014-04-09 19:45:06 +09:00 |
|
Emil Siverhall
|
968e7c533d
|
hide/show all link only visible if previous exists
|
2014-04-09 12:34:16 +02:00 |
|
|
|
85c2751e43
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 12:30:27 +02: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 |
|
Golrokh Moattar
|
92263a1817
|
test problem fixed
|
2014-04-09 11:41:51 +02:00 |
|
Golrokh Moattar
|
f976d14527
|
test problem fixed
|
2014-04-09 11:34:24 +02:00 |
|
Emil Siverhall
|
45728452b6
|
deletion of service objects implemented
|
2014-04-09 11:06:55 +02:00 |
|
Emil Siverhall
|
79b857bfb2
|
cleanup
|
2014-04-09 10:47:41 +02:00 |
|
Emil Siverhall
|
bc5f165207
|
feedback fix
|
2014-04-09 10:35:31 +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 |
|
Emil Siverhall
|
d22696ee77
|
buttons now work fine with more than one participant
|
2014-04-09 09:46:42 +02:00 |
|
Richard
|
0ac513c65a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-09 09:37:13 +02:00 |
|
Richard
|
b161aa0674
|
Added new SciPro Projects header.
Changed title to SciPro Projects, DSV
|
2014-04-09 09:35:55 +02:00 |
|
|
|
c184fcb464
|
Renamed WorkerSchedule to Task
|
2014-04-09 09:30:23 +02:00 |
|
Emil Siverhall
|
02a6b86449
|
added department service panel to supervisor view as well
|
2014-04-09 08:59:16 +02:00 |
|
fred-fri
|
e1fe56abf0
|
creating transaction entity
|
2014-04-09 13:00:11 +09:00 |
|
Emil Siverhall
|
84f37d9181
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 19:53:14 +02:00 |
|
Emil Siverhall
|
458be4486a
|
local feedback in study plan panel
|
2014-04-08 19:53:04 +02:00 |
|
Golrokh Moattar
|
dc00210260
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 17:45:21 +02:00 |
|
Golrokh Moattar
|
5d471999f5
|
GenericDataPanel used in Supervisor->Reviewing->Final seminar preliminary grading report and Examiner->Examining->Final seminar preliminary grading report
|
2014-04-08 17:45:14 +02:00 |
|
Emil Siverhall
|
1be4924511
|
fixed test
|
2014-04-08 17:44:58 +02:00 |
|
Emil Siverhall
|
0ce0143630
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 17:17:10 +02:00 |
|
Emil Siverhall
|
40a4813a69
|
feedback on correct place in research plan panel
|
2014-04-08 17:10:38 +02:00 |
|
Golrokh Moattar
|
524f046d80
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 17:09:16 +02:00 |
|
Golrokh Moattar
|
e9bd729fae
|
GenericDataPanel used in Supervisor->Reviewing->Final seminar preliminary grading report and Examiner->Examining->Final seminar preliminary grading report
|
2014-04-08 17:08:45 +02:00 |
|
Emil Siverhall
|
b00a5ee696
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 17:03:05 +02:00 |
|
Emil Siverhall
|
f6975e68fa
|
display
|
2014-04-08 17:02:30 +02:00 |
|
Emil Siverhall
|
cfe6257664
|
test
|
2014-04-08 16:59:33 +02:00 |
|
Emil Siverhall
|
d78de35209
|
2 x department service panels
|
2014-04-08 16:50:20 +02:00 |
|
|
|
b0625753e9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 16:46:11 +02:00 |
|
|
|
eb6fe5f62a
|
Renamed class to reflect its new purpose.
|
2014-04-08 16:46:01 +02:00 |
|
|
|
caae63a700
|
Minor cleaning.
|
2014-04-08 16:45:36 +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 |
|
Golrokh Moattar
|
0a68951c27
|
GenericDataPanel2 to GenericDataPanel & GenericDataPanel to GenericDataPanel_
|
2014-04-08 16:32:08 +02:00 |
|
Golrokh Moattar
|
88e677413f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 16:27:54 +02:00 |
|
Golrokh Moattar
|
bd4f3ce970
|
GenericDataPanel used in Supervisor->MyProject-> Opposition & Active participations
|
2014-04-08 16:27:35 +02:00 |
|
|
|
737dd6026b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 15:50:12 +02:00 |
|
|
|
7310ff6b59
|
Moved the project exporter and user bulk import to the daisy-integration module.
|
2014-04-08 15:38:43 +02:00 |
|
|
|
33a5096ce9
|
Removed all the static stuff that was left in the Scheduler and hid the implementation behind an interface.
|
2014-04-08 15:26:53 +02:00 |
|
Golrokh Moattar
|
be5b87a1e1
|
GenericDataPanel used in Supervisor->MyProject-> Files
|
2014-04-08 15:02:08 +02:00 |
|
Golrokh Moattar
|
760964291a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-04-08 14:51:15 +02:00 |
|
Golrokh Moattar
|
c801597c4a
|
bootstrap styling on navigations
|
2014-04-08 14:51:07 +02:00 |
|
|
|
5a4c8b8dfc
|
Moved worker-related stuff to core.
|
2014-04-08 14:16:41 +02:00 |
|
Emil Siverhall
|
b065de67e2
|
removed feedback from page and added department service panel (visibility based on module settings)
|
2014-04-08 13:58:40 +02:00 |
|
Emil Siverhall
|
31a6da8e90
|
feedback for department service panel
|
2014-04-08 13:57:13 +02:00 |
|
|
|
63bf727ece
|
Cleaning.
|
2014-04-08 13:50:17 +02:00 |
|
