mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-08-01 08:44:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow to set and view the owner of a part lot

Browse source
This commit is contained in:
Jan Böhmer 2023-04-02 23:17:24 +02:00
parent 5f5541ca12
commit 447b54fa4b
4 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
templates/helper.twig
View file

@ -159,11 +159,7 @@
{% endif %}
{% if user is not null %}
{% if user.fullName is not empty %}
({{ _self.user_icon(user) }} <a href="{{ path('user_info', {"id": user.id}) }}" title="@{{ user.name }}">{{ user.fullName }}</a>)
{% else %}
({{ _self.user_icon(user) }} <a href="{{ path('user_info', {"id": user.id}) }}" title="@{{ user.name }}">@{{ user.name }}</a>)
{% endif %}
({{ _self.user_icon_link(user) }})
{% endif %}
{% endif %}
{% endmacro %}
@ -180,6 +176,14 @@
<img src="{{ avatar_helper.avatarSmURL(user) }}" class="avatar-xs" alt="User avatar" {{ stimulus_controller('elements/hoverpic') }} data-thumbnail="{{ avatar_helper.avatarMdURL(user) }}">
{% endmacro %}
{% macro user_icon_link(user) %}
{% if user.fullName is not empty %}
{{ _self.user_icon(user) }} <a href="{{ path('user_info', {"id": user.id}) }}" title="@{{ user.name }}">{{ user.fullName }}</a>
{% else %}
{{ _self.user_icon(user) }} <a href="{{ path('user_info', {"id": user.id}) }}" title="@{{ user.name }}">@{{ user.name }}</a>
{% endif %}
{% endmacro %}
{% macro entity_preview_sm(entity) %}
{# @var entity \App\Entity\Contracts\HasMasterAttachmentInterface #}
{% if entity.masterPictureAttachment and entity.masterPictureAttachment.picture and attachment_manager.fileExisting(entity.masterPictureAttachment) %}

13
templates/parts/info/_part_lots.html.twig
View file

@ -41,21 +41,26 @@
</td>
<td>
<h6>
{% if lot.owner %}
<span class="badge bg-light mb-1" title="{% trans %}part_lot.owner{% endtrans %}">
{{ helper.user_icon_link(lot.owner) }}
</span><br>
{% endif %}
{% if lot.expirationDate %}
<span class="badge bg-info" title="{% trans %}part_lots.expiration_date{% endtrans %}">
<i class="fas fa-calendar-alt fa-fw"></i> {{ lot.expirationDate | format_date() }}
<span class="badge bg-info mb-1" title="{% trans %}part_lots.expiration_date{% endtrans %}">
<i class="fas fa-calendar-alt fa-fw"></i> {{ lot.expirationDate | format_date() }}<br>
</span>
{% endif %}
{% if lot.expired %}
<br>
<span class="badge bg-warning">
<span class="badge bg-warning mb-1">
<i class="fas fa-exclamation-circle fa-fw"></i>
{% trans %}part_lots.is_expired{% endtrans %}
</span>
{% endif %}
{% if lot.needsRefill %}
<br>
<span class="badge bg-warning">
<span class="badge bg-warning mb-1">
<i class="fas fa-dolly fa-fw"></i>
{% trans %}part_lots.need_refill{% endtrans %}
</span>