Skip to content

Commit f24977d

Browse files
hcientisthcientist
authored
Merge pull request #27 from Lab-Lab-Lab/main
try once more to trigger the workflow
2 parents 8856d6c + f75c2d0 commit f24977d

File tree

4 files changed

+106
-34
lines changed

4 files changed

+106
-34
lines changed

‎teleband/dashboards/urls.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from django.urls import path
22

33
from teleband.dashboards.views import AssignmentListView, CourseListView, csv_view
4+
45
app_name = "dashboards"
56
urlpatterns = [
67
path("", AssignmentListView.as_view(), name="assignment_list"),

‎teleband/dashboards/views.py‎

Lines changed: 92 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -53,49 +53,113 @@ def csv_view(request):
5353
# is a performance booster which results in a single more complex query but won't require
5454
# database queries
5555
assignments = Assignment.objects.select_related(
56-
"piece",
57-
"piece_plan",
58-
"enrollment",
59-
"enrollment__user",
60-
"enrollment__course",
61-
"enrollment__instrument",
62-
"enrollment__course__owner",
63-
"instrument",
64-
"activity",
65-
).all()
56+
"piece",
57+
"piece_plan",
58+
"enrollment",
59+
"enrollment__user",
60+
"enrollment__course",
61+
"enrollment__instrument",
62+
"enrollment__course__owner",
63+
"instrument",
64+
"activity",
65+
).all()
6666

6767
# Create the HttpResponse object with the appropriate CSV header
6868
response = HttpResponse(
6969
content_type="text/csv",
70-
headers={"Content-Disposition": 'attachment; filename="assignment.csv"'}
70+
headers={"Content-Disposition": 'attachment; filename="assignment.csv"'},
7171
)
7272

7373
writer = csv.writer(response)
74-
writer.writerow(["ID", "Course ID", "Course Name", "Piece ID", "Piece Name", "Piece Plan ID", "Piece Plan Name",
75-
"Student ID", "Student Instrument ID", "Student Instrument Name", "Assignment Activity ID",
76-
"Assignment Activity", "Assignment Instrument ID", "Assignment Instrument Name", "Submissions ID",
77-
"Submissions Content", "Submissions submitted", "Submissions grade", "Submissions Self Grade",
78-
"Submission Attatchnment ID", "Submission Attachment File", "Submission Attachment Submitted"])
74+
writer.writerow(
75+
[
76+
"ID",
77+
"Course ID",
78+
"Course Name",
79+
"Piece ID",
80+
"Piece Name",
81+
"Piece Plan ID",
82+
"Piece Plan Name",
83+
"Student ID",
84+
"Student Instrument ID",
85+
"Student Instrument Name",
86+
"Assignment Activity ID",
87+
"Assignment Activity",
88+
"Assignment Instrument ID",
89+
"Assignment Instrument Name",
90+
"Submissions ID",
91+
"Submissions Content",
92+
"Submissions submitted",
93+
"Submissions grade",
94+
"Submissions Self Grade",
95+
"Submission Attatchnment ID",
96+
"Submission Attachment File",
97+
"Submission Attachment Submitted",
98+
]
99+
)
79100
for assn in assignments:
80101
if len(assn.submissions.all()) == 0:
81-
82-
writer.writerow([assn.id, assn.enrollment.course.id, assn.enrollment.course.name, assn.piece.id,
83-
assn.piece.name, assn.piece_plan.id, assn.piece_plan, assn.enrollment.user.id,
84-
assn.enrollment.instrument.id, assn.enrollment.instrument.name, assn.activity.id,
85-
assn.activity, assn.instrument.id, assn.instrument.name, "N/A", "N/A", "N/A",
86-
"N/A", "N/A", "N/A", "N/A", "N/A"])
102+
103+
writer.writerow(
104+
[
105+
assn.id,
106+
assn.enrollment.course.id,
107+
assn.enrollment.course.name,
108+
assn.piece.id,
109+
assn.piece.name,
110+
assn.piece_plan.id,
111+
assn.piece_plan,
112+
assn.enrollment.user.id,
113+
assn.enrollment.instrument.id,
114+
assn.enrollment.instrument.name,
115+
assn.activity.id,
116+
assn.activity,
117+
assn.instrument.id,
118+
assn.instrument.name,
119+
"N/A",
120+
"N/A",
121+
"N/A",
122+
"N/A",
123+
"N/A",
124+
"N/A",
125+
"N/A",
126+
"N/A",
127+
]
128+
)
87129
else:
88130
for sub in assn.submissions.all():
89131
for att in sub.attachments.all():
90-
csv_val = [assn.id, assn.enrollment.course.id, assn.enrollment.course.name, assn.piece.id,
91-
assn.piece.name, assn.piece_plan.id, assn.piece_plan, assn.enrollment.user.id,
92-
assn.enrollment.instrument.id, assn.enrollment.instrument.name, assn.activity.id,
93-
assn.activity, assn.instrument.id, assn.instrument.name, sub.id]
132+
csv_val = [
133+
assn.id,
134+
assn.enrollment.course.id,
135+
assn.enrollment.course.name,
136+
assn.piece.id,
137+
assn.piece.name,
138+
assn.piece_plan.id,
139+
assn.piece_plan,
140+
assn.enrollment.user.id,
141+
assn.enrollment.instrument.id,
142+
assn.enrollment.instrument.name,
143+
assn.activity.id,
144+
assn.activity,
145+
assn.instrument.id,
146+
assn.instrument.name,
147+
sub.id,
148+
]
94149
if assn.activity.category == "Create":
95150
csv_val.append("Create, see below")
96151
else:
97152
csv_val.append(sub.content)
98-
csv_val.extend([sub.submitted, sub.grade, sub.self_grade, att.id, att.file, att.submitted])
99-
153+
csv_val.extend(
154+
[
155+
sub.submitted,
156+
sub.grade,
157+
sub.self_grade,
158+
att.id,
159+
att.file,
160+
att.submitted,
161+
]
162+
)
163+
100164
writer.writerow(csv_val)
101165
return response

