Emil Siverhall
715adc20e2
Merge branch 'keywordCreationFix' into develop
2012-03-06 13:18:51 +01:00
Emil Siverhall
07a0d5027e
changed the order on the Manage keyword-page. Regular keywords are now at the top, since they are the only to be edited or created
2012-03-06 13:17:31 +01:00
Emil Siverhall
0e5eff46f5
added boolean that decides if a keyword panel should include ability to create and edit keywords. Units and research areas are now not editable in Scipro
2012-03-06 12:56:50 +01:00
Emil Siverhall
c77aa0c8fe
Merge branch 'watsonCharFix' into develop
2012-03-06 11:01:29 +01:00
Emil Siverhall
75f03fe031
changed limit of watson fields to 4000. db changes needed and is included in current.sql
2012-03-06 11:00:38 +01:00
Emil Siverhall
0e0e56a9b8
Merge branch 'supervisorMyProjectIdeas' into develop
2012-03-06 10:26:24 +01:00
Emil Siverhall
9e8ce1f676
removed unused imports
2012-03-06 10:26:09 +01:00
Emil Siverhall
86cad73d55
Merge branch 'supervisorMyProjectIdeas' into develop
2012-03-06 10:22:13 +01:00
Emil Siverhall
8aad7e4056
small alignment fixes for panels
2012-03-06 10:19:27 +01:00
Emil Siverhall
8c45b5ec13
added menu option for new My Project Ideas tab in supervisor view and moved the project idea panel from supervisor start page
2012-03-06 10:19:25 +01:00
Tom Vahlman
2c2e9e3968
Changed size of icon to ImageObject.SIXTEEN.
2012-03-06 10:11:44 +01:00
Fredrik Friis
1287005baa
new db update file
2012-03-06 13:08:55 +09:00
Fredrik Friis
0a5b8ea97e
added suggested reviewer info to supervisor project idea popup
2012-03-06 12:45:48 +09:00
Fredrik Friis
f7599b6714
fixed mixup and made GUI clearer
2012-03-06 12:31:29 +09:00
Fredrik Friis
430d04ec7b
Merge branch 'myBranch' into develop
2012-03-06 11:19:44 +09:00
Fredrik Friis
09f2e6b69e
fixed the links a little
2012-03-06 11:19:06 +09:00
Tom Vahlman
9dbe6b9297
Simplified setup to tests.
2012-03-05 20:23:13 +01:00
Tom Vahlman
3a92cb08f5
Reverted to have @Transactional on method level instead of class level in tests.
2012-03-05 18:03:53 +01:00
Tom Vahlman
6d16b27062
Changed size of Icons to ImageObject.SIXTEEN.
2012-03-05 16:45:30 +01:00
Tom Vahlman
b1b1738277
Replaced deprecated FormFeedbackPanel with a FeedbackPanel + Changed size of Icons to ImageObject.SIXTEEN.
2012-03-05 16:43:47 +01:00
Emil Siverhall
fef14a1679
Merge branch 'supervisorFiltering' into develop
2012-03-05 15:43:37 +01:00
Emil Siverhall
3be38c0b3d
added info box to keyword statistics page
2012-03-05 15:19:06 +01:00
Emil Siverhall
376f073364
added sorting link to supervisor keywords statistics page.
2012-03-05 15:06:22 +01:00
Emil Siverhall
f9dfc55d93
Merge branch 'watsonFix' into develop
2012-03-05 14:31:20 +01:00
Emil Siverhall
15c0db6664
minor changes to watson field counters. using custom validation instead of static StringValidator, to be able to show when user is writing to long inputs
2012-03-05 14:30:59 +01:00
Emil Siverhall
f4cd83843c
added maximum limit of chars for watson boxes and counter with remaining chars
2012-03-05 14:30:56 +01:00
Emil Siverhall
a920500eb2
minor text changes for admin statistics front page
2012-03-05 14:30:54 +01:00
Tom Vahlman
3ede0870a8
Added a Transactional annotation on the test class.
2012-03-05 11:37:33 +01:00
Tom Vahlman
a82385ca46
Added the file test-applicationContext.xml, which replaces all the context files for tests. + Added property default-lazy-init, which is set to true, this means that only the beans that is used in the test are loaded.
2012-03-05 11:29:40 +01:00
Tom Vahlman
9e8b25a1aa
Added the file test-applicationContext.xml, which replaces all the context files for tests.
2012-03-04 22:39:23 +01:00
Tom Vahlman
f092001a60
Merge remote-tracking branch 'origin/develop' into develop
2012-03-04 22:25:18 +01:00
Tom Vahlman
aee07067bf
Added the file test-applicationContext.xml, which replaces all the context files for tests.
2012-03-04 22:24:53 +01:00
Emil Siverhall
b310656688
Merge branch 'supervisorKeywordInfo' into develop
...
* supervisorKeywordInfo:
added filtering on supervisor name to keyword statistics page and some sort improvements when using queryable data provider for the list of supervisors
New tab Statistics under Admin. Moved Supervisor keywords to statistics
added sorting param to SupervisorDaoParams. Employees may now be sorted by appropriate field on linked entities. Sorted by last name on AdminSupervisorKeywordPage
minor corrections
Added new page and panels for supervisor keyword statistics
2012-03-04 21:23:26 +01:00
Emil Siverhall
b925f21b90
added filtering on supervisor name to keyword statistics page and some sort improvements when using queryable data provider for the list of supervisors
2012-03-04 21:18:25 +01:00
Emil Siverhall
9ca65d53d4
New tab Statistics under Admin. Moved Supervisor keywords to statistics
2012-03-04 21:18:22 +01:00
Emil Siverhall
0da8bbb59c
added sorting param to SupervisorDaoParams. Employees may now be sorted by appropriate field on linked entities. Sorted by last name on AdminSupervisorKeywordPage
2012-03-04 21:18:19 +01:00
Emil Siverhall
a323375cd4
minor corrections
2012-03-04 21:18:15 +01:00
Emil Siverhall
f3f559c626
Added new page and panels for supervisor keyword statistics
2012-03-04 21:18:08 +01:00
Tom Vahlman
e211fb3f70
Fixed failed test when adding "LazyInitializationException when adding a match to the match-history of a project idea".
2012-03-04 12:06:22 +01:00
Tom Vahlman
da1fc4358e
LazyInitializationException when adding a match to the match-history of a project idea.
2012-03-04 11:33:50 +01:00
Tom Vahlman
d39998ec63
Made a rollback of previous coding because of a design change of the Match panels.
2012-03-03 16:31:16 +01:00
Tom Vahlman
eafa2fb6f7
Added new method for checking if a Match is previously rejected by a supervisor.
2012-03-03 16:30:24 +01:00
Tom Vahlman
a1c72b9e26
Converted instance variables to locals.
2012-03-03 14:28:17 +01:00
Tom Vahlman
b5b14b00e9
Removed code that was commented out.
2012-03-03 14:17:48 +01:00
Tom Vahlman
1f5c056156
Save and Cancel buttons in wrong place.
2012-03-03 14:15:16 +01:00
Tom Vahlman
ebb41fd09f
Save and Cancel buttons in wrong place.
2012-03-03 14:14:56 +01:00
Tom Vahlman
c9b73d15c3
Wrong button name: "Suggest reviewer" should be "Suggest manually".
2012-03-03 13:54:20 +01:00
Tom Vahlman
63768f0ea8
Confirmed project ideas which are opened by the supervisor should not have any action buttons.
2012-03-02 21:15:14 +01:00
Tom Vahlman
44f1fb80cd
Edit and Delete icons missing in Admin => Project Management list.
2012-03-02 20:54:32 +01:00
Tom Vahlman
21b436e335
The popup "Project ideas" on the supervisors view is too narrow.
2012-03-02 19:22:22 +01:00
