diff options
| author | Matthew Lemon <lemon@matthewlemon.com> | 2020-09-29 12:03:54 +0100 |
|---|---|---|
| committer | Matthew Lemon <lemon@matthewlemon.com> | 2020-09-29 12:41:34 +0100 |
| commit | 5314ffb3308a02de8e8bd51cb4ce1784181a4a81 (patch) | |
| tree | 016fdbf35b37f106bb91b00ab652e254dc4f3713 /ctrack/organisations | |
| parent | cf4ee94db89e697d625106e78831b7e219cd8c03 (diff) | |
Can now add an engagement event from org detail with only relevant people in dropdown
nearly converted engagement event form so that it is based on org
tidy in prep for big change to engagement event form
link to related CAF included in the OES engagements table
formatting
Diffstat (limited to 'ctrack/organisations')
| -rw-r--r-- | ctrack/organisations/templates/organisations/organisation_detail.html | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ctrack/organisations/templates/organisations/organisation_detail.html b/ctrack/organisations/templates/organisations/organisation_detail.html index 4af5d6f..708f5a2 100644 --- a/ctrack/organisations/templates/organisations/organisation_detail.html +++ b/ctrack/organisations/templates/organisations/organisation_detail.html @@ -200,7 +200,7 @@ <div class="col-md-12 my-2"> <div class="card bg-light"> <div class="card-body"> - <div class="card-title" style="font-size: 1.1rem;">OES Engagements<a href="{% url "register:create" %}" + <div class="card-title" style="font-size: 1.1rem;">Engagements<a href="{% url "register:create" object.slug %}" class="btn btn-outline-primary btn-sm float-right">Add new...</a></div> <div class="table table-responsive"> @@ -210,6 +210,7 @@ <th>Date</th> <th>Type</th> <th>Description</th> + <th>CAF</th> <th>Response Requested</th> <th>Response Due</th> </tr> @@ -220,6 +221,11 @@ <td>{{ event.date |date:"D d M Y H:i" }}</td> <td><a href="#">{{ event.type }}</a></td> <td>{{ event.short_description }}</td> + {% if event.related_caf %} + <td><a href="{% url "caf:detail" event.related_caf.id %}">{{ event.related_caf }}</a></td> + {% else %} + <td>NA</td> + {% endif %} {% if event.response_date_requested %} <td style="color: {{ event.days_to_response_due.descriptor }}">{{ event.response_date_requested |date:"D d M Y" }}</td> {% else %} @@ -229,7 +235,7 @@ <td>{{ event.response_received | date:"D d M Y" }}</td> {% else %} {% if event.response_date_requested %} - <td style="color: {{ event.days_to_response_due.descriptor }};">{{ event.days_to_response_due.days}} {{ event.days_to_response_due.day_str }}</td> + <td style="color: {{ event.days_to_response_due.descriptor }};">{{ event.days_to_response_due.days }} {{ event.days_to_response_due.day_str }}</td> {% else %} <td>NA</td> {% endif %} @@ -237,7 +243,7 @@ </tr> {% endfor %} {% else %} - <a class="btn btn-outline-primary btn-sm" href="{% url "register:create" %}" role="button">Add + <a class="btn btn-outline-primary btn-sm" href="{% url "register:create" object.slug %}" role="button">Add new...</a> {% endif %} </table> |