mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-20 15:02:31 +00:00
Add rig collected by information issue #25
This commit is contained in:
@@ -89,4 +89,4 @@ class EventForm(forms.ModelForm):
|
|||||||
model = models.Event
|
model = models.Event
|
||||||
fields = ['is_rig', 'name', 'venue', 'start_date', 'start_time', 'end_date',
|
fields = ['is_rig', 'name', 'venue', 'start_date', 'start_time', 'end_date',
|
||||||
'end_time', 'meet_at', 'access_at', 'description', 'notes', 'mic',
|
'end_time', 'meet_at', 'access_at', 'description', 'notes', 'mic',
|
||||||
'person', 'organisation', 'dry_hire', 'checked_in_by', 'status']
|
'person', 'organisation', 'dry_hire', 'checked_in_by', 'status', 'collector']
|
||||||
@@ -246,7 +246,7 @@ class Event(models.Model, RevisionMixin):
|
|||||||
payment_method = models.CharField(max_length=255, blank=True, null=True)
|
payment_method = models.CharField(max_length=255, blank=True, null=True)
|
||||||
payment_received = models.CharField(max_length=255, blank=True, null=True)
|
payment_received = models.CharField(max_length=255, blank=True, null=True)
|
||||||
purchase_order = models.CharField(max_length=255, blank=True, null=True)
|
purchase_order = models.CharField(max_length=255, blank=True, null=True)
|
||||||
collector = models.CharField(max_length=255, blank=True, null=True)
|
collector = models.CharField(max_length=255, blank=True, null=True, verbose_name='Collected By')
|
||||||
|
|
||||||
# Calculated values
|
# Calculated values
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -113,6 +113,9 @@
|
|||||||
<dt>Checked In By</dt>
|
<dt>Checked In By</dt>
|
||||||
<dd>{{ object.checked_in_by.name }}</dd>
|
<dd>{{ object.checked_in_by.name }}</dd>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
<dt>Collected By</dt>
|
||||||
|
<dd>{{ object.collector }}</dd>
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -347,6 +347,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="{{ form.collector.id_for_label }}"
|
||||||
|
class="col-sm-4 control-label">{{ form.collector.label }}</label>
|
||||||
|
|
||||||
|
<div class="col-sm-8">
|
||||||
|
{% render_field form.collector class+="form-control" %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user