feat: [AXM-297] Add progress to assignments in BlocksInfoInCourseView API #2546
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
monteri
reviewed
Apr 24, 2024
| from openedx.core.djangoapps.content.block_structure.api import get_block_structure_manager | ||
|
|
||
|
|
||
| def calculate_progress(user, course_id, cache_timeout): |
| """ | ||
| Extends sequential xblock info with assignment's name and progress. | ||
| """ | ||
| subsection_grades = calculate_progress(requested_user, course_id, BLOCK_STRUCTURE_CACHE_TIMEOUT) |
There was a problem hiding this comment.
Probably it could be wrapped in the try except with potential log to debug easier
There was a problem hiding this comment.
Yes, I wrapped into try except calculate_progress function's logic in utils file
Comment on lines
407
to
421
| if grade: | ||
| points_earned = ( | ||
| grade.graded_total.earned | ||
| if grades_with_locations[block_id].graded | ||
| else 0 | ||
| ) | ||
| points_possible = ( | ||
| grade.graded_total.possible | ||
| if grades_with_locations[block_id].graded | ||
| else 0 | ||
| ) | ||
| assignment_type = grade.format | ||
| else: | ||
| points_earned, points_possible = 0, 0 | ||
| assignment_type = None |
There was a problem hiding this comment.
Suggested change
| if grade: | |
| points_earned = ( | |
| grade.graded_total.earned | |
| if grades_with_locations[block_id].graded | |
| else 0 | |
| ) | |
| points_possible = ( | |
| grade.graded_total.possible | |
| if grades_with_locations[block_id].graded | |
| else 0 | |
| ) | |
| assignment_type = grade.format | |
| else: | |
| points_earned, points_possible = 0, 0 | |
| assignment_type = None | |
| if grade: | |
| graded_total = grade.graded_total if grade.graded else None | |
| points_earned = graded_total.earned if graded_total else 0 | |
| points_possible = graded_total.possible if graded_total else 0 | |
| assignment_type = grade.format | |
| else: | |
| points_earned, points_possible, assignment_type = 0, 0, None |
Please, check if this fits to improve readability
There was a problem hiding this comment.
Yes, it's more readable and works correctly. I took these changes
monteri
merged commit 8afbc54
into
glugovgrglib/add_course_access_to_mobile_info_api
64 checks passed
GlugovGrGlib
pushed a commit
that referenced
this pull request
May 2, 2024
… API (#2546) * feat: [AXM-297, AXM-310] Add progress to assignments and total course progress * feat: [AXM-297] Add progress to assignments * style: [AXM-297] Try to fix linters (add docstrings) * refactor: [AXM-297] Add typing, refactor methods
monteri
pushed a commit
that referenced
this pull request
May 22, 2024
… API (#2546) * feat: [AXM-297, AXM-310] Add progress to assignments and total course progress * feat: [AXM-297] Add progress to assignments * style: [AXM-297] Try to fix linters (add docstrings) * refactor: [AXM-297] Add typing, refactor methods
KyryloKireiev
added a commit
that referenced
this pull request
May 27, 2024
… API (#2546) * feat: [AXM-297, AXM-310] Add progress to assignments and total course progress * feat: [AXM-297] Add progress to assignments * style: [AXM-297] Try to fix linters (add docstrings) * refactor: [AXM-297] Add typing, refactor methods
NiedielnitsevIvan
pushed a commit
that referenced
this pull request
May 27, 2024
… API (#2546) * feat: [AXM-297, AXM-310] Add progress to assignments and total course progress * feat: [AXM-297] Add progress to assignments * style: [AXM-297] Try to fix linters (add docstrings) * refactor: [AXM-297] Add typing, refactor methods
NiedielnitsevIvan
pushed a commit
that referenced
this pull request
Jun 10, 2024
… API (#2546) * feat: [AXM-297, AXM-310] Add progress to assignments and total course progress * feat: [AXM-297] Add progress to assignments * style: [AXM-297] Try to fix linters (add docstrings) * refactor: [AXM-297] Add typing, refactor methods
KyryloKireiev
added a commit
that referenced
this pull request
Jun 21, 2024
… API (#2546) * feat: [AXM-297, AXM-310] Add progress to assignments and total course progress * feat: [AXM-297] Add progress to assignments * style: [AXM-297] Try to fix linters (add docstrings) * refactor: [AXM-297] Add typing, refactor methods
KyryloKireiev
added a commit
that referenced
this pull request
Jun 21, 2024
… API (#2546) * feat: [AXM-297, AXM-310] Add progress to assignments and total course progress * feat: [AXM-297] Add progress to assignments * style: [AXM-297] Try to fix linters (add docstrings) * refactor: [AXM-297] Add typing, refactor methods
KyryloKireiev
added a commit
that referenced
this pull request
Jun 25, 2024
… API (#2546) * feat: [AXM-297, AXM-310] Add progress to assignments and total course progress * feat: [AXM-297] Add progress to assignments * style: [AXM-297] Try to fix linters (add docstrings) * refactor: [AXM-297] Add typing, refactor methods
KyryloKireiev
added a commit
that referenced
this pull request
Jun 26, 2024
… API (#2546) * feat: [AXM-297, AXM-310] Add progress to assignments and total course progress * feat: [AXM-297] Add progress to assignments * style: [AXM-297] Try to fix linters (add docstrings) * refactor: [AXM-297] Add typing, refactor methods
KyryloKireiev
added a commit
that referenced
this pull request
Jul 1, 2024
… API (#2546) * feat: [AXM-297, AXM-310] Add progress to assignments and total course progress * feat: [AXM-297] Add progress to assignments * style: [AXM-297] Try to fix linters (add docstrings) * refactor: [AXM-297] Add typing, refactor methods
ruzniaievdm
pushed a commit
that referenced
this pull request
Jul 11, 2024
…urses on dashboard view (openedx#34848) * feat: [AXM-24] Update structure for course enrollments API (#2515) --------- Co-authored-by: Glib Glugovskiy <glib.glugovskiy@raccoongang.com> * feat: [AXM-53] add assertions for primary course (#2522) --------- Co-authored-by: monteri <36768631+monteri@users.noreply.github.com> * feat: [AXM-297] Add progress to assignments in BlocksInfoInCourseView API (#2546) --------- Co-authored-by: NiedielnitsevIvan <81557788+NiedielnitsevIvan@users.noreply.github.com> Co-authored-by: Glib Glugovskiy <glib.glugovskiy@raccoongang.com> Co-authored-by: monteri <36768631+monteri@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Add
assignments_progressfield to sequential info in BlocksInfoInCourseView API.YouTrack
https://youtrack.raccoongang.com/issue/AXM-297