autonomic-cooperative
/
hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/project' into release/rework-css

This commit is contained in:
Jean-Baptiste Pasquier 2020-06-13 16:10:50 +02:00
parent c598a79a85 17eed1d4ad
commit 518864e093
No known key found for this signature in database
GPG Key ID: F2702E6D22ED4D62
5 changed files with 159 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/templates/hubl-captain.pug
View File

@ -11,5 +11,5 @@ sib-widget(name='hubl-captain')
class-is_lead='user-thumb__lead'
widget-account.picture='hubl-user-avatar'
value-is_lead='Project lead'
value-is_lead='Capitaine'
)

40
src/views/admin/page-admin-projects-create.pug
View File

@ -12,37 +12,41 @@ div.content-box__info.flex
naked
)
h1.centered Créer un projet
h1 Créer un nouveau projet
sib-form.form.button-register(
data-src=`${endpoints.projects || endpoints.post.projects}`
fields='line-1(customer, name), line-2(project.description), line-3(businessProvider.name, businessProvider.fee), line-4(captain)'
fields='status, line-1(customer.name, name), description, line-10(captain), logo'
label-customer='Nom du client*'
class-customer='form-label is-light is-half-width'
range-customer=`${endpoints.customers || endpoints.get.customers}`
widget-customer='sib-form-auto-completion'
label-status='Statut du canal*'
widget-status='hubl-status'
class-status='form-label is-light is-full-width member-select color'
label-description='Description du projet'
class-description='form-label is-light is-full-width'
widget-description='sib-form-textarea'
class-fieldset-captain='fieldset'
widget-fieldset-captain='hubl-template-project-title'
label-customer.name='Nom du client*'
class-customer.name='form-label is-light is-half-width'
label-name='Nom du projet*'
class-name='form-label is-light is-half-width input-text-like'
label-project.description='Description du projet'
class-project.description='form-label is-light is-full-width input-text-like'
widget-project.description='sib-form-textarea'
label-businessProvider.name='Apporteur d\'affaire*'
class-businessProvider.name='form-label is-light is-half-width input-text-like'
label-businessProvider.fee='Contribution'
class-businessProvider.fee='form-label is-light is-half-width input-text-like'
label-captain='Capitaine du projet'
label-captain='Capitaine du projet*'
range-captain=`${endpoints.users || endpoints.get.users}`
class-captain='form-label is-light is-half-width'
widget-captain='sib-form-auto-completion'
widget-logo="sib-form-file"
label-logo="Télécharger un logo"
class-logo='form-label is-light is-full-width'
upload-url-logo=`${endpoints.uploads || endpoints.post.uploads}`
next='admin-project-list'
submit-button='Enregistrer'
submit-button='Enregistrer et ajouter des membres'
)

153
src/views/admin/page-admin-projects.pug
View File

@ -20,79 +20,108 @@
sib-link(
class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-plus'
next='admin-project-create'
) Créer un projet
) Créer un nouveau projet
.table-wrapper
.table
div.table-header.grey-color
div.w262 Nom
div.w262 Administrateurs
div.w262 Capitaines
div.w262 Accès
.table
div.table-header.grey-color
div.w25 Nom
div.w25 Administrateurs
div.w25 Capitaines
div.w25 Rejoindre
sib-widget(name="hubl-admin-project-leave-button")
template
sib-delete(
class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
data-src="${src}"
data-label='Quitter'
)
sib-widget(name="hubl-admin-project-leave-button")
template
sib-delete(
class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
data-src="${src}"
data-label='Quitter'
)
sib-widget(name='hubl-project-captain')
template
sib-display.user-thumb.is-spaced(
data-src='${await value}'
fields='account.picture, sup(name), sub(username)'
sib-widget(name='hubl-project-captain')
template
sib-display.user-thumb(
data-src='${await value}'
fields='account.picture, sup(name), sub(username)'
class-account.picture='avatar user-thumb__picture'
class-name='user-thumb__name'
class-username='user-thumb__username'
class-account.picture='user-thumb__picture'
class-name='user-thumb__name'
class-username='user-thumb__username'
widget-account.picture='hubl-user-avatar'
)
widget-account.picture='hubl-user-avatar'
)
sib-widget(name='hubl-project-admins')
template
sib-display(
data-src='${value}'
fields='user'
search-fields='is_admin'
search-value-is_admin='true'
search-widget-is_admin='sib-form-hidden'
widget-user='hubl-project-captain'
)
sib-widget(name='hubl-project-admins')
template
sib-display(
data-src='${value}'
fields='user'
search-fields='is_admin'
search-value-is_admin='true'
search-widget-is_admin='sib-form-hidden'
widget-user='hubl-project-captain'
)
sib-widget(name="hubl-admin-project-buttons")
template
sib-display(
data-src='${src}'
nested-field='members'
fields='relation'
action-relation='relation'
widget-relation='hubl-admin-project-leave-button'
search-fields='user'
search-widget-user='sib-form-hidden'
search-value-user="-"
hubl-inherit-user-id="search-value-user"
)
sib-widget(name='hubl-admin-project-leave-button')
template
sib-delete(
class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
data-src="${src}"
data-label='Quitter'
)
sib-display(
class='table-body'
sib-display(
class='table-body'
data-src=`${endpoints.projects || endpoints.get.projects}`
fields='name, members, captain, buttons'
bind-user
nested-field="projects"
fields='project.name, project.members, project.captain, leaveButton'
class-name='w262 border cell-with-name hashtag'
class-members='w262 border'
class-captain='w262 border cell-with-id-card'
class-buttons='w262 border cell-with-buttons'
class-project.name='w25 cell border cell-with-name'
class-project.members='w25 cell border'
class-project.captain='w25 cell border cell-with-id-card'
class-leaveButton='w25 cell border cell-with-buttons'
widget-buttons="admin-project-buttons"
action-buttons="buttons"
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-project-leave-button"
widget-captain='hubl-project-captain'
widget-members='hubl-project-admins'
)
widget-project.captain='hubl-project-captain'
widget-project.members='hubl-project-admins'
#admin-project-create.content-box__height(hidden)
order-by="project.name"
)
sib-widget(name='hubl-admin-project-join-button')
template
sib-form.button.text-bold.text-uppercase.reversed.button-primary.bordered.with-icon.icon-arrow-right-circle.flex(
data-src='${src}'
nested-field="members"
fields='user.username'
value-user.username='hubl-workaround-493'
widget-user.username='sib-form-hidden'
submit-button='Rejoindre'
)
sib-display(
class='table-body'
data-src=`${endpoints.projects || endpoints.get.projects}joinable/`
fields='name, members, captain, joinButton'
class-name='w25 cell border cell-with-name'
class-members='w25 cell border'
class-captain='w25 cell border cell-with-id-card'
class-joinButton='w25 cell border cell-with-buttons'
action-joinButton="joinButton" # Workaround: I need members two times
widget-joinButton="hubl-admin-project-join-button"
widget-captain='hubl-project-captain'
widget-members='hubl-project-admins'
order-by="name"
)
#admin-project-create(hidden)
include page-admin-projects-create.pug

