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

update: add new customer address fields on forms

Browse Source
This commit is contained in:
Marjolaine Le Bon
2021-05-19 17:01:23 +02:00
parent 28b1e7195f
commit 9e844b2636
7 changed files with 138 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/locales/en.json
View File

@ -198,11 +198,17 @@
"create": {
"backlink": "Back",
"title": " Create a new project",
"labelProjectset": "Project",
"labelCustomerset": "Customer",
"labelBusinessproviderset": "Business Provider",
"labelName": "Project name*",
"labelDescription": "Project description",
"descriptionHelp": "You can use markdown",
"labelCustomer": "Customer name*",
"labelCustomerAddress": "Customer address",
"labelCustomerPostcode": "Post Code",
"labelCustomerCity": "City",
"labelCustomerCountry": "Country",
"labelCaptain": "Project captain*",
"labelBusinessprovider": "Business Input",
"labelBusinessproviderAdd": "Add a Business Provider",
@ -215,9 +221,14 @@
"buttonDelete": "Remove",
"backlink": "Back",
"title": "Edit your project",
"labelProjectset": "Project",
"labelCustomerset": "Customer",
"labelName": "Project name *",
"labelCustomer": "Customer name *",
"labelCustomerAddress": "Customer address",
"labelCustomerPostcode": "Post Code",
"labelCustomerCity": "City",
"labelCustomerCountry": "Country",
"labelCaptain": "Captain *",
"labelDescription": "Project description",
"descriptionHelp": "You can use markdown",

11
src/locales/es.json
View File

@ -198,11 +198,17 @@
"create": {
"backlink": "Atrás",
"title": "Crear un proyecto nuevo",
"labelProjectset": "Proyecto",
"labelCustomerset": "Clientx",
"labelBusinessproviderset": "Contribución empresarial",
"labelName": "Nombre del proyecto *",
"labelDescription": "Descripción del proyecto",
"descriptionHelp": "Puedes usar markdown",
"labelCustomer": "Nombre del/la clientx *",
"labelCustomerAddress": "Dirección del/la clientx",
"labelCustomerPostcode": "Código postal",
"labelCustomerCity": "Ciudad",
"labelCustomerCountry": "País",
"labelCaptain": "Líder del proyecto *",
"labelBusinessprovider": "Contribución empresarial",
"labelBusinessproviderAdd": "Eliminar",
@ -215,9 +221,14 @@
"buttonDelete": "Eliminar",
"backlink": "Atrás",
"title": "Modificar tu proyecto",
"labelProjectset": "Proyecto",
"labelCustomerset": "Clientx",
"labelName": "Nombre del proyecto *",
"labelCustomer": "Nombre del/la clientx *",
"labelCustomerAddress": "Dirección del/la clientx",
"labelCustomerPostcode": "Código postal",
"labelCustomerCity": "Ciudad",
"labelCustomerCountry": "País",
"labelCaptain": "Capitain *",
"labelDescription": "Descripción del proyecto",
"descriptionHelp": "Puedes usar markdown",

11
src/locales/fr.json
View File

@ -196,11 +196,17 @@
"create": {
"backlink": "Retour",
"title": "Créer un nouveau projet",
"labelProjectset": "Projet",
"labelCustomerset": "Client",
"labelBusinessproviderset": "Apport d'affaire",
"labelName": "Nom du projet *",
"labelDescription": "Description du projet",
"descriptionHelp": "Vous pouvez utiliser Markdown",
"labelCustomer": "Nom du client*",
"labelCustomerAddress": "Adresse du client",
"labelCustomerPostcode": "Code Postal",
"labelCustomerCity": "Ville",
"labelCustomerCountry": "Pays",
"labelCaptain": "Capitaine du projet*",
"labelBusinessprovider": "Apport d'affaire",
"labelBusinessproviderAdd": "Ajouter de l'apport d'affaire",
@ -213,9 +219,14 @@
"buttonDelete": "Retirer",
"backlink": "Retour",
"title": "Modifie ton projet",
"labelProjectset": "Projet",
"labelCustomerset": "Client",
"labelName": "Nom du projet *",
"labelCustomer": "Nom du client *",
"labelCustomerAddress": "Adresse du client",
"labelCustomerPostcode": "Code Postal",
"labelCustomerCity": "Ville",
"labelCustomerCountry": "Pays",
"labelCaptain": "Capitaine *",
"labelDescription": "Description du projet",
"descriptionHelp": "Vous pouvez utiliser Markdown",

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

@ -25,16 +25,28 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
loader-id=`loader-admin-${getComponent('projects').uniq}`
label-status=''
label-customer.name=''
label-customer.address=''
label-projectset=''
label-customerset=''
label-businessproviderset=''
label-name=''
label-description=''
label-help=''
label-captain=''
label-customer.name=''
label-customer.address=''
label-customer.postcode=''
label-customer.city=''
label-customer.country=''
label-businessprovider=''
class-projectset='segment full padding-bottom-small margin-bottom-medium border-bottom border-color-grey text-color-heading text-bold text-letter-spacing-large text-xlarge'
class-customerset='segment full padding-bottom-small margin-bottom-medium border-bottom border-color-grey text-color-heading text-bold text-letter-spacing-large text-xlarge'
class-businessproviderset='segment full padding-bottom-small margin-bottom-medium border-bottom border-color-grey text-color-heading text-bold text-letter-spacing-large text-xlarge'
class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-customer.address='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-customer.address='segment margin-bottom-medium full sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-customer.postcode='segment margin-bottom-medium third sm-full padding-right-xsmall sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-customer.city='segment margin-bottom-medium third sm-full padding-left-xxsmall padding-righ-xxsmall sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-customer.country='segment margin-bottom-medium third sm-full padding-left-xsmall sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading'
class-help='segment full text-small margin-bottom-medium padding-left-small'
class-linebreak='segment full sm-hidden'
@ -47,10 +59,14 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
widget-status='solid-form-hidden'
value-status='Private'
widget-projectset='solid-form-hidden-label'
widget-customerset='solid-form-hidden-label'
widget-businessproviderset='solid-form-hidden-label'
widget-description='solid-form-richtext-label'
widget-captain='solid-form-dropdown-autocompletion-label'
widget-help='solid-form-hidden-label'
widget-linebreak='solid-form-hidden'
widget-customer.address="solid-form-textarea-label"
submit-button=''
submit-widget="button"
@ -58,9 +74,9 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
next=getRoute('projects', true)
data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-customer.address=project.create.labelCustomerAddress;label-businessprovider=project.create.labelBusinessprovider;multiple-businessprovider-add-label=project.create.labelBusinessproviderAdd;multiple-businessprovider-remove-label=project.create.labelBusinessproviderRemove;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit'
data-trans='label-status=project.create.labelStatus;label-projectset=project.create.labelProjectset;label-customerset=project.create.labelCustomerset;label-businessproviderset=project.create.labelBusinessproviderset;label-customer.name=project.create.labelCustomer;label-customer.address=project.create.labelCustomerAddress;label-customer.postcode=project.create.labelCustomerPostcode;label-customer.city=project.create.labelCustomerCity;label-customer.country=project.create.labelCustomerCountry;label-businessprovider=project.create.labelBusinessprovider;multiple-businessprovider-add-label=project.create.labelBusinessproviderAdd;multiple-businessprovider-remove-label=project.create.labelBusinessproviderRemove;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit'
)&attributes({
"fields": componentSet.has('invoices') ? "status, customer.name, customer.address, name, captain, businessprovider, description, help, linebreak" : "status, customer.name, name, description, help, captain, linebreak",
"fields": componentSet.has('invoices') ? "status, projectset, name, captain, description, help, linebreak, customerset, customer.name, customer.address, customer.postcode, customer.city, customer.country, businessproviderset, businessprovider" : "status, customer.name, name, description, help, captain, linebreak",
"class-captain": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' : 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal',
"class-name": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' : 'segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading'
})

80
src/views/partials/project/page-project-edit.pug
View File

@ -29,45 +29,65 @@ div.segment.full.padding-large.whitespace-normal
div
//- Add translation for description and captain in the translate file
solid-form.form(
bind-resources
required-customer.name
required-name
required-captain
range-captain=component.endpoints.captains
solid-form.form(
bind-resources
label-name=''
label-customer.name=''
label-customer.address=''
label-description=''
label-captain=''
label-help=''
range-captain=`${getComponent('projects').endpoints.captains}`
required-status
required-customer.name
required-name
required-captain
loader-id=`loader-admin-${getComponent('projects').uniq}`
class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-customer.address='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading'
class-linebreak='segment full'
class-help='segment full sm-full text-small margin-bottom-medium padding-left-small'
label-status=''
label-projectset=''
label-customerset=''
label-name=''
label-description=''
label-help=''
label-captain=''
label-customer.name=''
label-customer.address=''
label-customer.postcode=''
label-customer.city=''
label-customer.country=''
widget-description='solid-form-richtext-label'
widget-captain='solid-form-dropdown-autocompletion-label'
widget-linebreak='solid-form-hidden'
widget-help='solid-form-hidden-label'
class-projectset='segment full padding-bottom-small margin-bottom-medium border-bottom border-color-grey text-color-heading text-bold text-letter-spacing-large text-xlarge'
class-customerset='segment full padding-bottom-small margin-bottom-medium border-bottom border-color-grey text-color-heading text-bold text-letter-spacing-large text-xlarge'
class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-customer.address='segment margin-bottom-medium full sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-customer.postcode='segment margin-bottom-medium third sm-full padding-right-xsmall sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-customer.city='segment margin-bottom-medium third sm-full padding-left-xxsmall padding-righ-xxsmall sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-customer.country='segment margin-bottom-medium third sm-full padding-left-xsmall sm-padding-none text-small text-semibold text-uppercase text-color-heading'
class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading'
class-help='segment full text-small margin-bottom-medium padding-left-small'
class-linebreak='segment full sm-hidden'
widget-status='solid-form-hidden'
value-status='Private'
widget-projectset='solid-form-hidden-label'
widget-customerset='solid-form-hidden-label'
widget-description='solid-form-richtext-label'
widget-captain='solid-form-dropdown-autocompletion-label'
widget-help='solid-form-hidden-label'
widget-linebreak='solid-form-hidden'
widget-customer.address="solid-form-textarea-label"
partial=""
submit-button=''
submit-widget="button"
class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
next=getRoute('projects', true)
submit-button=''
submit-widget="button"
class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
next=`${component.route}-information`
data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-customer.address=project.edit.labelCustomerAddress;label-description=project.edit.labelDescription;label-help=project.edit.descriptionHelp;submit-button=project.edit.buttonSubmit'
)&attributes({
"fields": componentSet.has('invoices') ? "customer.name, customer.address, name, captain, description, help, linebreak" : "customer.name, name, description, help, captain, linebreak",
data-trans='label-status=project.edit.labelStatus;label-projectset=project.edit.labelProjectset;label-customerset=project.edit.labelCustomerset;label-customer.name=project.edit.labelCustomer;label-customer.address=project.edit.labelCustomerAddress;label-customer.postcode=project.edit.labelCustomerPostcode;label-customer.city=project.edit.labelCustomerCity;label-customer.country=project.edit.labelCustomerCountry;label-name=project.edit.labelName;label-description=project.edit.labelDescription;label-captain=project.edit.labelCaptain;label-help=project.edit.descriptionHelp;submit-button=project.edit.buttonSubmit'
)&attributes({
"fields": componentSet.has('invoices') ? "status, projectset, name, captain, description, help, linebreak, customerset, customer.name, customer.address, customer.postcode, customer.city, customer.country" : "status, name, captain, description, help, customer.name, linebreak",
"class-captain": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' : 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal',
"class-name": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' : 'segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading'
})
if componentSet.has("invoices")
h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.businessProviderTitle')