fred-fri
|
ade3b52ead
|
Merge branch 'release20121119'
20121119
|
2012-11-19 12:29:33 +09:00 |
|
fred-fri
|
335a0fa4a6
|
created new db_update file
|
2012-11-19 12:23:06 +09:00 |
|
fred-fri
|
e8e7e5f7e9
|
edited current file
|
2012-11-19 12:22:04 +09:00 |
|
fred-fri
|
e97bad79e9
|
trying to add textfields, but since not all supervisors have targets we get nullpointers
|
2012-11-19 10:28:27 +09:00 |
|
Jona Ekenberg
|
adf5918481
|
added a input field for copying email adresses
|
2012-11-17 16:38:38 +01:00 |
|
Emil Siverhall
|
ee83473867
|
added find partner link on submission page for students
|
2012-11-16 14:54:18 +01:00 |
|
Jona Ekenberg
|
751dd3f691
|
added 'recipients' after the number of recipients
|
2012-11-16 14:31:23 +01:00 |
|
Emil Siverhall
|
e484e4c750
|
we should not show partner selection when student accepting a master idea
|
2012-11-16 14:06:27 +01:00 |
|
Emil Siverhall
|
f62c51fe71
|
added keyword filtering to both student and supervisor datatable with ideas available for selection
|
2012-11-16 13:42:25 +01:00 |
|
Jona Ekenberg
|
a8bb6a5b4e
|
Merge branch 'AdminMail' into develop
|
2012-11-16 13:14:54 +01:00 |
|
Jona Ekenberg
|
f0ff52b6c5
|
added and changed some choices for filtering mail, and made it look in SupervisorIdeas as well
|
2012-11-16 13:13:12 +01:00 |
|
Emil Siverhall
|
7d5710db02
|
changed to show matched ideas by default on supervisor idea start page. + details dialog is now closing when supervisor updating first meeting details
|
2012-11-16 13:03:49 +01:00 |
|
Emil Siverhall
|
aeb815488e
|
Merge branch 'newIdeaEntity' into develop
|
2012-11-16 09:34:47 +01:00 |
|
Emil Siverhall
|
a955d73a5e
|
updated current sql and made some changes to use a renamed keyword selection panel
|
2012-11-16 09:34:30 +01:00 |
|
Emil Siverhall
|
b8d6393fb9
|
minor changes to filterform checkbox panel and mounted some more of the new idea pages in sciproapplication
|
2012-11-16 08:41:55 +01:00 |
|
Emil Siverhall
|
ff9baba8c2
|
added unit test class for new ideas. more tests needed
|
2012-11-16 08:41:53 +01:00 |
|
Emil Siverhall
|
b5c5fc1df7
|
some visibility logic fixes and clean up
|
2012-11-16 08:41:51 +01:00 |
|
Emil Siverhall
|
1472f0609c
|
added new status column panels for student and supervisor idea datatables with more detailed statuses
|
2012-11-16 08:41:48 +01:00 |
|
Emil Siverhall
|
267abe6386
|
added new worker thread to check for expired participant confirmations. also small fixes with links to dialog and name of co-author when accepting to be part of an idea
|
2012-11-16 08:41:46 +01:00 |
|
Emil Siverhall
|
6d58f3dbd7
|
added some more sysadmin annotations to new idea pages
|
2012-11-16 08:41:44 +01:00 |
|
Emil Siverhall
|
17d1da7563
|
added popup if author have confirmed ideas without unfinished watsons. also added watson info text
|
2012-11-16 08:41:41 +01:00 |
|
Emil Siverhall
|
cda301a40e
|
added new complete idea dialog panel where authors may complete the watson boxes
|
2012-11-16 08:41:39 +01:00 |
|
Emil Siverhall
|
63580b838c
|
added auto popup dialog if author have unconfirmed participation on an idea. also service methods for accepting and declining participation
|
2012-11-16 08:41:37 +01:00 |
|
Emil Siverhall
|
2471a68064
|
added supervisor dialog to add new first meeting to ideas. also changed to show both time and date of meetings in datatables
|
2012-11-16 08:41:35 +01:00 |
|
Emil Siverhall
|
ca16c66a90
|
added sysadmin authorizations to new idea tabs and some links between pages
|
2012-11-16 08:41:32 +01:00 |
|
Emil Siverhall
|
8199c538e6
|
students may now only choose from supervisor ideas if application period is open for a certain project level. also some redirect fixes when accepting/submitting ideas
|
2012-11-16 08:41:30 +01:00 |
|
Emil Siverhall
|
48617ee482
|
added accept dialog for students selecting supervisor ideas
|
2012-11-16 08:41:27 +01:00 |
|
Emil Siverhall
|
7e3c39b821
|
changes to partner addition panel to use refocus to trick dialog bugs. (optional)
|
2012-11-16 08:41:25 +01:00 |
|
Emil Siverhall
|
90a93cc24a
|
added filtering to new supervisor idea start page
|
2012-11-16 08:41:23 +01:00 |
|
Emil Siverhall
|
6c2bcd8502
|
added feedback dialog to show error message if a supervisor tries to accept another student idea when target numbers are already reached
|
2012-11-16 08:41:20 +01:00 |
|
Emil Siverhall
|
1947892f2d
|
supervisor may now accept to supervise student ideas
|
2012-11-16 08:41:18 +01:00 |
|
Emil Siverhall
|
83711b8886
|
new dialog panel when supervisors accept to supervise student ideas
|
2012-11-16 08:41:16 +01:00 |
|
Emil Siverhall
|
c63331c4ae
|
new supervisor service method that returns true if a supervisors idea should be visible to selection by students
|
2012-11-16 08:41:14 +01:00 |
|
Emil Siverhall
|
70f72e3242
|
new page where student may pick supervisor ideas. better implementation to check if a supervisor is within limits than the old one
|
2012-11-16 08:41:11 +01:00 |
|
Emil Siverhall
|
19a835691c
|
added more filtering to supervisor- all student ideas panel
|
2012-11-16 08:41:09 +01:00 |
|
Emil Siverhall
|
4faaa09663
|
working on new page+panel where supervisors may select available student ideas
|
2012-11-16 08:41:07 +01:00 |
|
Emil Siverhall
|
f8dc87e2ea
|
started working on new start page for students ideas
|
2012-11-16 08:41:04 +01:00 |
|
Emil Siverhall
|
1d20c50517
|
new partner addition panel to use when submitting student ideas. the old one didnt use our current auto complete component and looked pretty bad
|
2012-11-16 08:41:02 +01:00 |
|
Emil Siverhall
|
e28fd1ab18
|
more work on student idea submission. works pretty good now
|
2012-11-16 08:41:00 +01:00 |
|
Emil Siverhall
|
3bc7e190c9
|
started working on new idea submission page for students
|
2012-11-16 08:40:57 +01:00 |
|
Emil Siverhall
|
54df41272a
|
further work on new supervisor idea start page
|
2012-11-16 08:40:55 +01:00 |
|
Emil Siverhall
|
3e128c6490
|
started working on new idea start page for supervisors according to mockups
|
2012-11-16 08:40:53 +01:00 |
|
Emil Siverhall
|
11aa667b80
|
added new repo and service classes for new idea entity match objects
|
2012-11-16 08:40:51 +01:00 |
|
Emil Siverhall
|
0409fceaae
|
further work on new idea submission for supervisors and some validation logic in service class
|
2012-11-16 08:40:49 +01:00 |
|
Emil Siverhall
|
56578aa665
|
added all input fields on new supervisor idea submission, submission logic still needed
|
2012-11-16 08:40:46 +01:00 |
|
Emil Siverhall
|
fd919cf172
|
added new generic dropdown with ajax behavior
|
2012-11-16 08:40:44 +01:00 |
|
Emil Siverhall
|
daf84b40fe
|
started working on new idea submission page for supervisors with the new idea entities
|
2012-11-16 08:40:42 +01:00 |
|
Emil Siverhall
|
95ca82ac39
|
added new repo and services for Languages
|
2012-11-16 08:40:40 +01:00 |
|
Emil Siverhall
|
3e73a55b31
|
added new repo and service classes to new idea entity, with basic filter params and findall method
|
2012-11-16 08:40:38 +01:00 |
|
Emil Siverhall
|
6b0bc8f961
|
added new entities for idea and first meetings
|
2012-11-16 08:40:35 +01:00 |
|