Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dashboard): rajout de l'heure aux dates dans l'export des données #1759

Merged
merged 1 commit into from
Nov 6, 2023
Merged

fix(dashboard): rajout de l'heure aux dates dans l'export des données #1759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions dashboard/src/scenes/data-import-export/ExportFormattedData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,18 @@ export default function ExportFormattedData({ personCreated, personUpdated, acti
fields[field.label] = (person[field.name] || []).map((t) => teams.find((person) => person._id === t)?.name)?.join(', ');
} else if (field.name === 'user') {
} else if (['date', 'date-with-time'].includes(field.type))
fields[field.label || field.name] = person[field.name] ? dayjsInstance(person[field.name]).format('YYYY-MM-DD') : '';
fields[field.label || field.name] = person[field.name]
? dayjsInstance(person[field.name]).format(field.type === 'date' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm')
: '';
else if (['boolean'].includes(field.type)) fields[field.label || field.name] = person[field.name] ? 'Oui' : 'Non';
else if (['yes-no'].includes(field.type)) fields[field.label || field.name] = person[field.name];
else if (Array.isArray(person[field.name])) fields[field.label || field.name] = person[field.name].join(', ');
else fields[field.label || field.name] = person[field.name];
return fields;
}, {}),
'Créée par': loadedUsers.find((u) => u._id === person.user)?.name,
'Créée le': dayjsInstance(person.createdAt).format('YYYY-MM-DD'),
'Mise à jour le': dayjsInstance(person.updatedAt).format('YYYY-MM-DD'),
'Créée le': dayjsInstance(person.createdAt).format('YYYY-MM-DD HH:mm'),
'Mise à jour le': dayjsInstance(person.updatedAt).format('YYYY-MM-DD HH:mm'),
};
};

Expand All @@ -66,11 +68,11 @@ export default function ExportFormattedData({ personCreated, personUpdated, acti
Équipe: action.teams?.length ? action.teams.map((t) => teams.find((action) => action._id === t)?.name).join(', ') : action.team,
Urgent: action.urgent ? 'Oui' : 'Non',
Statut: action.status,
'Complétée le': action.completedAt ? dayjsInstance(action.completedAt).format('YYYY-MM-DD') : '',
'Complétée le': action.completedAt ? dayjsInstance(action.completedAt).format('YYYY-MM-DD HH:mm') : '',
'À faire le': action.dueAt ? dayjsInstance(action.dueAt).format(action.withTime ? 'YYYY-MM-DD HH:mm' : 'YYYY-MM-DD') : '',
'Créée par': loadedUsers.find((u) => u._id === action.user)?.name,
'Créée le': dayjsInstance(action.createdAt).format('YYYY-MM-DD'),
'Mise à jour le': dayjsInstance(action.updatedAt).format('YYYY-MM-DD'),
'Créée le': dayjsInstance(action.createdAt).format('YYYY-MM-DD HH:mm'),
'Mise à jour le': dayjsInstance(action.updatedAt).format('YYYY-MM-DD HH:mm'),
};
};

Expand All @@ -80,11 +82,11 @@ export default function ExportFormattedData({ personCreated, personUpdated, acti
'Personne suivie - Nom': persons.find((p) => p._id === rencontre.person)?.name,
'Personne suivie - id': persons.find((p) => p._id === rencontre.person)?._id,
Équipe: rencontre.team ? teams.find((t) => t._id === rencontre.team)?.name : '',
Date: dayjsInstance(rencontre.date).format('YYYY-MM-DD'),
Date: dayjsInstance(rencontre.date).format('YYYY-MM-DD HH:mm'),
Commentaire: rencontre.comment,
'Créée par': loadedUsers.find((u) => u._id === rencontre.user)?.name,
'Créée le': dayjsInstance(rencontre.createdAt).format('YYYY-MM-DD'),
'Mise à jour le': dayjsInstance(rencontre.updatedAt).format('YYYY-MM-DD'),
'Créée le': dayjsInstance(rencontre.createdAt).format('YYYY-MM-DD HH:mm'),
'Mise à jour le': dayjsInstance(rencontre.updatedAt).format('YYYY-MM-DD HH:mm'),
};
};

Expand All @@ -94,11 +96,11 @@ export default function ExportFormattedData({ personCreated, personUpdated, acti
'Personne suivie - Nom': persons.find((p) => p._id === passage.person)?.name,
'Personne suivie - id': persons.find((p) => p._id === passage.person)?._id,
Équipe: passage.team ? teams.find((t) => t._id === passage.team)?.name : '',
Date: dayjsInstance(passage.date).format('YYYY-MM-DD'),
Date: dayjsInstance(passage.date).format('YYYY-MM-DD HH:mm'),
Commentaire: passage.comment,
'Créée par': loadedUsers.find((u) => u._id === passage.user)?.name,
'Créée le': dayjsInstance(passage.createdAt).format('YYYY-MM-DD'),
'Mise à jour le': dayjsInstance(passage.updatedAt).format('YYYY-MM-DD'),
'Créée le': dayjsInstance(passage.createdAt).format('YYYY-MM-DD HH:mm'),
'Mise à jour le': dayjsInstance(passage.updatedAt).format('YYYY-MM-DD HH:mm'),
};
};

Expand All @@ -107,20 +109,22 @@ export default function ExportFormattedData({ personCreated, personUpdated, acti
return {
id: observation._id,
'Territoire - Nom': territories.find((t) => t._id === observation.territory)?.name,
'Observé le': dayjsInstance(observation.date).format('YYYY-MM-DD'),
'Observé le': dayjsInstance(observation.date).format('YYYY-MM-DD HH:mm'),
Équipe: observation.team ? teams.find((t) => t._id === observation.team)?.name : '',
...customFieldsObs.reduce((fields, field) => {
if (['date', 'date-with-time'].includes(field.type))
fields[field.label || field.name] = observation[field.name] ? dayjsInstance(observation[field.name]).format('YYYY-MM-DD') : '';
fields[field.label || field.name] = observation[field.name]
? dayjsInstance(observation[field.name]).format(field.type === 'date' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm')
: '';
else if (['boolean'].includes(field.type)) fields[field.label || field.name] = observation[field.name] ? 'Oui' : 'Non';
else if (['yes-no'].includes(field.type)) fields[field.label || field.name] = observation[field.name];
else if (Array.isArray(observation[field.name])) fields[field.label || field.name] = observation[field.name].join(', ');
else fields[field.label || field.name] = observation[field.name];
return fields;
}, {}),
'Créée par': loadedUsers.find((u) => u._id === observation.user)?.name,
'Créée le': dayjsInstance(observation.createdAt).format('YYYY-MM-DD'),
'Mise à jour le': dayjsInstance(observation.updatedAt).format('YYYY-MM-DD'),
'Créée le': dayjsInstance(observation.createdAt).format('YYYY-MM-DD HH:mm'),
'Mise à jour le': dayjsInstance(observation.updatedAt).format('YYYY-MM-DD HH:mm'),
};
};

Expand Down
Loading