Skip to content

Commit fc2f9c3

Browse files
committed
Quick refactoring
1 parent 435b5e6 commit fc2f9c3

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

partner_programs/admin.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,21 @@ def get_export_file_view(self, request, object_id):
5757
program = PartnerProgram.objects.get(pk=object_id)
5858
return self.get_export_file(program)
5959

60-
def get_export_file(self, obj: PartnerProgram):
61-
json_schema = obj.data_schema
62-
profiles = PartnerProgramUserProfile.objects.filter(partner_program=obj)
60+
def get_export_file(self, partner_program: PartnerProgram):
61+
json_schema = partner_program.data_schema
62+
profiles = PartnerProgramUserProfile.objects.filter(
63+
partner_program=partner_program
64+
)
6365
to_delete_from_json_scheme = []
6466
column_names = ["Имя", "Фамилия", "Отчество", "Почта", "Дата рождения"]
65-
for i in json_schema:
66-
if "name" not in json_schema[i]:
67-
to_delete_from_json_scheme.append(i)
67+
for field_key in json_schema:
68+
if "name" not in json_schema[field_key]:
69+
to_delete_from_json_scheme.append(field_key)
6870
else:
69-
column_names.append(json_schema[i]["name"])
71+
column_names.append(json_schema[field_key]["name"])
7072

71-
for i in to_delete_from_json_scheme:
72-
del json_schema[i]
73+
for field_key in to_delete_from_json_scheme:
74+
del json_schema[field_key]
7375

7476
response_data = tablib.Dataset(headers=column_names)
7577
for profile in profiles:
@@ -87,8 +89,9 @@ def get_export_file(self, obj: PartnerProgram):
8789
response_data.append(row)
8890

8991
binary_data = response_data.export("xlsx")
90-
file_name = timezone.now().strftime("%d-%m-%Y %H:%M:%S")
91-
print(file_name)
92+
file_name = (
93+
f'{partner_program.name} {timezone.now().strftime("%d-%m-%Y %H:%M:%S")}'
94+
)
9295
response = HttpResponse(
9396
content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
9497
headers={"Content-Disposition": f'attachment; filename="{file_name}.xlsx"'},

0 commit comments

Comments
 (0)