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.

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

Change reading for mastery_model #3362

Conversation

AtKristijan
Copy link
Contributor

@AtKristijan AtKristijan commented Apr 11, 2022

Summary

Description of the change(s) you made

Fixes parts of #3339

I change the reading for mastery model and put both cases for reading.

Comments

I am not sure if I change everywhere the master_model, i search the project but could not find other ones.


Contributor's Checklist

PR process:

  • If this is an important user-facing change, PR or related issue the CHANGELOG label been added to this PR. Note: items with this label will be added to the CHANGELOG at a later time
  • If this includes an internal dependency change, a link to the diff is provided
  • The docs label has been added if this introduces a change that needs to be updated in the user docs?
  • If any Python requirements have changed, the updated requirements.txt files also included in this PR
  • Opportunities for using Google Analytics here are noted
  • Migrations are safe for a large db

Studio-specifc:

  • All user-facing strings are translated properly
  • The notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)
  • All UI components are LTR and RTL compliant
  • Views are organized into pages, components, and layouts directories as described in the docs
  • Users' storage used is recalculated properly on any changes to main tree files
  • If there new ways this uses user data that needs to be factored into our Privacy Policy, it has been noted.

Testing:

  • Code is clean and well-commented
  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Any new interactions have been added to the QA Sheet
  • Critical and brittle code paths are covered by unit tests

Reviewer's Checklist

This section is for reviewers to fill out.

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

@AtKristijan AtKristijan requested review from rtibbles and bjester April 11, 2022 08:35
Copy link
Member

@rtibbles rtibbles left a comment

Choose a reason for hiding this comment

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

A few changes needed - to confirm you have caught all instances, have you searched for mastery_model in the Python files?

The other thing that is missing here is a unified representation from the ContentNode viewset, there have been no changes there, so it would currently be up to the frontend to also handle this data being present in either location.

@AtKristijan AtKristijan requested a review from rtibbles April 26, 2022 13:45
@rtibbles
Copy link
Member

Note that this still needs updates in the ContentNode viewset also.

exercise_data_type = ""
if exercise_data.get('mastery_model'):
exercise_data_type = exercise_data.get('mastery_model')
if exercise_data.get('option') or exercise_data.get('option').get('completion_criteria') or exercise_data.get('option').get('completion_criteria').get('mastery_model'):
Copy link
Member

Choose a reason for hiding this comment

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

These should be and not or here, otherwise you are trying to access .get from None, if exercise_data.get('option') is None.

I think if you fix this, the tests should pass, and we can merge this PR. We'll manage the rest in follow up work.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is changed

@AtKristijan AtKristijan requested review from bjester and rtibbles May 19, 2022 06:59
@rtibbles rtibbles merged commit b69c625 into learningequality:unstable May 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants