Merge pull request #1019 from saraburns1/coursenames

feat: add course name to run charts
openedx · Feb 3, 2025 · a31c4b4 · a31c4b4
2 parents 35eac2d + 7295cc2
commit a31c4b4
Show file tree

Hide file tree

Showing 8 changed files with 237 additions and 178 deletions.
diff --git a/...aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_7eaf5b.yaml b/...aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_7eaf5b.yaml
@@ -12,7 +12,6 @@ params:
     operator: TEMPORAL_RANGE
     subject: emission_time
   aggregateFunction: Sum
-  annotation_layers: []
   colOrder: key_a_to_z
   colSubTotals: false
   conditional_formatting: []
@@ -22,19 +21,19 @@ params:
   - enrollment_mode
   groupbyRows:
   - course_name
+  - org
   metrics:
   - enrollees
   metricsLayout: COLUMNS
   order_desc: true
   rowOrder: key_a_to_z
   row_limit: 10000
   temporal_columns_lookup: {}
-  time_grain_sqla: P1D
   valueFormat: SMART_NUMBER
   viz_type: pivot_table_v2
 query_context:
   datasource:
-    id: 221
+    id: 261
     type: table
   force: false
   form_data:
@@ -49,15 +48,16 @@ query_context:
     colSubTotals: false
     conditional_formatting: []
     dashboards:
-    - 3141
-    datasource: 221__table
+    - 1111
+    datasource: 261__table
     date_format: smart_date
     extra_form_data: {}
     force: false
     groupbyColumns:
     - enrollment_mode
     groupbyRows:
     - course_name
+    - org
     metrics:
     - enrollees
     metricsLayout: COLUMNS
@@ -68,7 +68,6 @@ query_context:
     row_limit: 10000
     slice_id: 161
     temporal_columns_lookup: {}
-    time_grain_sqla: P1D
     valueFormat: SMART_NUMBER
     viz_type: pivot_table_v2
   queries:
@@ -77,11 +76,11 @@ query_context:
     columns:
     - enrollment_mode
     - course_name
+    - org
     custom_form_data: {}
     custom_params: {}
     extras:
       having: ''
-      time_grain_sqla: P1D
       where: ''
     filters:
     - col: emission_time

diff --git a/...aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_8230a3.yaml b/...aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_8230a3.yaml
@@ -12,7 +12,6 @@ params:
     operator: TEMPORAL_RANGE
     subject: emission_time
   aggregateFunction: Sum
-  annotation_layers: []
   colOrder: key_a_to_z
   colSubTotals: false
   conditional_formatting: []
@@ -22,19 +21,19 @@ params:
   - enrollment_mode
   groupbyRows:
   - course_run
+  - course_name
   metrics:
   - enrollees
   metricsLayout: COLUMNS
   order_desc: false
   rowOrder: key_a_to_z
   row_limit: 50000
   temporal_columns_lookup: {}
-  time_grain_sqla: P1D
   valueFormat: SMART_NUMBER
   viz_type: pivot_table_v2
 query_context:
   datasource:
-    id: 221
+    id: 261
     type: table
   force: false
   form_data:
@@ -49,15 +48,16 @@ query_context:
     colSubTotals: false
     conditional_formatting: []
     dashboards:
-    - 3141
-    datasource: 221__table
+    - 1111
+    datasource: 261__table
     date_format: smart_date
     extra_form_data: {}
     force: false
     groupbyColumns:
     - enrollment_mode
     groupbyRows:
     - course_run
+    - course_name
     metrics:
     - enrollees
     metricsLayout: COLUMNS
@@ -66,9 +66,8 @@ query_context:
     result_type: full
     rowOrder: key_a_to_z
     row_limit: 50000
-    slice_id: 1081
+    slice_id: 1141
     temporal_columns_lookup: {}
-    time_grain_sqla: P1D
     valueFormat: SMART_NUMBER
     viz_type: pivot_table_v2
   queries:
@@ -77,11 +76,11 @@ query_context:
     columns:
     - enrollment_mode
     - course_run
+    - course_name
     custom_form_data: {}
     custom_params: {}
     extras:
       having: ''
-      time_grain_sqla: P1D
       where: ''
     filters:
     - col: emission_time

diff --git a/...d/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_b73b0a.yaml b/...d/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_b73b0a.yaml
@@ -26,6 +26,7 @@ params:
   - active
   - at_risk
   minorTicks: false
+  only_total: true
   orientation: horizontal
   rich_tooltip: false
   row_limit: 10
@@ -40,16 +41,22 @@ params:
   truncate_metric: false
   viz_type: echarts_timeseries_bar
   xAxisLabelRotation: 0
-  x_axis: course_name
+  x_axis: name_org
   x_axis_sort_series: sum
   x_axis_sort_series_ascending: false
   x_axis_time_format: smart_date
   x_axis_title: ''
   x_axis_title_margin: 15
+  y_axis_bounds:
+  - null
+  - null
+  y_axis_format: SMART_NUMBER
+  y_axis_title_margin: 15
+  y_axis_title_position: Left
   zoomable: false
 query_context:
   datasource:
-    id: 464
+    id: 504
     type: table
   force: false
   form_data:
@@ -63,8 +70,8 @@ query_context:
     color_scheme: supersetColors
     contributionMode: null
     dashboards:
-    - 3441
-    datasource: 464__table
+    - 1111
+    datasource: 504__table
     extra_form_data: {}
     force: false
     groupby: []
