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

[BUGFIXE] Pouvoir remettre à zéro une compétence et relancer sans problème. #586

Closed
wants to merge 1 commit into from
Closed

[BUGFIXE] Pouvoir remettre à zéro une compétence et relancer sans problème. #586

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions api/lib/application/competence-evaluations/competence-evaluation-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ module.exports = {
const userId = request.auth.credentials.userId;
const options = queryParamsUtils.extractParameters(request.query);

if (!options.filter.assessmentId) {
throw new BadRequestError('Competence evalutation must be fetched by assessmentId');
if (!options.filter.assessmentId && !options.filter.competenceId) {
throw new BadRequestError('Competence evalutation must be fetched by assessmentId or competenceId');
}

const { models: competenceEvaluations } = await usecases.findCompetenceEvaluations({ userId, options });
Expand Down
8 changes: 5 additions & 3 deletions api/lib/domain/usecases/find-competence-evaluations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ module.exports = async function findCompetenceEvaluations({
competenceEvaluationRepository,
smartPlacementAssessmentRepository,
}) {
if (!(await smartPlacementAssessmentRepository.checkIfAssessmentBelongToUser(options.filter.assessmentId, userId))) {
throw new UserNotAuthorizedToAccessEntity('User does not have an access to this competence evaluation');
if(options.filter.assessmentId ){
if (!(await smartPlacementAssessmentRepository.checkIfAssessmentBelongToUser(options.filter.assessmentId, userId))) {
throw new UserNotAuthorizedToAccessEntity('User does not have an access to this competence evaluation');
}
}

options.filter.userId = userId;
return competenceEvaluationRepository.find(options);
};
14 changes: 8 additions & 6 deletions mon-pix/app/routes/competences/resume.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ export default Route.extend(AuthenticatedRouteMixin, {
session: service(),
competenceId: null,

model(params) {
async model(params) {
const competenceId = params.competence_id;

const competenceEvaluation = this.store.peekAll('competenceEvaluation')
.find((competenceEvaluation) => competenceEvaluation.get('competenceId') === competenceId);
if (competenceEvaluation) {
return competenceEvaluation;
const competenceEvaluation = await this.store.query('competenceEvaluation', { filter: { competenceId } });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pourquoi remplacer peekAll par query?

if (competenceEvaluation.content.length > 0 && competenceEvaluation.get('firstObject').get('status') != 'reset') {
return competenceEvaluation.get('firstObject');
}
return this.store.createRecord('competenceEvaluation', { competenceId }).save();

return this.store.createRecord('competenceEvaluation', { competenceId }).save()
.catch(() => this.store.query('competenceEvaluation', { filter: { competenceId } })
.then((newCompetenceEvaluation) => (newCompetenceEvaluation.get('firstObject'))));

},

Expand Down
7 changes: 7 additions & 0 deletions mon-pix/app/templates/components/scorecard-details.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@
{{/if}}
{{/link-to}}
{{/unless}}
{{#if displayResetButton}}
<button class="link link--underline scorecard-details__reset-button" {{action "openModal"}}>
Remettre à zéro <div class="sr-only">la compétence "{{scorecard.name}}"</div>
</button>
{{else if displayWaitSentence}}
<p class="scorecard-details-content-right__reset-message">{{remainingDaysText}}</p>
{{/if}}

</div>

Expand Down