mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-29 03:12:15 +00:00
* FEAT: Initial work on revision history for assets The revision history for individual items mostly works, though it shows database ID where it should show asset ID. Recent changes feed isn't yet done. * FEAT: Initial implementation of asset activity stream * CHORE: Fix pep8 * FIX: Asset history table 'branding' * FIX: Individual asset version history is now correctly filtered * FEAT: Make revision history for suppliers accessible * CHORE: *sings* And a pep8 in a broken tree... * Refactored out duplicated code from `AssetVersionHistory * CHORE: pep8 And another random bit of wierd whitespace I found Co-authored-by: Matthew Smith <mattysmith22@googlemail.com> Closes #358
260 lines
10 KiB
HTML
260 lines
10 KiB
HTML
{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
|
|
{% block title %}{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} | {{object.name}}{% endblock %}
|
|
|
|
{% block content %}
|
|
<div class="row">
|
|
{% if not request.is_ajax %}
|
|
<div class="col-sm-12">
|
|
<h1>
|
|
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
|
|
| {{ object.name }} {% if event.dry_hire %}<span class="badge">Dry Hire</span>{% endif %}
|
|
</h1>
|
|
</div>
|
|
<div class="col-sm-12 text-right">
|
|
{% include 'RIGS/event_detail_buttons.html' %}
|
|
</div>
|
|
|
|
{% endif %}
|
|
{% if object.is_rig %}
|
|
{# only need contact details for a rig #}
|
|
<div class="col-sm-12 col-md-6 col-lg-5">
|
|
<div class="panel panel-default">
|
|
<div class="panel-heading">Contact Details</div>
|
|
<div class="panel-body">
|
|
<dl class="dl-horizontal">
|
|
<dt>Person</dt>
|
|
<dd>
|
|
{% if object.person %}
|
|
<a href="{% url 'person_detail' object.person.pk %}" class="modal-href">
|
|
{{ object.person }}
|
|
</a>
|
|
{% endif %}
|
|
</dd>
|
|
|
|
<dt>Email</dt>
|
|
<dd>
|
|
<a href="mailto:{{object.person.email}}" target="_blank">
|
|
<span class="overflow-ellipsis">{{ object.person.email }}</span>
|
|
</a>
|
|
</dd>
|
|
|
|
<dt>Phone Number</dt>
|
|
<dd><a href="tel:{{object.person.phone}}">{{ object.person.phone }}</a></dd>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
{% if event.organisation %}
|
|
<div class="panel panel-default">
|
|
<div class="panel-heading">Organisation</div>
|
|
<div class="panel-body">
|
|
<dl class="dl-horizontal">
|
|
<dt>Organisation</dt>
|
|
<dd>
|
|
{% if object.organisation %}
|
|
<a href="{% url 'organisation_detail' object.organisation.pk %}" class="modal-href">
|
|
{{ object.organisation }}
|
|
</a>
|
|
{% endif %}
|
|
</dd>
|
|
|
|
<dt>Phone Number</dt>
|
|
<dd>
|
|
<a href="tel:{{object.person.phone}}">
|
|
{{ object.organisation.phone }}
|
|
</a>
|
|
</dd>
|
|
|
|
<dt>Has SU Account</dt>
|
|
<dd>{{ event.organisation.union_account|yesno|capfirst }}</dd>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
</div>
|
|
{% endif %}
|
|
<div class="col-sm-12 {% if event.is_rig %}col-md-6 col-lg-7{% endif %}">
|
|
<div class="panel panel-info">
|
|
<div class="panel-heading">Event Info</div>
|
|
<div class="panel-body">
|
|
<dl class="dl-horizontal">
|
|
<dt>Event Venue</dt>
|
|
<dd>
|
|
{% if object.venue %}
|
|
<a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
|
|
{{ object.venue }}
|
|
</a>
|
|
{% endif %}
|
|
</dd>
|
|
|
|
{% if event.is_rig %}
|
|
<dt>Event MIC</dt>
|
|
<dd>
|
|
{% if event.mic and perms.RIGS.view_profile %}
|
|
<a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">
|
|
{{ event.mic.name }}
|
|
</a>
|
|
{% else %}
|
|
{{ event.mic.name }}
|
|
{% endif %}
|
|
</dd>
|
|
{% endif %}
|
|
|
|
<dt>Status</dt>
|
|
<dd>{{ event.get_status_display }}</dd>
|
|
|
|
<dd> </dd>
|
|
|
|
{% if event.is_rig %}
|
|
<dt>Crew Meet</dt>
|
|
<dd>{{ event.meet_at|date:"D d M Y H:i"|default:"" }}</dd>
|
|
<dd>{{ event.meet_info|default:"" }}</dd>
|
|
|
|
<dt>Access From</dt>
|
|
<dd>{{ event.access_at|date:"D d M Y H:i"|default:"" }}</dd>
|
|
{% endif %}
|
|
|
|
<dt>Event Starts</dt>
|
|
<dd>{{ event.start_date|date:"D d M Y" }} {{ event.start_time|date:"H:i" }}</dd>
|
|
|
|
<dt>Event Ends</dt>
|
|
<dd>{{ event.end_date|date:"D d M Y" }} {{ event.end_time|date:"H:i" }}</dd>
|
|
|
|
<dd> </dd>
|
|
|
|
<dt>Event Description</dt>
|
|
<dd>{{ event.description|linebreaksbr }}</dd>
|
|
|
|
<dd> </dd>
|
|
|
|
<dt>Based On</dt>
|
|
<dd>
|
|
{% if object.based_on %}
|
|
<a href="{% url 'event_detail' pk=object.based_on.pk %}">
|
|
{% if object.based_on.is_rig %}N{{ object.based_on.pk|stringformat:"05d" }}{% else %}
|
|
{{ object.based_on.pk }}{% endif %}
|
|
{{ object.based_on.name }} {% if object.based_on.mic %}by {{ object.based_on.mic.name }}{% endif %}
|
|
</a>
|
|
{% endif %}
|
|
</dd>
|
|
|
|
{% if event.dry_hire %}
|
|
<dt>Checked In By</dt>
|
|
<dd>{{ object.checked_in_by.name }}</dd>
|
|
{% endif %}
|
|
|
|
{% if event.is_rig %}
|
|
<dt>Collected By</dt>
|
|
<dd>{{ object.collector }}</dd>
|
|
{% endif %}
|
|
|
|
{% if event.is_rig and not event.internal %}
|
|
<dd> </dd>
|
|
<dt>PO</dt>
|
|
<dd>{{ object.purchase_order }}</dd>
|
|
{% endif %}
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{% if event.is_rig and event.internal %}
|
|
<div class="col-sm-12">
|
|
<div class="panel panel-default">
|
|
<div class="panel-heading">Client Authorisation</div>
|
|
<div class="panel-body">
|
|
<dl class="dl-horizontal col-sm-6">
|
|
<dt>Authorisation Request</dt>
|
|
<dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd>
|
|
|
|
<dt>By</dt>
|
|
<dd>{{ object.auth_request_by }}</dd>
|
|
|
|
<dt>At</dt>
|
|
<dd>{{ object.auth_request_at|date:"D d M Y H:i"|default:"" }}</dd>
|
|
|
|
<dt>To</dt>
|
|
<dd>{{ object.auth_request_to }}</dd>
|
|
</dl>
|
|
<dd class="visible-xs"> </dd>
|
|
<dl class="dl-horizontal col-sm-6">
|
|
<dt>Authorised</dt>
|
|
<dd>{{ object.authorised|yesno:"Yes,No" }}</dd>
|
|
|
|
<dt>Authorised by</dt>
|
|
<dd>
|
|
{% if object.authorisation %}
|
|
{{ object.authorisation.name }}
|
|
(<a href="mailto:{{ object.authorisation.email }}">{{ object.authorisation.email }}</a>)
|
|
{% endif %}
|
|
</dd>
|
|
|
|
<dt>Authorised at</dt>
|
|
<dd>{{ object.authorisation.last_edited_at }}</dd>
|
|
|
|
<dt>Authorised amount</dt>
|
|
<dd>
|
|
{% if object.authorisation %}
|
|
£ {{ object.authorisation.amount|floatformat:"2" }}
|
|
{% endif %}
|
|
</dd>
|
|
|
|
<dt>Requested by</dt>
|
|
<dd>{{ object.authorisation.sent_by }}</dd>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
{% endif %}
|
|
{% if not request.is_ajax %}
|
|
<div class="col-sm-12 text-right">
|
|
{% include 'RIGS/event_detail_buttons.html' %}
|
|
</div>
|
|
{% endif %}
|
|
{% if event.is_rig %}
|
|
<div class="col-sm-12">
|
|
<div class="panel panel-default">
|
|
<div class="panel-heading">Event Details</div>
|
|
<div class="panel-body">
|
|
<div class="well well-sm">
|
|
<h4>Notes</h4>
|
|
{{ event.notes|linebreaksbr }}
|
|
</div>
|
|
{% include 'RIGS/item_table.html' %}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{% if not request.is_ajax %}
|
|
<div class="col-sm-12 text-right">
|
|
{% include 'RIGS/event_detail_buttons.html' %}
|
|
</div>
|
|
{% endif %}
|
|
{% endif %}
|
|
{% if not request.is_ajax %}
|
|
<div class="col-sm-12 text-right">
|
|
<div>
|
|
<a href="{% url 'event_history' object.pk %}" title="View Revision History">
|
|
Last edited at {{ object.last_edited_at }} by {{ object.last_edited_by.name }}
|
|
</a>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
</div>
|
|
{% endblock %}
|
|
|
|
{% if request.is_ajax %}
|
|
{% block footer %}
|
|
<div class="row">
|
|
<div class="col-sm-10 align-left">
|
|
<a href="{% url 'event_history' object.pk %}" title="View Revision History">
|
|
Last edited at {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'nobody' }}
|
|
</a>
|
|
</div>
|
|
<div class="col-sm-2">
|
|
<div class="pull-right">
|
|
<a href="{% url 'event_detail' object.pk %}" class="btn btn-primary">Open Event Page <span
|
|
class="glyphicon glyphicon-eye"></span></a>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{% endblock %}
|
|
{% endif %}
|