fred-fri
|
45384c593a
|
sending what project was clicked to onclick method
|
2012-08-07 10:48:12 +09:00 |
|
fred-fri
|
608d04e402
|
added new finalseminar repo and services and also a finalseminarcolumnpanel
|
2012-08-07 10:45:25 +09:00 |
|
Emil Siverhall
|
34c1839dcc
|
Merge branch 'm3_idea_history' into develop
|
2012-08-03 14:11:22 +02:00 |
|
Emil Siverhall
|
03f7dc1fa7
|
added new datatable with the authors confirmed supervisor provided ideas under My project idea history
|
2012-08-03 14:10:39 +02:00 |
|
Emil Siverhall
|
1744c2ffa0
|
Merge branch 'm3_start_date' into develop
|
2012-08-03 12:21:44 +02:00 |
|
Emil Siverhall
|
cf8c7f61e5
|
added some custom validation logic to supervisor idea submission to display appropriate feedback messages if number of students doesnt match specified project level
|
2012-08-03 12:13:54 +02:00 |
|
Emil Siverhall
|
461120728d
|
removed duplicated feedback panels and some code cleanup
|
2012-08-03 10:30:40 +02:00 |
|
Emil Siverhall
|
a74c27f1eb
|
added column with course start date to datatable on supervisor - my matched student ideas page
|
2012-08-03 10:09:33 +02:00 |
|
fred-fri
|
073c26b69d
|
added myprojectspanel to supervisor my final seminars page, need to modify the columns a bit
|
2012-08-03 17:02:25 +09:00 |
|
fred-fri
|
a8a6fd1f92
|
removed a panel and cleared out supervisors my final seminars page
|
2012-08-03 15:09:48 +09:00 |
|
fred-fri
|
23a73b2f5c
|
show nothing if user is not employee
|
2012-08-03 12:30:32 +09:00 |
|
fred-fri
|
aa219ceb8c
|
fixed some page markup bugs
|
2012-08-03 12:26:17 +09:00 |
|
fred-fri
|
68d74dddd2
|
Merge branch 'export' into develop
|
2012-08-03 11:38:23 +09:00 |
|
fred-fri
|
d7ff70a301
|
added info about successful export too
|
2012-08-03 11:28:09 +09:00 |
|
fred-fri
|
51ee7cbffa
|
catching exception when trying to export, and printing an error message if not succesful
|
2012-08-03 11:24:19 +09:00 |
|
fred-fri
|
97a3c1be96
|
changed delete method and throwing exception higher
|
2012-08-03 11:07:56 +09:00 |
|
Emil Siverhall
|
9931d13305
|
Merge branch 'm3_first_meeting' into develop
|
2012-08-02 16:04:51 +02:00 |
|
Emil Siverhall
|
fc33af744a
|
updated current.sql with new first meeting table
|
2012-08-02 16:04:39 +02:00 |
|
Emil Siverhall
|
f6732d5a09
|
added new page to supervisor - project ideas where only the current supervisors ideas that have authors is displayed. from here, the supervisor may add a first meeting date to the idea
|
2012-08-02 16:03:46 +02:00 |
|
Emil Siverhall
|
944087b07f
|
added new count methods to supervisor idea services to make datatable pagination work properly
|
2012-08-02 16:03:44 +02:00 |
|
Emil Siverhall
|
095d2412f8
|
some new pages mounted
|
2012-08-02 16:03:41 +02:00 |
|
Emil Siverhall
|
4ec937ea2a
|
added service class for first meetings to use when authors cancel their idea selections and a first meeting is already added
|
2012-08-02 16:03:39 +02:00 |
|
Emil Siverhall
|
cb0387472a
|
added new column that may be used with datatables. the column takes two icons in the constructor and displaying appropriate icon in the column depending on a boolean value
|
2012-08-02 16:03:37 +02:00 |
|
Emil Siverhall
|
9484791d60
|
added first meeting entity and fields for adding this in the supervisor project idea details dialog.
|
2012-08-02 16:03:35 +02:00 |
|
fred-fri
|
fb57363139
|
added remote export setting back again
|
2012-08-02 12:25:21 +09:00 |
|
fred-fri
|
966616f297
|
Merge branch 'erase' into develop
|
2012-08-02 12:06:01 +09:00 |
|
fred-fri
|
c5777e7fb0
|
removed unecessary stuff from generalsystemsettings and added remove statements to current.sql
|
2012-08-02 12:04:18 +09:00 |
|
fred-fri
|
b0741b8421
|
deleted lots of old panels
|
2012-08-02 12:01:41 +09:00 |
|
fred-fri
|
7991a7e8c4
|
removed artifacts for force accept
|
2012-08-02 11:49:04 +09:00 |
|
fred-fri
|
82a6d8d3ef
|
removed manual suggesting and matching algorithm suggesting
|
2012-08-02 11:46:26 +09:00 |
|
fred-fri
|
7d01e1bbb1
|
fixed fetchtype eager bug and lazy loading exception by reloading the project idea before sending it to watsonpanel
|
2012-08-02 11:44:43 +09:00 |
|
Emil Siverhall
|
47b36f75f6
|
Merge branch 'm3_first_meeting' into develop
|
2012-08-01 13:00:54 +02:00 |
|
Emil Siverhall
|
558e78d599
|
disabled the possibilitu for students to submit their own idea if they are already included in a supervisor provided idea
|
2012-08-01 11:34:56 +02:00 |
|
Emil Siverhall
|
adaded1029
|
Merge branch 'm3_number_of_ideas' into develop
|
2012-08-01 10:49:04 +02:00 |
|
Emil Siverhall
|
85aee3cd2a
|
added logic to prevent authors from selecting more than one supervisor idea. also some refactorized submission logic to make better feedback messages when receiving errors while accepting ideas.
|
2012-08-01 10:47:28 +02:00 |
|
fred-fri
|
ab5bc053b1
|
some improvements
|
2012-08-01 14:21:12 +09:00 |
|
fred-fri
|
0387f61010
|
made new accepted student project idea datapanel
|
2012-08-01 14:09:23 +09:00 |
|
fred-fri
|
24b599ed27
|
fixed session bug
|
2012-08-01 12:12:38 +09:00 |
|
fred-fri
|
9e3adae7b0
|
fixed some sql statements
|
2012-08-01 11:42:12 +09:00 |
|
Emil Siverhall
|
5786ce4f40
|
some panel refactoring when sending ideas to service classes
|
2012-07-31 17:18:05 +02:00 |
|
Emil Siverhall
|
ea53b74f45
|
Merge branch 'm3_autocomplete_bug' into develop
|
2012-07-31 10:33:42 +02:00 |
|
Emil Siverhall
|
9d9729caa1
|
fixed bug to avoid the need to refocus on partner selection when authors accepting supervisor ideas. added an enclosure container as well to avoid wicket warnings
|
2012-07-31 10:32:14 +02:00 |
|
fred-fri
|
65c9987a1e
|
added new db update file
|
2012-07-31 15:27:27 +09:00 |
|
fred-fri
|
77f88e5f0c
|
changed menutype for better visibility
|
2012-07-31 15:19:19 +09:00 |
|
fred-fri
|
0049b57d58
|
current.sql small caps change
|
2012-07-31 11:07:19 +09:00 |
|
fred-fri
|
318f9854d3
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-07-31 10:13:39 +09:00 |
|
fred-fri
|
a373b3c633
|
sql statement fixes
|
2012-07-31 10:13:05 +09:00 |
|
Emil Siverhall
|
59b4528076
|
Merge branch 'm3_application_periods' into develop
|
2012-07-30 15:48:11 +02:00 |
|
Emil Siverhall
|
4e0f55e675
|
mounted new project idea pages to make better looking url's
|
2012-07-30 15:45:05 +02:00 |
|
Emil Siverhall
|
b2e3942851
|
removed some dummy text
|
2012-07-30 15:39:21 +02:00 |
|