From 426f44e09a4a6607e5314a681da22f3d6f483d67 Mon Sep 17 00:00:00 2001
From: Valera Rozuvan <valera.rozuvan@gmail.com>
Date: Wed, 19 Dec 2012 19:10:55 +0200
Subject: [PATCH] Refined error messaging.

---
 .../js/src/graphical_slider_tool/el_output.js |  4 ++++
 .../js/src/graphical_slider_tool/graph.js     | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
index 98795b5d32..f79a93b822 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
@@ -74,6 +74,10 @@ define('ElOutput', ['logme'], function (logme) {
                         funcString +
                         '" was not converted by the Function constructor.'
                 );
+                logme('Error message: "' + err.message + '".');
+
+                $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from string "' + funcString + '".' + '</div>');
+                $('#' + gstId).html('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
 
                 paramNames.pop();
 
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
index 49e5789025..ccb8411e90 100644
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
+++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
@@ -279,6 +279,9 @@ define('Graph', ['logme'], function (logme) {
                 logme('ERROR: could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.');
                 logme('Error message: "' + err.message + '"');
 
+                $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.' + '</div>');
+                $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                 return false;
             }
             allParamNames.pop();
@@ -290,6 +293,9 @@ define('Graph', ['logme'], function (logme) {
                 logme('ERROR: could not create a function from the string "' + config.plot.xrange.max + '" for xrange.max.');
                 logme('Error message: "' + err.message + '"');
 
+                $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + config.plot.xrange.max + '" for xrange.max.' + '</div>');
+                $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                 return false;
             }
             allParamNames.pop();
@@ -463,6 +469,9 @@ define('Graph', ['logme'], function (logme) {
                     );
                     logme('Error message: "' + err.message + '"');
 
+                    $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + funcString + '".' + '</div>');
+                    $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                     paramNames.pop();
                     paramNames.pop();
 
@@ -565,6 +574,9 @@ define('Graph', ['logme'], function (logme) {
                     logme('ERROR: Could not determine xrange start.');
                     logme('Error message: "' + err.message + '".');
 
+                    $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not determine xrange start from defined function.' + '</div>');
+                    $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                     return false;
                 }
                 try {
@@ -573,6 +585,9 @@ define('Graph', ['logme'], function (logme) {
                     logme('ERROR: Could not determine xrange end.');
                     logme('Error message: "' + err.message + '".');
 
+                    $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not determine xrange end from defined function.' + '</div>');
+                    $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                     return false;
                 }
                 step = (end - start) / (numPoints - 1);
@@ -592,6 +607,9 @@ define('Graph', ['logme'], function (logme) {
                         logme('ERROR: Could not generate data.');
                         logme('Error message: "' + err.message + '".');
 
+                        $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not generate data from defined function.' + '</div>');
+                        $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
+
                         return false;
                     }
 
@@ -618,6 +636,9 @@ define('Graph', ['logme'], function (logme) {
                         logme('ERROR: Could not generate data.');
                         logme('Error message: "' + err.message + '".');
 
+                        $('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not generate data from function.' + '</div>');
+                        $('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');g
+
                         return false;
                     }
                     paramValues.pop();