fred-fri
|
4aa58c8248
|
removed a lot of stuff, fixed pi to refer to the remaining keywords table for keywords
|
2012-08-29 11:19:33 +09:00 |
|
fred-fri
|
6dc41fe09d
|
removed a lot of stuff
|
2012-08-29 10:34:31 +09:00 |
|
fred-fri
|
b7a58fd77f
|
removed a lot of stuff
|
2012-08-29 10:32:03 +09:00 |
|
fred-fri
|
affe410490
|
removed keywords from project idea submission
|
2012-08-29 09:23:16 +09:00 |
|
fred-fri
|
0337254ca3
|
emptied manage keywords page and cleared out filtering on keywords on supervisor settings
|
2012-08-29 09:18:23 +09:00 |
|
fred-fri
|
1bb59249f4
|
emptied manage keywords page and cleared out filtering on keywords on supervisor settings
|
2012-08-29 09:15:23 +09:00 |
|
fred-fri
|
f01825f325
|
emptied manage keywords page and cleared out filtering on keywords on supervisor settings
|
2012-08-29 09:15:10 +09:00 |
|
fred-fri
|
7714dd4335
|
removed keywords from supervisor profile page
|
2012-08-29 08:55:52 +09:00 |
|
Emil Siverhall
|
cdc42ad473
|
Merge branch 'm3_system_setting_auto_decline' into develop
|
2012-08-28 21:27:37 +02:00 |
|
Emil Siverhall
|
c75bd808d9
|
added db changes to current.sql
|
2012-08-28 21:27:26 +02:00 |
|
Emil Siverhall
|
c1de6e6857
|
Merge branch 'm3_system_setting_auto_decline' into develop
|
2012-08-28 21:23:46 +02:00 |
|
Emil Siverhall
|
8fa5389ec3
|
minor changes to idea participation worker
|
2012-08-28 21:22:07 +02:00 |
|
Emil Siverhall
|
fcad3c4ac3
|
added new unit test to confirm service method findIdeasWithUnconfirmedAuthors
|
2012-08-28 21:17:22 +02:00 |
|
Emil Siverhall
|
586dafc5e9
|
added service methods to check if idea participation confirmation time has expired and a worker thread that runs every night to see if ideas needs to be auto declined
|
2012-08-28 20:47:09 +02:00 |
|
Emil Siverhall
|
ce7463c1f4
|
added new dateCreated to IdeaParticipations and a new system settings that defines how many days an idea participation may be unconfirmed before auto declined
|
2012-08-28 20:45:15 +02:00 |
|
Emil Siverhall
|
d7f4493ad4
|
Merge branch 'm3_application_periods' into develop
|
2012-08-28 09:24:04 +02:00 |
|
Emil Siverhall
|
205ba06bf5
|
added check to make sure students may not add a project partner that is already attached to another project idea when submitting their own idea
|
2012-08-28 09:20:08 +02:00 |
|
Emil Siverhall
|
331b0668be
|
added unmatched ideas when counting student ideas for students, to make sure students cant both add their own and select a supervisor idea
|
2012-08-28 08:21:35 +02:00 |
|
Emil Siverhall
|
d3cabe6920
|
supervisor should not be able to add student to project idea if student already participating on another idea
|
2012-08-27 20:47:57 +02:00 |
|
Emil Siverhall
|
83d85ed8de
|
added count of student submitted project ideas to supervisor idea service method alreadyParticipatingOnIdea
|
2012-08-27 20:25:48 +02:00 |
|
Emil Siverhall
|
9c4ec9f93a
|
code cleanup
|
2012-08-27 14:15:28 +02:00 |
|
Emil Siverhall
|
12f971ba8f
|
Watson boxes is no longer editable when the application period connected to the idea is over
|
2012-08-27 13:46:45 +02:00 |
|
Emil Siverhall
|
690afb7a8f
|
fixed bug that made all ideas selectable for students even if application period for the level was closed
|
2012-08-27 12:20:30 +02:00 |
|
Emil Siverhall
|
6117ccf669
|
Merge branch 'm3_statuses' into develop
|
2012-08-27 10:57:23 +02:00 |
|
Emil Siverhall
|
8b63aa1a6a
|
added status column to my student project ideas in student view
|
2012-08-27 10:56:24 +02:00 |
|
Emil Siverhall
|
74f5c55b58
|
added new status column to supervisor - my matched student project ideas
|
2012-08-27 10:56:22 +02:00 |
|
Emil Siverhall
|
d9b666abde
|
some changes to status labels
|
2012-08-27 10:56:20 +02:00 |
|
Emil Siverhall
|
9595012a1a
|
added status column to student view datatable with selected supervisor ideas
|
2012-08-27 10:56:17 +02:00 |
|
fred-fri
|
3ea4500671
|
markup fixes
|
2012-08-27 17:45:23 +09:00 |
|
fred-fri
|
88b88bfca4
|
added clean button for old keywords that have keyword type unit or research area.
|
2012-08-27 17:41:02 +09:00 |
|
fred-fri
|
1c593a3d2c
|
added new db update file
|
2012-08-27 12:34:52 +09:00 |
|
fred-fri
|
08d300c6b0
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-08-27 11:09:08 +09:00 |
|
fred-fri
|
ac4363363c
|
phrase change
|
2012-08-27 11:08:53 +09:00 |
|
fred-fri
|
b16069f605
|
fixed a markup bug
|
2012-08-27 10:55:21 +09:00 |
|
fred-fri
|
766c1f65cf
|
added comment to current.sql
|
2012-08-27 10:38:27 +09:00 |
|
Emil Siverhall
|
dbeda404a1
|
Merge branch 'm3_statuses' into develop
|
2012-08-24 10:29:50 +02:00 |
|
Emil Siverhall
|
18ac9cc60a
|
added title link to reach idea info in supervisor datatable
|
2012-08-24 10:29:40 +02:00 |
|
Emil Siverhall
|
12d820306e
|
added new status column to supervisor data tables with more details status labels
|
2012-08-24 10:29:38 +02:00 |
|
fred-fri
|
341a07d0fc
|
made supervisor idea clickable open dialog
|
2012-08-24 16:38:43 +09:00 |
|
fred-fri
|
d023867e32
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-08-24 16:23:12 +09:00 |
|
fred-fri
|
8b70eb8ab8
|
removed project idea subtabmenu
|
2012-08-24 16:22:44 +09:00 |
|
fred-fri
|
eecc0b0750
|
added clickable title column that opens watson dialog on project ideas
|
2012-08-24 16:08:59 +09:00 |
|
fred-fri
|
349b792ee1
|
fixed columns for student project idea datapanel in author section
|
2012-08-24 15:24:26 +09:00 |
|
fred-fri
|
7720b8f65f
|
switched positions of supervisor and student project idea data tables
|
2012-08-24 15:00:06 +09:00 |
|
fred-fri
|
82c60dbb56
|
fixed datatable for my student project ideas instead of old data something else repeater component
|
2012-08-24 14:57:42 +09:00 |
|
Emil Siverhall
|
08e99461f2
|
Merge branch 'm3_currently_numbers' into develop
|
2012-08-24 07:43:53 +02:00 |
|
Emil Siverhall
|
6bf59686b3
|
added check to make sure project is not created when counting ideas submitted by students
|
2012-08-24 07:43:27 +02:00 |
|
Emil Siverhall
|
2e4b4de4f0
|
you are currently supervising now takes ideas submitted by students into account as well
|
2012-08-24 07:43:25 +02:00 |
|
Emil Siverhall
|
01f9d0cd16
|
you are currently supervising now takes active projects in account as well
|
2012-08-24 07:43:23 +02:00 |
|
fred-fri
|
ec9c0c3e2b
|
made student project idea tablewider
|
2012-08-24 14:41:40 +09:00 |
|