@@ -77,6 +84,7 @@ query_context:
     - active
     - at_risk
     minorTicks: false
+    only_total: true
     orientation: horizontal
     result_format: json
     result_type: full
@@ -85,7 +93,7 @@ query_context:
     show_empty_columns: false
     show_legend: true
     show_value: false
-    slice_id: 1504
+    slice_id: 461
     sort_series_ascending: true
     sort_series_type: name
     stack: null
@@ -94,21 +102,27 @@ query_context:
     truncate_metric: false
     viz_type: echarts_timeseries_bar
     xAxisLabelRotation: 0
-    x_axis: course_name
+    x_axis: name_org
     x_axis_sort_series: sum
     x_axis_sort_series_ascending: false
     x_axis_time_format: smart_date
     x_axis_title: ''
     x_axis_title_margin: 15
+    y_axis_bounds:
+    - null
+    - null
+    y_axis_format: SMART_NUMBER
+    y_axis_title_margin: 15
+    y_axis_title_position: Left
     zoomable: false
   queries:
   - annotation_layers: []
     applied_time_extras: {}
     columns:
     - columnType: BASE_AXIS
       expressionType: SQL
-      label: course_name
-      sqlExpression: course_name
+      label: name_org
+      sqlExpression: name_org
     custom_form_data: {}
     custom_params: {}
     extras:
@@ -142,7 +156,7 @@ query_context:
         columns: []
         drop_missing_columns: true
         index:
-        - course_name
+        - name_org
     - operation: flatten
     row_limit: 10
     series_columns: []

diff --git a/...d/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_d414b1.yaml b/...d/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_d414b1.yaml
@@ -9,13 +9,8 @@ params:
   adhoc_filters:
   - clause: WHERE
     comparator: No filter
-    datasourceWarning: false
     expressionType: SIMPLE
-    filterOptionName: filter_noj2mkjbumn_edkgbebkld8
-    isExtra: false
-    isNew: false
     operator: TEMPORAL_RANGE
-    sqlExpression: null
     subject: enrolled_at
   annotation_layers: []
   color_scheme: supersetColors
@@ -31,6 +26,7 @@ params:
   - at_risk
   - active
   minorTicks: false
+  only_total: true
   orientation: horizontal
   rich_tooltip: false
   row_limit: 10
@@ -40,42 +36,42 @@ params:
   sort_series_ascending: true
   sort_series_type: name
   stack: null
-  timeseries_limit_metric: null
   tooltipTimeFormat: smart_date
   truncateXAxis: false
   truncate_metric: true
   viz_type: echarts_timeseries_bar
   xAxisLabelRotation: 0
-  x_axis: course_run
+  x_axis: run_name
   x_axis_sort_series: name
   x_axis_sort_series_ascending: true
   x_axis_time_format: smart_date
   x_axis_title: ''
   x_axis_title_margin: 15
+  y_axis_bounds:
+  - null
+  - null
+  y_axis_format: SMART_NUMBER
+  y_axis_title_margin: 15
+  y_axis_title_position: Left
   zoomable: false
 query_context:
   datasource:
-    id: 464
+    id: 504
     type: table
   force: false
   form_data:
     adhoc_filters:
     - clause: WHERE
       comparator: No filter
-      datasourceWarning: false
       expressionType: SIMPLE
-      filterOptionName: filter_noj2mkjbumn_edkgbebkld8
-      isExtra: false
-      isNew: false
       operator: TEMPORAL_RANGE
-      sqlExpression: null
       subject: enrolled_at
     annotation_layers: []
     color_scheme: supersetColors
     contributionMode: null
     dashboards:
-    - 3441
-    datasource: 464__table
+    - 1111
+    datasource: 504__table
     extra_form_data: {}
     force: false
     groupby: []
@@ -88,6 +84,7 @@ query_context:
     - at_risk
     - active
     minorTicks: false
+    only_total: true
     orientation: horizontal
     result_format: json
     result_type: full
@@ -96,31 +93,36 @@ query_context:
     show_empty_columns: false
     show_legend: true
     show_value: false
-    slice_id: 1505
+    slice_id: 101
     sort_series_ascending: true
     sort_series_type: name
     stack: null
-    timeseries_limit_metric: null
     tooltipTimeFormat: smart_date
     truncateXAxis: false
     truncate_metric: true
     viz_type: echarts_timeseries_bar
     xAxisLabelRotation: 0
-    x_axis: course_run
+    x_axis: run_name
     x_axis_sort_series: name
     x_axis_sort_series_ascending: true
     x_axis_time_format: smart_date
     x_axis_title: ''
     x_axis_title_margin: 15
+    y_axis_bounds:
+    - null
+    - null
+    y_axis_format: SMART_NUMBER
+    y_axis_title_margin: 15
+    y_axis_title_position: Left
     zoomable: false
   queries:
   - annotation_layers: []
     applied_time_extras: {}
     columns:
     - columnType: BASE_AXIS
       expressionType: SQL
-      label: course_run
-      sqlExpression: course_run
+      label: run_name
+      sqlExpression: run_name
     custom_form_data: {}
     custom_params: {}
     extras:
@@ -154,7 +156,7 @@ query_context:
         columns: []
         drop_missing_columns: true
         index:
-        - course_run
+        - run_name
     - operation: flatten
     row_limit: 10
     series_columns: []