Skip to content

try once more to trigger the workflow #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 28, 2024
Merged

try once more to trigger the workflow #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f1746b
trigger pr when this is pr'ed back to og
hcientist Oct 28, 2024
b45ef3b
Merge branch 'Lab-Lab-Lab:main' into main
hcientist Oct 28, 2024
f75c2d0
get right with formatting
hcientist Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions teleband/dashboards/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django.urls import path

from teleband.dashboards.views import AssignmentListView, CourseListView, csv_view

app_name = "dashboards"
urlpatterns = [
path("", AssignmentListView.as_view(), name="assignment_list"),
Expand Down
120 changes: 92 additions & 28 deletions teleband/dashboards/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,49 +53,113 @@ def csv_view(request):
# is a performance booster which results in a single more complex query but won't require
# database queries
assignments = Assignment.objects.select_related(
"piece",
"piece_plan",
"enrollment",
"enrollment__user",
"enrollment__course",
"enrollment__instrument",
"enrollment__course__owner",
"instrument",
"activity",
).all()
"piece",
"piece_plan",
"enrollment",
"enrollment__user",
"enrollment__course",
"enrollment__instrument",
"enrollment__course__owner",
"instrument",
"activity",
).all()

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

writer = csv.writer(response)
writer.writerow(["ID", "Course ID", "Course Name", "Piece ID", "Piece Name", "Piece Plan ID", "Piece Plan Name",
"Student ID", "Student Instrument ID", "Student Instrument Name", "Assignment Activity ID",
"Assignment Activity", "Assignment Instrument ID", "Assignment Instrument Name", "Submissions ID",
"Submissions Content", "Submissions submitted", "Submissions grade", "Submissions Self Grade",
"Submission Attatchnment ID", "Submission Attachment File", "Submission Attachment Submitted"])
writer.writerow(
[
"ID",
"Course ID",
"Course Name",
"Piece ID",
"Piece Name",
"Piece Plan ID",
"Piece Plan Name",
"Student ID",
"Student Instrument ID",
"Student Instrument Name",
"Assignment Activity ID",
"Assignment Activity",
"Assignment Instrument ID",
"Assignment Instrument Name",
"Submissions ID",
"Submissions Content",
"Submissions submitted",
"Submissions grade",
"Submissions Self Grade",
"Submission Attatchnment ID",
"Submission Attachment File",
"Submission Attachment Submitted",
]
)
for assn in assignments:
if len(assn.submissions.all()) == 0:

writer.writerow([assn.id, assn.enrollment.course.id, assn.enrollment.course.name, assn.piece.id,
assn.piece.name, assn.piece_plan.id, assn.piece_plan, assn.enrollment.user.id,
assn.enrollment.instrument.id, assn.enrollment.instrument.name, assn.activity.id,
assn.activity, assn.instrument.id, assn.instrument.name, "N/A", "N/A", "N/A",
"N/A", "N/A", "N/A", "N/A", "N/A"])

writer.writerow(
[
assn.id,
assn.enrollment.course.id,
assn.enrollment.course.name,
assn.piece.id,
assn.piece.name,
assn.piece_plan.id,
assn.piece_plan,
assn.enrollment.user.id,
assn.enrollment.instrument.id,
assn.enrollment.instrument.name,
assn.activity.id,
assn.activity,
assn.instrument.id,
assn.instrument.name,
"N/A",
"N/A",
"N/A",
"N/A",
"N/A",
"N/A",
"N/A",
"N/A",
]
)
else:
for sub in assn.submissions.all():
for att in sub.attachments.all():
csv_val = [assn.id, assn.enrollment.course.id, assn.enrollment.course.name, assn.piece.id,
assn.piece.name, assn.piece_plan.id, assn.piece_plan, assn.enrollment.user.id,
assn.enrollment.instrument.id, assn.enrollment.instrument.name, assn.activity.id,
assn.activity, assn.instrument.id, assn.instrument.name, sub.id]
csv_val = [
assn.id,
assn.enrollment.course.id,
assn.enrollment.course.name,
assn.piece.id,
assn.piece.name,
assn.piece_plan.id,
assn.piece_plan,
assn.enrollment.user.id,
assn.enrollment.instrument.id,
assn.enrollment.instrument.name,
assn.activity.id,
assn.activity,
assn.instrument.id,
assn.instrument.name,
sub.id,
]
if assn.activity.category == "Create":
csv_val.append("Create, see below")
else:
csv_val.append(sub.content)
csv_val.extend([sub.submitted, sub.grade, sub.self_grade, att.id, att.file, att.submitted])

csv_val.extend(
[
sub.submitted,
sub.grade,
sub.self_grade,
att.id,
att.file,
att.submitted,
]
)

writer.writerow(csv_val)
return response
11 changes: 8 additions & 3 deletions teleband/musics/api/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
from rest_framework import serializers

from teleband.musics.models import (
Piece, Part, PartTransposition, Composer, PartType,
PartInstrumentSample, EnsembleType
Piece,
Part,
PartTransposition,
Composer,
PartType,
PartInstrumentSample,
EnsembleType,
)
from teleband.instruments.models import Transposition
from teleband.utils.serializers import GenericNameSerializer
Expand Down Expand Up @@ -49,7 +54,7 @@ class Meta:
class PartInstrumentSampleSerializer(serializers.ModelSerializer):
class Meta:
model = PartInstrumentSample
fields = ['id', 'part', 'instrument', 'sample_audio']
fields = ["id", "part", "instrument", "sample_audio"]


class PartSerializer(serializers.ModelSerializer):
Expand Down
8 changes: 5 additions & 3 deletions teleband/musics/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,14 @@ def __str__(self):


class PartInstrumentSample(models.Model):
part = models.ForeignKey(Part, related_name="instrument_samples", on_delete=models.PROTECT)
instrument = models.ForeignKey('instruments.Instrument', on_delete=models.PROTECT)
part = models.ForeignKey(
Part, related_name="instrument_samples", on_delete=models.PROTECT
)
instrument = models.ForeignKey("instruments.Instrument", on_delete=models.PROTECT)
sample_audio = models.FileField(upload_to="instrument_samples/")

class Meta:
unique_together = ['part', 'instrument']
unique_together = ["part", "instrument"]
verbose_name = "Part Instrument Sample"
verbose_name_plural = "Part Instrument Samples"

Expand Down
Loading