From bb40beb449a4ce7b8256eaa9a53867cef4579d2e Mon Sep 17 00:00:00 2001
From: Calum Mackervoy <c.mackervoy@gmail.com>
Date: Thu, 9 Jan 2020 15:21:17 +0100
Subject: [PATCH 1/4] customer dropdown in edit-project
---
config.sample.json | 1 +
src/page-project-edit.pug | 28 ++++------------------------
2 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/config.sample.json b/config.sample.json
index 27aed52c..54ce4fce 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -7,6 +7,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/"
}
diff --git a/src/page-project-edit.pug b/src/page-project-edit.pug
index 19a0dc17..2ea3ab8a 100644
--- a/src/page-project-edit.pug
+++ b/src/page-project-edit.pug
@@ -13,18 +13,16 @@ div.content-box__info
sib-form.form-container.block(
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-customer='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-customer='Customer'
+ range-customer=`${endpoints.customer}`
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'
@@ -36,24 +34,6 @@ div.content-box__info
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'
)
--
GitLab
From e50845455ba1f46115c3fa522beddaeb0613a154 Mon Sep 17 00:00:00 2001
From: Calum Mackervoy <c.mackervoy@gmail.com>
Date: Mon, 13 Jan 2020 10:33:36 +0100
Subject: [PATCH 2/4] customer dropdown in project-edit
---
src/page-project-edit.pug | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/page-project-edit.pug b/src/page-project-edit.pug
index 2ea3ab8a..bb1fe73c 100644
--- a/src/page-project-edit.pug
+++ b/src/page-project-edit.pug
@@ -20,7 +20,7 @@ div.content-box__info
class-description='form-label is-light is-full-width'
label-fieldset-info=''
label-customer='Customer'
- range-customer=`${endpoints.customer}`
+ range-customer=`${endpoints.customers}`
label-name='Project\'s name*'
label-description='Project description'
widget-fieldset-info='hd-fieldset-title'
--
GitLab
From 6a0821a59b7a0bd7fe5c948c4115c61bb5f2ff42 Mon Sep 17 00:00:00 2001
From: Calum Mackervoy <c.mackervoy@gmail.com>
Date: Mon, 13 Jan 2020 11:50:45 +0100
Subject: [PATCH 3/4] customer dropdown for project create
---
src/page-project-create.pug | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/page-project-create.pug b/src/page-project-create.pug
index 80cbceaa..87182c35 100644
--- a/src/page-project-create.pug
+++ b/src/page-project-create.pug
@@ -7,24 +7,15 @@
range-members=`${endpoints.users}`,
range-team=`${endpoints.users}`,
- fields='block-project__info(customer.name, name, customer.logo, description), block-project__fee(fieldset-fee, businessProvider, businessProviderFee), block-project__customer(fieldset-customer, customer.companyRegister, customer.address, customer.firstName, customer.lastName, customer.role, customer.email, customer.phone)',
+ fields='block-project__info(customer, name, description), block-project__fee(fieldset-fee, businessProvider, businessProviderFee)',
- label-customer.name='Customer\'s name',
+ label-customer='Customer',
+ range-customer=`${endpoints.customers}`,
label-name='Project\'s name',
- label-customer.logo='Customer\'s logo',
label-description='Project description',
widget-fieldset-fee='hd-template-project-title',
label-businessProvider='Business provider',
label-businessProviderFee='Amount of the contribution',
-
- widget-fieldset-customer='hd-template-project-title',
- 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'
)
\ No newline at end of file
--
GitLab
From b0e7584a076973c78fed0fbcd632895d4b691aff Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Thu, 16 Jan 2020 18:48:21 +0100
Subject: [PATCH 4/4] css for project-edit added + refactoring
---
src/page-admin-projects-create.pug | 5 +-
src/page-circle-edit.pug | 6 +-
src/page-project-edit.pug | 105 ++++++------
src/styles/base/form.scss | 23 ++-
src/styles/base/table.scss | 1 +
src/styles/layout/circle/_index.scss | 1 -
src/styles/layout/circle/circle-edit.scss | 161 ------------------
src/styles/layout/circle/circle-profile.scss | 9 -
src/styles/layout/project-profile/_index.scss | 2 +-
9 files changed, 82 insertions(+), 231 deletions(-)
delete mode 100644 src/styles/layout/circle/circle-edit.scss
diff --git a/src/page-admin-projects-create.pug b/src/page-admin-projects-create.pug
index 92dd7244..3ea8961c 100644
--- a/src/page-admin-projects-create.pug
+++ b/src/page-admin-projects-create.pug
@@ -32,8 +32,9 @@ div.content-box__info
widget-fieldset-captain='hd-template-project-title'
label-customer='Customer'
- class-customer='form-label is-light is-half-width'
- range-customer=`${endpoints.customers}`,
+ 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'
diff --git a/src/page-circle-edit.pug b/src/page-circle-edit.pug
index 2a7bab02..930302eb 100644
--- a/src/page-circle-edit.pug
+++ b/src/page-circle-edit.pug
@@ -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
diff --git a/src/page-project-edit.pug b/src/page-project-edit.pug
index bb1fe73c..2a5be6c7 100644
--- a/src/page-project-edit.pug
+++ b/src/page-project-edit.pug
@@ -1,69 +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
-
- fields='fieldset-info, block-project__info(customer, name, description), fieldset-fee, block-project__fee(businessProvider, businessProviderFee)'
+ sib-form.block.form-edit(
+ bind-resources
+
+ fields='fieldset-info, block-project__info(customer, name, description), fieldset-fee, block-project__fee(businessProvider, businessProviderFee)'
- class-customer='form-label is-light is-half-width'
- 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-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'
- submit-button='Save'
- )
+ submit-button='Save'
+ )
- h2 Members List
+ h2 Members List
- sib-form.block.team-form(
- bind-resources
- nested-field='members'
- fields='user'
- range-user=`${endpoints.users}`
+ sib-form.block.select-add-member(
+ 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'
+ )
diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss
index 3dff76e6..388f1978 100644
--- a/src/styles/base/form.scss
+++ b/src/styles/base/form.scss
@@ -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;*/
diff --git a/src/styles/base/table.scss b/src/styles/base/table.scss
index 6b5b0bee..af42ed73 100644
--- a/src/styles/base/table.scss
+++ b/src/styles/base/table.scss
@@ -2,6 +2,7 @@
#circle-edit,
#admin-circle-list,
#admin-circle-create,
+#project-edit,
#admin-project-list,
#admin-project-create {
diff --git a/src/styles/layout/circle/_index.scss b/src/styles/layout/circle/_index.scss
index 8ef02997..940c5fc0 100644
--- a/src/styles/layout/circle/_index.scss
+++ b/src/styles/layout/circle/_index.scss
@@ -1,4 +1,3 @@
@import 'circle';
@import 'circle-profile';
-@import 'circle-edit';
@import 'circle-admin';
diff --git a/src/styles/layout/circle/circle-edit.scss b/src/styles/layout/circle/circle-edit.scss
deleted file mode 100644
index c1e26833..00000000
--- a/src/styles/layout/circle/circle-edit.scss
+++ /dev/null
@@ -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;
- }
- }
- }
- }
- }*/
-}
-
diff --git a/src/styles/layout/circle/circle-profile.scss b/src/styles/layout/circle/circle-profile.scss
index 96e50e5f..63bf22a1 100644
--- a/src/styles/layout/circle/circle-profile.scss
+++ b/src/styles/layout/circle/circle-profile.scss
@@ -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;
diff --git a/src/styles/layout/project-profile/_index.scss b/src/styles/layout/project-profile/_index.scss
index 0ff827cb..74f68a74 100644
--- a/src/styles/layout/project-profile/_index.scss
+++ b/src/styles/layout/project-profile/_index.scss
@@ -1,2 +1,2 @@
@import 'project';
-@import 'project-profile';
\ No newline at end of file
+@import 'project-profile';
--
GitLab