RunasSudo
/
society-self-service
1
Fork 0
Code Issues 1 Pull Requests Activity

Add withdrawn reimbursement claim state

This commit is contained in:
Yingtong Li 2020-07-15 17:03:52 +10:00
parent 1344f612f8
commit eb46c82ae1
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sstreasury/models.py
View File

@ -209,6 +209,7 @@ class BudgetRevision(models.Model):
class ClaimState(DescriptionEnum): class ClaimState(DescriptionEnum):
DRAFT = 10, 'Draft' DRAFT = 10, 'Draft'
WITHDRAWN = 15, 'Withdrawn'
RESUBMIT = 20, 'Returned for redrafting' RESUBMIT = 20, 'Returned for redrafting'
AWAIT_REVIEW = 30, 'Awaiting Treasury approval' AWAIT_REVIEW = 30, 'Awaiting Treasury approval'
APPROVED = 40, 'Approved by Treasury, awaiting payment' APPROVED = 40, 'Approved by Treasury, awaiting payment'
@ -273,7 +274,7 @@ class ReimbursementClaim(models.Model):
return False return False
# Only Treasurer may edit if submitted # Only Treasurer may edit if submitted
if self.state != ClaimState.DRAFT.value and self.state != ClaimState.RESUBMIT.value: if self.state not in (ClaimState.DRAFT.value, ClaimState.RESUBMIT.value, ClaimState.WITHDRAWN.value):
if user.groups.filter(name='Treasury').exists(): if user.groups.filter(name='Treasury').exists():
return True return True
return False return False
@ -290,7 +291,7 @@ class ReimbursementClaim(models.Model):
def can_submit(self, user): def can_submit(self, user):
if not self.can_edit(user): if not self.can_edit(user):
return False return False
if self.state == ClaimState.DRAFT.value or self.state == ClaimState.RESUBMIT.value: if self.state in (ClaimState.DRAFT.value, ClaimState.RESUBMIT.value, ClaimState.WITHDRAWN.value):
return True return True
return False return False
@ -300,7 +301,7 @@ class ReimbursementClaim(models.Model):
if user != self.author and not user.groups.filter(name='Treasury').exists(): if user != self.author and not user.groups.filter(name='Treasury').exists():
return False return False
if self.state == ClaimState.AWAIT_REVIEW.value or self.state == ClaimState.APPROVED.value: if self.state in (ClaimState.AWAIT_REVIEW.value, ClaimState.APPROVED.value, ClaimState.DRAFT.value, ClaimState.RESUBMIT.value):
return True return True
return False return False
@ -309,7 +310,7 @@ class ReimbursementClaim(models.Model):
return False return False
if not user.groups.filter(name='Treasury').exists(): if not user.groups.filter(name='Treasury').exists():
return False return False
if self.state == ClaimState.DRAFT.value or self.state == ClaimState.RESUBMIT.value or self.state == ClaimState.AWAIT_REVIEW.value: if self.state in (ClaimState.DRAFT.value, ClaimState.RESUBMIT.value, ClaimState.AWAIT_REVIEW.value, ClaimState.WITHDRAWN.value):
return True return True
return False return False

7
sstreasury/views.py
View File

@ -459,6 +459,9 @@ def claim_list(request):
for claim in models.ReimbursementClaim.objects.all(): for claim in models.ReimbursementClaim.objects.all():
state = models.ClaimState(claim.state) state = models.ClaimState(claim.state)
if not claim.can_view(request.user):
continue
group = None group = None
if request.user.groups.filter(name='Treasury').exists() and state in [models.ClaimState.AWAIT_REVIEW, models.ClaimState.APPROVED]: if request.user.groups.filter(name='Treasury').exists() and state in [models.ClaimState.AWAIT_REVIEW, models.ClaimState.APPROVED]:
@ -471,7 +474,7 @@ def claim_list(request):
else: else:
group = claims_closed group = claims_closed
elif request.user.groups.filter(name='Treasury').exists(): elif request.user.groups.filter(name='Treasury').exists():
if state == models.ClaimState.PAID: if state in [models.ClaimState.PAID, models.ClaimState.WITHDRAWN]:
group = claims_closed group = claims_closed
else: else:
group = claims_open group = claims_open
@ -641,7 +644,7 @@ def claim_action(request, claim):
raise PermissionDenied raise PermissionDenied
with transaction.atomic(): with transaction.atomic():
claim.update_state(request.user, models.ClaimState.DRAFT) claim.update_state(request.user, models.ClaimState.WITHDRAWN)
if 'Approve' in actions: if 'Approve' in actions:
if not claim.can_approve(request.user): if not claim.can_approve(request.user):