Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bulk action

Browse source 
Bulk action marks printed + schwag, but as print is automated and
happens after checkin is flagged, we should only set checkin and schwag
and print will happen.
This commit is contained in:
Sachi King 2018-01-23 13:30:45 +11:00
parent 5a085535c0
commit e41da66cac
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vendor/regidesk/regidesk/models.py vendored
View file

@ -107,7 +107,7 @@ class CheckIn(models.Model):
self.save() self.save()
def bulk_mark_given(self): def bulk_mark_given(self):
self.badge_printed = True self.checked_in_bool = True
self.schwag_given = True self.schwag_given = True
self.save() self.save()

7
vendor/regidesk/regidesk/templates/regidesk/ci_overview.html vendored
View file

@ -108,15 +108,16 @@
</div> </div>
</div> </div>
<div class="panel {% if check_in.badge_printed or check_in.schwag_given %}panel-danger{% else %}panel-success{% endif %}"> <div class="panel {% if check_in.checked_in_bool or check_in.schwag_given %}panel-danger{% else %}panel-success{% endif %}">
<div class="panel-heading">Bulk actions</div> <div class="panel-heading">Bulk actions</div>
<div class="panel-body"> <div class="panel-body">
<p>Mark attendee as checked in and schwag given</p>
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>Status</dt><dd>{% if check_in.badge_printed or check_in.schwag_given %}One of the items in bulk action is marked as given already{% else %}Both items are marked as unrecived{% endif %}</dd> <dt>Status</dt><dd>{% if check_in.checked_in_bool or check_in.schwag_given %}One of the items in bulk action is marked as given already{% else %}Both items are marked as unrecived{% endif %}</dd>
</dl> </dl>
<form method="post"> <form method="post">
<input type="checkbox" name="bulk" value="bulk" checked hidden> <input type="checkbox" name="bulk" value="bulk" checked hidden>
<input class="btn {% if check_in.badge_printed or check_in.schwag_given %}btn-danger{% else %}btn-success{% endif %} pull-right" type="submit" value="Submit"> <input class="btn {% if check_in.checked_in_bool or check_in.schwag_given %}btn-danger{% else %}btn-success{% endif %} pull-right" type="submit" value="Submit">
</form> </form>
</div> </div>
</div> </div>