DMC/scipro
7
0
Fork 0
Code Issues 32 Pull Requests 2 Actions Projects 1 Wiki Activity
4,290 Commits 6 Branches 412 Tags
Commit Graph

4290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tom Vahlman
c8846e5ff9 Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop 2012-03-02 15:30:28 +01:00
Tom Vahlman
7008916810 Removed faulty Java doc. 2012-03-02 15:30:13 +01:00
Tom Vahlman
538109c5e1 Variable should be initialized locally. 2012-03-02 15:25:24 +01:00
Tom Vahlman
e5d30021ab The action panel should be the default panel not the project idea info. 2012-03-02 15:24:55 +01:00
Tom Vahlman
aedf9846f7 Variable should be initialized locally. 2012-03-02 15:24:22 +01:00
Tom Vahlman
711360c6f3 Save and Cancel buttons are wrong positioned. 2012-03-02 15:23:38 +01:00
Tom Vahlman
b6ad21fc62 Changed table name projectIdea. 2012-03-02 15:05:42 +01:00
anto-gom
30c03073b7 Merge remote-tracking branch 'origin/develop' into develop 2012-03-02 14:44:39 +01:00
anto-gom
04f9f2cd09 Modified ProjectIdeaActionPanel to reflect new parameters for ManualMatchPanel constructor. 2012-03-02 14:28:39 +01:00
Tom Vahlman
ec93b62927 Merge remote-tracking branch 'origin/develop' into develop 2012-03-02 14:24:13 +01:00
Tom Vahlman
28c21355a6 Removed unused bean injection. 2012-03-02 14:24:03 +01:00
anto-gom
5c024cd125 Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into projectreviewer 2012-03-02 14:23:27 +01:00
anto-gom
be9b940d3c Changed .gitignore to include Thumbs.db 2012-03-02 14:17:58 +01:00
anto-gom
692f16258f Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into projectreviewer 
Conflicts:
	src/main/java/se/su/dsv/scipro/admin/panels/ManualMatchPanel.html
	src/main/java/se/su/dsv/scipro/admin/panels/match/AdminEditProjectIdeaPanel.java
	src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.html
	src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.java
 2012-03-02 13:53:51 +01:00
Tom Vahlman
e8f5fe17d5 Removed unused import statement. 2012-03-02 13:43:30 +01:00