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 |
|
fred-fri
|
3ea4500671
|
markup fixes
|
2012-08-27 17:45:23 +09:00 |
|
fred-fri
|
88b88bfca4
|
added clean button for old keywords that have keyword type unit or research area.
|
2012-08-27 17:41:02 +09:00 |
|
fred-fri
|
1c593a3d2c
|
added new db update file
|
2012-08-27 12:34:52 +09:00 |
|
fred-fri
|
08d300c6b0
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-08-27 11:09:08 +09:00 |
|
fred-fri
|
ac4363363c
|
phrase change
|
2012-08-27 11:08:53 +09:00 |
|
fred-fri
|
b16069f605
|
fixed a markup bug
|
2012-08-27 10:55:21 +09:00 |
|
fred-fri
|
766c1f65cf
|
added comment to current.sql
|
2012-08-27 10:38:27 +09:00 |
|
Emil Siverhall
|
dbeda404a1
|
Merge branch 'm3_statuses' into develop
|
2012-08-24 10:29:50 +02:00 |
|
Emil Siverhall
|
18ac9cc60a
|
added title link to reach idea info in supervisor datatable
|
2012-08-24 10:29:40 +02:00 |
|
Emil Siverhall
|
12d820306e
|
added new status column to supervisor data tables with more details status labels
|
2012-08-24 10:29:38 +02:00 |
|
fred-fri
|
341a07d0fc
|
made supervisor idea clickable open dialog
|
2012-08-24 16:38:43 +09:00 |
|
fred-fri
|
d023867e32
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-08-24 16:23:12 +09:00 |
|
fred-fri
|
8b70eb8ab8
|
removed project idea subtabmenu
|
2012-08-24 16:22:44 +09:00 |
|
fred-fri
|
eecc0b0750
|
added clickable title column that opens watson dialog on project ideas
|
2012-08-24 16:08:59 +09:00 |
|
fred-fri
|
349b792ee1
|
fixed columns for student project idea datapanel in author section
|
2012-08-24 15:24:26 +09:00 |
|
fred-fri
|
7720b8f65f
|
switched positions of supervisor and student project idea data tables
|
2012-08-24 15:00:06 +09:00 |
|
fred-fri
|
82c60dbb56
|
fixed datatable for my student project ideas instead of old data something else repeater component
|
2012-08-24 14:57:42 +09:00 |
|
Emil Siverhall
|
08e99461f2
|
Merge branch 'm3_currently_numbers' into develop
|
2012-08-24 07:43:53 +02:00 |
|
Emil Siverhall
|
6bf59686b3
|
added check to make sure project is not created when counting ideas submitted by students
|
2012-08-24 07:43:27 +02:00 |
|
Emil Siverhall
|
2e4b4de4f0
|
you are currently supervising now takes ideas submitted by students into account as well
|
2012-08-24 07:43:25 +02:00 |
|
Emil Siverhall
|
01f9d0cd16
|
you are currently supervising now takes active projects in account as well
|
2012-08-24 07:43:23 +02:00 |
|
fred-fri
|
ec9c0c3e2b
|
made student project idea tablewider
|
2012-08-24 14:41:40 +09:00 |
|
fred-fri
|
c0dfa8f2c7
|
fixed some stuff
|
2012-08-24 14:40:25 +09:00 |
|
fred-fri
|
bdb907b0aa
|
removed unneccessary link
|
2012-08-24 14:21:21 +09:00 |
|
fred-fri
|
ca9889c540
|
made supervisor idea table on author section always visible, and made new method that only uses author not status and confirmed to find ideas
|
2012-08-24 14:00:53 +09:00 |
|
fred-fri
|
ce479485f2
|
Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop
|
2012-08-24 12:45:58 +09:00 |
|
fred-fri
|
90b9258459
|
made some more changes to ideainfopanel
|
2012-08-24 12:45:41 +09:00 |
|
fred-fri
|
e13def567d
|
changed wording and made bold read more section of project idea general info area
|
2012-08-24 12:24:04 +09:00 |
|
fred-fri
|
e56c749a66
|
made create new supervisor project idea link a button for more visibility
|
2012-08-24 12:09:18 +09:00 |
|
fred-fri
|
e30e7e02ef
|
bolded level text in application period info panel to make it stand out more
|
2012-08-24 12:02:19 +09:00 |
|
fred-fri
|
b06bd37795
|
made project idea info panel smaller and using a dialog for it
|
2012-08-24 11:58:14 +09:00 |
|
fred-fri
|
bc5fac3dda
|
made application period info panel smaller
|
2012-08-24 11:41:12 +09:00 |
|
fred-fri
|
91b6ac7498
|
made info box padding less
|
2012-08-24 11:35:55 +09:00 |
|
Emil Siverhall
|
70d652d283
|
Merge branch 'margin_fix' into develop
|
2012-08-23 20:32:54 +02:00 |
|
Emil Siverhall
|
5e39d1f567
|
html markup fix that made content of page float out of screen in firefox
|
2012-08-23 20:32:41 +02:00 |
|
Emil Siverhall
|
d1c7899164
|
Merge branch 'm3_firstmeeting_fixes' into develop
|
2012-08-23 20:08:35 +02:00 |
|
Emil Siverhall
|
2b7936823f
|
instead of using the same datatable for supervisors own ideas and all supervisors ideas i've split them into two different since columns differ and only one of them use filtering
|
2012-08-23 16:39:44 +02:00 |
|
Emil Siverhall
|
0f15c0d646
|
added column with first meeting date to datatable on supervisors project idea start page.
|
2012-08-23 16:20:36 +02:00 |
|
fred-fri
|
8c6fbb2c0e
|
term change
|
2012-08-23 13:52:30 +09:00 |
|
fred-fri
|
d9976c445d
|
supervisor projet idea tab design now according to mockup, but must clean up and remove some pages and panels
|
2012-08-23 13:27:40 +09:00 |
|