arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Properly handle eventauthorisations in new versioning

Browse Source 
It's not great, not terrible...
This commit is contained in:
FreneticScribbler
2020-10-07 16:45:46 +01:00
parent abf3cfe1ce
commit ae13cabe09
9 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
RIGS/models.py
View File

@@ -518,6 +518,10 @@ class EventItem(models.Model, RevisionMixin):
def __str__(self):
return str(self.event.pk) + "." + str(self.order) + ": " + self.event.name + " | " + self.name
@property
def activity_feed_string(self):
return str("item {}".format(self.name))
@reversion.register
class EventAuthorisation(models.Model, RevisionMixin):
@@ -529,12 +533,14 @@ class EventAuthorisation(models.Model, RevisionMixin):
amount = models.DecimalField(max_digits=10, decimal_places=2, verbose_name="authorisation amount")
sent_by = models.ForeignKey('Profile', on_delete=models.CASCADE)
#reversion_perm = 'RIGS.view_eventauthorisation'
def get_absolute_url(self):
return reverse_lazy('event_detail', kwargs={'pk': self.event.pk})
@property
def activity_feed_string(self):
return str("N%05d" % self.event.pk + ' (requested by ' + self.sent_by.initials + ')')
return "{} (requested by {})".format(self.event.display_id, self.sent_by.initials)
@reversion.register(follow=['payment_set'])
@@ -607,6 +613,10 @@ class Payment(models.Model, RevisionMixin):
def __str__(self):
return "%s: %d" % (self.get_method_display(), self.amount)
@property
def activity_feed_string(self):
return str("payment at £{}".format(self.amount))
@reversion.register
class RiskAssessment(models.Model, RevisionMixin):