Move controller query service to xmodule side to prepare for ETA message displays

common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py

@@ -0,0 +1,92 @@
+import logging
+from xmodule.open_ended_grading_classes.grading_service_module import GradingService
+
+from mitxmako.shortcuts import render_to_string
+
+log = logging.getLogger(__name__)
+
+
+class ControllerQueryService(GradingService):
+    """
+    Interface to staff grading backend.
+    """
+    def __init__(self, config, system):
+        config['system'] = system
+        #ModuleSystem(None, None, None, render_to_string, None)
+        super(ControllerQueryService, self).__init__(config)
+        self.url = config['url'] + config['grading_controller']
+        self.login_url = self.url + '/login/'
+        self.check_eta_url = self.url + '/get_submission_eta/'
+        self.is_unique_url = self.url + '/is_name_unique/'
+        self.combined_notifications_url = self.url + '/combined_notifications/'
+        self.grading_status_list_url = self.url + '/get_grading_status_list/'
+        self.flagged_problem_list_url = self.url + '/get_flagged_problem_list/'
+        self.take_action_on_flags_url = self.url + '/take_action_on_flags/'
+
+    def check_if_name_is_unique(self, location, problem_id, course_id):
+        params = {
+            'course_id': course_id,
+            'location': location,
+            'problem_id': problem_id
+        }
+        response = self.get(self.is_unique_url, params)
+        return response
+
+    def check_for_eta(self, location):
+        params = {
+            'location': location,
+        }
+        response = self.get(self.check_eta_url, params)
+        return response
+
+    def check_combined_notifications(self, course_id, student_id, user_is_staff, last_time_viewed):
+        params = {
+            'student_id': student_id,
+            'course_id': course_id,
+            'user_is_staff': user_is_staff,
+            'last_time_viewed': last_time_viewed,
+        }
+        log.debug(self.combined_notifications_url)
+        response = self.get(self.combined_notifications_url, params)
+        return response
+
+    def get_grading_status_list(self, course_id, student_id):
+        params = {
+            'student_id': student_id,
+            'course_id': course_id,
+        }
+
+        response = self.get(self.grading_status_list_url, params)
+        return response
+
+    def get_flagged_problem_list(self, course_id):
+        params = {
+            'course_id': course_id,
+            }
+
+        response = self.get(self.flagged_problem_list_url, params)
+        return response
+
+    def take_action_on_flags(self, course_id, student_id, submission_id, action_type):
+        params = {
+            'course_id': course_id,
+            'student_id': student_id,
+            'submission_id': submission_id,
+            'action_type': action_type
+            }
+
+        response = self.post(self.take_action_on_flags_url, params)
+        return response
+
+def convert_seconds_to_human_readable(seconds):
+    if seconds < 60:
+        human_string = "{0} seconds".format(seconds)
+    elif seconds < 60 * 60:
+        human_string = "{0} minutes".format(round(seconds/60,1))
+    elif seconds < (24*60*60):
+        human_string = "{0} hours".format(round(seconds/(60*60),1))
+    else:
+        human_string = "{0} days".format(round(seconds/(60*60*24),1))
+
+    eta_string = "{0}".format(human_string)
+    return eta_string

common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py

@@ -23,6 +23,7 @@ from xmodule.xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 from capa.util import *
 from peer_grading_service import PeerGradingService
+import controller_query_service
 
 from datetime import datetime
 
@@ -106,8 +107,10 @@ class OpenEndedChild(object):
         # completion (doesn't matter if you self-assessed correct/incorrect).
         self._max_score = static_data['max_score']
         self.peer_gs = PeerGradingService(system.open_ended_grading_interface, system)
+        self.controller_qs = controller_query_service.ControllerQueryService(system.open_ended_grading_interface,system)
 
         self.system = system
+        self.location = location
         self.setup_response(system, location, definition, descriptor)
 
     def setup_response(self, system, location, definition, descriptor):
@@ -446,3 +449,13 @@ class OpenEndedChild(object):
             error_message = error_string.format(count_required-count_graded, count_graded, count_required, student_sub_count)
             return success, allowed_to_submit, error_message
 
+    def get_eta(self):
+        response = self.controller_qs.check_for_eta(self.location.url())
+        try:
+            response = json.loads(response)
+        except:
+            pass
+
+        
+
+