Emil Siverhall
|
cb0387472a
|
added new column that may be used with datatables. the column takes two icons in the constructor and displaying appropriate icon in the column depending on a boolean value
|
2012-08-02 16:03:37 +02:00 |
|
Emil Siverhall
|
9484791d60
|
added first meeting entity and fields for adding this in the supervisor project idea details dialog.
|
2012-08-02 16:03:35 +02:00 |
|
fred-fri
|
966616f297
|
Merge branch 'erase' into develop
|
2012-08-02 12:06:01 +09:00 |
|
fred-fri
|
c5777e7fb0
|
removed unecessary stuff from generalsystemsettings and added remove statements to current.sql
|
2012-08-02 12:04:18 +09:00 |
|
fred-fri
|
b0741b8421
|
deleted lots of old panels
|
2012-08-02 12:01:41 +09:00 |
|
fred-fri
|
7991a7e8c4
|
removed artifacts for force accept
|
2012-08-02 11:49:04 +09:00 |
|
fred-fri
|
82a6d8d3ef
|
removed manual suggesting and matching algorithm suggesting
|
2012-08-02 11:46:26 +09:00 |
|
fred-fri
|
7d01e1bbb1
|
fixed fetchtype eager bug and lazy loading exception by reloading the project idea before sending it to watsonpanel
|
2012-08-02 11:44:43 +09:00 |
|
Emil Siverhall
|
47b36f75f6
|
Merge branch 'm3_first_meeting' into develop
|
2012-08-01 13:00:54 +02:00 |
|
Emil Siverhall
|
558e78d599
|
disabled the possibilitu for students to submit their own idea if they are already included in a supervisor provided idea
|
2012-08-01 11:34:56 +02:00 |
|
Emil Siverhall
|
adaded1029
|
Merge branch 'm3_number_of_ideas' into develop
|
2012-08-01 10:49:04 +02:00 |
|
Emil Siverhall
|
85aee3cd2a
|
added logic to prevent authors from selecting more than one supervisor idea. also some refactorized submission logic to make better feedback messages when receiving errors while accepting ideas.
|
2012-08-01 10:47:28 +02:00 |
|
fred-fri
|
ab5bc053b1
|
some improvements
|
2012-08-01 14:21:12 +09:00 |
|
fred-fri
|
0387f61010
|
made new accepted student project idea datapanel
|
2012-08-01 14:09:23 +09:00 |
|
Emil Siverhall
|
5786ce4f40
|
some panel refactoring when sending ideas to service classes
|
2012-07-31 17:18:05 +02:00 |
|
Emil Siverhall
|
ea53b74f45
|
Merge branch 'm3_autocomplete_bug' into develop
|
2012-07-31 10:33:42 +02:00 |
|
Emil Siverhall
|
9d9729caa1
|
fixed bug to avoid the need to refocus on partner selection when authors accepting supervisor ideas. added an enclosure container as well to avoid wicket warnings
|
2012-07-31 10:32:14 +02:00 |
|
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 |
|