re-verification dashboard styles

common/djangoapps/student/views.py

@@ -10,7 +10,6 @@ import string       # pylint: disable=W0402
 import urllib
 import uuid
 import time
-import datetime
 from pytz import UTC
 
 from django.conf import settings
@@ -47,7 +46,7 @@ from student.models import (
 )
 from student.forms import PasswordResetFormNoActive
 
-from verify_student.models import SoftwareSecurePhotoVerification, MidcourseReverificationWindow, SSPMidcourseReverification
+from verify_student.models import SoftwareSecurePhotoVerification, MidcourseReverificationWindow
 from certificates.models import CertificateStatuses, certificate_status_for_student
 
 from xmodule.course_module import CourseDescriptor
@@ -394,21 +393,24 @@ def dashboard(request):
     verification_status, verification_msg = SoftwareSecurePhotoVerification.user_status(user)
 
     # TODO: Factor this out into a function; I'm pretty sure there's code duplication floating around...
-    prompt_midcourse_reverify = False
     reverify_course_data = []
     for (course, enrollment) in course_enrollment_pairs:
-        if MidcourseReverificationWindow.window_open_for_course(course.id) and not SSPMidcourseReverification.user_has_valid_or_pending(user, course.id):
+
+        # IF the reverification window is open
+        if (MidcourseReverificationWindow.window_open_for_course(course.id)):
+            # AND the user is actually verified-enrolled AND they don't have a pending reverification already
             window = MidcourseReverificationWindow.get_window(course.id, datetime.datetime.now(UTC))
-            status_for_window = SSPMidcourseReverification.get_status_for_window(user, window)
-            reverify_course_data.append(
-                (
-                    course.id,
-                    course.display_name,
-                    window.end_date,
-                    "must_reverify" # TODO: reflect more states than just "must_reverify" has_valid_or_pending (must show failure)
+            if (enrollment.mode == "verified" and not SoftwareSecurePhotoVerification.user_has_valid_or_pending(user, window=window)):
+                window = MidcourseReverificationWindow.get_window(course.id, datetime.datetime.now(UTC))
+                status_for_window = SoftwareSecurePhotoVerification.user_status(user, window=window)
+                reverify_course_data.append(
+                    (
+                        course.id,
+                        course.display_name,
+                        window.end_date,
+                        "must_reverify"  # TODO: reflect more states than just "must_reverify" has_valid_or_pending (must show failure)
+                    )
                 )
-            )
-            prompt_midcourse_reverify = True
 
     show_refund_option_for = frozenset(course.id for course, _enrollment in course_enrollment_pairs
                                        if _enrollment.refundable())
@@ -430,7 +432,6 @@ def dashboard(request):
                'all_course_modes': course_modes,
                'cert_statuses': cert_statuses,
                'show_email_settings_for': show_email_settings_for,
-               'prompt_midcourse_reverify': prompt_midcourse_reverify,
                'reverify_course_data': reverify_course_data,
                'verification_status': verification_status,
                'verification_msg': verification_msg,