fred-fri
|
9de79f249d
|
added new db update file
|
2012-09-03 13:16:28 +09:00 |
|
fred-fri
|
c41f744101
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-09-03 12:42:18 +09:00 |
|
fred-fri
|
196c427c54
|
delete message now works
|
2012-09-03 12:41:37 +09:00 |
|
Emil Siverhall
|
cc7c744f60
|
Merge branch 'filterFormCleanup' into develop
|
2012-08-31 15:51:12 +02:00 |
|
Emil Siverhall
|
e31408d58a
|
refactoring of some datatable filter forms. using generic filter form checkbox panel and deleting all specific panels thats been used before
|
2012-08-31 15:50:46 +02:00 |
|
Emil Siverhall
|
b745ed415f
|
Merge branch 'm3_supervisor_settings' into develop
|
2012-08-31 14:49:15 +02:00 |
|
Emil Siverhall
|
21f2554883
|
added service methods to current count numbers to use countActiveFromDates and reset logic for reset buttons
|
2012-08-31 14:49:05 +02:00 |
|
Emil Siverhall
|
a2c8f17fd0
|
added reset buttons to supervisor settings and counting since label to the current supervisor counts
|
2012-08-31 14:49:03 +02:00 |
|
Emil Siverhall
|
5a4fd434ba
|
added column with unit name to supervisor settings datatable
|
2012-08-31 14:49:01 +02:00 |
|
Emil Siverhall
|
c6d3589533
|
changes to only create availability once for each datatable row to make it work a bit faster
|
2012-08-31 14:48:58 +02:00 |
|
Emil Siverhall
|
b20ed6ab84
|
fixed markup bug in project idea details panel
|
2012-08-31 14:48:56 +02:00 |
|
Emil Siverhall
|
18991464f8
|
added filtering on supervisor name (auto complete) to supervisor settings datatable
|
2012-08-31 14:48:54 +02:00 |
|
Emil Siverhall
|
8711eca1a9
|
refactor of supervisor settings page to a new panel, filtering on units through dropdown now works and new supervisor service methods to display list and size of list properly
|
2012-08-31 14:48:52 +02:00 |
|
Emil Siverhall
|
46cadd4a09
|
added new generic filter form panel to use when filtering with checkboxes.
|
2012-08-31 14:48:50 +02:00 |
|
Emil Siverhall
|
0d2813a6cc
|
added columns for current bachelors and masters to supervisor settings datatable
|
2012-08-31 14:48:48 +02:00 |
|
Emil Siverhall
|
6a015626ff
|
added dropdown element to new supervisor setting datatable to make target numbers available for selection + new service methods instead of old dao methods
|
2012-08-31 14:48:45 +02:00 |
|
fred-fri
|
356f252337
|
create new works now
|
2012-08-31 15:58:59 +09:00 |
|
Emil Siverhall
|
d1228ab958
|
Merge branch 'keywordEditFix' into develop
|
2012-08-31 08:50:54 +02:00 |
|
Emil Siverhall
|
cd4a7fc089
|
changes to use form when submitting new keyword
|
2012-08-31 08:50:34 +02:00 |
|
fred-fri
|
89e3c6383c
|
still not working, hiding create new button
|
2012-08-31 15:05:55 +09:00 |
|
fred-fri
|
d8dc6fdd5c
|
stupid ting wont work
|
2012-08-31 14:37:32 +09:00 |
|
fred-fri
|
d1dedd1eda
|
moved edit panel into new file, trying to make saving work
|
2012-08-31 14:29:16 +09:00 |
|
fred-fri
|
c1d6c3d4af
|
improvements on keywords page
|
2012-08-31 13:47:28 +09:00 |
|
fred-fri
|
59c8f65d0e
|
added clickable keywords active column
|
2012-08-31 13:19:57 +09:00 |
|
fred-fri
|
e7cb654348
|
small fix
|
2012-08-30 16:14:52 +09:00 |
|
fred-fri
|
498d76fb58
|
some cleanup
|
2012-08-30 15:16:29 +09:00 |
|
fred-fri
|
1e115ce3c8
|
added new panel which can be used to display a supervisors limits in a column
|
2012-08-30 14:35:41 +09:00 |
|
fred-fri
|
dc680f86d8
|
added simple datapanel
|
2012-08-30 14:13:11 +09:00 |
|
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 |
|