-
Notifications
You must be signed in to change notification settings - Fork 109
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
Fixed weight ignore issue on grade calculation #242
base: master
Are you sure you want to change the base?
Conversation
Codecov Report
@@ Coverage Diff @@
## master #242 +/- ##
==========================================
+ Coverage 92.4% 92.46% +0.05%
==========================================
Files 15 15
Lines 1594 1606 +12
Branches 101 101
==========================================
+ Hits 1473 1485 +12
Misses 111 111
Partials 10 10
Continue to review full report at Codecov.
|
fixed atomic block issue in Traceback (most recent call last):
File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/base.py", line 973, in delete
collector.collect([self], keep_parents=keep_parents)
File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/deletion.py", line 222, in collect
elif sub_objs:
File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/query.py", line 258, in __nonzero__
return type(self).__bool__(self)
File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/query.py", line 254, in __bool__
self._fetch_all()
File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/query.py", line 1118, in _fetch_all
self._result_cache = list(self._iterable_class(self))
File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/query.py", line 53, in __iter__
results = compiler.execute_sql(chunked_fetch=self.chunked_fetch)
File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/db/models/sql/compiler.py", line 899, in execute_sql
raise original_exception
TransactionManagementError: An error occurred in the current transaction. You can't execute queries until the end of the 'atomic' block. |
d812e38
to
1cb2c26
Compare
@amir-qayyum-khan can you rebase this and address the merge conflicts? I've been sitting on this for a while because I'm not certain what the actual requirement is. Once it's rebased I'll run it by someone from the MITx team to get their input. |
89e88be
to
d4b632f
Compare
rebased @pdpinch |
What are the relevant tickets?
fixes #95
Background:
What's this PR do?
In this PR i am using weight to calculate grade percentage. Applied this logic on two points. Images are attached to demonstrate.
How should this be manually tested?
@pdpinch
Screenshots (if appropriate)