fred-fri
|
32eccf8718
|
moved changes to new sql file
|
2012-09-11 17:15:47 +09:00 |
|
fred-fri
|
cba90fa7a9
|
added new sql file
|
2012-09-11 17:13:07 +09:00 |
|
fred-fri
|
d9b5990ddf
|
modified current.sql file
|
2012-09-11 15:53:30 +09:00 |
|
fred-fri
|
fd6134fd3e
|
some improvements on turnitinworker
|
2012-09-11 15:49:03 +09:00 |
|
fred-fri
|
d120697a4e
|
some improvements on turnitinworker
|
2012-09-11 15:32:36 +09:00 |
|
fred-fri
|
c34b3c0e01
|
entered the new prod integration id into the pom
|
2012-09-11 13:18:44 +09:00 |
|
Emil Siverhall
|
1a94773ef6
|
Merge branch 'inactivate' into develop
|
2012-09-10 15:28:26 +02:00 |
|
Emil Siverhall
|
dd47bde884
|
added new idea status inactive and worker thread that checks for ideas that does not have filled Watson boxes before application period end date, and if not, inactivates the idea
|
2012-09-10 15:25:22 +02:00 |
|
Emil Siverhall
|
269e979891
|
Merge branch 'sqlFix' into develop
|
2012-09-10 15:10:35 +02:00 |
|
Emil Siverhall
|
05f4d87e25
|
case sensitive changes to current sql
|
2012-09-10 15:10:26 +02:00 |
|
Emil Siverhall
|
1e728b44b9
|
Merge branch 'connection' into develop
|
2012-09-10 15:00:22 +02:00 |
|
Emil Siverhall
|
5c85324441
|
updated current.sql
|
2012-09-10 14:59:55 +02:00 |
|
Emil Siverhall
|
1b1a8605d3
|
new unit test for new keyword-research area connections
|
2012-09-10 14:59:40 +02:00 |
|
Emil Siverhall
|
4550bca678
|
changes to keyword-research area connections to make it work properly.
|
2012-09-10 14:59:10 +02:00 |
|
fred-fri
|
101c906920
|
cleared out nonfunctioning keyword research area connection code
|
2012-09-10 19:21:48 +09:00 |
|
fred-fri
|
0c9374f1c4
|
adding submit evaluation
|
2012-09-10 16:15:46 +09:00 |
|
fred-fri
|
4c8992cd5a
|
adding submit evaluation
|
2012-09-10 16:10:16 +09:00 |
|
fred-fri
|
55fea5d52b
|
fixed some markup bugs and added research area label to watsoninfopanel
|
2012-09-10 15:57:07 +09:00 |
|
fred-fri
|
ca349bc5f1
|
added research area and keyword selection to project idea submission page, but they need a markupcontainer of their own as to not clear the inputfield
|
2012-09-10 15:01:08 +09:00 |
|
fred-fri
|
4378ca2e05
|
fixed npe bug in project idea keywords
|
2012-09-10 13:26:14 +09:00 |
|
fred-fri
|
9a76153235
|
commented out tests on buggy methods in order to be able to push these unrelated changes
|
2012-09-10 13:21:00 +09:00 |
|
fred-fri
|
eb11c240b5
|
resolved conflicts
|
2012-09-10 13:19:37 +09:00 |
|
fred-fri
|
135ae7a019
|
fixed edit bug
|
2012-09-10 13:05:13 +09:00 |
|
fred-fri
|
7f71276f11
|
saving with research areas and keywords now work
|
2012-09-10 12:45:42 +09:00 |
|
fred-fri
|
729b090aa2
|
some markup cleanup, looks better now
|
2012-09-10 12:38:29 +09:00 |
|
fred-fri
|
69e3027428
|
made new wmc for research areas and keywords as to not clear the textareas when refreshing
|
2012-09-10 12:32:45 +09:00 |
|
fred-fri
|
165da72bc2
|
removed selection bugs
|
2012-09-10 11:44:42 +09:00 |
|
fred-fri
|
6814457930
|
some refactoring of variable names to make code more consistent
|
2012-09-10 11:35:03 +09:00 |
|
Emil Siverhall
|
44465498dd
|
Merge branch 'testFix' into develop
|
2012-09-07 13:54:01 +02:00 |
|
Emil Siverhall
|
f005f557c5
|
minor changes to unit test to make test aware that application period is automatically connected to supervisor idea if students are added on creation
|
2012-09-07 13:53:52 +02:00 |
|
Emil Siverhall
|
614c4a37ad
|
Merge branch 'applicationPeriodFix' into develop
|
2012-09-07 13:46:54 +02:00 |
|
Emil Siverhall
|
d0603d98db
|
ideas are now connected to correct application periods if students are attached when supervisors creating ideas. if no applicatio period isopen for the current level, supervisor may not add students to idea
|
2012-09-07 13:46:24 +02:00 |
|
Emil Siverhall
|
d09a0886fe
|
Merge branch 'm3_admin_crud' into develop
|
2012-09-07 12:56:56 +02:00 |
|
Emil Siverhall
|
b296d21aeb
|
added sort on first meeting column
|
2012-09-07 12:56:44 +02:00 |
|
Emil Siverhall
|
f1c1cd9242
|
delete functionality added
|
2012-09-07 12:56:42 +02:00 |
|
Emil Siverhall
|
26ea808c43
|
added possibility to add confirmation dialog to ClickableIconColumn in datatables
|
2012-09-07 12:56:40 +02:00 |
|
Emil Siverhall
|
87e2efa729
|
added filtering on idea title as well.
|
2012-09-07 12:56:38 +02:00 |
|
Emil Siverhall
|
a9316d0ed6
|
added filtering on supervisor
|
2012-09-07 12:56:36 +02:00 |
|
Emil Siverhall
|
69dc21e121
|
added filtering on the supervisor ideas dateCreated attribute to admin crud panel
|
2012-09-07 12:56:34 +02:00 |
|
Emil Siverhall
|
327f244b5a
|
added functionality for admins to remove authors from supervisor project ideas
|
2012-09-07 12:56:32 +02:00 |
|
Emil Siverhall
|
477f01101c
|
added functionality for admins to switch supervisor on idea
|
2012-09-07 12:56:30 +02:00 |
|
Emil Siverhall
|
08b4545cc8
|
added dialog with idea details to crud page. also some refactoring and removal of redundant classes
|
2012-09-07 12:56:28 +02:00 |
|
Emil Siverhall
|
68f26d3e92
|
first meeting and status columns now shows proper information in admin crud datatable
|
2012-09-07 12:56:26 +02:00 |
|
Emil Siverhall
|
7c989571f7
|
only waiting ideas is supposed to be deletable
|
2012-09-07 12:56:23 +02:00 |
|
Emil Siverhall
|
6bc2db39d3
|
added datatable columns
|
2012-09-07 12:56:21 +02:00 |
|
Emil Siverhall
|
caaca3a78f
|
page and panel skeleton for admin supervisor idea crud page added
|
2012-09-07 12:56:19 +02:00 |
|
fred-fri
|
22e562bc04
|
only keywords that are related to the research area appear now, but selection of keywords seems to have stopped working
|
2012-09-07 15:28:10 +09:00 |
|
fred-fri
|
01c484219a
|
made logic for research area and keyword selection. the keywords selection panel now appears if a research area is selected
|
2012-09-07 14:45:23 +09:00 |
|
fred-fri
|
20a00297cd
|
replaced research area artefact with ajaxdropdown
|
2012-09-07 13:53:51 +09:00 |
|
fred-fri
|
168c8f4b89
|
made selectkeywordspanel invisible if there is no research area. also it will return no keywords if research area is null
|
2012-09-07 13:13:25 +09:00 |
|