6556 Commits

Author SHA1 Message Date
Emil Siverhall
39c775c0e0 changed project file page to use same model as all others page. should still be backed up by a loadable detachable model.. 2014-01-16 15:49:50 +01:00
Emil Siverhall
112ebf2153 watson character limit set to 300 2014-01-16 14:16:50 +01:00
Emil Siverhall
fd71e932b6 ... 2014-01-16 13:59:32 +01:00
Emil Siverhall
fa5665574c ajax link didn't recognize the correct model 2014-01-16 13:57:26 +01:00
Richard
0a7d85ea58 - Added class milestoneWrap to the MileStoneOverviewPanel.html.
- Disabled checkboxes on the milestone page are now hidden for supervisors.
- Disabled checked checkboxes are visible for supervisors.
2014-01-16 13:47:53 +01:00
Emil Siverhall
6599663234 tab and panel display logics changed from excluding degreelevel none to only include first and second cycle project types 2014-01-16 13:29:26 +01:00
Emil Siverhall
d60d61acb4 only show target numbers for project types within the application period concerned 2014-01-16 12:58:44 +01:00
5a156df72b Added component id to the abstract method and loosened model requirements. 2014-01-16 12:41:54 +01:00
ca0d53e149 Extracted PageAdapter to its own class. 2014-01-16 12:26:59 +01:00
Emil Siverhall
c8f2a65fc3 removed project type service method that only retrieves types with degree level since this was used to filter out ict4d. now we need same behavior for DegreeLevel.THIRD_CYCLE 2014-01-16 11:45:26 +01:00
Emil Siverhall
9a86d00401 Merge remote-tracking branch 'origin/develop' into develop 2014-01-16 10:09:25 +01:00
Richard
9bc51b8d1b Replaced student(s) with author(s). 2014-01-16 09:51:47 +01:00
Emil Siverhall
3bed9717a6 Merge remote-tracking branch 'origin/develop' into develop 2014-01-16 09:42:34 +01:00
a2fb193f55 Fixed some Sonar issues. 2014-01-16 09:32:19 +01:00
Emil Siverhall
a3637ad27a moved , inside of wicket:enclosure 2014-01-16 09:22:04 +01:00
e094d86c2f Removed unused class. 2014-01-16 09:16:16 +01:00
fred-fri
b8d2735695 refactoring 2014-01-16 13:16:57 +09:00
fred-fri
e44ff80fbd refactoring 2014-01-16 13:16:30 +09:00
fred-fri
8629c3dd41 develop2 2014-01-16 13:12:12 +09:00
cd6936f9bb Merge remote-tracking branch 'origin/develop' into develop 2014-01-15 17:17:05 +01:00
23cb64e982 Final refactoring. 2014-01-15 17:16:59 +01:00
776dc5f386 Moved check for no/only one project to page from panel. 2014-01-15 17:10:54 +01:00
Emil Siverhall
09c01a463a checkbox filter on ideas without first meeting booked.. 2014-01-15 17:06:45 +01:00
25f0ed36c9 Check for only one project now ignores inactive ones. 2014-01-15 16:57:03 +01:00
415881a8d1 Replaced filter with checkboxes to match the rest of the system. Removed inactive as a choice. 2014-01-15 16:31:44 +01:00
5be7880be1 Loosened requirements. 2014-01-15 16:02:47 +01:00
a7c3a8fa50 Refactored and tested retrieving projects and displaying "no projects" label. 2014-01-15 15:55:00 +01:00
Emil Siverhall
5dd7567604 Merge remote-tracking branch 'origin/develop' into develop 2014-01-15 15:32:32 +01:00
f09e8a18d9 Made the label for "no projects" not ugly. 2014-01-15 15:28:01 +01:00
Emil Siverhall
760bfee334 renamed FunctionalEditCheckListTemplatePanel. Great name.. 2014-01-15 14:50:54 +01:00
Emil Siverhall
9e0458f4bd moving some stuff around when editing checklist templates 2014-01-15 14:49:46 +01:00
559c3cdcbd Merge remote-tracking branch 'origin/develop' into develop 2014-01-15 14:41:08 +01:00
3d11aabd6c Changed labelString() return type from String to IModel<?> and replaced label component with setBody(IModel<?>) 2014-01-15 14:29:29 +01:00
61948ac2fd Cleanup. 2014-01-15 14:18:53 +01:00
Emil Siverhall
71dbe4ec0f changed to show all final seminars tab if student have a project on degreelevel first or second instead of hiding if a project on degreelevel none exists 2014-01-15 13:12:40 +01:00
Emil Siverhall
faac75a8c7 proper size on create project type dialog 2014-01-15 12:13:26 +01:00
815f2761fc Merge remote-tracking branch 'origin/develop' into develop 2014-01-15 11:38:50 +01:00
084d8ae6c2 Fixed warnings. 2014-01-15 11:35:44 +01:00
58ab87cb5b Phases are now hidden if there are no activities. 2014-01-15 11:35:23 +01:00
8271a9ba7e Refactored a bit. 2014-01-15 11:21:39 +01:00
ebb58a5f3c No need to use a StringResourceModel. 2014-01-15 11:17:58 +01:00
Richard
c9b1c1d521 Merge remote-tracking branch 'origin/develop' into develop 2014-01-15 11:08:54 +01:00
1cb5247bda Changed default return value from mocked PreliminaryGradingReportService. 2014-01-15 10:40:40 +01:00
Richard
e4c98c9021 Merge remote-tracking branch 'origin/develop' into develop 2014-01-15 10:26:49 +01:00
Emil Siverhall
9d3e8c875a Merge remote-tracking branch 'origin/develop' into develop 2014-01-15 10:22:35 +01:00
Emil Siverhall
691ae1ad69 same on Admin->Match->Ideas 2014-01-15 10:21:39 +01:00
Emil Siverhall
1eb5512de5 changed from OnChangeAjaxBehavior to AjaxFormComponentUpdatingBehavior on free text filter (project management) 2014-01-15 10:19:18 +01:00
Richard
4f1e485619 Merge remote-tracking branch 'origin/develop' into develop 2014-01-15 10:11:46 +01:00
d50224c224 Added generics. 2014-01-15 10:05:33 +01:00
355a3a09d7 Different text for report link if it is submitted or not. 2014-01-15 10:05:10 +01:00