5314 Commits

Author SHA1 Message Date
Emil Siverhall
da4691f5b2 added new current.sql file 2012-10-15 2012-10-15 08:31:33 +02:00
fred-fri
1eb7b051b1 logics changes for partner container 2012-10-12 17:23:06 +09:00
fred-fri
a3d498fa4f hiding links to get more ideas for students who already connected to an idea 2012-10-12 17:14:54 +09:00
Emil Siverhall
5f2cfee925 Merge branch 'studentIdeaPopup' into develop 2012-10-12 08:27:43 +02:00
Emil Siverhall
552815b2ec added idea title to dialog header when clicking on a student idea title in admin crud interface 2012-10-12 08:27:06 +02:00
Emil Siverhall
dfdf307f4a added match actions tab to student idea info dialog in admin view 2012-10-12 08:23:45 +02:00
Emil Siverhall
2aa9b80cff added possibility to filter on match status = suggested on admin - student project ideas 2012-10-12 08:23:06 +02:00
Emil Siverhall
1c0e71cbb8 Merge branch 'levelFiltering' into develop 2012-10-12 07:54:12 +02:00
Emil Siverhall
7c4c0bda25 project class filter has now all levels checked by default. nothing shows when no level is selected 2012-10-12 07:53:27 +02:00
Emil Siverhall
0f71f9b2b4 Merge branch 'bugged_out' into develop 2012-10-11 10:15:45 +02:00
Emil Siverhall
5c90f1cd10 restructure of admin - supervisor project idea tab selection to prevent dialogs from bugging out. hopefully works better now 2012-10-11 10:15:01 +02:00
fred-fri
0debaedc34 fixed status in tests again 2012-10-11 12:59:12 +09:00
fred-fri
736da259aa fixed test to expect status confirmed instead of unused status suggested 2012-10-11 12:56:10 +09:00
fred-fri
bcf13d306d removed the old student crud interface and added level filtering to the new big one 2012-10-11 12:40:30 +09:00
fred-fri
fdc209ace9 rearranged student idea filters 2012-10-11 12:15:46 +09:00
fred-fri
82f1f761b9 added level filtering and rearranger filter components 2012-10-11 11:57:57 +09:00
fred-fri
97b18257e3 changed agreed status from published to confirmed 2012-10-11 10:30:14 +09:00
fred-fri
9032863253 removed suggested supervisor from form 2012-10-11 10:16:16 +09:00
Emil Siverhall
5ba6274c81 Merge branch 'ajaxbugs' into develop 2012-10-10 16:07:50 +02:00
Emil Siverhall
5244ec43ed removed refocus method from supervisor idea crud dialog to see if this was responsible for the ajax bugs 2012-10-10 16:06:01 +02:00
Emil Siverhall
6cbe0f932e Merge branch 'linktopartner' into develop 2012-10-10 15:03:53 +02:00
Emil Siverhall
5b4bd24f4f added better looking url to project partner page 2012-10-10 15:02:40 +02:00
Emil Siverhall
1855e270e9 added link to project partner page when submitting student ideas 2012-10-10 15:02:20 +02:00
fred-fri
3c01149166 Merge branch 'master' into develop 2012-10-10 18:47:12 +09:00
fred-fri
76e894c5d1 removed sysadmin decoration from two pages 20121010d 2012-10-10 18:44:25 +09:00
Emil Siverhall
05b98acf64 Merge branch 'rolesFix' into develop 2012-10-10 11:23:16 +02:00
Emil Siverhall
05a86f4a9e changed authorization roles on idea selection page 2012-10-10 11:22:47 +02:00
Emil Siverhall
b4ea05710c Merge branch 'supervisorIdeaHistory' into develop 2012-10-10 08:56:37 +02:00
Emil Siverhall
0973c4e817 changes to make sure all sortable columns sort on the match objects supervisor and status, and to make sure all status columns check the current match status 2012-10-10 08:53:03 +02:00
Emil Siverhall
86ce1e9c68 added some db_changes 2012-10-10 08:16:43 +02:00
Emil Siverhall
9e14c503e8 added button that creates default history objects from the supervisor ideas that's been entered into the system before functionality was added 2012-10-10 08:16:41 +02:00
Emil Siverhall
12c4f834c6 refactoring of unit tests to be aware of new match history objects associated with supervisor ideas 2012-10-10 08:16:38 +02:00
Emil Siverhall
7a9770b383 added new tab to show match history on admin supervisor idea panel 2012-10-10 08:16:36 +02:00
Emil Siverhall
0d983736a3 added service method to find all supervisor idea that doesnt have a match object connected to it 2012-10-10 08:13:56 +02:00
Emil Siverhall
9ef486e92c hooked up new match history aware methods to panels that use supervisor ideas 2012-10-10 08:13:53 +02:00
Emil Siverhall
5b5084b9df all service methods now takes supervisor idea match objects in consideration 2012-10-10 08:13:51 +02:00
Emil Siverhall
ae70cca03d started to prepare pages and change methods to work with match history in supervisor project ideas. still a lot to be done 2012-10-10 08:08:23 +02:00
Emil Siverhall
7474b59050 added new domain object for supervisor idea match history. also repo and service method to create matches. 2012-10-10 08:02:25 +02:00
fred-fri
5dca056573 added a print apiaddress line to help determine what profile is active 2012-10-10 13:18:30 +09:00
fred-fri
34cf1827bc added test space for pushing 20121010c 2012-10-10 12:28:41 +09:00
fred-fri
66be31deca added info about cout from dates 2012-10-10 12:23:16 +09:00
fred-fri
f90f21c4d8 removed bug from project idea submission code 20121010b 2012-10-10 11:50:14 +09:00
fred-fri
17c6f0c8fb markup bug 20121010 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 20121009 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