Commit Graph

5273 Commits

Author SHA1 Message Date
fred-fri
f90f21c4d8 removed bug from project idea submission code 2012-10-10 11:50:14 +09:00
fred-fri
17c6f0c8fb markup bug 2012-10-10 11:21:45 +09:00
Emil Siverhall
b3ed224e99 Merge branch 'projectManagementFilter' into develop 2012-10-09 13:35:16 +02:00
Emil Siverhall
6caf26ffc9 fixed lazyinitialization bug when clicking project title on management page 2012-10-09 13:34:12 +02:00
Emil Siverhall
48e11712e4 some aligntment adjustments to create new project button 2012-10-09 13:14:42 +02:00
Emil Siverhall
5268b70d17 added filtering on project class to project management as well 2012-10-09 12:25:18 +02:00
Emil Siverhall
af0b8a6d3d replaced the filtering on admin - project management to use filterparams and separate field for author, supervisor and title. 2012-10-09 12:07:55 +02:00
fred-fri
5329f909c3 added new db update file 2012-10-09 15:53:53 +09:00
fred-fri
ac8f60917e fixed some logix for when a student with a bachelor exemption is manually assigned to a supervisor idea 2012-10-09 15:33:34 +09:00
fred-fri
3fa14aee1f some changes of wording 2012-10-09 15:01:59 +09:00
fred-fri
908243ea32 made a method to take application periods into account 2012-10-09 14:32:30 +09:00
fred-fri
78dd81008a made a method to take application periods into account 2012-10-09 14:04:07 +09:00
fred-fri
c7ce2652f2 first meeting details now added to all student sections that need it 2012-10-08 14:36:50 +09:00
fred-fri
13ec646074 added first meeting columns for students 2012-10-08 13:30:23 +09:00
fred-fri
2cf622ccf9 added first meeting column for students 2012-10-08 13:23:18 +09:00
fred-fri
2b3aa067a3 added first meeting details to students idea info panel 2012-10-08 13:14:28 +09:00
fred-fri
61c02d69d3 Merge branch 'showsupervisor' into develop 2012-10-08 12:47:55 +09:00
fred-fri
4859ea9341 added the supervisor name info to the ideainfopanel 2012-10-08 12:45:18 +09:00
fred-fri
072ec3eb15 made namevisibleinfo visible only if name is not visible yet 2012-10-08 12:36:47 +09:00
fred-fri
4185d85767 made the button work 2012-10-08 12:30:35 +09:00
fred-fri
40cc910147 added row coloring 2012-10-05 16:37:28 +09:00
fred-fri
2f7b693ead Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop 2012-10-05 15:34:21 +09:00
fred-fri
793e8084f0 button listener not working 2012-10-05 12:30:53 +09:00
fred-fri
194520c8a8 added button for making name visible, but its not showing 2012-10-04 17:45:42 +09:00
Emil Siverhall
ab1a108bef Merge branch 'historyOnPopUpPage' into develop 2012-10-04 10:22:31 +02:00
Emil Siverhall
0fc26cd8f2 added dialog with idea info when clicking title of student idea on the popup page. match history available here as well 2012-10-04 10:22:08 +02:00
fred-fri
c66742ce36 adding make supervisor name visible to students button 2012-10-04 16:49:47 +09:00
fred-fri
996c32e3b8 added supervisor column to student project idea panel 2012-10-04 16:42:23 +09:00
Emil Siverhall
61e64687ac Merge branch 'ideaBug' into develop 2012-10-04 09:37:43 +02:00
Emil Siverhall
0273ec12db fixed bug that made level filtering bug out the datatable with supervisor ideas to choose from for students 2012-10-04 09:37:23 +02:00
fred-fri
fd0675fff9 added showsupervisorboolean to supervisor idea 2012-10-04 16:03:08 +09:00
fred-fri
e2eee4789d added showsupervisorboolean to supervisor idea 2012-10-04 15:59:17 +09:00
fred-fri
03399cb0ad added matched to column to student project ideas 2012-10-04 15:54:10 +09:00
fred-fri
afba788abb added info about levels and languages to some pages 2012-10-04 12:53:30 +09:00
Emil Siverhall
b5998866e0 Merge branch 'studentIdeaMatchHistory' into develop 2012-10-03 22:40:12 +02:00
Emil Siverhall
40906ee1fb added match history tab to edit dialog as well on student idea datatable in admin - match 2012-10-03 22:36:50 +02:00
Emil Siverhall
8cf705f72c supervisor name is now displayed correctly in match history 2012-10-03 22:02:41 +02:00
Emil Siverhall
59a3c768ec added new match history panel to and refactor of student idea details popup at admin - match - student project ideas 2012-10-03 21:55:02 +02:00
Emil Siverhall
ef8c5ced9a added new match service methods to retrieve match history from a student idea 2012-10-03 21:54:05 +02:00
Emil Siverhall
55ac04ffed Merge branch 'statusRename' into develop 2012-10-03 09:16:49 +02:00
Emil Siverhall
fd7981f919 changes to name of idea statuses 2012-10-03 09:16:33 +02:00
Emil Siverhall
da2e52a03f Merge branch 'firstMeetingTime' into develop 2012-10-03 08:30:06 +02:00
Emil Siverhall
adbad045c1 same changes to student submitted ideas 2012-10-03 08:29:40 +02:00
Emil Siverhall
f98212d276 added possibility to add which time of the day the first meeting is to supervisor ideas 2012-10-03 08:29:03 +02:00
Emil Siverhall
a7209d7e51 Merge branch 'columnNameFix' into develop 2012-10-02 20:01:46 +02:00
Emil Siverhall
944a1c6b99 application period datatable had two edit columns instead of edit/delete 2012-10-02 20:01:34 +02:00
Emil Siverhall
3917c083c4 Merge branch 'exemptions' into develop 2012-10-02 19:23:02 +02:00
Emil Siverhall
03a6ee1934 admins may also add one student to bachelors if exemption is granted 2012-10-02 14:56:26 +02:00
Emil Siverhall
503aa1a1be students with exemption does not need to add a bachelor partner when selecting supervisor ideas 2012-10-02 14:44:31 +02:00
Emil Siverhall
2afbe78ded supervisors may now add only one author to a bachelor idea if student has been granted an exemption 2012-10-02 14:28:55 +02:00