fred-fri
|
245e39848d
|
added new user datapanel to page
|
2012-08-30 13:53:21 +09:00 |
|
fred-fri
|
cfdb57cce6
|
minor fixes
|
2012-08-30 12:54:32 +09:00 |
|
fred-fri
|
7c4785f7ee
|
minor fixes
|
2012-08-30 12:52:04 +09:00 |
|
fred-fri
|
5b15e27abd
|
date created
|
2012-08-30 12:49:06 +09:00 |
|
fred-fri
|
5f78b67ae7
|
Merge branch 'keywords' into develop
|
2012-08-30 12:28:45 +09:00 |
|
fred-fri
|
78c020de94
|
fixed some bugs
|
2012-08-30 12:06:35 +09:00 |
|
fred-fri
|
32eb58c079
|
added a comparator
|
2012-08-30 12:02:06 +09:00 |
|
fred-fri
|
cb41975e52
|
commented out match algorithm xml bean since it no longer exists
|
2012-08-30 10:30:20 +09:00 |
|
fred-fri
|
6ab8f4d94b
|
panel can now take some keywords to show
|
2012-08-30 10:23:44 +09:00 |
|
fred-fri
|
cf796bf286
|
keywords selection works for author project idea submission
|
2012-08-30 10:05:18 +09:00 |
|
fred-fri
|
2103cf296f
|
better query, fixed a bug
|
2012-08-30 09:38:08 +09:00 |
|
Emil Siverhall
|
6cc16ec586
|
Merge branch 'match_object_bug' into develop
|
2012-08-29 15:58:33 +02:00 |
|
Emil Siverhall
|
4967edf75e
|
fixed bug that made supervisor - student ideas datatable show wrong date selected. we didnt create a new match object when confirming ideas but this is now the case
|
2012-08-29 15:55:03 +02:00 |
|
Emil Siverhall
|
93d5fb2cea
|
Merge branch 'hide_link' into develop
|
2012-08-29 13:26:45 +02:00 |
|
Emil Siverhall
|
212455baae
|
hiding links to create new project idea if student is already attached to an idea
|
2012-08-29 13:26:30 +02:00 |
|
Emil Siverhall
|
66050f36c3
|
Merge branch 'final_seminar_fix' into develop
|
2012-08-29 11:11:43 +02:00 |
|
Emil Siverhall
|
d7af99497d
|
added possibility to remove active participants from final seminars and confirmation dialog prompting the admin when trying to remove opponent/ap/opponent report
|
2012-08-29 11:03:03 +02:00 |
|
fred-fri
|
58f4b3c5aa
|
nice looks
|
2012-08-29 14:49:47 +09:00 |
|
fred-fri
|
9e38059132
|
selecting keywords work now, need to clean up
|
2012-08-29 14:35:48 +09:00 |
|
fred-fri
|
ec13e10787
|
added checkbox
|
2012-08-29 14:08:35 +09:00 |
|
fred-fri
|
0378e63e57
|
startign work on new selectkeywordspanel
|
2012-08-29 13:59:16 +09:00 |
|
fred-fri
|
baddd3c878
|
created repo and service classes, added datapanel to manage keywords page
|
2012-08-29 11:34:39 +09:00 |
|
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 |
|