fred-fri
|
dd553b084f
|
changed name from perform peer review to browse peer requests for supervisor
|
2012-04-30 11:42:00 +09:00 |
|
fred-fri
|
dadbcca9e2
|
Merge branch 'newmessagefix' into develop
|
2012-04-30 11:38:52 +09:00 |
|
fred-fri
|
7c06b3a56a
|
works. some cleanup
|
2012-04-30 11:36:55 +09:00 |
|
fred-fri
|
6e8f4949c6
|
using new service instead of dao
|
2012-04-30 11:36:25 +09:00 |
|
fred-fri
|
0a3f0f47e4
|
new db update file
20120430
|
2012-04-30 10:58:49 +09:00 |
|
fred-fri
|
5359094ed4
|
just stashing changes in order to checkout another branch
|
2012-04-30 10:25:29 +09:00 |
|
fred-fri
|
fa3f57f2e8
|
using new service instead of dao
|
2012-04-27 17:58:01 +09:00 |
|
fred-fri
|
acc41f0dff
|
added messageboard repo and service layer
|
2012-04-27 16:59:18 +09:00 |
|
fred-fri
|
020aa39bd7
|
messageboard name now changes upon project name change
|
2012-04-27 16:54:32 +09:00 |
|
fred-fri
|
6369785b16
|
some cleanup
|
2012-04-26 18:11:04 +09:00 |
|
fred-fri
|
0e3a6929e1
|
this primitive way of doing it works, need patching up though
|
2012-04-26 17:47:56 +09:00 |
|
fred-fri
|
fdc55a9ed9
|
writing methods for finding out what students have more reviews than requests and vice versa
|
2012-04-26 17:38:05 +09:00 |
|
fred-fri
|
a970654dec
|
added count for peer requests
|
2012-04-26 17:22:01 +09:00 |
|
fred-fri
|
24f7fbfd4c
|
added method for counting all of a students peer reviews
|
2012-04-26 17:13:25 +09:00 |
|
fred-fri
|
ebe99e92f3
|
added peer statistics page
|
2012-04-26 15:43:01 +09:00 |
|
fred-fri
|
6dca60b4e1
|
moved do not touch in project idea panel
|
2012-04-26 13:29:03 +09:00 |
|
fred-fri
|
0953c58551
|
moved supervisor do not touch
|
2012-04-26 13:16:44 +09:00 |
|
fred-fri
|
da1bd429ed
|
Merge branch 'basenotify' into develop
|
2012-04-25 18:01:34 +09:00 |
|
fred-fri
|
1c5cf582a2
|
added current sql stuff
|
2012-04-25 18:01:25 +09:00 |
|
fred-fri
|
d0cc8a2314
|
Merge branch 'basenotify' into develop
|
2012-04-25 17:57:10 +09:00 |
|
fred-fri
|
c83d226b48
|
all hookups complete
|
2012-04-25 17:44:45 +09:00 |
|
fred-fri
|
30708aad4e
|
first hookup seems to work fine
|
2012-04-25 17:35:14 +09:00 |
|
fred-fri
|
1da6324fcb
|
notification controller seems to work fine with hooking up to user defined settings
|
2012-04-25 16:48:00 +09:00 |
|
fred-fri
|
fa5c460ebf
|
using models, some bugs fixed
|
2012-04-25 15:21:11 +09:00 |
|
fred-fri
|
18cbc39018
|
using models
|
2012-04-25 15:14:07 +09:00 |
|
|
|
3de1d701da
|
Merge branch 'matchSameLevelSlotsFirst' into develop
|
2012-04-24 15:21:06 +02:00 |
|
Emil Siverhall
|
63329efe8a
|
Merge branch 'peerSpringDataTests' into develop
|
2012-04-24 15:16:07 +02:00 |
|
|
|
effd7739a1
|
Changed compareTo method of match Pair object to order by same degree level FIRST and scoring SECOND. This way master ideas gets matched with master supervisor slots and bachelor ideas with bachelor supervisor slots BEFORE bachelor ideas get matched with master supervisor slots.
|
2012-04-24 15:15:53 +02:00 |
|
Emil Siverhall
|
1c2eb62fd2
|
added unit tests for new peer review/request services
|
2012-04-24 15:15:39 +02:00 |
|
|
|
d990768b24
|
Changed testAvailabilityLevelMatching to reflect the latest change of mind from management. Project ideas should now matched with supervisor availabilities of the same level FIRST, and scoring should come SECOND.
|
2012-04-24 15:12:57 +02:00 |
|
Emil Siverhall
|
b9d18a0a63
|
Merge branch 'springDataTests' into develop
|
2012-04-24 14:30:24 +02:00 |
|
Emil Siverhall
|
d2172fb107
|
added unit tests for new project service and some minor bug fixes to problems that was found while testing.
|
2012-04-24 14:29:51 +02:00 |
|
Emil Siverhall
|
7d45ef87cd
|
Merge branch 'serviceFix' into develop
|
2012-04-24 11:34:19 +02:00 |
|
Emil Siverhall
|
12f889d818
|
added some missed implementation when filtering on author or title in a reviewer or co-supervisor role
|
2012-04-24 11:33:36 +02:00 |
|
Emil Siverhall
|
ccbd47cbf3
|
Merge branch 'latestReviewerLink' into develop
|
2012-04-24 10:31:44 +02:00 |
|
Emil Siverhall
|
9eb276c4fc
|
changes to latest reviewer panel to make the links work for both students and supervisor with correct redirects
|
2012-04-24 10:31:27 +02:00 |
|
Emil Siverhall
|
1c5956f3c4
|
Merge branch 'projectServiceFix' into develop
|
2012-04-24 09:08:21 +02:00 |
|
Emil Siverhall
|
b657122e24
|
small fix on project service to make it return empty lists if not the correct role is found
|
2012-04-24 09:08:08 +02:00 |
|
Emil Siverhall
|
cede90a29c
|
Merge branch 'supervisorPeerMyProjects' into develop
|
2012-04-24 08:55:43 +02:00 |
|
fred-fri
|
9ef9bd2d93
|
finished adding all settings
|
2012-04-24 14:56:55 +09:00 |
|
fred-fri
|
8c477fefdd
|
added final seminar thesis and opposition uploaded settings
|
2012-04-24 14:18:01 +09:00 |
|
fred-fri
|
c1663468c5
|
added final seminar created and edited settings
|
2012-04-24 14:12:51 +09:00 |
|
fred-fri
|
08e70d54cc
|
added conference comment setting
|
2012-04-24 14:03:32 +09:00 |
|
fred-fri
|
02b459b740
|
added all settings to notificationsettings entity
|
2012-04-24 13:57:47 +09:00 |
|
fred-fri
|
bccc90ff88
|
priority setting is not enabled when boolean is false
|
2012-04-24 13:50:20 +09:00 |
|
fred-fri
|
bfdd21dd2b
|
added new setting to page, everything works. should setenabled false when boolean is false though
|
2012-04-24 13:46:55 +09:00 |
|
fred-fri
|
23a5af7caa
|
ajaxdropdown works
|
2012-04-24 13:26:31 +09:00 |
|
fred-fri
|
e1b23659ea
|
added markup for ajaxdropdown
|
2012-04-24 13:21:29 +09:00 |
|
fred-fri
|
d4697110e6
|
ajaxdropdown class created
|
2012-04-24 13:20:16 +09:00 |
|
fred-fri
|
1318478e03
|
singleton notificationsettings loaded
|
2012-04-24 12:51:31 +09:00 |
|
