fred-fri
|
65c9987a1e
|
added new db update file
20120731
|
2012-07-31 15:27:27 +09:00 |
|
fred-fri
|
77f88e5f0c
|
changed menutype for better visibility
|
2012-07-31 15:19:19 +09:00 |
|
fred-fri
|
0049b57d58
|
current.sql small caps change
|
2012-07-31 11:07:19 +09:00 |
|
fred-fri
|
318f9854d3
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-07-31 10:13:39 +09:00 |
|
fred-fri
|
a373b3c633
|
sql statement fixes
|
2012-07-31 10:13:05 +09:00 |
|
Emil Siverhall
|
59b4528076
|
Merge branch 'm3_application_periods' into develop
|
2012-07-30 15:48:11 +02:00 |
|
Emil Siverhall
|
4e0f55e675
|
mounted new project idea pages to make better looking url's
|
2012-07-30 15:45:05 +02:00 |
|
Emil Siverhall
|
b2e3942851
|
removed some dummy text
|
2012-07-30 15:39:21 +02:00 |
|
Emil Siverhall
|
e86bf38044
|
Merge branch 'm3_application_periods' into develop
|
2012-07-30 15:02:05 +02:00 |
|
Emil Siverhall
|
21c75abeb7
|
now connecting ideas to application periods when supervisors pre-added authors and one of the authors accept it
|
2012-07-30 14:59:19 +02:00 |
|
Emil Siverhall
|
c98549a0f7
|
connecting ideas to currently open application period when being selected by an author
|
2012-07-30 14:50:48 +02:00 |
|
Emil Siverhall
|
ae2edb6f9c
|
authors now only sees ideas on currently open application periods when selecting supervisor provided ideas
|
2012-07-30 14:13:51 +02:00 |
|
Emil Siverhall
|
6902f96bc6
|
added service method to retrieve currently open application periods and unit test to confirm results
|
2012-07-30 10:34:32 +02:00 |
|
Emil Siverhall
|
ccbcdb9d2f
|
added new service and repo classes for application periods
|
2012-07-30 09:04:46 +02:00 |
|
Emil Siverhall
|
a248518f66
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-07-30 08:53:16 +02:00 |
|
Emil Siverhall
|
1e0bac8a56
|
Merge branch 'm3_employee_targets' into develop
|
2012-07-30 08:51:50 +02:00 |
|
fred-fri
|
63afb1feca
|
added both research areas and keywords from both supervisor and students to watsoninfobox
|
2012-07-30 15:51:40 +09:00 |
|
fred-fri
|
99150c67b1
|
changed from hashset to treeset to make match statuses used for filtering always come in same order
|
2012-07-30 15:42:20 +09:00 |
|
fred-fri
|
22e1b4dd0a
|
fixed keywords bug if no matched supervisor
|
2012-07-30 15:37:46 +09:00 |
|
fred-fri
|
3b7986392d
|
changed from assisting sueprvisor to co-supervisor
|
2012-07-30 14:59:09 +09:00 |
|
Emil Siverhall
|
4a7ca19fd6
|
some case-sensitive changes to current.sql
|
2012-07-27 16:02:04 +02:00 |
|
Emil Siverhall
|
1eb7523484
|
added new test methods for availability and author-project ideas datatable to make sure you only see ideas of capable supervisors
|
2012-07-27 15:58:53 +02:00 |
|
Emil Siverhall
|
0a52473b4f
|
datatable in author - project ideas is only showing ideas by supervisors that does not have full target quote
|
2012-07-27 12:58:30 +02:00 |
|
Emil Siverhall
|
15a12b2d34
|
changed text on select project-button in accept idea dialog
|
2012-07-27 12:56:05 +02:00 |
|
Emil Siverhall
|
a7e7876097
|
added popup dialog to abstract project idea page so the popup with confirmed/unconfirmed ideas now comes up on all authors project idea pages
|
2012-07-27 12:42:43 +02:00 |
|
Emil Siverhall
|
aa25711278
|
added info box with target numbers and current numbers to supervisor project idea start page
|
2012-07-26 15:31:39 +02:00 |
|
Emil Siverhall
|
d3d44f403e
|
minor changes to current.sql to make application period optional when creating supervisor idea
|
2012-07-26 13:23:14 +02:00 |
|
Emil Siverhall
|
98f58cc4f2
|
Merge branch 'm3_supervisor_project_ideas' into develop
|
2012-07-26 10:39:09 +02:00 |
|
Emil Siverhall
|
d38f5104c1
|
fixed some merge errors caused by generic data table moved to another package
|
2012-07-26 10:36:43 +02:00 |
|
Emil Siverhall
|
61b2180fb3
|
updated current.sql with db changes
|
2012-07-26 10:32:46 +02:00 |
|
Emil Siverhall
|
b2c5cfc491
|
added filtering on project level on author - project idea datatable and made some refactoring to put table in a panel instead of the page.
|
2012-07-26 10:32:44 +02:00 |
|
Emil Siverhall
|
13807ad06b
|
made sure you cant select yourself as idea partner
|
2012-07-26 10:32:42 +02:00 |
|
Emil Siverhall
|
ed0a4560b0
|
added cancel button to students when already confirmed idea participation. also new dialog on supervisor project idea start page to see if watson boxes are filled in. + authorized for sys admins on new idea pages to make them ready for test server
|
2012-07-26 10:32:40 +02:00 |
|
Emil Siverhall
|
f82710dec5
|
added project idea popup with watson boxes to fill in when student entering project idea tab. also some refactoring of panels that are being used in more than one place
|
2012-07-26 10:32:37 +02:00 |
|
Emil Siverhall
|
468739997b
|
added feedback panel to project idea start page for authors and some submission logic that disallow bachelor students to accept ideas without partner. exemptions still needs to be implemented
|
2012-07-26 10:32:35 +02:00 |
|
Emil Siverhall
|
5b5c5cb7f2
|
added popup dialog for unconfirmed authors with accept and decline buttons. also some more changes to make the structure work with new idea participation objects and updated test class
|
2012-07-26 10:32:33 +02:00 |
|
Emil Siverhall
|
087dc6fb57
|
added new domain object for idea participation to be able to use an extra confirmed column on the join table between ideas and authors
|
2012-07-26 10:32:30 +02:00 |
|
Emil Siverhall
|
12895d5bd8
|
filtering to only show current supervisors idea now working on supervisor - project ideas datatable
|
2012-07-26 10:32:28 +02:00 |
|
Emil Siverhall
|
0e854ff7f1
|
filtering on project class now works at supervisor - project idea datatable
|
2012-07-26 10:32:26 +02:00 |
|
Emil Siverhall
|
5339de38d2
|
some refactoring to first page of supervisor - project ideas
|
2012-07-26 10:32:23 +02:00 |
|
Emil Siverhall
|
8088450860
|
now displaying areas and keywords when student wants to accept an idea created by supervisor
|
2012-07-26 10:32:22 +02:00 |
|
Emil Siverhall
|
af00f4ffca
|
added to not show inactive areas in employee profiles
|
2012-07-26 10:32:19 +02:00 |
|
Emil Siverhall
|
aedf8c01ca
|
changes in profile panel to show new researchareas instead of area keywords
|
2012-07-26 10:32:17 +02:00 |
|
Emil Siverhall
|
324a3fb46b
|
added keywords and research areas to idea submission
|
2012-07-26 10:32:15 +02:00 |
|
Emil Siverhall
|
2d6e1416e8
|
new idea mapped superclass that supervisor and author ideas sholud inherit from
|
2012-07-26 10:32:13 +02:00 |
|
Emil Siverhall
|
4aa9bba308
|
some structure changes to make idea submission on a new page instead of a dialog
|
2012-07-26 10:32:11 +02:00 |
|
Emil Siverhall
|
eaeba71038
|
added text class for supervisor ideas and some new service methods
|
2012-07-26 10:32:09 +02:00 |
|
Emil Siverhall
|
2ad1722d5c
|
added some new pages for the new match3 structure and dialog to accept ideas
|
2012-07-26 10:32:07 +02:00 |
|
Emil Siverhall
|
ca79800488
|
added set of research areas to employee domain object
|
2012-07-26 10:32:05 +02:00 |
|
Emil Siverhall
|
49a33cdfe6
|
added new entity for research areas instead of using keywords for everything. also made appropriate changes to importer facade
|
2012-07-26 10:32:03 +02:00 |
|