Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions upload/migrations/0011_xmlerrorreport_file.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 5.2.3

import upload.models
from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("upload", "0010_alter_package_category_alter_package_status"),
]

operations = [
migrations.AddField(
model_name="xmlerrorreport",
name="file",
field=models.FileField(
blank=True,
null=True,
upload_to=upload.models.upload_package_directory_path,
verbose_name="Report File",
),
),
]
39 changes: 39 additions & 0 deletions upload/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1960,11 +1960,15 @@ class XMLErrorReport(BaseValidationReport, ClusterableModel):
null=True,
default=False,
)
file = models.FileField(
_("Report File"), upload_to=upload_package_directory_path, null=True, blank=True
)

panels = (
[]
+ BaseValidationReport.panels
+ [
FieldPanel("file"),
# FieldPanel("package"),
InlinePanel("xml_error", label=_("XML error")),
FieldPanel("xml_producer_ack"),
Expand All @@ -1989,6 +1993,41 @@ class Meta:
def validation_results(self):
return self.xml_error

def save_file(self, filename, content):
try:
self.file.delete(save=True)
except Exception as e:
pass
self.file.save(filename, ContentFile(content))

def generate_report(self):
item = self.validation_results.first()

if not item:
return

fieldnames = ["package"]
fieldnames.extend(XMLError.cols)

filename = self.package.name + f"-{report_datetime()}-xml_errors.csv"
with TemporaryDirectory() as targetdir:
target = os.path.join(targetdir, filename)

with open(target, "w", newline="") as csvfile:
writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
writer.writeheader()

for row in self.ValidationResultClass.rows(self.package, fieldnames):
writer.writerow(row)

with open(target, "rb") as fp:
self.save_file(filename, fp.read())

def finish_validations(self):
self.generate_report()
self.creation = choices.REPORT_CREATION_DONE
self.save()

@property
def data(self):
d = super().data
Expand Down
11 changes: 11 additions & 0 deletions upload/templates/modeladmin/upload/package/inspect.html
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,17 @@ <h3>{% trans "XML Validations" %}</h3>
</td>
</tr>
{% endfor %}
{% for report in xml_error_reports %}
<tr>
<td class='title'>{{ report.title }}</td>
<td>{{ report.updated }}</td>
<td>{{ report.total }}</td>
<td>
<a name="xer_report{{ report.id }}"/>
<a class="button" href="/admin/upload/xmlerrorreport/edit/{{ report.id }}">{% trans 'View report' %}</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
Expand Down