3976 Commits

Author SHA1 Message Date
fred-fri
acbf553040 sql fixes 2013-12-10 10:38:56 +09:00
fred-fri
0e5fe3794e sql fixes 2013-12-10 10:12:37 +09:00
fred-fri
29a1f687e2 sql fixes 2013-12-10 09:20:25 +09:00
Per Lundholm
451607cd5c Renamed DegreeLevel to ProjectType 2013-12-09 17:10:46 +01:00
a6b24245a7 Merge remote-tracking branch 'origin/develop' into develop 2013-12-09 16:20:04 +01:00
Per Lundholm
e2ac1fe48f Renamed DegreeLevel to ProjectType 2013-12-09 15:52:43 +01:00
e23aa5c275 Criteria are not considered assessed until both points and feedback have been set. 2013-12-09 15:32:32 +01:00
6873e51135 Made it nullable until the dust settles. 2013-12-09 15:18:12 +01:00
ffb7003fa6 Added degree level enum to degree level the entity :) 2013-12-09 14:57:30 +01:00
39736d4f72 Removed findByName from ProjectClassService. 2013-12-09 13:29:28 +01:00
c28d73a58b Removed unused method. 2013-12-09 12:02:47 +01:00
74f7909ea0 Updated visibility in the checklist list under projects since the state "peer only" no longer exists, every checklist has associations with degree levels. 2013-12-09 11:58:39 +01:00
108749ea63 Removed old degree level categories. 2013-12-09 11:20:21 +01:00
5deac7a0aa Can now add/remove degree level associations to checklist templates. 2013-12-09 11:11:54 +01:00
c8c601703f Implemented new method. 2013-12-09 10:46:36 +01:00
717eeac9ba Fixed generic parameter name after project class got renamed. 2013-12-09 10:46:30 +01:00
c71405e3f0 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/panels/ListCheckListTemplatePanel.java
	view/src/test/java/se/su/dsv/scipro/panels/ListCheckListTemplatePanelTest.java
2013-12-09 10:38:38 +01:00
e2363ad523 Updated checklist template list panel to only show templates relevant for the given project. 2013-12-09 10:36:48 +01:00
Per Lundholm
9b3c5c9bab Merge remote-tracking branch 'origin/develop' into develop 2013-12-09 10:35:14 +01:00
Leo
8d60f850f8 fixed magic numbers 2013-12-09 10:27:50 +01:00
e95e9b4ede Added connection between checklist template and project class (degree level). 2013-12-09 10:23:31 +01:00
Per Lundholm
46ea4f3b25 Renamed ProjectClass to DegreeLevel 2013-12-09 10:07:42 +01:00
Emil Siverhall
19237c9cc5 Merge remote-tracking branch 'origin/develop' into develop 2013-12-09 08:29:53 +01:00
fred-fri
3819b833a5 clarified donotreply 2013-12-09 15:50:44 +09:00
86208ef47d Replaced explicit equals/hashCode with Lombok generated ones. 2013-12-07 11:53:33 +01:00
7887eb099f @Data'd Member. 2013-12-07 11:38:30 +01:00
Emil Siverhall
74e24d3513 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminIdeaOverviewPanel.java
2013-12-06 23:15:22 +01:00
Emil Siverhall
c0d7435205 create history(match) object when switching to/from inactive status 2013-12-06 21:43:38 +01:00
dd64af7a6b Replaced equals/hashCode with Lombok-generated ones. 2013-12-06 20:33:54 +01:00
ee8dfbfbf4 Removed useless interface. 2013-12-06 20:21:41 +01:00
0a7ccccc93 Removed unused method. 2013-12-06 20:20:47 +01:00
f182ba97c0 Removed unused classes. 2013-12-06 20:20:38 +01:00
Emil Siverhall
4ca62a6ef5 Added filtering on Inactive status on Admin-> Match 2013-12-06 20:18:18 +01:00
961e4fac53 Fixed cyclic dependency. 2013-12-06 20:06:11 +01:00
3d254fe611 Removed commented out code. 2013-12-06 19:16:48 +01:00
6c6b6744f3 Suppressed warnings due to Lombok. 2013-12-06 19:03:16 +01:00
a8ef66e8b6 Removed unused methods. 2013-12-06 18:57:12 +01:00
211ef2c30c Removed unused method. 2013-12-06 18:54:26 +01:00
ce522ceea4 Removed unused method. 2013-12-06 18:53:43 +01:00
8ccdc48399 Removed unused methods. 2013-12-06 18:53:11 +01:00
71d8158222 Removed unused method. 2013-12-06 18:52:34 +01:00
3e1daef9e4 Removed unused method. 2013-12-06 18:47:41 +01:00
0992de06a3 Removed methods from interface. 2013-12-06 18:46:24 +01:00
7a717d082c Removed unused method. 2013-12-06 18:36:35 +01:00
bcdb9a00d3 Removed unused methods. 2013-12-06 18:34:15 +01:00
961460c27e Removed unused method. 2013-12-06 18:31:57 +01:00
4b889c62e7 Removed unused methods. 2013-12-06 18:31:28 +01:00
cd6de28151 Removed unused method. 2013-12-06 18:28:19 +01:00
cfed878733 Removed unused methods. 2013-12-06 18:25:49 +01:00
b22400f2f2 Removed unused field. 2013-12-06 18:23:37 +01:00