Merge pull request #731 from SoryRawyer/rds/update-course-engagement-…

…charts fix: use correct datasets for engagement charts (FC-0051)
openedx · Apr 19, 2024 · 7234b3e · 7234b3e
2 parents 8693f75 + 07ebbdb
commit 7234b3e
Show file tree

Hide file tree

Showing 5 changed files with 421 additions and 452 deletions.
diff --git a/...uild/aspects-superset/openedx-assets/assets/charts/Page_views_per_section_subsection.yaml b/...uild/aspects-superset/openedx-assets/assets/charts/Page_views_per_section_subsection.yaml
@@ -2,15 +2,15 @@ _file_name: Page_views_per_section_subsection.yaml
 cache_timeout: null
 certification_details: null
 certified_by: null
-dataset_uuid: 1c443466-300e-4f01-a690-3d9d1b934d9a
+dataset_uuid: 9febd6be-5102-4dbf-86b9-45ebd3cbbc45
 description: null
 params:
   adhoc_filters:
   - clause: WHERE
     comparator: No filter
     expressionType: SIMPLE
     operator: TEMPORAL_RANGE
-    subject: emission_time
+    subject: visited_on
   annotation_layers: []
   color_scheme: supersetColors
   comparison_type: values
@@ -28,15 +28,17 @@ params:
     hasCustomLabel: true
     label: All pages viewed
     optionName: metric_79weo5uoij_22vrzytsx8v
-    sqlExpression: rand() % 10
+    sqlExpression: |-
+      countIf("section/subsection page engagement" = 'All pages viewed')
   - aggregate: null
     column: null
     datasourceWarning: false
     expressionType: SQL
     hasCustomLabel: true
     label: At least one page viewed
     optionName: metric_oijxyr99vkc_bvobo3jivn
-    sqlExpression: rand() % 20
+    sqlExpression: |-
+      countIf("section/subsection page engagement" = 'At least one page viewed' or "section/subsection page engagement" = 'All pages viewed')
   only_total: true
   order_desc: true
   orientation: vertical
@@ -47,13 +49,11 @@ params:
   sort_series_type: sum
   time_grain_sqla: P1M
   tooltipTimeFormat: smart_date
+  truncateXAxis: true
   truncate_metric: true
   viz_type: echarts_timeseries_bar
   xAxisLabelRotation: 45
-  x_axis:
-    expressionType: SQL
-    label: section_with_name
-    sqlExpression: block_name_with_location
+  x_axis: section/subsection name
   x_axis_sort_asc: true
   x_axis_sort_series: name
   x_axis_sort_series_ascending: true
@@ -67,21 +67,9 @@ params:
   y_axis_title_margin: 30
   y_axis_title_position: Left
   zoomable: true
