open-craft · itsjeyd · Jul 16, 2015 · Jul 3, 2015 · Jul 3, 2015 · Jul 6, 2015
diff --git a/LICENSE.MIT b/LICENSE.MIT
@@ -0,0 +1,30 @@
+------------------------------------------------------------------------------
+This license applies to the following third-party libraries included
+in this repository:
+
+  - backbone.paginator
+  - Backbone.js
+  - Underscore.js
+------------------------------------------------------------------------------
+
+The MIT License (MIT)
+
+Copyright (c) [year] [fullname]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/problem_builder/__init__.py b/problem_builder/__init__.py
@@ -2,7 +2,7 @@
 from .answer import AnswerBlock, AnswerRecapBlock
 from .choice import ChoiceBlock
 from .dashboard import DashboardBlock
-from .data_export import DataExportBlock
+from .instructor_tool import InstructorToolBlock
 from .mcq import MCQBlock, RatingBlock
 from .mrq import MRQBlock
 from .message import MentoringMessageBlock

diff --git a/problem_builder/data_export.py → problem_builder/instructor_tool.py b/problem_builder/data_export.py → problem_builder/instructor_tool.py
@@ -18,7 +18,7 @@
 # "AGPLv3".  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Data Export: An XBlock for instructors to export student answers from a course.
+Instructor Tool: An XBlock for instructors to export student answers from a course.
 
 All processing is done offline.
 """
@@ -39,16 +39,16 @@ def _(text):
 
 @XBlock.needs("i18n")
 @XBlock.wants('user')
-class DataExportBlock(XBlock):
+class InstructorToolBlock(XBlock):
     """
-    DataExportBlock: An XBlock for instructors to export student answers from a course.
+    InstructorToolBlock: An XBlock for instructors to export student answers from a course.
 
     All processing is done offline.
     """
     display_name = String(
         display_name=_("Title (Display name)"),
         help=_("Title to display"),
-        default=_("Data Export"),
+        default=_("Instructor Tool"),
         scope=Scope.settings
     )
     active_export_task_id = String(
@@ -67,13 +67,13 @@ class DataExportBlock(XBlock):
 
     @property
     def display_name_with_default(self):
-        return "Data Export"
+        return "Instructor Tool"
 
     def author_view(self, context=None):
         """ Studio View """
         # Warn the user that this block will only work from the LMS. (Since the CMS uses
         # different celery queues; our task listener is waiting for tasks on the LMS queue)
-        return Fragment(u'<p>Data Export Block</p><p>This block only works from the LMS.</p>')
+        return Fragment(u'<p>Instructor Tool Block</p><p>This block only works from the LMS.</p>')
 
     def check_pending_export(self):
         """
@@ -105,12 +105,17 @@ def student_view(self, context=None):
             _('Rating Question'): 'RatingBlock',
             _('Long Answer'): 'AnswerBlock',
         }
-        html = loader.render_template('templates/html/data_export.html', {'block_choices': block_choices})
+        html = loader.render_template(
+            'templates/html/instructor_tool.html',
+            {'block_choices': block_choices}
+        )
         fragment = Fragment(html)
-        fragment.add_css_url(self.runtime.local_resource_url(self, 'public/css/data_export.css'))
-        fragment.add_javascript_url(self.runtime.local_resource_url(self, 'public/js/data_export.js'))
+        fragment.add_css_url(self.runtime.local_resource_url(self, 'public/css/instructor_tool.css'))
+        fragment.add_javascript_url(self.runtime.local_resource_url(self, 'public/js/instructor_tool.js'))
         fragment.add_javascript_url(self.runtime.local_resource_url(self, 'public/js/vendor/underscore-min.js'))
-        fragment.initialize_js('DataExportBlock')
+        fragment.add_javascript_url(self.runtime.local_resource_url(self, 'public/js/vendor/backbone-min.js'))
+        fragment.add_javascript_url(self.runtime.local_resource_url(self, 'public/js/vendor/backbone.paginator.min.js'))
+        fragment.initialize_js('InstructorToolBlock')
         return fragment
 
     @property
