niklas3
|
01d5e978f9
|
stuffs
|
2013-12-10 16:38:44 +01:00 |
|
niklas3
|
6b9b7fe8e0
|
stuffs
|
2013-12-10 16:38:27 +01:00 |
|
Leo
|
3867339538
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 16:28:19 +01:00 |
|
niklas3
|
c279cd6083
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 16:18:19 +01:00 |
|
niklas3
|
cb70afec8d
|
Milestones are now in the DataInitializer.
|
2013-12-10 16:17:13 +01:00 |
|
Leo
|
875376bffa
|
removed block of import and export
|
2013-12-10 16:07:26 +01:00 |
|
|
|
b048a506d9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 15:39:54 +01:00 |
|
|
|
756302c984
|
Changed findByCode to take a DegreeLevel instead.
|
2013-12-10 15:39:49 +01:00 |
|
Emil Siverhall
|
72e6ad907d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 15:05:41 +01:00 |
|
Emil Siverhall
|
377e525bb6
|
tests
|
2013-12-10 15:05:27 +01:00 |
|
niklas3
|
46b5526746
|
Passed more correctness to project grading criterion template.
|
2013-12-10 14:58:20 +01:00 |
|
niklas3
|
c4a5f7d957
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 14:47:27 +01:00 |
|
niklas3
|
6a6a2e21f7
|
Passed the correct ProjectType to grading report template.
|
2013-12-10 14:47:24 +01:00 |
|
Emil Siverhall
|
ec2293a611
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 14:45:52 +01:00 |
|
Emil Siverhall
|
91c748aa35
|
textarea to write plagiarism feedback in grading report. pdf download is not enabled if feedback is missing.
|
2013-12-10 14:45:30 +01:00 |
|
niklas3
|
0ffe26e41e
|
added project ready for grading
|
2013-12-10 14:10:42 +01:00 |
|
Emil Siverhall
|
56266ea2fc
|
plagiarismFeedback column to grading_report table
|
2013-12-10 13:49:39 +01:00 |
|
|
|
31f024c734
|
Made degree level not null in ProjectType and added NONE as default.
|
2013-12-10 11:31:35 +01:00 |
|
niklas3
|
c409a3d0d8
|
more data in dataInitializer
|
2013-12-10 11:26:16 +01:00 |
|
niklas3
|
fab88466e7
|
some new checks for not exporting other than in production
|
2013-12-10 09:42:34 +01:00 |
|
niklas3
|
3af9816b4b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 09:30:12 +01:00 |
|
niklas3
|
8844d3222b
|
cleaning
|
2013-12-10 09:30:00 +01:00 |
|
fred-fri
|
80c732668d
|
sql fix
|
2013-12-10 16:09:21 +09:00 |
|
fred-fri
|
01644252e5
|
fixed sql
|
2013-12-10 15:08:07 +09:00 |
|
fred-fri
|
7f490b4b63
|
sql fixes
|
2013-12-10 11:23:09 +09:00 |
|
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 |
|