-query_context: '{"datasource":{"id":69,"type":"table"},"force":false,"queries":[{"filters":[{"col":"emission_time","op":"TEMPORAL_RANGE","val":"No
-  filter"}],"extras":{"having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1M","columnType":"BASE_AXIS","label":"section_with_name","sqlExpression":"block_name_with_location","expressionType":"SQL"}],"metrics":[{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"All
-  pages viewed","optionName":"metric_79weo5uoij_22vrzytsx8v","sqlExpression":"rand()
-  % 10"},{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"At
-  least one page viewed","optionName":"metric_oijxyr99vkc_bvobo3jivn","sqlExpression":"rand()
-  % 20"}],"orderby":[[{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"All
-  pages viewed","optionName":"metric_79weo5uoij_22vrzytsx8v","sqlExpression":"rand()
-  % 10"},false]],"annotation_layers":[],"row_limit":10000,"series_columns":[],"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"time_offsets":[],"post_processing":[{"operation":"pivot","options":{"index":["section_with_name"],"columns":[],"aggregates":{"All
-  pages viewed":{"operator":"mean"},"At least one page viewed":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"69__table","viz_type":"echarts_timeseries_bar","slice_id":201,"x_axis":{"label":"section_with_name","sqlExpression":"block_name_with_location","expressionType":"SQL"},"time_grain_sqla":"P1M","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":[{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"All
-  pages viewed","optionName":"metric_79weo5uoij_22vrzytsx8v","sqlExpression":"rand()
-  % 10"},{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"At
-  least one page viewed","optionName":"metric_oijxyr99vkc_bvobo3jivn","sqlExpression":"rand()
-  % 20"}],"groupby":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No filter","expressionType":"SIMPLE","operator":"TEMPORAL_RANGE","subject":"emission_time"}],"order_desc":true,"row_limit":10000,"truncate_metric":true,"show_empty_columns":true,"comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"orientation":"vertical","x_axis_title_margin":15,"y_axis_title":"Number
-  of learners","y_axis_title_margin":30,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","only_total":true,"zoomable":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"smart_date","xAxisLabelRotation":45,"y_axis_format":"SMART_NUMBER","y_axis_bounds":[null,null],"rich_tooltip":true,"tooltipTimeFormat":"smart_date","extra_form_data":{},"dashboards":[16],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context: |-
+  {"datasource":{"id":193,"type":"table"},"force":false,"queries":[{"filters":[{"col":"visited_on","op":"TEMPORAL_RANGE","val":"No filter"}],"extras":{"time_grain_sqla":"P1M","having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1M","columnType":"BASE_AXIS","sqlExpression":"section/subsection name","label":"section/subsection name","expressionType":"SQL"}],"metrics":[{"expressionType":"SQL","sqlExpression":"countIf(\"section/subsection page engagement\" = 'All pages viewed')","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"All pages viewed","optionName":"metric_79weo5uoij_22vrzytsx8v"},{"expressionType":"SQL","sqlExpression":"countIf(\"section/subsection page engagement\" = 'At least one page viewed' or \"section/subsection page engagement\" = 'All pages viewed')","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"At least one page viewed","optionName":"metric_oijxyr99vkc_bvobo3jivn"}],"orderby":[[{"expressionType":"SQL","sqlExpression":"countIf(\"section/subsection page engagement\" = 'All pages viewed')","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"All pages viewed","optionName":"metric_79weo5uoij_22vrzytsx8v"},false]],"annotation_layers":[],"row_limit":10000,"series_columns":[],"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"time_offsets":[],"post_processing":[{"operation":"pivot","options":{"index":["section/subsection name"],"columns":[],"aggregates":{"All pages viewed":{"operator":"mean"},"At least one page viewed":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"193__table","viz_type":"echarts_timeseries_bar","slice_id":1627,"x_axis":"section/subsection name","time_grain_sqla":"P1M","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":[{"expressionType":"SQL","sqlExpression":"countIf(\"section/subsection page engagement\" = 'All pages viewed')","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"All pages viewed","optionName":"metric_79weo5uoij_22vrzytsx8v"},{"expressionType":"SQL","sqlExpression":"countIf(\"section/subsection page engagement\" = 'At least one page viewed' or \"section/subsection page engagement\" = 'All pages viewed')","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"At least one page viewed","optionName":"metric_oijxyr99vkc_bvobo3jivn"}],"groupby":[],"adhoc_filters":[{"clause":"WHERE","subject":"visited_on","operator":"TEMPORAL_RANGE","comparator":"No filter","expressionType":"SIMPLE"}],"order_desc":true,"row_limit":10000,"truncate_metric":true,"show_empty_columns":true,"comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"orientation":"vertical","x_axis_title_margin":15,"y_axis_title":"Number of learners","y_axis_title_margin":30,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","only_total":true,"zoomable":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"smart_date","xAxisLabelRotation":45,"y_axis_format":"SMART_NUMBER","truncateXAxis":true,"y_axis_bounds":[null,null],"rich_tooltip":true,"tooltipTimeFormat":"smart_date","extra_form_data":{},"dashboards":[2249],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}
 slice_name: Page views per section/subsection
-uuid: 0538470d-0328-4f15-9e48-ffc9e84c4c06
+uuid: bf2d6219-d633-48c1-a9b5-742eac6a4c0a
 version: 1.0.0
 viz_type: echarts_timeseries_bar
diff --git a/...ects-superset/openedx-assets/assets/charts/Problems_attempted_per_section_subsection.yaml b/...ects-superset/openedx-assets/assets/charts/Problems_attempted_per_section_subsection.yaml
@@ -2,15 +2,10 @@ _file_name: Problems_attempted_per_section_subsection.yaml
 cache_timeout: null
 certification_details: null
 certified_by: null
-dataset_uuid: 1c443466-300e-4f01-a690-3d9d1b934d9a
+dataset_uuid: 171c88e5-fd4b-4aab-b287-361fa6fa5415
 description: null
 params:
-  adhoc_filters:
-  - clause: WHERE
-    comparator: No filter
-    expressionType: SIMPLE
-    operator: TEMPORAL_RANGE
-    subject: emission_time
+  adhoc_filters: []
   annotation_layers: []
   color_scheme: supersetColors
   comparison_type: values
@@ -28,15 +23,17 @@ params:
     hasCustomLabel: true
     label: Attempted at least one problem
     optionName: metric_0gasd9pjc5y_44f8wzc1g3q
-    sqlExpression: rand() % 20
+    sqlExpression: |-
+      countIf("section/subsection problem engagement" = 'At least one problem attempted' or "section/subsection problem engagement" = 'All problems attempted')
   - aggregate: null
     column: null
     datasourceWarning: false
     expressionType: SQL
     hasCustomLabel: true
     label: Attempted all problems
     optionName: metric_6ibge21tuod_k3hhlneae8f
-    sqlExpression: rand() % 10
+    sqlExpression: |-
+      countIf("section/subsection problem engagement" = 'All problems attempted')
   only_total: true
   order_desc: true
   orientation: vertical
@@ -47,10 +44,11 @@ params:
   sort_series_type: sum
   time_grain_sqla: P1M
   tooltipTimeFormat: smart_date
+  truncateXAxis: true
   truncate_metric: true
   viz_type: echarts_timeseries_bar
   xAxisLabelRotation: 45
-  x_axis: block_name_with_location
+  x_axis: section/subsection name
   x_axis_sort_asc: true
   x_axis_sort_series: name
   x_axis_sort_series_ascending: true
@@ -64,21 +62,9 @@ params:
   y_axis_title_margin: 30
   y_axis_title_position: Left
   zoomable: true
-query_context: '{"datasource":{"id":69,"type":"table"},"force":false,"queries":[{"filters":[{"col":"emission_time","op":"TEMPORAL_RANGE","val":"No
-  filter"}],"extras":{"having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1M","columnType":"BASE_AXIS","sqlExpression":"block_name_with_location","label":"block_name_with_location","expressionType":"SQL"}],"metrics":[{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"Attempted
-  at least one problem","optionName":"metric_0gasd9pjc5y_44f8wzc1g3q","sqlExpression":"rand()
-  % 20"},{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"Attempted
-  all problems","optionName":"metric_6ibge21tuod_k3hhlneae8f","sqlExpression":"rand()
-  % 10"}],"orderby":[[{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"Attempted
-  at least one problem","optionName":"metric_0gasd9pjc5y_44f8wzc1g3q","sqlExpression":"rand()
-  % 20"},false]],"annotation_layers":[],"row_limit":10000,"series_columns":[],"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"time_offsets":[],"post_processing":[{"operation":"pivot","options":{"index":["block_name_with_location"],"columns":[],"aggregates":{"Attempted
-  at least one problem":{"operator":"mean"},"Attempted all problems":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"69__table","viz_type":"echarts_timeseries_bar","slice_id":202,"x_axis":"block_name_with_location","time_grain_sqla":"P1M","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":[{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"Attempted
-  at least one problem","optionName":"metric_0gasd9pjc5y_44f8wzc1g3q","sqlExpression":"rand()
-  % 20"},{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"Attempted
-  all problems","optionName":"metric_6ibge21tuod_k3hhlneae8f","sqlExpression":"rand()
-  % 10"}],"groupby":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No filter","expressionType":"SIMPLE","operator":"TEMPORAL_RANGE","subject":"emission_time"}],"order_desc":true,"row_limit":10000,"truncate_metric":true,"show_empty_columns":true,"comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"orientation":"vertical","x_axis_title_margin":15,"y_axis_title":"Number
-  of learners","y_axis_title_margin":30,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","only_total":true,"zoomable":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"smart_date","xAxisLabelRotation":45,"y_axis_format":"SMART_NUMBER","y_axis_bounds":[null,null],"rich_tooltip":true,"tooltipTimeFormat":"smart_date","extra_form_data":{},"dashboards":[16],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context: |-
+  {"datasource":{"id":537,"type":"table"},"force":false,"queries":[{"filters":[],"extras":{"time_grain_sqla":"P1M","having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1M","columnType":"BASE_AXIS","sqlExpression":"section/subsection name","label":"section/subsection name","expressionType":"SQL"}],"metrics":[{"expressionType":"SQL","sqlExpression":"countIf(\"section/subsection problem engagement\" = 'At least one problem attempted' or \"section/subsection problem engagement\" = 'All problems attempted')","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"Attempted at least one problem","optionName":"metric_0gasd9pjc5y_44f8wzc1g3q"},{"expressionType":"SQL","sqlExpression":"countIf(\"section/subsection problem engagement\" = 'All problems attempted')","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"Attempted all problems","optionName":"metric_6ibge21tuod_k3hhlneae8f"}],"orderby":[[{"expressionType":"SQL","sqlExpression":"countIf(\"section/subsection problem engagement\" = 'At least one problem attempted' or \"section/subsection problem engagement\" = 'All problems attempted')","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"Attempted at least one problem","optionName":"metric_0gasd9pjc5y_44f8wzc1g3q"},false]],"annotation_layers":[],"row_limit":10000,"series_columns":[],"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"time_offsets":[],"post_processing":[{"operation":"pivot","options":{"index":["section/subsection name"],"columns":[],"aggregates":{"Attempted at least one problem":{"operator":"mean"},"Attempted all problems":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"537__table","viz_type":"echarts_timeseries_bar","slice_id":1790,"x_axis":"section/subsection name","time_grain_sqla":"P1M","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":[{"expressionType":"SQL","sqlExpression":"countIf(\"section/subsection problem engagement\" = 'At least one problem attempted' or \"section/subsection problem engagement\" = 'All problems attempted')","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"Attempted at least one problem","optionName":"metric_0gasd9pjc5y_44f8wzc1g3q"},{"expressionType":"SQL","sqlExpression":"countIf(\"section/subsection problem engagement\" = 'All problems attempted')","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"Attempted all problems","optionName":"metric_6ibge21tuod_k3hhlneae8f"}],"groupby":[],"adhoc_filters":[],"order_desc":true,"row_limit":10000,"truncate_metric":true,"show_empty_columns":true,"comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"orientation":"vertical","x_axis_title_margin":15,"y_axis_title":"Number of learners","y_axis_title_margin":30,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","only_total":true,"zoomable":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"smart_date","xAxisLabelRotation":45,"y_axis_format":"SMART_NUMBER","truncateXAxis":true,"y_axis_bounds":[null,null],"rich_tooltip":true,"tooltipTimeFormat":"smart_date","extra_form_data":{},"dashboards":[2329],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}
 slice_name: Problems attempted per section/subsection
-uuid: 869edaf6-f911-4ca7-9e4b-28435bba2e82
+uuid: 8cdcd4aa-1fa2-41dc-b38d-f1112134592e
 version: 1.0.0
 viz_type: echarts_timeseries_bar