Merge pull request #84 from praekelt/feature/SAS-84-improve-count-err…

…or-handling Improve Record counter error handling and copy
praekeltfoundation · Feb 1, 2018 · 0bfb7cc · 0bfb7cc
2 parents d58d5ba + 90861b4
commit 0bfb7cc
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/molo/surveys/static/js/survey-admin.js b/molo/surveys/static/js/survey-admin.js
@@ -268,10 +268,10 @@ $(function(){
         $.post(url, send_data, function(data) {
           $(".error-message").remove();
           $(".error").removeClass("error");
-          if (data.error != undefined) {
-            for (key in data.error) {
+          if (data.errors != undefined) {
+            for (key in data.errors) {
               field = $("[name='" + key + "']");
-              field.after("<p class='error-message'><span>"+data.error[key]+"</span></p>");
+              field.closest("div.field-content").append("<p class='error-message'><span>"+data.errors[key]+"</span></p>");
               field.closest("li").addClass("error");
             }
             $("#count-result").html("Please correct errors.");

diff --git a/molo/surveys/templates/modeladmin/create.html b/molo/surveys/templates/modeladmin/create.html
@@ -61,7 +61,7 @@
                         </div>
                     </li>
                     <li class="matching-users-result__result actions">
-                        <p class="matching-users-result__label"><em>{% trans 'Number of matching users:' %}</em></p>
+                        <p class="matching-users-result__label"><em>{% trans 'Users matching static rules:' %}</em></p>
                         <p id="count-result">-</p>
                     </li>
                 </ul>

diff --git a/molo/surveys/tests/test_views.py b/molo/surveys/tests/test_views.py
@@ -1091,4 +1091,17 @@ def test_segment_user_count(self):
         self.submit_survey(self.personalisable_survey, self.user)
         response = self.client.post('/surveys/count/', SEGMENT_FORM_DATA)
 
-        self.assertContains(response, '"segmentusercount": 1')
+        self.assertDictEqual(response.json(), {"segmentusercount": 1})
+
+    def test_segment_user_count_returns_errors(self):
+        self.submit_survey(self.personalisable_survey, self.user)
+        data = SEGMENT_FORM_DATA
+        data['name'] = [""]
+        data['surveys_surveyresponserule_related-0-survey'] = ['20']
+        response = self.client.post('/surveys/count/', data)
+
+        self.assertDictEqual(response.json(), {"errors": {
+            "surveys_surveyresponserule_related-0-survey": [
+                "Select a valid choice. That choice is not one of the "
+                "available choices."],
+            "name": ["This field is required."]}})
diff --git a/molo/surveys/views.py b/molo/surveys/views.py
@@ -42,7 +42,18 @@ def get_segment_user_count(request):
             count = f.count_matching_users(rules, f.instance.match_any)
             context = {'segmentusercount': count}
         else:
-            context = {'error': f.errors}
+            errors = f.errors
+            # Get the errors for the Rules forms
+            for formset in f.formsets.values():
+                if formset.has_changed():
+                    for form in formset:
+                        if form.errors:
+                            id_prefix = form.prefix
+                            for name, error in form.errors.items():
+                                input_name = id_prefix + "-%s" % name
+                                errors[input_name] = error
+
+            context = {'errors': errors}
 
         return JsonResponse(context)