klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-29 20:44:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebase

Browse Source
This commit is contained in:
Julien Constant 2023-04-08 22:11:24 +02:00
parent b5146569e1
commit 6e47d1471e
2 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/templates/core/base.jinja
View File

@ -117,7 +117,7 @@
{% if user.notifications.filter(viewed=False).count() > 0 %} {% if user.notifications.filter(viewed=False).count() > 0 %}
{% for n in user.notifications.filter(viewed=False).order_by('-date') %} {% for n in user.notifications.filter(viewed=False).order_by('-date') %}
<li> <li>
<a href="{{ url(" core:notification", notif_id=n.id) }}"> <a href="{{ url('core:notification', notif_id=n.id) }}">
<div class="datetime"> <div class="datetime">
<span class="header_notif_date"> <span class="header_notif_date">
{{ n.date|localtime|date(DATE_FORMAT) }} {{ n.date|localtime|date(DATE_FORMAT) }}

33
core/templates/core/user_detail.jinja
View File

@ -165,9 +165,10 @@
<a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">{% trans %}New subscription{% endtrans <a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">{% trans %}New subscription{% endtrans
%}</a> %}</a>
{% endif %} {% endif %}
{% endif %}
</div> </div>
{% endif %} {% endif %}
{% endif %}
<br>
{% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%} {% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%}
<div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak> <div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
<div class="collapse-header clickable" @click="collapsed = !collapsed"> <div class="collapse-header clickable" @click="collapsed = !collapsed">
@ -200,7 +201,6 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
<hr> <hr>
<div> <div>
{% if user.is_root or user.is_board_member %} {% if user.is_root or user.is_board_member %}
@ -213,25 +213,36 @@
{% if profile.gifts.exists() %} {% if profile.gifts.exists() %}
{% set gifts = profile.gifts.order_by("-date")|list %} {% set gifts = profile.gifts.order_by("-date")|list %}
<br> <br>
<div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak> <div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
<div class="collapse-header clickable" @click="collapsed = !collapsed"> <div class="collapse-header clickable" @click="collapsed = !collapsed">
<span class="collapse-header-text"> <span class="collapse-header-text">
{% trans %}Last given gift :{% endtrans %} {{ gifts[0] }} {% trans %}Last given gift :{% endtrans %} {{ gifts[0] }}
</span> </span>
<span class="collapse-header-icon" :class="{'reverse': collapsed}"> <span class="collapse-header-icon" :class="{'reverse': collapsed}">
<i class="fa fa-caret-down"></i> <i class="fa-solid fa-caret-down"></i>
</span> </span>
</div> </div>
<div class="collapse-body" x-show="collapsed" x-transition.scale.origin.top> <div class="collapse-body" x-show="collapsed" x-transition.scale.origin.top>
<ul> <table>
{% for gift in gifts %} <thead>
<li>{{ gift }} <tr>
<a href="{{ url('core:user_gift_delete', user_id=profile.id, gift_id=gift.id) }}"> <th>{% trans %}Subscription start{% endtrans %}</th>
<i class="fa fa-trash"></i> <th>{% trans %}Subscription end{% endtrans %}</th>
</a> <th>{% trans %}Subscription type{% endtrans %}</th>
</li> <th>{% trans %}Payment method{% endtrans %}</th>
</tr>
</thead>
{% for sub in profile.subscriptions.all() %}
<tr>
<td>{{ sub.subscription_start }}</td>
<td>{{ sub.subscription_end }}</td>
<td>{{ sub.subscription_type }}</td>
<td>{{ sub.get_payment_method_display() }}</td>
</tr>
{% endfor %} {% endfor %}
</ul> </table>
</div>
</div> </div>
{% else %} {% else %}
<em>{% trans %}No gift given yet{% endtrans %}</em> <em>{% trans %}No gift given yet{% endtrans %}</em>