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

Renomme les sauvegardes de score #3543

Merged
merged 2 commits into from
Jan 29, 2025
Merged

Renomme les sauvegardes de score #3543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a46fb8
Renomme les sauvegardes de score avec le format 'AAAA - nom sauvegarde'
amandinejacquelin Jan 23, 2025
de3d759
Ajoute DateTime.fromSQL en plus de DateTime.fromISO pour la comparais…
amandinejacquelin Jan 23, 2025
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
12 changes: 6 additions & 6 deletions backend/src/referentiels/services/referentiels-scoring-snapshots.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion backend/src/referentiels/services/referentiels-scoring.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading