From 3a46fb8e8400a11b8ca6649b12ddca9908ce710e Mon Sep 17 00:00:00 2001 From: Amandine Jacquelin Date: Thu, 23 Jan 2025 17:05:29 +0100 Subject: [PATCH 1/2] Renomme les sauvegardes de score avec le format 'AAAA - nom sauvegarde' --- .../referentiels-scoring-snapshots.service.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/referentiels/services/referentiels-scoring-snapshots.service.ts b/backend/src/referentiels/services/referentiels-scoring-snapshots.service.ts index ecf36d0af5..e6581805b5 100644 --- a/backend/src/referentiels/services/referentiels-scoring-snapshots.service.ts +++ b/backend/src/referentiels/services/referentiels-scoring-snapshots.service.ts @@ -37,12 +37,12 @@ export default class ReferentielsScoringSnapshotsService { static SCORE_COURANT_SNAPSHOT_REF = 'score-courant'; static SCORE_COURANT_SNAPSHOT_NOM = 'Score courant'; static PRE_AUDIT_SNAPSHOT_REF_PREFIX = 'pre-audit-'; - static PRE_AUDIT_SNAPSHOT_NOM_PREFIX = 'Avant audit '; + static PRE_AUDIT_SNAPSHOT_NOM_SUFFIX = ' - avant audit '; static POST_AUDIT_SNAPSHOT_REF_PREFIX = 'post-audit-'; - static POST_AUDIT_SNAPSHOT_NOM_PREFIX = 'Audité '; + static POST_AUDIT_SNAPSHOT_NOM_SUFFIX = ' - audit '; static JOUR_SNAPSHOT_REF_PREFIX = 'jour-'; static SCORE_PERSONNALISE_REF_PREFIX = 'user-'; - static JOUR_SNAPSHOT_NOM_PREFIX = 'Jour du '; + static JOUR_SNAPSHOT_NOM_PREFIX = ' - jour du '; static USER_DELETION_ALLOWED_SNAPSHOT_TYPES: ScoreJalon[] = [ ScoreJalon.DATE_PERSONNALISEE, @@ -100,11 +100,11 @@ export default class ReferentielsScoringSnapshotsService { switch (scoreResponse.jalon) { case ScoreJalon.PRE_AUDIT: scoreResponse.snapshot.ref = `${ReferentielsScoringSnapshotsService.PRE_AUDIT_SNAPSHOT_REF_PREFIX}${scoreResponse.anneeAudit}`; - scoreResponse.snapshot.nom = `${ReferentielsScoringSnapshotsService.PRE_AUDIT_SNAPSHOT_NOM_PREFIX}${scoreResponse.anneeAudit}`; + scoreResponse.snapshot.nom = `${scoreResponse.anneeAudit}${ReferentielsScoringSnapshotsService.PRE_AUDIT_SNAPSHOT_NOM_SUFFIX}`; break; case ScoreJalon.POST_AUDIT: scoreResponse.snapshot.ref = `${ReferentielsScoringSnapshotsService.POST_AUDIT_SNAPSHOT_REF_PREFIX}${scoreResponse.anneeAudit}`; - scoreResponse.snapshot.nom = `${ReferentielsScoringSnapshotsService.POST_AUDIT_SNAPSHOT_NOM_PREFIX}${scoreResponse.anneeAudit}`; + scoreResponse.snapshot.nom = `${scoreResponse.anneeAudit}${ReferentielsScoringSnapshotsService.POST_AUDIT_SNAPSHOT_NOM_SUFFIX}`; break; case ScoreJalon.SCORE_COURANT: scoreResponse.snapshot.ref = scoreResponse.snapshot.nom @@ -120,7 +120,7 @@ export default class ReferentielsScoringSnapshotsService { scoreResponse.snapshot.ref = `${ ReferentielsScoringSnapshotsService.JOUR_SNAPSHOT_REF_PREFIX }${dateTime.toISODate()}`; - scoreResponse.snapshot.nom = `${ + scoreResponse.snapshot.nom = `${dateTime.year}${ ReferentielsScoringSnapshotsService.JOUR_SNAPSHOT_NOM_PREFIX }${dateTime.toFormat('dd/MM/yyyy')}`; break; From de3d759ccb531f6b400a0e8819c170e25b709fe2 Mon Sep 17 00:00:00 2001 From: Amandine Jacquelin Date: Thu, 23 Jan 2025 17:07:22 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Ajoute=20DateTime.fromSQL=20en=20plus=20de?= =?UTF-8?q?=20DateTime.fromISO=20pour=20la=20comparaison=20des=20ann=C3=A9?= =?UTF-8?q?es=20d'audit=20pour=20faire=20fonctionner=20en=20local?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/referentiels/services/referentiels-scoring.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/referentiels/services/referentiels-scoring.service.ts b/backend/src/referentiels/services/referentiels-scoring.service.ts index 4d3cec7f52..a00270effc 100644 --- a/backend/src/referentiels/services/referentiels-scoring.service.ts +++ b/backend/src/referentiels/services/referentiels-scoring.service.ts @@ -1111,7 +1111,8 @@ export default class ReferentielsScoringService { audit = audits.find( (a) => a.dateFin && - DateTime.fromISO(a.dateFin).year === parameters.anneeAudit + (DateTime.fromISO(a.dateFin).year === parameters.anneeAudit || + DateTime.fromSQL(a.dateFin).year === parameters.anneeAudit) ); if (!audit) { throw new HttpException(