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

Merge branch 'edit-project-customer-dropdown' of git.happy-dev.fr:startinblox/applications/sib-app into gm-test-2

Browse Source
This commit is contained in:
gaelle morin 2020-01-18 12:17:57 +01:00
commit bf5a379b13
No known key found for this signature in database
GPG Key ID: BC97AADCB48B7F27
10 changed files with 85 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.sample.json
View File

@ -10,6 +10,7 @@
"groups": "http://localhost:8000/groups/",
"joboffers": "http://localhost:8000/job-offers/",
"projects": "http://localhost:8000/projects/",
"customers": "http://localhost:8000/customers/",
"skills": "http://localhost:8000/skills/",
"users": "http://localhost:8000/users/"
}

37
src/page-admin-projects-create.pug
View File

@ -21,29 +21,24 @@ div.content-box__info
sib-form.block(
data-src=`${endpoints.projects}`
fields='line-1(customer.name, name), line-2(customer.logo), line-3(project.description), fieldset-fee, line-4(businessProvider.name, businessProvider.fee), fieldset-customer, line-5(customer.companyRegister), line-6(customer.address), line-7(customer.firstName, customer.lastName), line-8(customer.role), line-9(customer.email, customer.phone), fieldset-captain, line-10(captain)'
fields='line-1(customer, name), line-3(project.description), fieldset-fee, line-4(businessProvider.name, businessProvider.fee), fieldset-captain, line-10(captain)'
class-fieldset-fee='fieldset'
value-fieldset-fee='Fee'
widget-fieldset-fee='hd-template-project-title'
class-fieldset-customer='fieldset'
value-fieldset-customer='Customer\'s information'
widget-fieldset-customer='hd-template-project-title'
class-fieldset-captain='fieldset'
value-fieldset-captain='Captain'
widget-fieldset-captain='hd-template-project-title'
label-customer.name='Customer\'s name*'
class-customer.name='form-label is-light is-half-width'
label-customer='Customer'
class-customer='member-select form-label is-light is-half-width'
range-customer=`${endpoints.customers}`
widget-customer='sib-form-auto-completion'
label-name='Project\'s name*'
class-name='form-label is-light is-half-width'
label-customer.logo='Customer\'s logo'
class-customer.logo='form-label is-light is-half-width'
label-project.description='Project description'
class-project.description='form-label is-light is-full-width'
widget-project.description='sib-form-textarea'
@ -54,28 +49,6 @@ div.content-box__info
label-businessProvider.fee='Amount of the contribution'
class-businessProvider.fee='form-label is-light is-half-width'
label-customer.companyregister='Company register'
class-customer.companyregister='form-label is-light is-half-width'
label-customer.address='Address'
class-customer.address='form-label is-light is-full-width'
widget-customer.address='sib-form-textarea'
label-customer.firstName='Name of the contact'
class-customer.firstName='form-label is-light is-half-width'
label-customer.lastName='Firstname of the contact'
class-customer.lastName='form-label is-light is-half-width'
label-customer.role='Role within the company'
class-customer.role='form-label is-light is-half-width'
label-customer.email='Email'
class-customer.email='form-label is-light is-half-width'
label-customer.phone='Phone'
class-customer.phone='form-label is-light is-half-width'
range-captain=`${endpoints.users}`
class-captain='member-select form-label is-light is-half-width'
widget-captain='sib-form-auto-completion'

6
src/page-circle-edit.pug
View File

@ -41,7 +41,7 @@ div.content-box__info
sib-ac-checker(permission='acl:Write', bind-resources)
h1 Edit your circle
sib-form.block.circle-edit-form(
sib-form.block.form-edit(
bind-resources
fields='block-circle__info(name, owner), description'
@ -65,7 +65,7 @@ div.content-box__info
h2 Members list
sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
sib-form.block.team-form(
sib-form.block.select-add-member(
bind-resources
nested-field='members'
fields='user'
@ -84,7 +84,7 @@ div.content-box__info
div Name
div Access
//-class='table-body'
//-class='table-body'
sib-display(
class='table-body'
bind-resources

123
src/page-project-edit.pug
View File

@ -1,89 +1,70 @@
div.content-box__info
include templates/hd-user-avatar.pug
include templates/hd-user-avatar.pug
sib-widget(name='hd-fieldset-title')
template
label ${label}
sib-widget(name='hd-fieldset-title')
template
label ${label}
sib-link(class='backlink', bind-resources, next='project-profile') Back
sib-link(class='backlink', bind-resources, next='project-profile') Back
h1 Edit your project
h1 Edit your project
sib-form.form-container.block(
bind-resources
sib-form.block.form-edit(
bind-resources
fields='fieldset-info, block-project__info(customer.name, name, customer.logo, description), fieldset-fee, block-project__fee(businessProvider, businessProviderFee), fieldset-customer, block-project__customer(customer.companyRegister, customer.address, customer.firstName, customer.lastName, customer.role, customer.email, customer.phone)'
fields='fieldset-info, block-project__info(customer, name, description), fieldset-fee, block-project__fee(businessProvider, businessProviderFee)'
class-customer.name='form-label is-light is-half-width'
class-name='form-label is-light is-half-width'
class-customer.logo='form-label is-light is-full-width'
class-description='form-label is-light is-full-width'
label-fieldset-info=''
label-customer.name='Customer\'s name'
label-name='Project\'s name*'
label-customer.logo='Customer\'s logo'
label-description='Project description'
upload-url-customer.logo=''
widget-fieldset-info='hd-fieldset-title'
widget-description='sib-form-textarea'
class-customer='member-select form-label is-light is-half-width'
widget-customer='sib-form-auto-completion'
class-name='form-label is-light is-half-width'
class-description='form-label is-light is-full-width'
label-fieldset-info=''
label-customer='Customer'
range-customer=`${endpoints.customers}`
label-name='Project\'s name*'
label-description='Project description'
widget-fieldset-info='hd-fieldset-title'
widget-description='sib-form-textarea'
class-fieldset-fee='fieldset'
class-businessprovider='form-label is-light is-half-width'
class-businessproviderfee='form-label is-light is-half-width'
label-fieldset-fee='Fee'
label-businessprovider='Business provider'
label-businessproviderfee='Amount of the contribution'
widget-fieldset-fee='hd-fieldset-title'
class-fieldset-fee='fieldset'
class-businessprovider='form-label is-light is-half-width'
class-businessproviderfee='form-label is-light is-half-width'
label-fieldset-fee='Fee'
label-businessprovider='Business provider'
label-businessproviderfee='Amount of the contribution'
widget-fieldset-fee='hd-fieldset-title'
class-fieldset-customer='fieldset'
class-customer.companyregister='form-label is-light is-half-width'
class-customer.address='form-label is-light is-half-width'
class-customer.firstname='form-label is-light is-half-width'
class-customer.lastname='form-label is-light is-half-width'
class-customer.role='form-label is-light is-half-width'
class-customer.email='form-label is-light is-half-width'
class-customer.phone='form-label is-light is-half-width'
label-fieldset-customer='Customer\'s information'
label-customer.companyregister='Company register*'
label-customer.address='Address'
label-customer.firstname='Name of the contact at the customer\'s premises'
label-customer.lastname='Firstname of the contact at the customer\'s premises'
label-customer.role='Role within the company'
label-customer.email='Email'
label-customer.phone='Phone'
widget-fieldset-customer='hd-fieldset-title'
submit-button='Save'
)
submit-button='Save'
)
h2 Members List
h2 Members List
sib-form.block.select-add-member(
bind-resources
nested-field='members'
fields='user'
range-user=`${endpoints.users}`
sib-form.block.team-form(
bind-resources
nested-field='members'
fields='user'
range-user=`${endpoints.users}`
class-user='team form-label is-dark'
label-user=''
widget-user='sib-form-auto-completion'
class-user='team form-label is-dark'
label-user=''
widget-user='sib-form-auto-completion'
submit-button='Add a member'
)
submit-button='Add a member'
)
.table
.table
div.table-header.grey-color
div Name
div Access
div.table-header.grey-color
div Name
div Access
//-class='table-body'
sib-display(
class='table-body'
bind-resources
fields='members'
//-class='table-body'
sib-display(
class='table-body'
bind-resources
fields='members'
multiple-members=''
widget-members='team-template-edit'
)
multiple-members=''
widget-members='team-template-edit'
)

23
src/styles/base/form.scss
View File

@ -100,11 +100,13 @@
/* CLASSES Peut-être à sortir de .content-box */
.block.team-form>form { /* circle-profile */
.block.select-add-member>form { /* circle-profile */
display: flex;
flex-direction: row;
margin-bottom: 2.6rem;
label {
margin-top: 0;
>.ss-main {
font-weight: normal;
@ -149,7 +151,24 @@
.form-container>form {
margin-top: 2.7rem;
}
}
.form-edit {
>form {
input[type='submit'] {
@extend .button,
.text-bold,
.text-uppercase,
.reversed,
.button-dark,
.bordered;
margin-left: auto;
margin-top: 3.2rem;
}
}
}
.form-label {
/*flex: 1 1 auto;*/

1
src/styles/base/table.scss
View File

@ -2,6 +2,7 @@
#circle-edit,
#admin-circle-list,
#admin-circle-create,
#project-edit,
#admin-project-list,
#admin-project-create {

1
src/styles/layout/circle/_index.scss
View File

@ -1,4 +1,3 @@
@import 'circle';
@import 'circle-profile';
@import 'circle-edit';
@import 'circle-admin';

161
src/styles/layout/circle/circle-edit.scss
View File

@ -1,161 +0,0 @@
#circle-edit {
.circle-edit-form>form {
input[type='submit'] {
@extend .button,
.text-bold,
.text-uppercase,
.reversed,
.button-dark,
.bordered;
margin-left: auto;
margin-top: 3.2rem;
}
}
/*.table-header {
background: $color-228-25-79;
color: white;
display: flex;
font-size: 1.6rem;
font-weight: 600;
justify-content: space-around;
text-align: center;
>*{
border-right: 1px solid white;
flex: 1;
padding: 1rem;
width: 50%;
}
>*:last-of-type {
border-right: 1px solid $color-228-25-79;
@media (max-width: 1220px) {
display: none;
}
}
}*/
/*.table-body div team-template-edit {
display: flex;
justify-content: space-between;
>* {
border-bottom: 1px solid $color-228-25-79;
flex: 1;
width: 50%;
}
sib-display {
border-left: 1px solid $color-228-25-79;
padding: 0 2.2rem;
}
sib-ac-checker {
align-items: center;
border-left: 1px solid $color-228-25-79;
border-right: 1px solid $color-228-25-79;
display: flex;
justify-content: flex-end;
padding: 2.7rem 2.2rem;
@media (max-width: 1220px) {
display: none;
}
}
}*/
.member-select.color {
.ss-main {
color: $color-233-18-29;
}
}
/*sib-multiple[widget='team-template-edit'] {
label {
display: none;
}
>div>team-template-edit>sib-display>div {
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
>[name$='account.picture'] {
align-items: center;
align-self: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
height: 7vh;
justify-content: center;
overflow: hidden;
position: relative;
width: 7vh;
img {
background-color: white;
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
object {
height: 45%;
width: 45%;
}
}
>[name='sup'] {
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
[name$='name'] {
font-weight: 600;
margin-right: 1rem;
}
sib-multiple {
display: flex;
[name='groups'] {
@extend %tag-role;
}
}
}
>[name='sub'] {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
margin-top: 0.50rem;
>[name$='profile.city']:not(:empty) {
@include mdi('atom');
align-items: center;
display: flex;
&::before {
color: $color-43-100-50;
margin-right: 0.50rem;
}
}
}
}
}*/
}

9
src/styles/layout/circle/circle-profile.scss
View File

@ -7,16 +7,7 @@
.block {
>form { /* peut-être à mettre dans main.scss */
margin-bottom: 2.6rem;
.form-label.is-dark>label {
margin-top: 0;
}
}
/* peut-être à mettre dans main.scss */
circle-team-template>sib-display>div {
display: grid;
grid-column-gap: 1.6rem;