diff --git a/src/models/grdfConsent.ts b/src/models/grdfConsent.ts index 396b0d3f9a261029dc59c34f0eda9252ec355315..0729f8f7654685dc582a87774756dbe0ad680d5d 100644 --- a/src/models/grdfConsent.ts +++ b/src/models/grdfConsent.ts @@ -3,15 +3,14 @@ import { DateTime } from 'luxon' import { dateFormatter } from '../utils/dateFormatter' export interface IGrdfConsent - extends Omit<GrdfConsentEntity, 'CreatedAt' | 'endDate' | 'startDate'> { - startDate: DateTime + extends Omit<GrdfConsentEntity, 'CreatedAt' | 'endDate'> { + createdAt: DateTime endDate: DateTime } export interface GrdfConsentEntity { ID: number CreatedAt: string - startDate: string endDate: string firstname: string lastname: string @@ -63,7 +62,7 @@ export const grdfColumnDef: ColDef[] = [ filter: true, }, { - field: 'startDate', + field: 'createdAt', valueFormatter: dateFormatter, headerName: 'Début du consentement', initialWidth: 150, diff --git a/src/models/sgeConsent.model.ts b/src/models/sgeConsent.model.ts index 6746d21cecba68982044501dd2493c26441d6055..bd000c59a995eacaa3ab6a803cc508e99f616961 100644 --- a/src/models/sgeConsent.model.ts +++ b/src/models/sgeConsent.model.ts @@ -4,7 +4,7 @@ import { dateFormatter } from '../utils/dateFormatter' export interface ISgeConsent extends Omit<SgeConsentEntity, 'CreatedAt' | 'endDate' | 'inseeCode'> { - startDate: DateTime + createdAt: DateTime endDate: DateTime } @@ -82,7 +82,7 @@ export const sgeColumnDefs: ColDef[] = [ initialWidth: 100, }, { - field: 'startDate', + field: 'createdAt', valueFormatter: dateFormatter, headerName: 'Début du consentement', initialWidth: 150, diff --git a/src/services/grdfConsent.service.ts b/src/services/grdfConsent.service.ts index fcf60b4709b53955754426efcc1f3978da615144..16eab96e31368b2a7dca1639a380d72c0480e870 100644 --- a/src/services/grdfConsent.service.ts +++ b/src/services/grdfConsent.service.ts @@ -44,7 +44,7 @@ export class GrdfConsentService { * @param consentEntity */ public parseConsent = (consentEntity: GrdfConsentEntity): IGrdfConsent => { - const startDate = DateTime.fromISO(consentEntity.startDate, { + const createdAt = DateTime.fromISO(consentEntity.CreatedAt, { zone: 'utc', }).setLocale('fr-FR') const endDate = DateTime.fromISO(consentEntity.endDate, { @@ -53,8 +53,8 @@ export class GrdfConsentService { return { ID: consentEntity.ID, - startDate: startDate, - endDate: endDate, + createdAt, + endDate, firstname: consentEntity.firstname, lastname: consentEntity.lastname, pce: consentEntity.pce, diff --git a/src/services/sgeConsent.service.ts b/src/services/sgeConsent.service.ts index ad71837d63e862d752dff43c1075c5988545d74e..b69ef35f67fb29c96ad372f717ac5b993e6f6f59 100644 --- a/src/services/sgeConsent.service.ts +++ b/src/services/sgeConsent.service.ts @@ -44,7 +44,7 @@ export class SgeConsentService { * @param consentEntity */ public parseConsent = (consentEntity: SgeConsentEntity): ISgeConsent => { - const startDate = DateTime.fromISO(consentEntity.CreatedAt, { + const createdAt = DateTime.fromISO(consentEntity.CreatedAt, { zone: 'utc', }).setLocale('fr-FR') const endDate = DateTime.fromISO(consentEntity.endDate, { @@ -53,8 +53,8 @@ export class SgeConsentService { return { ID: consentEntity.ID, - startDate: startDate, - endDate: endDate, + createdAt, + endDate, firstname: consentEntity.firstname, lastname: consentEntity.lastname, pointID: consentEntity.pointID,