From c8478ef0f0d15cccbd65217bce61697f55f7de9f Mon Sep 17 00:00:00 2001 From: Christophe Henry <contact@c-henry.fr> Date: Thu, 3 Oct 2019 15:27:57 +0200 Subject: [PATCH] Solves #145: add project captains to project page --- src/page-project-profile.pug | 28 ++++++++++++++++++++++++++-- src/templates/template-team.pug | 13 ++++++++----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/src/page-project-profile.pug b/src/page-project-profile.pug index c3aa6d36..f7663960 100644 --- a/src/page-project-profile.pug +++ b/src/page-project-profile.pug @@ -5,7 +5,7 @@ include templates/template-team.pug sib-display( - fields='block-title(const-title1, number, customer.name, const-title2, name, entitled, creationDate), infos(block-description(label-description, description), block-logo(customer.logo)), block-lead, block-fee(label-fee, businessProvider), block-customer(label-customer, customer), block-team(label-team, members)', + fields='block-title(const-title1, number, customer.name, const-title2, name, entitled, creationDate), infos(block-description(label-description, description), block-logo(customer.logo)), block-lead, block-fee(label-fee, businessProvider), block-customer(label-customer, customer)', value-const-title1='N°', value-const-title2='-', @@ -19,11 +19,35 @@ value-label-customer='CUSTOMER INFORMATIONS:', widget-customer='customer-template', - + + bind-resources + ) + + sib-display( + fields='block-team(label-team, members)', + + value-label-team='CAPTAINS:', + widget-members='team-template', + multiple-members='', + + search-fields='is_captain' + search-widget-team='sib-form-hidden' + search-value-team='true' + + bind-resources + ) + + sib-display( + fields='block-team(label-team, members)', + value-label-team='TEAM:', widget-members='team-template', multiple-members='', + search-fields='is_captain' + search-widget-team='sib-form-hidden' + search-value-team='false' + bind-resources ) diff --git a/src/templates/template-team.pug b/src/templates/template-team.pug index ac3a2ffc..09753e1a 100644 --- a/src/templates/template-team.pug +++ b/src/templates/template-team.pug @@ -3,15 +3,18 @@ include hd-user-avatar.pug sib-widget(name='team-template') template sib-display( - data-src="${value.user['@id']}" + data-src="${value.user ? value.user['@id'] : ''}" fields='account.picture', widget-account.picture='hd-user-avatar' ) div(name='user.thumb') - span ${value.user.name} sib-display( - data-src="${value.user.groups['@id']}", - fields='name', - multiple-name + data-src="${value.user ? value.user['@id'] : ''}" + fields='name' + ) + sib-display( + data-src="${value.user ? value.user['@id'] : ''}", + fields='name' + nested-field="groups" ) span ${value.name} -- GitLab