50
src/views/project/page-project-edit.pug
View File

@ -9,24 +9,26 @@ div.content-box__info
sib-form.form.button-register(
bind-resources
fields='line-1(customer, name), description, line-2(businessProvider, businessProviderFee)'
fields='status, block-project__info(customer.name, name), description'
label-status='Statut du canal*'
widget-status='hubl-status'
class-status='form-label is-light is-full-width member-select color'
class-customer='form-label is-light is-half-width'
widget-customer='sib-form-auto-completion'
class-name='form-label is-light is-half-width input-text-like'
class-description='form-label is-light is-full-width input-text-like'
label-customer='Client*'
range-customer=`${endpoints.customers || endpoints.get.customers}`
label-name='Nom du projet*'
class-name='form-label is-light is-half-width'
label-customer.name='Nom du client*'
class-customer.name='form-label is-light is-half-width'
label-description='Description du projet'
class-description='form-label is-light is-full-width'
widget-description='sib-form-textarea'
class-businessprovider='form-label is-light is-half-width input-text-like'
class-businessproviderfee='form-label is-light is-half-width input-text-like'
label-businessprovider='Apporteur d\'affaire'
label-businessproviderfee='Montant de la contribution'
partial=""
submit-button='Enregistrer'
next='project-information'
)
h2 Liste des membres :
@ -44,18 +46,18 @@ div.content-box__info
submit-button='Ajouter un membre'
)
.table-wrapper
.table
div.table-header.grey-color
div.w355 Nom
div.W152 Accès
.table
//-class='table-body'
sib-display(
class='table-body'
bind-resources
fields='members'
div.table-header.grey-color
div.w66 Nom
div.w33 Accès
multiple-members=''
widget-members='hubl-team-template-edit'
)
//-class='table-body'
sib-display(
class='table-body'
bind-resources
fields='members'
multiple-members=''
widget-members='hubl-team-template-edit'
)

39
src/views/project/page-project-profile.pug
View File

@ -21,10 +21,25 @@ sib-router(default-route='project-profile', hidden)
widget-creationDate='sib-display-date'
)
sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
sib-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre
sib-link(class='button text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources) Modifier et ajouter un membre
sib-display(
class='position-end'
bind-resources
nested-field='members'
fields='relation'
.flex.space-between.with-padding
action-relation='relation'
widget-relation='hubl-project-leave-button'
search-fields='user'
search-widget-user='sib-form-hidden'
search-value-user=""
hubl-inherit-user-id="search-value-user"
)
.space-between
sib-display(
bind-resources
fields='label-captain, captain'
@ -51,6 +66,7 @@ sib-router(default-route='project-profile', hidden)
multiple-members
)
sib-widget(name='hubl-project-leave-button')
template
sib-delete(
@ -59,22 +75,5 @@ sib-router(default-route='project-profile', hidden)
data-label='Quitter le groupe'
)
sib-display(
class='flex desktop-button__end'
bind-resources
nested-field='members'
fields='relation'
action-relation='relation'
widget-relation='hubl-project-leave-button'
search-fields='user'
search-widget-user='sib-form-hidden'
search-value-user=""
hubl-inherit-user-id="search-value-user"
)
#project-edit.content-box__height(hidden)
include page-project-edit.pug