niklas3
|
6c87eb255b
|
Hide "Opposition and peer review" from tabs if active project is ICT4D. Had to fix null pointers for every test in the world
|
2013-12-11 16:17:28 +01:00 |
|
|
|
6418d6cfee
|
Loosened coupling by changing HashSet to Collection.
|
2013-12-11 16:07:29 +01:00 |
|
|
|
c868b473d2
|
Loosened coupling by changing HashSet to Collection.
|
2013-12-11 15:54:14 +01:00 |
|
niklas3
|
6eb0f2caa7
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 14:59:56 +01:00 |
|
niklas3
|
24dbe0ceb7
|
Clean-up in aisle 5.
|
2013-12-11 14:59:52 +01:00 |
|
niklas3
|
7eeaa99fd4
|
Changed named of DataInitialiser.
|
2013-12-11 14:57:39 +01:00 |
|
niklas3
|
43b4a6af6d
|
Changed named of DataInitialiser + removed default users.
|
2013-12-11 14:57:20 +01:00 |
|
Emil Siverhall
|
5cc2f7309d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 14:50:24 +01:00 |
|
Emil Siverhall
|
63b31d93b3
|
removed ProjectClassFilter and replaced it with CheckBoxMultipleChoice component with Ajax behavior
|
2013-12-11 14:50:11 +01:00 |
|
Leo
|
98382e099c
|
GradingReport.getCriteria() sort criteria
|
2013-12-11 12:46:09 +01:00 |
|
|
|
526da96760
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 11:59:28 +01:00 |
|
|
|
a73e8e6069
|
Moved plagiarism feedback requirement to isFinished in GradingReport.
Turned <a> tag into <button> to get automatic disabled="disabled" attribute.
|
2013-12-11 11:59:23 +01:00 |
|
|
|
a4ac0dbf15
|
Added tests and renamed method.
|
2013-12-11 11:47:42 +01:00 |
|
|
|
ca9c22ff58
|
Grading report has a grade if all criteria have points even without feedback.
|
2013-12-11 11:39:26 +01:00 |
|
|
|
16965d77d5
|
Spelling.
|
2013-12-11 11:29:37 +01:00 |
|
|
|
ae2404700b
|
Creating criteria is done with polymorphism instead of if.
|
2013-12-11 11:28:57 +01:00 |
|
Emil Siverhall
|
5867968066
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 11:10:52 +01:00 |
|
Leo
|
3db25db883
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-11 10:44:15 +01:00 |
|
Leo
|
2f5544049e
|
added missed part of commit
|
2013-12-11 10:44:01 +01:00 |
|
Emil Siverhall
|
414072e1d1
|
service method for retrieving all active project types with a proper degree level
|
2013-12-11 10:33:37 +01:00 |
|
Emil Siverhall
|
5a9988c841
|
renamed project class service and project class repo
|
2013-12-11 09:28:21 +01:00 |
|
fred-fri
|
4cde27444e
|
dont add milestones if they already exist
|
2013-12-11 14:23:49 +09:00 |
|
|
|
a5aaad8e4f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 16:43:15 +01:00 |
|
|
|
d3a66f9272
|
Removed code from ProjectType.
|
2013-12-10 16:43:11 +01:00 |
|
niklas3
|
e376a64f3a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2013-12-10 16:38:49 +01:00 |
|
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 |
|
