PHRAS-2829 lightbox hide list of users

This commit is contained in:
Harrys Ravalomanana
2019-11-27 15:26:50 +04:00
parent 5e5bc0a9e9
commit 0ca3469bf3
2 changed files with 28 additions and 31 deletions

View File

@@ -1,21 +1,19 @@
{% for validationDatas in basket_element.getValidationDatas() %} {% for validationDatas in basket_element.getValidationDatas() %}
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
<li> <li>
<div class="validate-icon"> <div class="validate-icon">
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
{% if validationDatas.getAgreement() == true %}<span class="icomoon icon-agree">&#xe95f;</span>{% endif %} {% if validationDatas.getAgreement() == true %}<span class="icomoon icon-agree">&#xe95f;</span>{% endif %}
{% if validationDatas.getAgreement() == false and validationDatas.getAgreement() is not null %}<span class="icomoon icon-disagree">&#xe971; {{ validationDatas.getAgreement() }}</span>{% endif %} {% if validationDatas.getAgreement() == false and validationDatas.getAgreement() is not null %}<span class="icomoon icon-disagree">&#xe971; {{ validationDatas.getAgreement() }}</span>{% endif %}
{% endif %}
</div> </div>
<div class="validate-info"> <div class="validate-info">
<h3> <h3>
{{ validationDatas.getParticipant().getUser().getDisplayName() }} {{ validationDatas.getParticipant().getUser().getDisplayName() }}
</h3> </h3>
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
{% if validationDatas.getNote() != '' %} {% if validationDatas.getNote() != '' %}
<p style="text-align:left;">{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }} </p> <p style="text-align:left;">{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }} </p>
{% endif %} {% endif %}
{% endif %}
</div> </div>
</li> </li>
{% endif %}
{% endfor %} {% endfor %}

View File

@@ -17,6 +17,8 @@
</div> </div>
<div class="chim-right"> <div class="chim-right">
{% for validationDatas in basket_element.getValidationDatas()%} {% for validationDatas in basket_element.getValidationDatas()%}
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
<div class="basket_report_user_wrapper ui-corner-all"> <div class="basket_report_user_wrapper ui-corner-all">
{% if validationDatas.getAgreement() == true %} {% if validationDatas.getAgreement() == true %}
{% set imguser = '<span class="icomoon icon-agree">&#xe95f;</span>' %} {% set imguser = '<span class="icomoon icon-agree">&#xe95f;</span>' %}
@@ -30,19 +32,16 @@
{% endif %} {% endif %}
<div class="validate-icon"> <div class="validate-icon">
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
{{imguser|raw}} {{imguser|raw}}
{% endif %}
</div> </div>
<div class="validate-info"> <div class="validate-info">
<h3> {{validationDatas.getParticipant().getUser().getDisplayName()}}</h3> <h3> {{validationDatas.getParticipant().getUser().getDisplayName()}}</h3>
{% if validationDatas.getNote() != '' %} {% if validationDatas.getNote() != '' %}
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
<p> {{validationDatas.getNote()|nl2br}}</p> <p> {{validationDatas.getNote()|nl2br}}</p>
{% endif %} {% endif %}
</div>
</div>
{% endif %} {% endif %}
</div>
</div>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>