Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing logs, waffle flag and other old data

Browse Source
This commit is contained in:
Ali-D-Akbar
2020-07-14 12:00:26 +05:00
parent ac10f0bcaf
commit 8b857edd80
3 changed files with 2 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/djangoapps/student/models.py
View File

@@ -1028,19 +1028,6 @@ class CourseEnrollmentManager(models.Manager):
Custom manager for CourseEnrollment with Table-level filter methods.
"""
def num_enrolled_in(self, course_id):
"""
Returns the count of active enrollments in a course.
'course_id' is the course_id to return enrollments
"""
enrollment_number = super(CourseEnrollmentManager, self).get_queryset().filter(
course_id=course_id,
is_active=1
).count()
return enrollment_number
def is_small_course(self, course_id):
"""
Returns false if the number of enrollments are one greater than 'max_enrollments' else true

29
lms/djangoapps/instructor/toggles.py
View File

@@ -1,29 +0,0 @@
"""
Toggles for instructor app
"""
from openedx.core.djangoapps.waffle_utils import WaffleFlagNamespace, WaffleFlag
# Namespace for instructor waffle flags.
WAFFLE_FLAG_NAMESPACE = WaffleFlagNamespace(name='instructor')
# Waffle flag to use optimised is_small_course.
# .. toggle_name: verify_student.optimised_is_small_course
# .. toggle_implementation: WaffleFlag
# .. toggle_default: False
# .. toggle_description: Supports staged rollout to improved is_small_course method.
# .. toggle_category: instructor
# .. toggle_use_cases: incremental_release, open_edx
# .. toggle_creation_date: 2020-07-02
# .. toggle_expiration_date: n/a
# .. toggle_warnings: n/a
# .. toggle_tickets: PROD-1740
# .. toggle_status: supported
OPTIMISED_IS_SMALL_COURSE = WaffleFlag(
waffle_namespace=WAFFLE_FLAG_NAMESPACE,
flag_name='optimised_is_small_course',
)
def use_optimised_is_small_course():
return OPTIMISED_IS_SMALL_COURSE.is_enabled()

33
lms/djangoapps/instructor/views/instructor_dashboard.py
View File

@@ -7,7 +7,6 @@ import datetime
import logging
import uuid
from functools import reduce
import time
import pytz
import six
@@ -33,7 +32,6 @@ from xblock.fields import ScopeIds
from bulk_email.api import is_bulk_email_feature_enabled
from course_modes.models import CourseMode, CourseModesArchive
from edxmako.shortcuts import render_to_response
from instructor.toggles import use_optimised_is_small_course
from lms.djangoapps.certificates import api as certs_api
from lms.djangoapps.certificates.models import (
CertificateGenerationConfiguration,
@@ -133,7 +131,6 @@ def instructor_dashboard_2(request, course_id):
reports_enabled = configuration_helpers.get_value('SHOW_ECOMMERCE_REPORTS', False)
sections = []
start_time = time.time() # starts time before _section_student_admin (further calls is_small_course)
if access['staff']:
sections.extend([
_section_course_info(course, access),
@@ -142,8 +139,6 @@ def instructor_dashboard_2(request, course_id):
_section_discussions_management(course, access),
_section_student_admin(course, access),
])
if course_id == 'course-v1:HarvardX+CS50+X':
log.info('Investigating log at %s : after _section_student_admin', time.time() - start_time)
if access['data_researcher']:
sections.append(_section_data_download(course, access))
@@ -195,8 +190,6 @@ def instructor_dashboard_2(request, course_id):
if can_see_special_exams:
sections.append(_section_special_exams(course, access))
if course_id == 'course-v1:HarvardX+CS50+X':
log.info('Investigating log at %s : section certificate', time.time() - start_time)
# Certificates panel
# This is used to generate example certificates
# and enable self-generated certificates for a course.
@@ -215,14 +208,7 @@ def instructor_dashboard_2(request, course_id):
if len(openassessment_blocks) > 0 and access['staff']:
sections.append(_section_open_response_assessment(request, course, openassessment_blocks, access))
if course_id == 'course-v1:HarvardX+CS50+X':
log.info('Investigating log at %s : before Disable Button (calling is_small_course)', time.time() - start_time)
if use_optimised_is_small_course():
disable_buttons = not CourseEnrollment.objects.is_small_course(course_key)
else:
disable_buttons = not _is_small_course(course_key)
if course_id == 'course-v1:HarvardX+CS50+X':
log.info('Investigating log at %s : after Disable Button (calling is_small_course)', time.time() - start_time)
disable_buttons = not CourseEnrollment.objects.is_small_course(course_key)
certificate_white_list = CertificateWhitelist.get_certificate_white_list(course_key)
generate_certificate_exceptions_url = reverse(
@@ -243,8 +229,6 @@ def instructor_dashboard_2(request, course_id):
kwargs={'course_id': six.text_type(course_key)}
)
if course_id == 'course-v1:HarvardX+CS50+X':
log.info('Investigating log at %s : Before Context', time.time() - start_time)
certificate_invalidations = CertificateInvalidation.get_certificate_invalidations(course_key)
context = {
@@ -541,23 +525,10 @@ def _section_discussions_management(course, access):
return section_data
def _is_small_course(course_key):
""" Compares against MAX_ENROLLMENT_INSTR_BUTTONS to determine if course enrollment is considered small. """
is_small_course = False
enrollment_count = CourseEnrollment.objects.num_enrolled_in(course_key)
max_enrollment_for_buttons = settings.FEATURES.get("MAX_ENROLLMENT_INSTR_BUTTONS")
if max_enrollment_for_buttons is not None:
is_small_course = enrollment_count <= max_enrollment_for_buttons
return is_small_course
def _section_student_admin(course, access):
""" Provide data for the corresponding dashboard section """
course_key = course.id
if use_optimised_is_small_course():
is_small_course = CourseEnrollment.objects.is_small_course(course_key)
else:
is_small_course = _is_small_course(course_key)
is_small_course = CourseEnrollment.objects.is_small_course(course_key)
section_data = {
'section_key': 'student_admin',