Commit 10c7155d by Vik Paruchuri

Add open ended to JS pipeline

parent 4c164795
...@@ -438,6 +438,7 @@ main_vendor_js = [ ...@@ -438,6 +438,7 @@ main_vendor_js = [
discussion_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/discussion/**/*.coffee')) discussion_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/discussion/**/*.coffee'))
staff_grading_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/staff_grading/**/*.coffee')) staff_grading_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/staff_grading/**/*.coffee'))
peer_grading_js = sorted(rooted_glob(PROJECT_ROOT / 'static','coffee/src/peer_grading/**/*.coffee')) peer_grading_js = sorted(rooted_glob(PROJECT_ROOT / 'static','coffee/src/peer_grading/**/*.coffee'))
open_ended_js = sorted(rooted_glob(PROJECT_ROOT / 'static','coffee/src/open_ended/**/*.coffee'))
PIPELINE_CSS = { PIPELINE_CSS = {
'application': { 'application': {
...@@ -468,7 +469,7 @@ PIPELINE_JS = { ...@@ -468,7 +469,7 @@ PIPELINE_JS = {
'source_filenames': sorted( 'source_filenames': sorted(
set(rooted_glob(COMMON_ROOT / 'static', 'coffee/src/**/*.coffee') + set(rooted_glob(COMMON_ROOT / 'static', 'coffee/src/**/*.coffee') +
rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/**/*.coffee')) - rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/**/*.coffee')) -
set(courseware_js + discussion_js + staff_grading_js + peer_grading_js) set(courseware_js + discussion_js + staff_grading_js + peer_grading_js + open_ended_js)
) + [ ) + [
'js/form.ext.js', 'js/form.ext.js',
'js/my_courses_dropdown.js', 'js/my_courses_dropdown.js',
...@@ -501,6 +502,10 @@ PIPELINE_JS = { ...@@ -501,6 +502,10 @@ PIPELINE_JS = {
'peer_grading' : { 'peer_grading' : {
'source_filenames': peer_grading_js, 'source_filenames': peer_grading_js,
'output_filename': 'js/peer_grading.js' 'output_filename': 'js/peer_grading.js'
},
'open_ended' : {
'source_filenames': open_ended_js,
'output_filename': 'js/open_ended.js'
} }
} }
......
...@@ -20,14 +20,23 @@ class OpenEnded ...@@ -20,14 +20,23 @@ class OpenEnded
unflag: (event) => unflag: (event) =>
event.preventDefault() event.preventDefault()
@gentle_alert "Unflag"
ban: (event) => ban: (event) =>
event.preventDefault() event.preventDefault()
@gentle_alert "Ban"
post: (cmd, data, callback) -> post: (cmd, data, callback) ->
# if this post request fails, the error callback will catch it # if this post request fails, the error callback will catch it
$.post(@ajax_url + cmd, data, callback) $.post(@ajax_url + cmd, data, callback)
.error => callback({success: false, error: "Error occured while performing this operation"}) .error => callback({success: false, error: "Error occured while performing this operation"})
gentle_alert: (msg) =>
if $('.message-container').length
$('.message-container').remove()
alert_elem = "<div class='message-container'>" + msg + "</div>"
$('.error-container').after(alert_elem)
$('.message-container').css(opacity: 0).animate(opacity: 1, 700)
ajax_url = $('.open-ended-problems').data('ajax_url') ajax_url = $('.open-ended-problems').data('ajax_url')
$(document).ready(() -> new OpenEnded(ajax_url)) $(document).ready(() -> new OpenEnded(ajax_url))
...@@ -289,8 +289,8 @@ if settings.COURSEWARE_ENABLED: ...@@ -289,8 +289,8 @@ if settings.COURSEWARE_ENABLED:
# Open Ended flagged problem list # Open Ended flagged problem list
url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/open_ended_flagged_problems$', url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/open_ended_flagged_problems$',
'open_ended_grading.views.flagged_problem_list', name='open_ended_flagged_problems'), 'open_ended_grading.views.flagged_problem_list', name='open_ended_flagged_problems'),
url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/open_ended_flagged_problems$', url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/open_ended_flagged_problems/take_action_on_flag$',
'open_ended_grading.views.flagged_problem_list', name='open_ended_flagged_problems'), 'open_ended_grading.views.take_action_on_flags', name='open_ended_flagged_problems_take_action'),
# Cohorts management # Cohorts management
url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/cohorts$', url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/cohorts$',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment