fred-fri
b3341f0481
Merge branch 'release20130301'
2013-03-01 12:39:13 +09:00
fred-fri
1e1b391496
new db file
2013-03-01 12:39:05 +09:00
fred-fri
cb2acb9e12
level fix on idea submission page
2013-03-01 12:12:56 +09:00
fred-fri
62b9435786
fixed conflicts
2013-03-01 11:29:03 +09:00
b47dc11271
Updated misbehaving test to use the new assertSameContent method instead of relying on some implicit ordering
2013-02-28 21:39:25 +01:00
1210c5f3cb
Assert utility class for checking collection contents
2013-02-28 21:06:23 +01:00
68c3b56e39
Test ignored that relies on implicit ordering.
...
Needs to be rewritten to not expect a specific order when ordering is not specified in the query.
The order returned differs from jenkins and local machine.
2013-02-28 17:36:15 +01:00
49c19b08ba
Fixed name/email filtering.
2013-02-28 14:19:20 +01:00
e3234486ff
UserService now uses JPA features to filter based on entity class.
2013-02-28 14:19:20 +01:00
622521f5c6
Hibernate and HSQLDB updated to latest versions.
...
TestQuerySet ignored due to problems with lazy execution (only tests should be deprecated DAO classes anyway)
Some other DAO tests changed since they relied on an implicit ordering and failed since new version returned in different order.
Stupid backport package gone and imports removed and now uses java.util instead of edu.emory.mathcs.backpart.java.util.
2013-02-28 14:19:20 +01:00
0ad88a1225
Temporarily ignored tests due to final seminar cancellation issues
2013-02-28 14:05:07 +01:00
c3b6329d0e
Hid some html elements which are not relevant till we solve cancellation issues.
2013-02-28 14:01:26 +01:00
d954da518e
More half-merges. Landing page and property.
2013-02-28 13:58:55 +01:00
3840978f67
Merged delete notifications from thesis upload days ahead branch.
2013-02-28 13:51:05 +01:00
Emil Siverhall
aef140c484
Merge branch 'supervisorNameBug' into develop
2013-02-28 11:51:35 +01:00
Emil Siverhall
ac2fe22aef
hooked up hasPassed method to appropriate columns
2013-02-28 11:48:38 +01:00
Emil Siverhall
3f490edc01
new app period service method to check if course start date has passed
2013-02-28 10:35:01 +01:00
Emil Siverhall
7d35d3cf68
renamed courseStartIsReached method to courseStartIsThisDay since that's what the method actually checks for
2013-02-28 10:07:57 +01:00
Emil Siverhall
77d7808578
Merge branch 'levelSpecificSettings' into develop
2013-02-28 09:46:15 +01:00
Emil Siverhall
6b8901b0bc
text change on system settings page
2013-02-28 09:46:05 +01:00
Emil Siverhall
d5eff38ed2
changed to only count days on finalSeminarCreateDaysAhead setting. a seminar may now be created x no of days from now even if selected time is before current time of day
2013-02-28 09:46:03 +01:00
Emil Siverhall
c0fe62b72d
cleanup
2013-02-28 09:46:00 +01:00
Emil Siverhall
1f132719ee
changed how addition of opponents works, since we don't want to remove already existing opponents when adding new. we now only use the component to add new students, not remove already existing since we have the remove opposition link for that
2013-02-28 09:45:58 +01:00
Emil Siverhall
92fc95aa2a
changed to retrieve a list of authors active projects when supervisors adding opponents. if more than one available, manual addition is not allowed. We could use list in a dropdown for further implementation
2013-02-28 09:45:56 +01:00
Emil Siverhall
55b56605b7
added test for invalid number of max oppositions
2013-02-28 09:45:54 +01:00
Emil Siverhall
9855b67e26
now using minimum integers from project class settings instead of general system settings. added properties file for better looking error message when trying to add less than the minimum amount
2013-02-28 09:45:52 +01:00
Emil Siverhall
58454548cf
removed some settings from general system settings that now are located in project class settings instead
2013-02-28 09:45:50 +01:00
Emil Siverhall
264aae614b
added new settings to system settings page
2013-02-28 09:45:47 +01:00
Emil Siverhall
e7de4aee8c
added min opponents/active participants to project class settings. supervisor should not be allowed to enter a number less than these settings when creating seminars
2013-02-28 09:45:45 +01:00
Emil Siverhall
54dac5bdd5
structure changes in seminar panel
2013-02-28 09:45:43 +01:00
Emil Siverhall
7b0243cd1e
using new constructor when creating new final seminars to retrieve correct max opponents/active participation numbers
2013-02-28 09:45:41 +01:00
Emil Siverhall
9f41e62e49
added opponent addition to the seminar crud panel
2013-02-28 09:45:39 +01:00
Emil Siverhall
3f774f7e20
convenience methods to easier reach maxOpponents and maxParticipants for a project class and final seminar constructor that takes maxOpps and maxActivePart...
2013-02-28 09:45:37 +01:00
Emil Siverhall
6c098363d3
final seminar settings page now have list view with active levels where admins may set max opponents and participants. also added separate header for turnitin settings to split the page a bit. maybe a new page for those would be more suitable
2013-02-28 09:45:35 +01:00
Emil Siverhall
c4d674a328
level specific settings for max opponents/participants added to project class settings do
2013-02-28 09:45:33 +01:00
fred-fri
15d12b2c94
cleanup
2013-02-28 11:32:52 +09:00
fred-fri
fbf681fb4f
removed unnecessary stuff. all tests work now. not sure about how to test leakage of state between when and verify calls
2013-02-28 11:08:38 +09:00
fred-fri
0294d9749d
removed unnecessary stuff and added mocks to sciprotest
2013-02-28 11:06:26 +09:00
fred-fri
9543087bdd
removed unnecessary stuff
2013-02-28 10:58:40 +09:00
fred-fri
bf30f369fc
removed unnecessary stuff
2013-02-28 10:51:07 +09:00
fred-fri
8b4b6529e6
removed unnecessary stuff
2013-02-28 10:45:43 +09:00
fred-fri
8446281a75
removed unnecessary stuff
2013-02-28 10:44:52 +09:00
fred-fri
2e8da315dd
removed unnecessary stuff
2013-02-28 10:43:29 +09:00
fred-fri
b37be67652
removed unnecessary stuff and added some mocks to sciprotest
2013-02-28 10:41:51 +09:00
fred-fri
d75c5dfce6
removed unnecessary stuff
2013-02-28 10:35:34 +09:00
fred-fri
5b7b6172e7
removed unnecessary stuff from pagetest
2013-02-28 10:34:34 +09:00
fred-fri
5b0271d238
added some daos to sciprotest
2013-02-28 10:30:57 +09:00
fred-fri
004220225d
some modifications to make seminarcrudpaneltest work
2013-02-28 09:36:11 +09:00
Jona Ekenberg
6480d5b512
updatterade forummockups
2013-02-27 17:31:35 +01:00
fred-fri
3a84d4beca
added a bunch of mocks, very blunt
2013-02-27 12:14:34 +09:00
