DMC/scipro
7
0
Fork 0
Code Issues 31 Pull Requests 3 Actions Projects 1 Wiki Activity
3,718 Commits 7 Branches 413 Tags
Commit Graph

3718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Tom Vahlman
a1f3d8e334 Removed unused files. 2012-03-02 13:43:06 +01:00
Tom Vahlman
fe7bcf78c3 The action buttons should be the default option when selecting the dialog "Match>P-idea>Edit" to make life easier for the administration. 2012-03-02 11:58:53 +01:00
Tom Vahlman
45c57cd513 Merge remote-tracking branch 'origin/develop' into develop 2012-03-02 11:55:35 +01:00
Tom Vahlman
6db2b1cac2 Cancel and Save wrong posistioned in the dialog Match>P-idea>Edit>"Match manually" 2012-03-02 11:55:21 +01:00
anto-gom
6c4eb10b2b Fixed parts of the new ProjectIdeaActionPanel that were not working. 2012-03-02 11:42:18 +01:00
Alexander Kozynchenko
3aed0817a9 Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop 2012-03-02 11:22:37 +01:00
Tom Vahlman
db387c76d2 Removed code that has been commented out. 2012-03-02 11:14:45 +01:00
Tom Vahlman
9b4b10fe1e Removed code that has been commented out. 2012-03-02 11:13:35 +01:00
Tom Vahlman
0ef12f67bb Disabled action buttons accepted (Status.COMMITED) project ideas in the supervisor GUI. 2012-03-02 11:12:38 +01:00
Alexander Kozynchenko
d6fd04ecd8 Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop 2012-03-02 11:09:10 +01:00
Tom Vahlman
900b06228d Added a test to verify that the match algorithm considers availability (both per project class and "total availability")and "project class" when sorting matches according to relevance. 2012-03-02 10:05:27 +01:00
anto-gom
f3148f7abc Removed an unclosed, unneeded markup element causing the page to fail HTML validation. 2012-03-02 09:22:54 +01:00
anto-gom
1e9efa0359 Created a panel for manually suggesting a reviewer for a project idea. 2012-03-02 09:22:07 +01:00
anto-gom
e1b136ea42 Added reviewer as a filterable Param to ProjectIdeaDao and its implementation class. 2012-03-02 09:13:29 +01:00
anto-gom
fde55d3944 Wrote at test for entity ProjectIdea reviewer field. 2012-03-02 09:12:16 +01:00
anto-gom
e804c146de Added a change to the database in current.sql 2012-03-02 09:10:56 +01:00
anto-gom
8e93e29166 Added the reviewer field to ProjectIdea and fixed an incorrect ORM multiplicity. 2012-03-02 09:10:13 +01:00
Tom Vahlman
0595121bc9 Added a test to verify that the match algorithm considers availability (both per project class and "total availability")and "project class" when sorting matches according to relevance. 2012-03-01 19:10:22 +01:00
Tom Vahlman
06a2afff12 Added a possibility for the administrator to match manually to Suggested (PUBLISHED). 2012-03-01 17:03:20 +01:00
Tom Vahlman
bedbefaa6b There should not be any actions on the watson information panel. Action-buttons should only resist on the Action-panel. 2012-03-01 16:25:39 +01:00
Tom Vahlman
50397b8189 Changed the text for the API doc. 2012-03-01 16:23:43 +01:00
Alexander Kozynchenko
6ced38a99c Maintaining a consistent layout using a single page: swapping tables with different content using panels. 2012-03-01 14:31:59 +01:00