diff --git a/src/header.pug b/src/header.pug
index 63b1b49fde362f84927250a199002866f5229c05..7301712c20c14f751f72004ff6a225177e13dbf8 100644
--- a/src/header.pug
+++ b/src/header.pug
@@ -16,8 +16,8 @@ details
include page-notifications.pug
sib-display#profile(
- data-fields='first_name,member.avatar',
- widget-member.avatar='sib-display-img',
+ data-fields='first_name,profile.picture',
+ widget-profile.picture='sib-display-img',
bind-user
)
diff --git a/src/page-group-profile.pug b/src/page-group-profile.pug
index 0ecb4dc2dfadaaadc6e406e8cd093f18d6d91ec0..fcf3b478708c4ef466b0fed254c34fa325494fdd 100644
--- a/src/page-group-profile.pug
+++ b/src/page-group-profile.pug
@@ -8,8 +8,8 @@
sib-display(
id-suffix='members',
data-fields='user-thumb',
- set-user-thumb='member.avatar, first_name, last_name',
- widget-member.avatar='sib-display-img',
+ set-user-thumb='profile.picture, first_name, last_name',
+ widget-profile.picture='sib-display-img',
bind-resources
)
@@ -28,7 +28,7 @@
sib-display(
data-fields='title, label-description, description, client',
- set-title='number, client.name, name',
+ set-title='phone, client.name, name',
set-client='label-client, client.name, client.logo, client.address',
value-label-description="Description:"
value-label-client="Client:"
diff --git a/src/page-job-offer-create.pug b/src/page-job-offer-create.pug
index aa6e77c625b19c21f5b0cf6447dc9f702e608dcd..14dd8815551307e6834578bc2d21083b1f9df596 100644
--- a/src/page-job-offer-create.pug
+++ b/src/page-job-offer-create.pug
@@ -4,7 +4,7 @@ div
.form-view
sib-form.block(
data-src=`${sdn}/job-offers/`,
- data-fields="author, description, skills",
+ data-fields="description, skills",
widget-author='sib-form-dropdown',
- widget-skills='sib-form-multiple-dropdown',
+ range-skills= `${sdn}/skills/`,
)
diff --git a/src/page-job-offers.pug b/src/page-job-offers.pug
index 609fcab27ecc9a7bd795dc702a3dd408ff1fef1a..c380d33c5470b2382477c180e093d8d1a79732ec 100644
--- a/src/page-job-offers.pug
+++ b/src/page-job-offers.pug
@@ -4,10 +4,10 @@ div.grid-layer
span Here you can find and post offers
sib-display#offers-list(
data-src=`${sdn}/job-offers/`,
- data-fields='date, user-thumb, title, description, roles, skills',
+ data-fields='date, user-thumb, title, description, skills',
widget-skills='sib-display-lookuplist',
- set-user-thumb='author.member.avatar, author.first_name, author.last_name, author.groups',
- widget-author.member.avatar='sib-display-img',
+ set-user-thumb='author.profile.picture, author.first_name, author.last_name',
+ widget-author.profile.picture='sib-display-img',
set-date='closingDate, creationDate',
set-creation='creationDate',
widget-closingDate='hdapp-closing-date',
diff --git a/src/page-member-edit.pug b/src/page-member-edit.pug
index 4a5a2c583c397d9b9369c2b0edcf7e03ee196e8e..6fbc111b842f32998339974b10d35b21dabbc3ad 100644
--- a/src/page-member-edit.pug
+++ b/src/page-member-edit.pug
@@ -1,14 +1,6 @@
.form-view
- label.d-none(for='avatar-input')
- img#avatar-preview(src='', style='width: 100%;')
- input#avatar-input.d-none(
- type='file',
- accept='image/*',
- name='avatar',
- value='',
- )
sib-form.block(
- data-fields='user, avatar, bio, cell, jabberID, number, pseudo, skills, website',
+ data-fields='user, picture, bio, cell, jabberID, phone, pseudo, skills, website',
widget-user='hdapp-usereditinfo',
range-cell=`${sdn}/cells/`, widget-skills='sib-form-multiple-dropdown',
range-skills=`${sdn}/skills/`,
diff --git a/src/page-member-profile.pug b/src/page-member-profile.pug
index 04d14ba6a87b87e0147fe713527bcd15f5240994..48a856caace73f89861b4350c5f8ab02030bfb16 100644
--- a/src/page-member-profile.pug
+++ b/src/page-member-profile.pug
@@ -1,22 +1,21 @@
template#chat-link
sib-link(next="member-chat") ${value}
sib-display#member-info(
- data-fields='available, header, name, pseudonym, infos, skills',
- set-header='avatar',
- set-infos='cell, roles,send, user.email, number, foaf:homepage',
+ data-fields='available, header, name, pseudonym, infos, user.skills',
+ set-header='picture',
+ set-infos='city, country, user.roles, user.email, send, phone, foaf:homepage, ',
set-name='user.first_name, user.last_name',
set-pseudonym='before-pseudo, pseudo',
value-before-pseudo='@',
value-send='SEND A MESSAGE',
template-send='chat-link',
widget-available='hdapp-available',
- widget-avatar='sib-display-img',
+ widget-picture='sib-display-img',
widget-user='hdapp-userinfo',
- widget-cell='hdapp-usercell',
- widget-number='sib-display-tel',
+ widget-phone='sib-display-tel',
widget-foaf:homepage='hdapp-hyperlink',
widget-user.email='sib-display-mailto',
- widget-roles='sib-display-lookuplist',
- widget-skills='sib-display-lookuplist',
+ widget-user.roles='sib-display-lookuplist',
+ widget-user.skills='sib-display-lookuplist',
bind-resources
)
diff --git a/src/page-members.pug b/src/page-members.pug
index 1c381095097ffaa6c2d504a04e29fb5f457d362d..97b17f79dc159b0b450d72882678413a41514e8e 100644
--- a/src/page-members.pug
+++ b/src/page-members.pug
@@ -7,8 +7,8 @@ div.grid-layer
h1 Members
sib-display#profiles-list(
data-src=`${sdn}/members/`,
- data-fields='header, infos, group, role, more',
- set-header='avatar, user, pseudonym, bio, send',
+ data-fields='header, infos, groups, role, more',
+ set-header='picture, user, pseudonym, bio, send, city, country',
set-infos='cell, roles, user.email, foaf:homepage, skills',
set-pseudonym='before-pseudo,pseudo'
label-skills='skill',
@@ -17,10 +17,9 @@ div.grid-layer
template-more='hdapp-link-more',
value-send='SEND A MESSAGE',
template-send='chat-link',
- widget-avatar='sib-display-img',
+ widget-picture='sib-display-img',
widget-user='hdapp-userinfo',
widget-foaf:hompage='hdapp-hyperlink',
- widget-cell='hdapp-usercell',
widget-roles='sib-display-lookuplist',
widget-skills='sib-display-lookuplist',
set-name='pseudo,user.first_name,user.last_name',
diff --git a/src/page-project-create.pug b/src/page-project-create.pug
index 11d7b45efc8c9c00386528a092ddbab39a9a0f23..1e235d6467da1993dae82d37df634c6f1c97f114 100644
--- a/src/page-project-create.pug
+++ b/src/page-project-create.pug
@@ -2,7 +2,7 @@ h1 New project
.form-view
sib-form.block(
data-src=`${sdn}/projects/`,
- range-client=`${sdn}/clients/`,
+ range-customer=`${sdn}/customers/`,
widget-team='sib-form-multiple-dropdown',
range-team=`${sdn}/members/`
)
diff --git a/src/page-project-edit.pug b/src/page-project-edit.pug
index 534754ff0a1e5e8c81fcf1684727dcfb5a395435..859cea070d5690e3adb85a1af55c50f7d0c15ecc 100644
--- a/src/page-project-edit.pug
+++ b/src/page-project-edit.pug
@@ -2,9 +2,9 @@ h1 Edit project
//- sib-display(data-fields="name" bind-resources)]
.form-view
sib-form(
- range-client=`${sdn}/clients/`,
+ range-customer=`${sdn}/customers/`,
range-team=`${sdn}/members/`,
- data-fields=`name, number, client, description, team, jabberRoom, foaf:jabberID`,
+ data-fields=`name, phone, customer, description, team, jabberRoom, foaf:jabberID`,
widget-jabberRoom='sib-form-checkbox',
widget-description='sib-form-textarea',
widget-team='hdapp-link-more',
diff --git a/src/page-project-profile.pug b/src/page-project-profile.pug
index 4d12e61a3f40b2875ef1b7fccb445db691fb7c70..c7cc89b011c56e6b37bfd314bdb3b0564e92475a 100644
--- a/src/page-project-profile.pug
+++ b/src/page-project-profile.pug
@@ -1,5 +1,5 @@
.frame
- template#client-template
+ template#customer-template
div#clientBox
div
h2 Client :
@@ -13,13 +13,13 @@
h2 Contact :
sib-display(
- data-fields='title, client.logo, label-description, description, client',
- set-title='const-title1,number,client.name,const-title2, name',
- widget-client.logo='sib-display-img',
- template-client='client-template',
+ data-fields='title, customer.logo, label-description, description, customer',
+ set-title='const-title1,phone, customer.name,const-title2, name',
+ widget-customer.logo='sib-display-img',
+ template-customer='customer-template',
widget-team='sib-display-lookuplist',
value-label-description="Description:",
- value-label-client="Client:",
+ value-label-customer="Client:",
value-const-title1="N°:",
value-const-title2="-",
bind-resources,
@@ -29,10 +29,10 @@
div.containerH
sib-display.members-list-condensed(
id-suffix='team',
- data-fields='member.avatar, member.user, member.roles',
- widget-member.avatar='sib-display-img',
- widget-member.user='hdapp-userinfo',
- widget-member.roles='sib-display-lookuplist',
- next='member',
+ data-fields='profile.picture, profile.user, groups',
+ widget-profile.picture='sib-display-img',
+ widget-profile.user='hdapp-userinfo',
+ widget-groups='sib-display-lookuplist',
+ next='profile',
bind-resources,
)
diff --git a/src/page-projects.pug b/src/page-projects.pug
index 7563087f8a2910c1a09472d5f39a1b02dc9d533c..4490ae255c62e8ca11ae7f2615efe4c03a9527ce 100644
--- a/src/page-projects.pug
+++ b/src/page-projects.pug
@@ -3,8 +3,8 @@ div
h1 Projects
sib-display(
data-src=`${sdn}/projects/`,
- data-fields='number, client, name',
- widget-client='hdapp-client',
- search-fields='number, name',
+ data-fields='phone, customer, name',
+ widget-customer='hdapp-client',
+ search-fields='phone, name',
next='project'
)
diff --git a/src/scripts/hd-widgets.js b/src/scripts/hd-widgets.js
index b8fa9429d372c078474e6785ce2e763d40c2b0a2..ccc837705604125954ed1bee63d3fd5948839908 100644
--- a/src/scripts/hd-widgets.js
+++ b/src/scripts/hd-widgets.js
@@ -27,32 +27,6 @@ document.addEventListener('WebComponentsReady', function(event) {
}
customElements.define('hdapp-userinfo', HDAppUserInfo);
- class HDAppCell extends SIBDisplayLookupList {
- get parentElement() {
- return 'div';
- }
- getTemplate(value, index) {
- var city, country;
-
- if (typeof value == 'object')
- if (Object.keys(value).length > 1) {
- city = value.city;
- country = value.country;
- } else {
- store.get(value).then(resource => {
- this.value.push(resource);
- this.render();
- });
- if (Array.isArray(this.value))
- this.value.splice(this.value.indexOf(value), 1);
- else this.value = [];
- return '';
- }
- return `<span>${city} - ${country}</span>`;
- }
- }
- customElements.define('hdapp-usercell', HDAppCell);
-
class HDAppMail extends SIBWidget {
get template() {
return `<a href="mailto:${this.value}"><div class="icon-envelope"></div><div>SEND A MESSAGE</div></a>`;
diff --git a/www/lib/sib-core b/www/lib/sib-core
index e38ebf298b1e1e8f6961feb1163338fd61259312..90d8772af806d1d2345272e4f309cd496c07d56f 160000
--- a/www/lib/sib-core
+++ b/www/lib/sib-core
@@ -1 +1 @@
-Subproject commit e38ebf298b1e1e8f6961feb1163338fd61259312
+Subproject commit 90d8772af806d1d2345272e4f309cd496c07d56f