From a7403bc5dc1cf2f14acf8cd8f47c9265feca6973 Mon Sep 17 00:00:00 2001 From: janmax <mail-github@jmx.io> Date: Thu, 9 Nov 2017 23:12:41 +0100 Subject: [PATCH] Makefile fix and minor formatting issues (PEP8, and line length) --- backend/Makefile | 2 +- backend/core/serializers.py | 5 ++++- backend/core/tests.py | 1 + frontend/src/components/student/SubmissionList.vue | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/backend/Makefile b/backend/Makefile index 8393a665..64d359b2 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -31,7 +31,7 @@ install: yarn test: - python manage.py run test + python manage.py test coverage: coverage run manage.py test diff --git a/backend/core/serializers.py b/backend/core/serializers.py index b8f2e56f..8178ecfa 100644 --- a/backend/core/serializers.py +++ b/backend/core/serializers.py @@ -4,12 +4,15 @@ from core.models import ExamType, Feedback, Student, Submission class ExamSerializer(serializers.ModelSerializer): + class Meta: model = ExamType - fields = ('module_reference', 'total_score', 'pass_score', 'pass_only',) + fields = ('module_reference', 'total_score', + 'pass_score', 'pass_only',) class FeedbackSerializer(serializers.ModelSerializer): + class Meta: model = Feedback fields = ('text', 'score') diff --git a/backend/core/tests.py b/backend/core/tests.py index 9447b624..f3290fbe 100644 --- a/backend/core/tests.py +++ b/backend/core/tests.py @@ -54,6 +54,7 @@ class FactoryTestCase(TestCase): def test_can_create_student(self): self.assertIn(self.factory.make_student(), Student.objects.all()) + class AccountsTestCase(TestCase): factory = GradyUserFactory() diff --git a/frontend/src/components/student/SubmissionList.vue b/frontend/src/components/student/SubmissionList.vue index 3474bfd5..c39e745f 100644 --- a/frontend/src/components/student/SubmissionList.vue +++ b/frontend/src/components/student/SubmissionList.vue @@ -1,7 +1,9 @@ <template> <div class="row my-2 justify-content-center"> <b-table hover :items="submissions" :fields="fields"></b-table> - <div class="alert alert-info">You reached <b>{{ sumScore }}</b> of <b>{{ sumFullScore }}</b> possible points( {{ pointRatio }}% ).</div> + <div class="alert alert-info"> + You reached <b>{{ sumScore }}</b> of <b>{{ sumFullScore }}</b> possible points( {{ pointRatio }}% ). + </div> </div> </template> -- GitLab