Skip to content
Snippets Groups Projects
Commit c7f2c002 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

Merge branch 'feat/US847-consents-city' into 'dev'

feat/us847 consents city

See merge request web-et-numerique/llle_project/backoffice-client!70
parents 7dab1b93 89b81e92
No related branches found
No related tags found
6 merge requests!96Deploy OpenShift v2,!95MEP fix liens undefined,!91MEP: removed Meilisearch,!79Fix: nginx unprivileged image,!77Back-office SGE before canary release,!70feat/us847 consents city
Pipeline #43411 passed
...@@ -92,6 +92,10 @@ const Consents: React.FC = () => { ...@@ -92,6 +92,10 @@ const Consents: React.FC = () => {
initialWidth: 100, initialWidth: 100,
filter: true, filter: true,
}, },
{
field: 'city',
headerName: 'Ville',
},
{ {
field: 'startDate', field: 'startDate',
headerName: 'Début du consentement', headerName: 'Début du consentement',
......
...@@ -14,6 +14,7 @@ export interface ConsentEntity { ...@@ -14,6 +14,7 @@ export interface ConsentEntity {
address: string address: string
postalCode: string postalCode: string
inseeCode: string inseeCode: string
city: string
} }
export interface IConsentPagination export interface IConsentPagination
......
...@@ -84,7 +84,7 @@ export class ConsentService { ...@@ -84,7 +84,7 @@ export class ConsentService {
.setLocale('fr-FR') .setLocale('fr-FR')
.toLocaleString() .toLocaleString()
const consent: IConsent = { return {
ID: consentEntity.ID, ID: consentEntity.ID,
startDate: startDate, startDate: startDate,
endDate: endDate, endDate: endDate,
...@@ -93,8 +93,8 @@ export class ConsentService { ...@@ -93,8 +93,8 @@ export class ConsentService {
pointID: consentEntity.pointID, pointID: consentEntity.pointID,
address: consentEntity.address, address: consentEntity.address,
postalCode: consentEntity.postalCode, postalCode: consentEntity.postalCode,
city: consentEntity.city,
} }
return consent
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment