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

Build 0.3.9 #225

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions figures/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -611,17 +611,21 @@ def get_progress_data(self, course_enrollment):
else:
course_completed = False

# Default values if we can't retrieve progress data
progress_percent = 0.0
course_progress_details = None

try:
obj = LearnerCourseGradeMetrics.objects.most_recent_for_learner_course(
user=course_enrollment.user,
course_id=str(course_enrollment.course_id))
course_progress = dict(
progress_percent=obj.progress_percent,
course_progress_details=obj.progress_details)
if obj:
progress_percent = obj.progress_percent
course_progress_details = obj.progress_details
except Exception as e: # pylint: disable=broad-except
# TODO: Use more specific database-related exception
error_data = dict(
msg='Unable to get learner course metrics',
msg='Exception trying to get learner course metrics',
username=course_enrollment.user.username,
course_id=str(course_enrollment.course_id),
exception=str(e)
Expand All @@ -630,18 +634,15 @@ def get_progress_data(self, course_enrollment):
error_data=error_data,
error_type=PipelineError.UNSPECIFIED_DATA,
)
course_progress = dict(
progress_percent=0.0,
course_progress_details=None)

# Empty list initially, then will fill after we implement capturing
# learner specific progress
course_progress_history = []

data = dict(
course_completed=course_completed,
course_progress=course_progress['progress_percent'],
course_progress_details=course_progress['course_progress_details'],
course_progress=progress_percent,
course_progress_details=course_progress_details,
course_progress_history=course_progress_history,
)
return data
Expand Down
7 changes: 7 additions & 0 deletions figures/static/figures/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"main.css": "styles.css",
"main.css.map": "styles.css.map",
"main.js": "static/js/main.6b3f6711.js",
"main.js.map": "static/js/main.6b3f6711.js.map",
"static/media/figures--logo--negative.svg": "static/media/figures--logo--negative.b9a0b06e.svg"
}
Binary file added figures/static/figures/favicon.ico
Binary file not shown.
1 change: 1 addition & 0 deletions figures/static/figures/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!doctype html><html lang="en" style="font-size:10px"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/static/figures/manifest.json"><link rel="shortcut icon" href="/static/figures/favicon.ico"><title>React App</title><link href="/static/figures/styles.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="edx-figures-app"></div><script type="text/javascript" src="/static/figures/static/js/main.6b3f6711.js"></script></body></html>
15 changes: 15 additions & 0 deletions figures/static/figures/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
}
],
"start_url": "./index.html",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
1 change: 1 addition & 0 deletions figures/static/figures/service-worker.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions figures/static/figures/static/js/main.6b3f6711.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions figures/static/figures/static/js/main.6b3f6711.js.map

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading