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 |
|
fred-fri
|
6ee8159f98
|
added research area to select keywords constructor
|
2012-09-07 13:06:00 +09:00 |
|
fred-fri
|
17357fb1b1
|
some test changes, readonly set to false, algo improvements and keyword research area connection editing now works great
|
2012-09-07 12:08:57 +09:00 |
|
fred-fri
|
08cd3c3ef0
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-09-06 12:24:49 +09:00 |
|
fred-fri
|
fc1b7b5d1d
|
made modifications to tests
|
2012-09-06 12:23:49 +09:00 |
|
Emil Siverhall
|
2210f7b29f
|
Merge branch 'statistics_ideas_wo_projects' into develop
|
2012-09-05 13:20:47 +02:00 |
|
Emil Siverhall
|
cf9a86262e
|
some changes to number column on statistic page to show details link with count numbers
|
2012-09-05 12:26:03 +02:00 |
|
Emil Siverhall
|
57ef552c25
|
changes to generic data panel to make the headers toolbar with sorting links ajaxified. needed to make sorting in dialogs work properly
|
2012-09-05 10:47:17 +02:00 |
|
Emil Siverhall
|
f07d12bdf7
|
changes to status columns in both datatables
|
2012-09-05 10:38:35 +02:00 |
|
Emil Siverhall
|
dcaddb3cfa
|
only showing table if it's not empty
|
2012-09-05 10:03:23 +02:00 |
|
Emil Siverhall
|
cb0cd12e0f
|
datatable for students ideas implemented as well. status columns needs work and some display logics
|
2012-09-05 09:17:35 +02:00 |
|
Emil Siverhall
|
0ce25750eb
|
datatable for supervisor ideas now implemented
|
2012-09-05 08:59:38 +02:00 |
|
fred-fri
|
156b354924
|
making some tests
|
2012-09-05 15:06:10 +09:00 |
|
fred-fri
|
f93113df60
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-09-05 13:44:31 +09:00 |
|
fred-fri
|
b2ee789ab0
|
removed bad test
|
2012-09-05 13:42:38 +09:00 |
|
fred-fri
|
ffd65d4113
|
removals are now also saved
|
2012-09-05 13:41:37 +09:00 |
|
fred-fri
|
5b262a2ba8
|
since research areas is the owning entity you need to loop through them and save them
|
2012-09-05 13:02:23 +09:00 |
|
fred-fri
|
b2f2998a4c
|
gui implemented but saving the research areas wont work
|
2012-09-05 12:50:17 +09:00 |
|
fred-fri
|
8fbf87599d
|
implementing gui
|
2012-09-05 12:37:31 +09:00 |
|
fred-fri
|
660322b8cb
|
implementing gui
|
2012-09-05 12:34:09 +09:00 |
|
fred-fri
|
1f4fa6735f
|
implementing gui
|
2012-09-05 12:32:24 +09:00 |
|
fred-fri
|
73f1633f92
|
implementing gui
|
2012-09-05 12:28:37 +09:00 |
|
fred-fri
|
627674824f
|
implementing gui
|
2012-09-05 12:20:23 +09:00 |
|
fred-fri
|
429433973c
|
case bug fix
|
2012-09-05 11:22:45 +09:00 |
|
fred-fri
|
651ab1d293
|
some hibernate mappings specified, but its still trying to create a new keywords_research areas table
|
2012-09-05 11:17:57 +09:00 |
|
fred-fri
|
154e0683c2
|
added sql
|
2012-09-05 10:40:30 +09:00 |
|
Emil Siverhall
|
534afaba62
|
count for numbers of ideas without projects now display correct numbers in the statistics datatable. both student and supervisor ideas are added
|
2012-09-04 20:39:05 +02:00 |
|
Emil Siverhall
|
f61b656f5a
|
added dialog to show details about the supervisors ideas that doesnt have projects created. datatable to show ideas still not implemented
|
2012-09-04 20:20:07 +02:00 |
|
Emil Siverhall
|
aaed6045f4
|
list of supervisors on statistic page now includes supervisors that are supervising student ideas
|
2012-09-04 19:33:49 +02:00 |
|
Emil Siverhall
|
fd358302bd
|
list of supervisors with ideas without projects now works for supervisor ideas. support for student ideas still needs to be implemented
|
2012-09-04 15:09:28 +02:00 |
|
Emil Siverhall
|
94dbff5bb1
|
added new panel with datatable to ideas without projects statistics page. correct data to fill datatable still needed
|
2012-09-04 14:23:31 +02:00 |
|
Emil Siverhall
|
f8ed25d093
|
added new page skeleton for Admin - Statistics - Project ideas without projects
|
2012-09-04 14:08:27 +02:00 |
|
Emil Siverhall
|
555d49a95e
|
Merge branch 'finalSem' into develop
|
2012-09-04 13:50:48 +02:00 |
|
Emil Siverhall
|
e33c7f5bf2
|
changes to FinalSeminarDataPanel to make sorting change from ascending to descending when switching between future and past seminaes
|
2012-09-04 13:50:38 +02:00 |
|
Emil Siverhall
|
048c1d2b8e
|
Merge branch 'final_seminar_date_filter' into develop
|
2012-09-04 10:34:20 +02:00 |
|
Emil Siverhall
|
83810ed5d4
|
added radio choice filtering on past or future final seminars to FinalSeminarDataPanel
|
2012-09-04 10:34:00 +02:00 |
|
fred-fri
|
b0cd29064c
|
added sets
|
2012-09-04 16:42:02 +09:00 |
|
Emil Siverhall
|
215ad84856
|
Merge branch 'm3_statusFix' into develop
|
2012-09-03 14:38:22 +02:00 |
|
Emil Siverhall
|
829878c76f
|
changes to status columns in author view as well
|
2012-09-03 14:38:02 +02:00 |
|
Emil Siverhall
|
ac868986b1
|
some changes to status columns in supervisor view to show course start date when matched
|
2012-09-03 13:31:18 +02:00 |
|
Emil Siverhall
|
c452c4ea85
|
Merge branch 'm3_watson_reminder' into develop
|
2012-09-03 12:29:27 +02:00 |
|
Emil Siverhall
|
7653a1bbbe
|
added info box to remind students to fill in watson details before application period end date
|
2012-09-03 12:28:48 +02:00 |
|
fred-fri
|
46962fd4b7
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-09-03 15:59:45 +09:00 |
|
fred-fri
|
faa58e4464
|
dropped identifier from keyword
|
2012-09-03 15:59:13 +09:00 |
|
Emil Siverhall
|
fd6f5f46d6
|
Merge branch 'acceptDateInfo' into develop
|
2012-09-03 08:49:38 +02:00 |
|
Emil Siverhall
|
0e86d34a8d
|
added info of the latest date a student have to confirm participation on a supervisor idea
|
2012-09-03 08:49:07 +02:00 |
|
fred-fri
|
e369ae1878
|
added dialog title for remaining dialoges, and adjusted their size
|
2012-09-03 15:18:42 +09:00 |
|
fred-fri
|
9e1c87f962
|
added dialog title for remaining dialoges, and adjusted their size
|
2012-09-03 15:14:17 +09:00 |
|