From 10c7155d4d061d51eee8572a4a5b6fd5f1da03eb Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 30 Jan 2013 21:28:42 -0500
Subject: [PATCH] Add open ended to JS pipeline

---
 lms/envs/common.py                                 | 7 ++++++-
 lms/static/coffee/src/open_ended/open_ended.coffee | 9 +++++++++
 lms/urls.py                                        | 4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 16472795e0..426c29c7d0 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -438,6 +438,7 @@ main_vendor_js = [
 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'))
 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 = {
     'application': {
@@ -468,7 +469,7 @@ PIPELINE_JS = {
         'source_filenames': sorted(
             set(rooted_glob(COMMON_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/my_courses_dropdown.js',
@@ -501,6 +502,10 @@ PIPELINE_JS = {
     'peer_grading' : {
         'source_filenames': peer_grading_js,
         'output_filename': 'js/peer_grading.js'
+    },
+    'open_ended' : {
+        'source_filenames': open_ended_js,
+        'output_filename': 'js/open_ended.js'
     }
 }
 
diff --git a/lms/static/coffee/src/open_ended/open_ended.coffee b/lms/static/coffee/src/open_ended/open_ended.coffee
index f45efeb8a7..5c0f455ce7 100644
--- a/lms/static/coffee/src/open_ended/open_ended.coffee
+++ b/lms/static/coffee/src/open_ended/open_ended.coffee
@@ -20,14 +20,23 @@ class OpenEnded
 
   unflag: (event) =>
     event.preventDefault()
+    @gentle_alert "Unflag"
 
   ban: (event) =>
     event.preventDefault()
+    @gentle_alert "Ban"
 
   post: (cmd, data, callback) ->
       # if this post request fails, the error callback will catch it
       $.post(@ajax_url + cmd, data, callback)
         .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')
 $(document).ready(() -> new OpenEnded(ajax_url))
diff --git a/lms/urls.py b/lms/urls.py
index 41e8e9fff1..260f55dd05 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -289,8 +289,8 @@ if settings.COURSEWARE_ENABLED:
         # Open Ended flagged problem list
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/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$',
-            'open_ended_grading.views.flagged_problem_list', name='open_ended_flagged_problems'),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/open_ended_flagged_problems/take_action_on_flag$',
+            'open_ended_grading.views.take_action_on_flags', name='open_ended_flagged_problems_take_action'),
 		
 		# Cohorts management
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/cohorts$',