-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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
fix: disable submit button for archived courses #34920
fix: disable submit button for archived courses #34920
Conversation
Thanks for the pull request, @Anas12091101! What's next?Please work through the following steps to get your changes ready for engineering review: 🔘 Get product approvalIf you haven't already, check this list to see if your contribution needs to go through the product review process.
🔘 Provide contextTo help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:
🔘 Get a green buildIf one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green. 🔘 Let us know that your PR is ready for review:Who will review my changes?This repository is currently maintained by Where can I find more information?If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources:
When can I expect my changes to be merged?Our goal is to get community contributions seen and reviewed as efficiently as possible. However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:
💡 As a result it may take up to several weeks or months to complete a review and merge your PR. |
1599550
to
de46adf
Compare
xmodule/capa_block.py
Outdated
if self.course_is_archived(): | ||
return True |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be more direct to just check course.has_ended() here? I'm wary of adding a new method just for this. I'm not sure how well understood "archived" is within the codebase.
@Anas12091101 this will need a test |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left some thoughs about alternate approaches to solve the problem.
xmodule/capa_block.py
Outdated
# Checking if the course is archived | ||
from xmodule.modulestore.django import modulestore | ||
try: | ||
if isinstance(self.course_id, CourseKey): | ||
course = modulestore().get_course(self.course_id) | ||
closed_date = ( | ||
course.end + self.graceperiod if self.graceperiod is not None else course.end | ||
) | ||
if closed_date and datetime.datetime.now(utc) > closed_date: | ||
return True | ||
except AttributeError: | ||
pass |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we might have other solutions to this problem. e.g. How Open edX is checking for archived courses in other places. I also think this is something that would need a product review.
However, What I would try to do here is:
Option 1:
- Check how archived courses are being detected in other places, One example is HomePage Course View that uses some functionality to check for archived courses. The API eventually ends up checking course.has_ended() to check for an archived course.
- If we go for this solution, We should also use that same has_ended method instead of writing our own code
- If we need to add the grace period as well, We should ideally move that to
has_ended
method. However, All the places I see that check for grace period are related to grading only.
Option 2:
If we can't go with option#1, We should move this code into another function and call it here just like how we are using self.is_past_due():
below. This new function can check both has_ended
from the course and graceperiod if needed.
We need to give some consideration to how this interacts with the past_due function. Based on what I understand from the course authors, they expect that a user who has been granted an extension on a problem due date would still be able to submit after the course end date. |
Will this change affect all xBlocks, or just capa problems? |
I believe it will only affect the capa problems |
I've spoken with a number of experienced course authors and they all feel that this behavior is a bug that was introduced sometime in 2023. In the Olive release, learners could not submit answers after the course end date. Now in Quince they can. Can you do some research in the git history and see if you can figure out when this change was introduced? Are there any tests for course end dates? |
@pdpinch, I set up Olive locally using Tutor and tested this. Olive is also allowing submissions for problems in archived courses, with the difference that the gradebook doesn't get updated. If a course becomes archived after a submission, the gradebook is updated on the next submission. This seems more like a bug than a feature. A similar behavior was observed previously for the restricted course blocks and was solved in this PR by Asad Ali. I tried to further debug this but couldn't due to several errors in the Tutor release for Olive. The devstack provision command for Olive is also not working. |
I've spoken with a number of folks about this, and they all agree that it's a bug. Another area we should examine: edx-when. My understanding after discussing with @ormsbee is that the edx-when application manages a cached, customized version of course dates for users, particularly for self-paced courses where deadlines are shifted based on when the user starts the course. |
0a5e269
to
148c141
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Anas12091101 thanks for these improvements. I have couple of suggestions could you please take care of those?
xmodule/capa_block.py
Outdated
@@ -795,12 +795,21 @@ def generate_report_data(self, user_state_iterator, limit_responses=None): | |||
} | |||
yield (user_state.username, report) | |||
|
|||
def get_course_end_date(self): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could you please change this to a property eg. course_end_date
xmodule/capa_block.py
Outdated
@property | ||
def close_date(self): | ||
""" | ||
Return the date submissions should be closed from. | ||
""" | ||
due_date = self.due | ||
try: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please move this try-except block in course_end_date
property as suggested above
4503def
to
8a7bd18
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@Anas12091101 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future. |
2U Release Notice: This PR has been deployed to the edX staging environment in preparation for a release to production. |
2U Release Notice: This PR has been deployed to the edX production environment. |
1 similar comment
2U Release Notice: This PR has been deployed to the edX production environment. |
* fix: disable submit button for archived courses
* fix: disable submit button for archived courses
…) to quince (openedx#35225) * fix: disable submit button for archived courses (openedx#34920)
Description
This PR disables the submission button for problems in the archived courses.
Current behaviour:
The learner can submit the problem in the archived courses which don't have a due date. The grade is recorded in the gradebook that should be closed.
After the PR merges:
The submit button will be disabled and the learner cannot submit the problem.
Useful information to include:
Before
After
![Screenshot 2024-06-05 at 3 14 50 PM](https://private-user-images.githubusercontent.com/88967643/336795178-3f9caa05-72eb-47b7-9225-65fdc606da57.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkyMjczNjEsIm5iZiI6MTczOTIyNzA2MSwicGF0aCI6Ii84ODk2NzY0My8zMzY3OTUxNzgtM2Y5Y2FhMDUtNzJlYi00N2I3LTkyMjUtNjVmZGM2MDZkYTU3LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTAlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEwVDIyMzc0MVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWU5ODQ2YzMxNmNiOTY0MGVlZDlkMzM3NWQ4MGQ1YTE2NmRkZDVlMzMzOTljOWY4M2FjZDFmZmZlNjIzYzVhMDkmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.5Ucu7SX-lyvpB9Cj-DsRPnqeqIRNdgcoBSA616cq5A0)
changes.
Supporting information
https://github.com/mitodl/hq/issues/4415
Testing instructions
Schedule and Details
.self-paced
and add the start date and end date to some past dates.Homework
View Live Version
.Deadline
None
Other information
Include anything else that will help reviewers and consumers understand the change.