‎teleband/musics/api/serializers.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
from rest_framework import serializers
22

33
from teleband.musics.models import (
4-
Piece, Part, PartTransposition, Composer, PartType,
5-
PartInstrumentSample, EnsembleType
4+
Piece,
5+
Part,
6+
PartTransposition,
7+
Composer,
8+
PartType,
9+
PartInstrumentSample,
10+
EnsembleType,
611
)
712
from teleband.instruments.models import Transposition
813
from teleband.utils.serializers import GenericNameSerializer
@@ -49,7 +54,7 @@ class Meta:
4954
class PartInstrumentSampleSerializer(serializers.ModelSerializer):
5055
class Meta:
5156
model = PartInstrumentSample
52-
fields = ['id', 'part', 'instrument', 'sample_audio']
57+
fields = ["id", "part", "instrument", "sample_audio"]
5358

5459

5560
class PartSerializer(serializers.ModelSerializer):

‎teleband/musics/models.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,14 @@ def __str__(self):
9696

9797

9898
class PartInstrumentSample(models.Model):
99-
part = models.ForeignKey(Part, related_name="instrument_samples", on_delete=models.PROTECT)
100-
instrument = models.ForeignKey('instruments.Instrument', on_delete=models.PROTECT)
99+
part = models.ForeignKey(
100+
Part, related_name="instrument_samples", on_delete=models.PROTECT
101+
)
102+
instrument = models.ForeignKey("instruments.Instrument", on_delete=models.PROTECT)
101103
sample_audio = models.FileField(upload_to="instrument_samples/")
102104

103105
class Meta:
104-
unique_together = ['part', 'instrument']
106+
unique_together = ["part", "instrument"]
105107
verbose_name = "Part Instrument Sample"
106108
verbose_name_plural = "Part Instrument Samples"
107109

0 commit comments

Comments
 (0)