Merge pull request #3333 from alphagov/uploads-page-ready

Redesign the uploads page to accommodate different kinds of uploads
This commit is contained in:
Chris Hill-Scott
2020-03-03 13:44:38 +00:00
committed by GitHub
14 changed files with 233 additions and 81 deletions

View File

@@ -75,6 +75,9 @@ class ModelList(ABC, Sequence):
def __add__(self, other):
return list(self) + list(other)
def __radd__(self, other):
return list(other) + list(self)
class InviteTokenError(Exception):
pass

View File

@@ -30,6 +30,8 @@ class Job(JSONModel):
'processing_started',
'notification_count',
'created_by',
'template_type',
'recipient',
}
@classmethod
@@ -56,6 +58,10 @@ class Job(JSONModel):
def upload_type(self):
return self._dict.get('upload_type')
@property
def pdf_letter(self):
return self.upload_type == 'letter'
@property
def processing_started(self):
if not self._dict.get('processing_started'):
@@ -132,10 +138,6 @@ class Job(JSONModel):
version=self.template_version,
)['data']
@property
def template_type(self):
return self.template['template_type']
@property
def percentage_complete(self):
return self.notifications_requested / self.notification_count * 100