Fix student big board

learning-unlimited · Nov 22, 2021 · 46e5a73 · 46e5a73
1 parent 07159a4
commit 46e5a73
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/esp/esp/program/statistics.py b/esp/esp/program/statistics.py
@@ -391,7 +391,7 @@ def student_reg(form, programs, students, profiles, result_dict={}):
     ]
     result_dict.update({"prog_data": prog_data,
                         "stat_names": stat_names,
-                        "categories": json.dumps([program.name for program in programs.order_by('id')]),
+                        "x_axis_categories": json.dumps([program.name for program in programs.order_by('id')]),
                         "left_axis_data": left_axis_data,
                        })
     return render_to_string('program/statistics/student_reg.html', result_dict)
@@ -427,7 +427,7 @@ def teacher_reg(form, programs, teachers, profiles, result_dict={}):
     ]
     result_dict.update({"prog_data": prog_data,
                         "stat_names": stat_names,
-                        "categories": json.dumps([program.name for program in programs.order_by('id')]),
+                        "x_axis_categories": json.dumps([program.name for program in programs.order_by('id')]),
                         "left_axis_data": left_axis_data,
                        })
     return render_to_string('program/statistics/teacher_reg.html', result_dict)
@@ -481,7 +481,7 @@ def class_reg(form, programs, teachers, profiles, result_dict={}):
                         "stat_categories": stat_categories,
                         "stats_per_category": len(stat_names)/len(stat_categories),
                         "stat_names": [stat_name.split(' ')[1] for stat_name in stat_names],
-                        "categories": json.dumps([program.name for program in programs.order_by('id')]),
+                        "x_axis_categories": json.dumps([program.name for program in programs.order_by('id')]),
                         "left_axis_data": left_axis_data,
                         "right_axis_data": right_axis_data,
                        })

diff --git a/esp/templates/program/modules/bigboardmodule/bigboard_graph.html b/esp/templates/program/modules/bigboardmodule/bigboard_graph.html
@@ -29,9 +29,9 @@
       shared: true,
     },
     xAxis: {
-      {% if categories %}
+      {% if x_axis_categories %}
       type: 'category',
-      categories: {{ categories|safe }},
+      categories: {{ x_axis_categories|safe }},
       {% else %}
       type: 'datetime',
       minRange: 24 * 60 * 60 * 1000, // one day
@@ -63,7 +63,7 @@
           type: 'line',
           yAxis: {{ forloop.parentloop.counter0 }},
           name: '{{series.description}}',
-          {% if not categories %}
+          {% if not x_axis_categories %}
           pointInterval: 60 * 60 * 1000, // one hour
           pointStart: Date.UTC(
               {{first_hour.year}}, {{first_hour.month}} - 1,
@@ -86,7 +86,7 @@
           type: 'line',
           yAxis: {{ forloop.parentloop.counter0 }} + left_axes,
           name: '{{series.description}}',
-          {% if not categories %}
+          {% if not x_axis_categories %}
           pointInterval: 60 * 60 * 1000, // one hour
           pointStart: Date.UTC(
               {{first_hour.year}}, {{first_hour.month}} - 1,