Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/app/dashboard/_dashboardUserIndex.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{% set modulesWithTutorComments = 0 %}
{% for module in theme.modules %}
{% set actionByCurrentUser = module.actions|filter(action => action.agentComment is not null and action.user == app.user) %}
{% set moduleCommented = module.actions|filter(action => action.mentorComment is not null and action.user == app.user) %}
{% set moduleCommented = module.actions|filter(action => action.mentorComment is not null and action.mentorValidatedAt is null and action.user == app.user) %}
{% if actionByCurrentUser|length > 0 %}
{% set completedModules = completedModules + 1 %}
{% endif %}
Expand Down Expand Up @@ -85,7 +85,7 @@
{% set actionByCurrentUser = module.actions|filter(action => action.agentComment is not null and action.user == app.user) %}
{% set hasFilledActions = actionByCurrentUser|length > 0 %}
{% set moduleValidatedByMentor = module.actions|filter(action => action.mentorValidatedAt and action.user == app.user) %}
{% set moduleCommentedByMentor = module.actions|filter(action => action.mentorComment is not null and action.user == app.user) %}
{% set moduleCommentedByMentor = module.actions|filter(action => action.mentorComment is not null and action.mentorValidatedAt is null and action.user == app.user) %}
<li id="module-{{ module.id }}"
class="list-group-item d-flex justify-content-between align-items-center py-2
{{ moduleCommentedByMentor is not empty ? 'bg-primary-subtle border border-primary rounded-1' : '' }}
Expand Down
Loading