@@ -160,34 +165,45 @@ def start_export(self, data, suffix=''):
         block_types = data.get('block_types', None)
         username = data.get('username', None)
         root_block_id = data.get('root_block_id', None)
-        if not root_block_id:
-            root_block_id = self.scope_ids.usage_id
-            # Block ID not in workbench runtime.
-            root_block_id = unicode(getattr(root_block_id, 'block_id', root_block_id))
-            get_root = True
+        match_string = data.get('match_string', None)
+
+        # Process user-submitted data
+        if block_types == 'all':
+            block_types = []
         else:
-            get_root = False
+            block_types = [block_types]
+
         user_service = self.runtime.service(self, 'user')
         if not self.user_is_staff():
             return {'error': 'permission denied'}
-        from .tasks import export_data as export_data_task  # Import here since this is edX LMS specific
-        self._delete_export()
-        # Make sure we nail down our state before sending off an asynchronous task.
-        self.save()
         if not username:
             user_id = None
         else:
             user_id = user_service.get_anonymous_user_id(username, unicode(self.runtime.course_id))
             if user_id is None:
                 self.raise_error(404, _("Could not find the specified username."))
 
+        if not root_block_id:
+            root_block_id = self.scope_ids.usage_id
+            # Block ID not in workbench runtime.
+            root_block_id = unicode(getattr(root_block_id, 'block_id', root_block_id))
+            get_root = True
+        else:
+            get_root = False
+
+        # Launch task
+        from .tasks import export_data as export_data_task  # Import here since this is edX LMS specific
+        self._delete_export()
+        # Make sure we nail down our state before sending off an asynchronous task.
+        self.save()
         async_result = export_data_task.delay(
             # course_id not available in workbench.
             unicode(getattr(self.runtime, 'course_id', 'course_id')),
             root_block_id,
             block_types,
             user_id,
-            get_root=get_root,
+            match_string,
+            get_root=get_root
         )
         if async_result.ready():
             # In development mode, the task may have executed synchronously.

diff --git a/problem_builder/public/css/data_export.css b/problem_builder/public/css/data_export.css
diff --git a/problem_builder/public/css/instructor_tool.css b/problem_builder/public/css/instructor_tool.css
@@ -0,0 +1,68 @@
+.data-export-options, .data-export-results, .data-export-status {
+    margin-top: 2em;
+}
+.data-export-options, .data-export-results table {
+    border: 2px solid #999;
+}
+.data-export-options, .data-export-results thead {
+    background-color: #ddd;
+}
+.data-export-options {
+    display: table;
+    padding: 1em;
+}
+.data-export-header, .data-export-row {
+    display: table-row;
+}
+.data-export-header h3, .data-export-results thead {
+    font-weight: bold;
+}
+.data-export-header h3 {
+    margin-top: 0px;
+    margin-bottom: 10px;
+}
+.data-export-field-container, .data-export-options .data-export-actions {
+    display: table-cell;
+    padding-left: 1em;
+}
+.data-export-field {
+    margin-top: .5em;
+    margin-bottom: .5em;
+}
+.data-export-field label span {
+    padding-right: .5em;
+    vertical-align: middle;
+}
+.data-export-field input, .data-export-field select {
+    max-width: 60%;
+    float: right;
+}
+.data-export-results, .data-export-download, .data-export-cancel, .data-export-delete {
+    display: none;
+}
+.data-export-results table {
+    width: 100%;
+    margin-top: 1em;
+}
+.data-export-results thead {
+    border-bottom: 2px solid #999;
+}
+.data-export-results td {
+    border-left: 1px solid #999;
+    padding: 5px;
+}
+.data-export-results tr:nth-child(odd) {
+    background-color: #eee;
+}
+.data-export-info p {
+    font-size: 75%;
+}
+.data-export-status {
+    margin-bottom: 1em;
+}
+.data-export-status i {
+    font-size: 3em;
+}
+.data-export-actions {
+    text-align: right;
+}
diff --git a/problem_builder/public/js/data_export.js b/problem_builder/public/js/data_export.js