Skip to content
This repository has been archived by the owner on Mar 7, 2023. It is now read-only.

[#574] [FEATURE] Possibilité de reprendre un test déjà commencé depuis la page du profil (US-565). #574

Merged
merged 28 commits into from
Nov 8, 2017

Conversation

MBrandone
Copy link
Contributor

No description provided.

@MBrandone MBrandone changed the title [#] [FEATURE] Possibilité de reprendre un test déjà commencé depuis la page du profil (US-565). [#574] [FEATURE] Possibilité de reprendre un test déjà commencé depuis la page du profil (US-565). Oct 27, 2017
},

isCompleted() {
return !!(this.get('estimatedLevel') && this.get('pixScore'));
Copy link
Contributor

Choose a reason for hiding this comment

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

Je permets de mettre un warning sur cette écriture.
On a gagné en ligne mais perdu en lisibilité.
A la limite je proposerais de caster via le constructeur qui donne plus de clarté. Eg:
return Boolean(this.get('estimatedLevel') && this.get('pixScore'))

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

}
return RSVP.resolve(challenge);
});
queryRecord(store, type, query) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Pourquoi être passé de queryNext à queryRecord ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

queryNext n'est pas un standard Ember. C'était une fonction qui avait été ajouté à l'adapter et qui modifiait le comportement lorsqu'on requetait le store (resolve null au lieu de reject par exemple).
queryRecord est une fonction standard Ember, et on ne fait que la surchargé (plus facile à appeler dans l'implementaion, et à tester derrière). On revient dans les standards.

@@ -34,9 +35,16 @@ export default Ember.Component.extend({
canUserStartCourse: Ember.computed('courseId', 'hasLevel', function() {
const courseId = this.get('courseId');
const hasLevel = this.get('hasLevel');
if (!courseId || hasLevel) {
const assessmentId = this.get('assessmentId');
if (!courseId || hasLevel || assessmentId) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Je pense qu'on peut extraire cette condition dans une petite fonction, à première vu je ne comprends pas l'intention de la condition

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done
Ce sera 'hasAFinishedAssessment'

Copy link
Contributor Author

Choose a reason for hiding this comment

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

finalement, on return l'inverse du boolean, ça va plus vite

canUserResumeAssessment : Ember.computed('assessmentId', 'hasLevel', function() {
const hasLevel = this.get('hasLevel');
const assessmentId = this.get('assessmentId');
return !hasLevel && assessmentId != null && assessmentId != '' ;
Copy link
Contributor

Choose a reason for hiding this comment

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

Je propose:
return !hasLevel && Ember.isPresent(assessmentId);

Copy link
Contributor Author

Choose a reason for hiding this comment

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

bien vu done

MBrandone and others added 24 commits November 6, 2017 17:08
…smentRepository#findLastAssessmentsForEachCoursesByUser
@MBrandone MBrandone merged commit 0fdb17f into dev Nov 8, 2017
@MBrandone MBrandone deleted the 565-resume-test branch November 8, 2017 16:41
Akhilian pushed a commit that referenced this pull request Nov 13, 2017
…s la page du profil (US-565). (#574)

* [US-565] Add link reprendre le test when assessment is related to competence

* [US-565] create data to test functionnally on mirage

* [US-565] add assessmentId field in competence model

* [US-565] implement link reprendre when assessment is present for a competence

* [US-565] create resume assessment route

* [US-565] get assessment infos in resume assessment route

* [US-565] clean tests

* [US-565] implement route assessment resume and make a little change on adapter

* delete only

* wip clean mirage for functional testing

* Fix Mirage and make resume works (but break tests)

* Take into account dynamic assessment in Mirage

* finalize mirage routes refacto

* Rename AssessmentRepository#findCompletedAssessmentsByUserId by AssessmentRepository#findLastAssessmentsForEachCoursesByUser

* [US-565] implement assessment repo, get all assessments from one user

* [US-565] add assessment id to competence in profile object

* [US-565] implement profile-serializer with assessment-id

* [US-565] change api and adapter front

* Undo assessment-service fix

* skip acceptance tests which fail (temporary action)

* Re implement findCompletedAssessmentByUser

* Unskip and fix broken acceptance tests on challenge validation

* remove acceptance test on deprecated behaviour: two timed challenges cannot follow each other

* delete skip

* [US-880] changes from tech review

* try to resolve acceptance test after rebase

* fix errors from rebase

* fix bug
Akhilian pushed a commit that referenced this pull request Nov 13, 2017
…s la page du profil (US-565). (#574)

* [US-565] Add link reprendre le test when assessment is related to competence

* [US-565] create data to test functionnally on mirage

* [US-565] add assessmentId field in competence model

* [US-565] implement link reprendre when assessment is present for a competence

* [US-565] create resume assessment route

* [US-565] get assessment infos in resume assessment route

* [US-565] clean tests

* [US-565] implement route assessment resume and make a little change on adapter

* delete only

* wip clean mirage for functional testing

* Fix Mirage and make resume works (but break tests)

* Take into account dynamic assessment in Mirage

* finalize mirage routes refacto

* Rename AssessmentRepository#findCompletedAssessmentsByUserId by AssessmentRepository#findLastAssessmentsForEachCoursesByUser

* [US-565] implement assessment repo, get all assessments from one user

* [US-565] add assessment id to competence in profile object

* [US-565] implement profile-serializer with assessment-id

* [US-565] change api and adapter front

* Undo assessment-service fix

* skip acceptance tests which fail (temporary action)

* Re implement findCompletedAssessmentByUser

* Unskip and fix broken acceptance tests on challenge validation

* remove acceptance test on deprecated behaviour: two timed challenges cannot follow each other

* delete skip

* [US-880] changes from tech review

* try to resolve acceptance test after rebase

* fix errors from rebase

* fix bug
Akhilian pushed a commit that referenced this pull request Nov 13, 2017
…s la page du profil (US-565). (#574)

* [US-565] Add link reprendre le test when assessment is related to competence

* [US-565] create data to test functionnally on mirage

* [US-565] add assessmentId field in competence model

* [US-565] implement link reprendre when assessment is present for a competence

* [US-565] create resume assessment route

* [US-565] get assessment infos in resume assessment route

* [US-565] clean tests

* [US-565] implement route assessment resume and make a little change on adapter

* delete only

* wip clean mirage for functional testing

* Fix Mirage and make resume works (but break tests)

* Take into account dynamic assessment in Mirage

* finalize mirage routes refacto

* Rename AssessmentRepository#findCompletedAssessmentsByUserId by AssessmentRepository#findLastAssessmentsForEachCoursesByUser

* [US-565] implement assessment repo, get all assessments from one user

* [US-565] add assessment id to competence in profile object

* [US-565] implement profile-serializer with assessment-id

* [US-565] change api and adapter front

* Undo assessment-service fix

* skip acceptance tests which fail (temporary action)

* Re implement findCompletedAssessmentByUser

* Unskip and fix broken acceptance tests on challenge validation

* remove acceptance test on deprecated behaviour: two timed challenges cannot follow each other

* delete skip

* [US-880] changes from tech review

* try to resolve acceptance test after rebase

* fix errors from rebase

* fix bug
florianEnoh pushed a commit that referenced this pull request Nov 15, 2017
… (US-924). (#585)

* Add Sorted skills

* litlle refacto of user-service_test

* Massive function rename

* refacto

* refacto

* [US-880] resolve Bug from func review (only skills from 1st assessment)

* [US-880] delete unused function

* [#563] [CLEANUP] Nettoyage de code côté front (US-867). (#563)

* Remove useless route courses.get-challenge-preview

* Micro-refactor router.js to use new Ember 2.16 import

* Remove useless route file 'create-assessment-old'

* Rename route 'challenges.get-preview' into 'challenges.preview'

* Rename route 'challenges.preview' into challenge-preview

* Add a '/' before 'rejoindre' route path

* Rename route (and files)' assessments.get-challenge' into 'assessments.challenge'

* Rename route (and files)' assessments.results' into 'assessments.results'

* Refactor assessments routes to declare and use nesting routes (with perf optimizations as a result ^^)

* Fix little regression on 'validate' button management

* Rename route 'assessments.get-comparison' into 'assessments.comparison'

* Remove useless initializer

* [#576] [TECH] Mise à jour de la config eslint pour Mocha.

[#576] [TECH] Mise à jour de la config eslint pour Mocha

* [US-880] integrating review comments

* Fixing linter

* [#574] [FEATURE] Possibilité de reprendre un test déjà commencé depuis la page du profil (US-565). (#574)

* [US-565] Add link reprendre le test when assessment is related to competence

* [US-565] create data to test functionnally on mirage

* [US-565] add assessmentId field in competence model

* [US-565] implement link reprendre when assessment is present for a competence

* [US-565] create resume assessment route

* [US-565] get assessment infos in resume assessment route

* [US-565] clean tests

* [US-565] implement route assessment resume and make a little change on adapter

* delete only

* wip clean mirage for functional testing

* Fix Mirage and make resume works (but break tests)

* Take into account dynamic assessment in Mirage

* finalize mirage routes refacto

* Rename AssessmentRepository#findCompletedAssessmentsByUserId by AssessmentRepository#findLastAssessmentsForEachCoursesByUser

* [US-565] implement assessment repo, get all assessments from one user

* [US-565] add assessment id to competence in profile object

* [US-565] implement profile-serializer with assessment-id

* [US-565] change api and adapter front

* Undo assessment-service fix

* skip acceptance tests which fail (temporary action)

* Re implement findCompletedAssessmentByUser

* Unskip and fix broken acceptance tests on challenge validation

* remove acceptance test on deprecated behaviour: two timed challenges cannot follow each other

* delete skip

* [US-880] changes from tech review

* try to resolve acceptance test after rebase

* fix errors from rebase

* fix bug

* [#578] [FEATURE] Mise à jour des logos des ministères de l'éducation (Sup & SCO) (US-822) (#578)

* Update Mensr logo

* Add alternative text to ministries logo

* [#577] [CLEANUP] Modification des dates de fin d'inscriptions pour les etablissements (US-865) (#577)

* modify date of inscription end

* delete little note

* delete unused style

* Update lycee section content

* Update sup section content

* Add new component tutorial-panel (#582)

* [#581] [FEATURE] Bouton seconde chance pour que l'utilisateur repasse la compétence (US-863).

* [US-565] Add link reprendre le test when assessment is related to competence

* [US-565] create data to test functionnally on mirage

* [US-565] add assessmentId field in competence model

* [US-565] implement link reprendre when assessment is present for a competence

* [US-565] create resume assessment route

* [US-565] get assessment infos in resume assessment route

* [US-565] clean tests

* [US-565] implement route assessment resume and make a little change on adapter

* delete only

* wip clean mirage for functional testing

* Fix Mirage and make resume works (but break tests)

* Take into account dynamic assessment in Mirage

* finalize mirage routes refacto

* Rename AssessmentRepository#findCompletedAssessmentsByUserId by AssessmentRepository#findLastAssessmentsForEachCoursesByUser

* [US-565] implement assessment repo, get all assessments from one user

* [US-565] add assessment id to competence in profile object

* [US-565] implement profile-serializer with assessment-id

* [US-565] change api and adapter front

* Undo assessment-service fix

* skip acceptance tests which fail (temporary action)

* Re implement findCompletedAssessmentByUser

* Unskip and fix broken acceptance tests on challenge validation

* remove acceptance test on deprecated behaviour: two timed challenges cannot follow each other

* delete skip

* [US-880] changes from tech review

* try to resolve acceptance test after rebase

* fix errors from rebase

* Add status in competence in progress bar

* Add function to set status to competences in profile

* Add Status in competence of profile and add status in tests

* Rebase work for relaunch test + Add set status correctly for competences

* Add simple link to replay assessment + modify check to continue assessment

* [US-565] Add link reprendre le test when assessment is related to competence

* [US-565] implement link reprendre when assessment is present for a competence

* [US-565] create resume assessment route

* [US-565] implement route assessment resume and make a little change on adapter

* wip clean mirage for functional testing

* Rename AssessmentRepository#findCompletedAssessmentsByUserId by AssessmentRepository#findLastAssessmentsForEachCoursesByUser

* skip acceptance tests which fail (temporary action)

* Re implement findCompletedAssessmentByUser

* delete skip

* fix errors from rebase

* Add status in competence in progress bar

* Add function to set status to competences in profile

* Add Status in competence of profile and add status in tests

* Rebase work for relaunch test + Add set status correctly for competences

* Add simple link to replay assessment + modify check to continue assessment

* Correct error for assessment with 0 pix score which was consider as notEvaluated

* Add simple visible button to replay assessment + clean code

* Correct test and clean code

* Clean code after rebase

* Clean code after rebase

* Add findLastAssessmentsForEachCoursesByUser

* Fix tests

* Extracting logic from Profile constructor to service

* Defining warnings

* [#580] [BUGFIX] Correction du loader qui disparaît de façon impromptue au démarrage d'un test de positionnement (US-917). (#580)

* Use replaceWith instead of transitionTo in order to have a better browser history, cf. https://guides.emberjs.com/v2.16.0/routing/redirection/#toc-toggle

* Add template on route create-assessment (the fix is here) because afterModel() hook sends a notification to the Ember engine that it can stop the loader + change the loading text for a better user experience.

* Remove routes nesting because, according to Ember, it is a good mechanism if we use a common templates for all the child routes. Here, it is not the case and it adds a little complexity that is too much.

* Force Ember to reload assessment model from results page in order to fix bug
@Akhilian
Copy link
Contributor

@Akhilian Akhilian added this to the v1.28.0 milestone Nov 17, 2017
qcattez pushed a commit that referenced this pull request Nov 20, 2017
… évaluation de type certification (US-893) (#589)

* Add Sorted skills

* litlle refacto of user-service_test

* Massive function rename

* refacto

* refacto

* [US-880] resolve Bug from func review (only skills from 1st assessment)

* [US-880] delete unused function

* [#563] [CLEANUP] Nettoyage de code côté front (US-867). (#563)

* Remove useless route courses.get-challenge-preview

* Micro-refactor router.js to use new Ember 2.16 import

* Remove useless route file 'create-assessment-old'

* Rename route 'challenges.get-preview' into 'challenges.preview'

* Rename route 'challenges.preview' into challenge-preview

* Add a '/' before 'rejoindre' route path

* Rename route (and files)' assessments.get-challenge' into 'assessments.challenge'

* Rename route (and files)' assessments.results' into 'assessments.results'

* Refactor assessments routes to declare and use nesting routes (with perf optimizations as a result ^^)

* Fix little regression on 'validate' button management

* Rename route 'assessments.get-comparison' into 'assessments.comparison'

* Remove useless initializer

* [#576] [TECH] Mise à jour de la config eslint pour Mocha.

[#576] [TECH] Mise à jour de la config eslint pour Mocha

* [US-880] integrating review comments

* Fixing linter

* [#574] [FEATURE] Possibilité de reprendre un test déjà commencé depuis la page du profil (US-565). (#574)

* [US-565] Add link reprendre le test when assessment is related to competence

* [US-565] create data to test functionnally on mirage

* [US-565] add assessmentId field in competence model

* [US-565] implement link reprendre when assessment is present for a competence

* [US-565] create resume assessment route

* [US-565] get assessment infos in resume assessment route

* [US-565] clean tests

* [US-565] implement route assessment resume and make a little change on adapter

* delete only

* wip clean mirage for functional testing

* Fix Mirage and make resume works (but break tests)

* Take into account dynamic assessment in Mirage

* finalize mirage routes refacto

* Rename AssessmentRepository#findCompletedAssessmentsByUserId by AssessmentRepository#findLastAssessmentsForEachCoursesByUser

* [US-565] implement assessment repo, get all assessments from one user

* [US-565] add assessment id to competence in profile object

* [US-565] implement profile-serializer with assessment-id

* [US-565] change api and adapter front

* Undo assessment-service fix

* skip acceptance tests which fail (temporary action)

* Re implement findCompletedAssessmentByUser

* Unskip and fix broken acceptance tests on challenge validation

* remove acceptance test on deprecated behaviour: two timed challenges cannot follow each other

* delete skip

* [US-880] changes from tech review

* try to resolve acceptance test after rebase

* fix errors from rebase

* fix bug

* [#578] [FEATURE] Mise à jour des logos des ministères de l'éducation (Sup & SCO) (US-822) (#578)

* Update Mensr logo

* Add alternative text to ministries logo

* [#577] [CLEANUP] Modification des dates de fin d'inscriptions pour les etablissements (US-865) (#577)

* modify date of inscription end

* delete little note

* delete unused style

* Update lycee section content

* Update sup section content

* Add new component tutorial-panel (#582)

* [#581] [FEATURE] Bouton seconde chance pour que l'utilisateur repasse la compétence (US-863).

* [US-565] Add link reprendre le test when assessment is related to competence

* [US-565] create data to test functionnally on mirage

* [US-565] add assessmentId field in competence model

* [US-565] implement link reprendre when assessment is present for a competence

* [US-565] create resume assessment route

* [US-565] get assessment infos in resume assessment route

* [US-565] clean tests

* [US-565] implement route assessment resume and make a little change on adapter

* delete only

* wip clean mirage for functional testing

* Fix Mirage and make resume works (but break tests)

* Take into account dynamic assessment in Mirage

* finalize mirage routes refacto

* Rename AssessmentRepository#findCompletedAssessmentsByUserId by AssessmentRepository#findLastAssessmentsForEachCoursesByUser

* [US-565] implement assessment repo, get all assessments from one user

* [US-565] add assessment id to competence in profile object

* [US-565] implement profile-serializer with assessment-id

* [US-565] change api and adapter front

* Undo assessment-service fix

* skip acceptance tests which fail (temporary action)

* Re implement findCompletedAssessmentByUser

* Unskip and fix broken acceptance tests on challenge validation

* remove acceptance test on deprecated behaviour: two timed challenges cannot follow each other

* delete skip

* [US-880] changes from tech review

* try to resolve acceptance test after rebase

* fix errors from rebase

* Add status in competence in progress bar

* Add function to set status to competences in profile

* Add Status in competence of profile and add status in tests

* Rebase work for relaunch test + Add set status correctly for competences

* Add simple link to replay assessment + modify check to continue assessment

* [US-565] Add link reprendre le test when assessment is related to competence

* [US-565] implement link reprendre when assessment is present for a competence

* [US-565] create resume assessment route

* [US-565] implement route assessment resume and make a little change on adapter

* wip clean mirage for functional testing

* Rename AssessmentRepository#findCompletedAssessmentsByUserId by AssessmentRepository#findLastAssessmentsForEachCoursesByUser

* skip acceptance tests which fail (temporary action)

* Re implement findCompletedAssessmentByUser

* delete skip

* fix errors from rebase

* Add status in competence in progress bar

* Add function to set status to competences in profile

* Add Status in competence of profile and add status in tests

* Rebase work for relaunch test + Add set status correctly for competences

* Add simple link to replay assessment + modify check to continue assessment

* Correct error for assessment with 0 pix score which was consider as notEvaluated

* Add simple visible button to replay assessment + clean code

* Correct test and clean code

* Clean code after rebase

* Clean code after rebase

* Add findLastAssessmentsForEachCoursesByUser

* Fix tests

* Extracting logic from Profile constructor to service

* Defining warnings

* [#580] [BUGFIX] Correction du loader qui disparaît de façon impromptue au démarrage d'un test de positionnement (US-917). (#580)

* Use replaceWith instead of transitionTo in order to have a better browser history, cf. https://guides.emberjs.com/v2.16.0/routing/redirection/#toc-toggle

* Add template on route create-assessment (the fix is here) because afterModel() hook sends a notification to the Ember engine that it can stop the loader + change the loading text for a better user experience.

* Remove routes nesting because, according to Ember, it is a good mechanism if we use a common templates for all the child routes. Here, it is not the case and it adds a little complexity that is too much.

* Remove toJSON() from AirTableRecord in model objects

* adding missing tests to challenge-tests

* add certifications/results route

* add tests to certifications/results route

* add certification-banner component

* WIP styling certification + custom route /certifications for dev

* Add top level template-component and related tests

* lint compte-test

* Update according to code review

* updating certification result message

* renaming certification-results-template into certification-results-page
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
4 participants