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.

Sign up for GitHub

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 handling when general course data has null metrics #310

Merged
merged 2 commits into from
Dec 15, 2020
Merged

Fix handling when general course data has null metrics #310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a43736
Fix handling when general course data has null metrics
johnbaldwin Dec 15, 2020
cf3af39
Merge branch 'master' into john/0.4-fix-api-null-metrics
johnbaldwin Dec 15, 2020
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
9 changes: 9 additions & 0 deletions figures/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,15 @@ def get_staff(self, obj):
return []

def get_metrics(self, obj):
"""
Will return None if there is not a CourseDailyMetrics model

This will happen for courses that are created after the last daily
pipeline ran

TODO: Add unit tests for this and decide if we want to continue to
return None or if we return "zero" data
"""
qs = CourseDailyMetrics.objects.filter(course_id=str(obj.id))
if qs:
return CourseDailyMetricsSerializer(qs.order_by('-date_for')[0]).data
Expand Down
14 changes: 12 additions & 2 deletions frontend/src/views/CoursesList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,16 @@ class CoursesList extends Component {
render() {

const listItems = this.state.coursesList.map((course, index) => {
var metrics_enrollment_count = 'N/A';
var metrics_num_learners_completed = 'N/A';
if (course.hasOwnProperty('metrics') && course['metrics'] ) {
if (course['metrics'].hasOwnProperty('enrollment_count')) {
metrics_enrollment_count = course['metrics']['enrollment_count'];
}
if (course['metrics'].hasOwnProperty('num_learners_completed')) {
metrics_num_learners_completed = course['metrics']['num_learners_completed'];
}
}
return (
<li key={course['id']} className={styles['course-list-item']}>
<div className={styles['course-name']}>
Expand Down Expand Up @@ -166,7 +176,7 @@ class CoursesList extends Component {
Enrolments:
</div>
<div className={styles['mobile-value']}>
{course['metrics']['enrollment_count']}
{metrics_enrollment_count}
</div>
</div>
</div>
Expand All @@ -176,7 +186,7 @@ class CoursesList extends Component {
Completions:
</div>
<div className={styles['mobile-value']}>
{course['metrics']['num_learners_completed']}
{metrics_num_learners_completed}
</div>
</div>
</div>
Expand Down