feat: serialize query_context as json for redability

tutoraspects/asset_command_helpers.py

@@ -5,6 +5,7 @@
 import glob
 import os
 import re
+import json
 from zipfile import ZipFile
 
 import click
@@ -171,6 +172,9 @@ class ChartAsset(Asset):
     def process(self, content: dict, existing: dict):
         if not content.get("query_context"):
             content["query_context"] = existing.get("query_context")
+        query_context = content["query_context"]
+        if query_context is not None and isinstance(query_context, str):
+            content["query_context"] = json.loads(query_context)
 
 
 class DashboardAsset(Asset):

tutoraspects/templates/aspects/apps/superset/pythonpath/create_assets_utils.py

@@ -24,6 +24,7 @@
 # version, which skips a variety of other checks.
 import logging
 import yaml
+import json
 from pathlib import Path
 
 from flask import g
@@ -57,7 +58,13 @@ def load_configs_from_directory(
             queue.extend(path_name.glob("*"))
         elif path_name.suffix.lower() in YAML_EXTENSIONS:
             with open(path_name) as fp:
-                contents[str(path_name.relative_to(root))] = fp.read()
+                content = fp.read()
+                loaded_content = yaml.load(content, Loader=yaml.Loader)
+                if loaded_content.get("query_context") and isinstance(loaded_content["query_context"], dict):
+                    loaded_content["query_context"] = json.dumps(loaded_content["query_context"])
+                content = yaml.dump(loaded_content)
+                contents[str(path_name.relative_to(root))] = content
+
 
     # removing "type" from the metadata allows us to import any exported model
     # from the unzipped directory directly

tutoraspects/templates/aspects/apps/superset/pythonpath/performance_metrics.py

@@ -140,7 +140,7 @@ def get_query_contexts_from_assets():
             with open(path, "r") as file:
                 asset = yaml.safe_load(file)
                 if "query_context" in asset and asset["query_context"]:
-                    query_contexts[asset["uuid"]] = json.loads(asset["query_context"])
+                    query_contexts[asset["uuid"]] = asset["query_context"]
 
     logger.info(f"Found {len(query_contexts)} query contexts")
     return query_contexts

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Active_Courses.yaml

@@ -59,13 +59,130 @@ params:
   y_axis_title_margin: 15
   y_axis_title_position: Left
   zoomable: true
-query_context: '{"datasource":{"id":829,"type":"table"},"force":false,"queries":[{"filters":[{"col":"emission_hour","op":"TEMPORAL_RANGE","val":"No
-  filter"}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1D","columnType":"BASE_AXIS","sqlExpression":"emission_hour","label":"emission_hour","expressionType":"SQL"}],"metrics":[{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"Active
-  Courses","optionName":"metric_hvxlgfij23e_68a6guxh855","sqlExpression":"uniqCombinedMerge(courses_cnt)"}],"orderby":[[{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":true,"label":"Active
-  Courses","optionName":"metric_hvxlgfij23e_68a6guxh855","sqlExpression":"uniqCombinedMerge(courses_cnt)"},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":["emission_hour"],"columns":[],"aggregates":{"Active
-  Courses":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"829__table","viz_type":"echarts_timeseries_line","slice_id":3402,"x_axis":"emission_hour","time_grain_sqla":"P1D","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":"Active
-  Courses","optionName":"metric_hvxlgfij23e_68a6guxh855","sqlExpression":"uniqCombinedMerge(courses_cnt)"}],"groupby":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No
-  filter","expressionType":"SIMPLE","operator":"TEMPORAL_RANGE","subject":"emission_hour"}],"order_desc":true,"row_limit":10000,"truncate_metric":false,"show_empty_columns":true,"comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"x_axis_title_margin":15,"y_axis_title_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","seriesType":"line","only_total":true,"opacity":0.2,"markerEnabled":false,"markerSize":6,"zoomable":true,"show_legend":false,"legendType":"scroll","legendOrientation":"top","legendMargin":null,"x_axis_time_format":"%Y-%m-%d","rich_tooltip":true,"tooltipTimeFormat":"smart_date","y_axis_format":"SMART_NUMBER","truncateXAxis":false,"y_axis_bounds":[null,null],"extra_form_data":{},"dashboards":[2422],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 829
+    type: table
+  force: false
+  form_data:
+    adhoc_filters:
+    - clause: WHERE
+      comparator: No filter
+      expressionType: SIMPLE
+      operator: TEMPORAL_RANGE
+      subject: emission_hour
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 2422
+    datasource: 829__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendMargin: null
+    legendOrientation: top
+    legendType: scroll
+    markerEnabled: false
+    markerSize: 6
+    metrics:
+    - aggregate: null
+      column: null
+      datasourceWarning: false
+      expressionType: SQL
+      hasCustomLabel: true
+      label: Active Courses
+      optionName: metric_hvxlgfij23e_68a6guxh855
+      sqlExpression: uniqCombinedMerge(courses_cnt)
+    only_total: true
+    opacity: 0.2
+    order_desc: true
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 10000
+    seriesType: line
+    show_empty_columns: true
+    show_legend: false
+    slice_id: 3402
+    sort_series_type: sum
+    time_grain_sqla: P1D
+    tooltipTimeFormat: smart_date
+    truncateXAxis: false
+    truncate_metric: false
+    viz_type: echarts_timeseries_line
+    x_axis: emission_hour
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: '%Y-%m-%d'
+    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: true
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: emission_hour
+      sqlExpression: emission_hour
+      timeGrain: P1D
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1D
+      where: ''
+    filters:
+    - col: emission_hour
+      op: TEMPORAL_RANGE
+      val: No filter
+    metrics:
+    - aggregate: null
+      column: null
+      datasourceWarning: false
+      expressionType: SQL
+      hasCustomLabel: true
+      label: Active Courses
+      optionName: metric_hvxlgfij23e_68a6guxh855
+      sqlExpression: uniqCombinedMerge(courses_cnt)
+    order_desc: true
+    orderby:
+    - - aggregate: null
+        column: null
+        datasourceWarning: false
+        expressionType: SQL
+        hasCustomLabel: true
+        label: Active Courses
+        optionName: metric_hvxlgfij23e_68a6guxh855
+        sqlExpression: uniqCombinedMerge(courses_cnt)
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          Active Courses:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - emission_hour
+    - operation: flatten
+    row_limit: 10000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Active Courses
 uuid: 138eb72a-f73f-42b5-96d6-3417715c3519
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Active_Learners.yaml

@@ -63,13 +63,134 @@ params:
   y_axis_title_margin: 15
   y_axis_title_position: Left
   zoomable: true
-query_context: '{"datasource":{"id":84,"type":"table"},"force":false,"queries":[{"filters":[{"col":"emission_hour","op":"TEMPORAL_RANGE","val":"No
-  filter"}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1D","columnType":"BASE_AXIS","sqlExpression":"emission_hour","label":"emission_hour","expressionType":"SQL"}],"metrics":[{"expressionType":"SQL","sqlExpression":"uniqCombinedMerge(actors_cnt)","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"Active
-  Learners","optionName":"metric_hvxlgfij23e_68a6guxh855"}],"orderby":[[{"expressionType":"SQL","sqlExpression":"uniqCombinedMerge(actors_cnt)","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"Active
-  Learners","optionName":"metric_hvxlgfij23e_68a6guxh855"},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":["emission_hour"],"columns":[],"aggregates":{"Active
-  Learners":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"84__table","viz_type":"echarts_timeseries_line","slice_id":3403,"x_axis":"emission_hour","time_grain_sqla":"P1D","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":[{"expressionType":"SQL","sqlExpression":"uniqCombinedMerge(actors_cnt)","column":null,"aggregate":null,"datasourceWarning":false,"hasCustomLabel":true,"label":"Active
-  Learners","optionName":"metric_hvxlgfij23e_68a6guxh855"}],"groupby":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No
-  filter","expressionType":"SIMPLE","operator":"TEMPORAL_RANGE","subject":"emission_hour"}],"order_desc":true,"row_limit":10000,"truncate_metric":true,"show_empty_columns":true,"comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"x_axis_title_margin":15,"y_axis_title_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","seriesType":"line","only_total":true,"area":false,"opacity":0.2,"markerEnabled":false,"markerSize":6,"zoomable":true,"minorTicks":false,"show_legend":false,"legendType":"scroll","legendOrientation":"top","legendMargin":null,"x_axis_time_format":"%Y-%m-%d","rich_tooltip":true,"tooltipTimeFormat":"smart_date","y_axis_format":"SMART_NUMBER","minorSplitLine":false,"truncateXAxis":false,"truncateYAxis":false,"y_axis_bounds":[null,null],"extra_form_data":{},"dashboards":[2422],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 84
+    type: table
+  force: false
+  form_data:
+    adhoc_filters:
+    - clause: WHERE
+      comparator: No filter
+      expressionType: SIMPLE
+      operator: TEMPORAL_RANGE
+      subject: emission_hour
+    annotation_layers: []
+    area: false
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 2422
+    datasource: 84__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendMargin: null
+    legendOrientation: top
+    legendType: scroll
+    markerEnabled: false
+    markerSize: 6
+    metrics:
+    - aggregate: null
+      column: null
+      datasourceWarning: false
+      expressionType: SQL
+      hasCustomLabel: true
+      label: Active Learners
+      optionName: metric_hvxlgfij23e_68a6guxh855
+      sqlExpression: uniqCombinedMerge(actors_cnt)
+    minorSplitLine: false
+    minorTicks: false
+    only_total: true
+    opacity: 0.2
+    order_desc: true
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 10000
+    seriesType: line
+    show_empty_columns: true
+    show_legend: false
+    slice_id: 3403
+    sort_series_type: sum
+    time_grain_sqla: P1D
+    tooltipTimeFormat: smart_date
+    truncateXAxis: false
+    truncateYAxis: false
+    truncate_metric: true
+    viz_type: echarts_timeseries_line
+    x_axis: emission_hour
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: '%Y-%m-%d'
+    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: true
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: emission_hour
+      sqlExpression: emission_hour
+      timeGrain: P1D
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1D
+      where: ''
+    filters:
+    - col: emission_hour
+      op: TEMPORAL_RANGE
+      val: No filter
+    metrics:
+    - aggregate: null
+      column: null
+      datasourceWarning: false
+      expressionType: SQL
+      hasCustomLabel: true
+      label: Active Learners
+      optionName: metric_hvxlgfij23e_68a6guxh855
+      sqlExpression: uniqCombinedMerge(actors_cnt)
+    order_desc: true
+    orderby:
+    - - aggregate: null
+        column: null
+        datasourceWarning: false
+        expressionType: SQL
+        hasCustomLabel: true
+        label: Active Learners
+        optionName: metric_hvxlgfij23e_68a6guxh855
+        sqlExpression: uniqCombinedMerge(actors_cnt)
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          Active Learners:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - emission_hour
+    - operation: flatten
+    row_limit: 10000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Active Learners
 uuid: b9b602ec-001b-4584-aa24-9201f3b8746f
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/At-risk_Enrollees_per_Enrollment_Track.yaml

@@ -65,14 +65,165 @@ params:
   y_axis_format: SMART_NUMBER
   y_axis_title_margin: 15
   y_axis_title_position: Left
-query_context: '{"datasource":{"id":1180,"type":"table"},"force":false,"queries":[{"filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1D","columnType":"BASE_AXIS","sqlExpression":"enrollment_mode","label":"enrollment_mode","expressionType":"SQL"}],"metrics":[{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_83n2xhwdm4x_srfoil9owpn","sqlExpression":null}],"orderby":[[{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_83n2xhwdm4x_srfoil9owpn","sqlExpression":null},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":["enrollment_mode"],"columns":[],"aggregates":{"Number
-  of Learners":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"1180__table","viz_type":"echarts_timeseries_bar","slice_id":2168,"x_axis":"enrollment_mode","time_grain_sqla":"P1D","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":[{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_83n2xhwdm4x_srfoil9owpn","sqlExpression":null}],"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_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","only_total":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"smart_date","y_axis_format":"SMART_NUMBER","truncateXAxis":true,"y_axis_bounds":[null,null],"rich_tooltip":true,"tooltipTimeFormat":"smart_date","extra_form_data":{},"dashboards":[6096],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 1180
+    type: table
+  force: false
+  form_data:
+    adhoc_filters: []
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 6096
+    datasource: 1180__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendOrientation: top
+    legendType: scroll
+    metrics:
+    - aggregate: COUNT_DISTINCT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 13538
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Number of Learners
+      optionName: metric_83n2xhwdm4x_srfoil9owpn
+      sqlExpression: null
+    only_total: true
+    order_desc: true
+    orientation: vertical
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 10000
+    show_empty_columns: true
+    show_legend: true
+    slice_id: 2168
+    sort_series_type: sum
+    time_grain_sqla: P1D
+    tooltipTimeFormat: smart_date
+    truncateXAxis: true
+    truncate_metric: true
+    viz_type: echarts_timeseries_bar
+    x_axis: enrollment_mode
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: smart_date
+    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
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: enrollment_mode
+      sqlExpression: enrollment_mode
+      timeGrain: P1D
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1D
+      where: ''
+    filters: []
+    metrics:
+    - aggregate: COUNT_DISTINCT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 13538
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Number of Learners
+      optionName: metric_83n2xhwdm4x_srfoil9owpn
+      sqlExpression: null
+    order_desc: true
+    orderby:
+    - - aggregate: COUNT_DISTINCT
+        column:
+          advanced_data_type: null
+          certification_details: null
+          certified_by: null
+          column_name: actor_id
+          description: null
+          expression: null
+          filterable: true
+          groupby: true
+          id: 13538
+          is_certified: false
+          is_dttm: false
+          python_date_format: null
+          type: String
+          type_generic: 1
+          verbose_name: Actor ID
+          warning_markdown: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: true
+        label: Number of Learners
+        optionName: metric_83n2xhwdm4x_srfoil9owpn
+        sqlExpression: null
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          Number of Learners:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - enrollment_mode
+    - operation: flatten
+    row_limit: 10000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: At-risk Enrollees per Enrollment Track
 uuid: f8beeb8c-b35c-47fc-8370-96b493f9c1b8
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/At-risk_Enrollment_Dates.yaml

@@ -66,14 +66,166 @@ params:
   y_axis_format: SMART_NUMBER
   y_axis_title_margin: 15
   y_axis_title_position: Left
-query_context: '{"datasource":{"id":1180,"type":"table"},"force":false,"queries":[{"filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1D","columnType":"BASE_AXIS","sqlExpression":"enrolled_at","label":"enrolled_at","expressionType":"SQL"}],"metrics":[{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_z7m68c6u4i_vpbb6m45cl","sqlExpression":null}],"orderby":[[{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_z7m68c6u4i_vpbb6m45cl","sqlExpression":null},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":["enrolled_at"],"columns":[],"aggregates":{"Number
-  of Learners":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"1180__table","viz_type":"echarts_timeseries_bar","slice_id":2785,"x_axis":"enrolled_at","time_grain_sqla":"P1D","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":[{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_z7m68c6u4i_vpbb6m45cl","sqlExpression":null}],"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_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","only_total":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"%Y-%m-%d","xAxisLabelRotation":45,"y_axis_format":"SMART_NUMBER","truncateXAxis":true,"y_axis_bounds":[null,null],"rich_tooltip":true,"tooltipTimeFormat":"smart_date","extra_form_data":{},"dashboards":[6096],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 1180
+    type: table
+  force: false
+  form_data:
+    adhoc_filters: []
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 6096
+    datasource: 1180__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendOrientation: top
+    legendType: scroll
+    metrics:
+    - aggregate: COUNT_DISTINCT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 13538
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Number of Learners
+      optionName: metric_z7m68c6u4i_vpbb6m45cl
+      sqlExpression: null
+    only_total: true
+    order_desc: true
+    orientation: vertical
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 10000
+    show_empty_columns: true
+    show_legend: true
+    slice_id: 2785
+    sort_series_type: sum
+    time_grain_sqla: P1D
+    tooltipTimeFormat: smart_date
+    truncateXAxis: true
+    truncate_metric: true
+    viz_type: echarts_timeseries_bar
+    xAxisLabelRotation: 45
+    x_axis: enrolled_at
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: '%Y-%m-%d'
+    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
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: enrolled_at
+      sqlExpression: enrolled_at
+      timeGrain: P1D
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1D
+      where: ''
+    filters: []
+    metrics:
+    - aggregate: COUNT_DISTINCT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 13538
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Number of Learners
+      optionName: metric_z7m68c6u4i_vpbb6m45cl
+      sqlExpression: null
+    order_desc: true
+    orderby:
+    - - aggregate: COUNT_DISTINCT
+        column:
+          advanced_data_type: null
+          certification_details: null
+          certified_by: null
+          column_name: actor_id
+          description: null
+          expression: null
+          filterable: true
+          groupby: true
+          id: 13538
+          is_certified: false
+          is_dttm: false
+          python_date_format: null
+          type: String
+          type_generic: 1
+          verbose_name: Actor ID
+          warning_markdown: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: true
+        label: Number of Learners
+        optionName: metric_z7m68c6u4i_vpbb6m45cl
+        sqlExpression: null
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          Number of Learners:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - enrolled_at
+    - operation: flatten
+    row_limit: 10000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: At-risk Enrollment Dates
 uuid: ded61855-48ea-4705-9385-690bf7dba53b
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/At-risk_learners.yaml

@@ -7,6 +7,7 @@ description: null
 params:
   adhoc_filters: []
   all_columns: []
+  annotation_layers: []
   color_pn: true
   extra_form_data: {}
   groupby:
@@ -53,15 +54,144 @@ params:
     optionName: metric_0woj6b3chi2_ihsomqnfpk9
     sqlExpression: null
   viz_type: table
-query_context: '{"datasource":{"id":991,"type":"table"},"force":false,"queries":[{"filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["name","username","email",{"expressionType":"SQL","label":"Course
-  Grade %","sqlExpression":"round(course_grade*100, 2)"},"last_visited"],"metrics":[],"orderby":[[{"aggregate":"MAX","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"course_grade","description":null,"expression":null,"filterable":true,"groupby":true,"id":10990,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"Float64","type_generic":0,"verbose_name":"Course
-  Grade","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":false,"label":"MAX(Course
-  Grade)","optionName":"metric_0woj6b3chi2_ihsomqnfpk9","sqlExpression":null},false]],"annotation_layers":[],"row_limit":5000,"series_limit":0,"series_limit_metric":{"aggregate":"MAX","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"course_grade","description":null,"expression":null,"filterable":true,"groupby":true,"id":10990,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"Float64","type_generic":0,"verbose_name":"Course
-  Grade","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":false,"label":"MAX(Course
-  Grade)","optionName":"metric_0woj6b3chi2_ihsomqnfpk9","sqlExpression":null},"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"991__table","viz_type":"table","slice_id":4124,"query_mode":"aggregate","groupby":["name","username","email",{"expressionType":"SQL","label":"Course
-  Grade %","sqlExpression":"round(course_grade*100, 2)"},"last_visited"],"time_grain_sqla":"P1D","temporal_columns_lookup":{},"all_columns":[],"percent_metrics":[],"adhoc_filters":[],"timeseries_limit_metric":{"aggregate":"MAX","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"course_grade","description":null,"expression":null,"filterable":true,"groupby":true,"id":10990,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"Float64","type_generic":0,"verbose_name":"Course
-  Grade","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":false,"label":"MAX(Course
-  Grade)","optionName":"metric_0woj6b3chi2_ihsomqnfpk9","sqlExpression":null},"order_by_cols":[],"row_limit":5000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"extra_form_data":{},"dashboards":[5608],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 991
+    type: table
+  force: false
+  form_data:
+    adhoc_filters: []
+    all_columns: []
+    color_pn: true
+    dashboards:
+    - 5608
+    datasource: 991__table
+    extra_form_data: {}
+    force: false
+    groupby:
+    - name
+    - username
+    - email
+    - expressionType: SQL
+      label: Course Grade %
+      sqlExpression: round(course_grade*100, 2)
+    - last_visited
+    order_by_cols: []
+    order_desc: true
+    percent_metrics: []
+    query_mode: aggregate
+    result_format: json
+    result_type: full
+    row_limit: 5000
+    server_page_length: 10
+    show_cell_bars: true
+    slice_id: 4124
+    table_timestamp_format: smart_date
+    temporal_columns_lookup: {}
+    time_grain_sqla: P1D
+    timeseries_limit_metric:
+      aggregate: MAX
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: course_grade
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 10990
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: Float64
+        type_generic: 0
+        verbose_name: Course Grade
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: false
+      label: MAX(Course Grade)
+      optionName: metric_0woj6b3chi2_ihsomqnfpk9
+      sqlExpression: null
+    viz_type: table
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - name
+    - username
+    - email
+    - expressionType: SQL
+      label: Course Grade %
+      sqlExpression: round(course_grade*100, 2)
+    - last_visited
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1D
+      where: ''
+    filters: []
+    metrics: []
+    order_desc: true
+    orderby:
+    - - aggregate: MAX
+        column:
+          advanced_data_type: null
+          certification_details: null
+          certified_by: null
+          column_name: course_grade
+          description: null
+          expression: null
+          filterable: true
+          groupby: true
+          id: 10990
+          is_certified: false
+          is_dttm: false
+          python_date_format: null
+          type: Float64
+          type_generic: 0
+          verbose_name: Course Grade
+          warning_markdown: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: false
+        label: MAX(Course Grade)
+        optionName: metric_0woj6b3chi2_ihsomqnfpk9
+        sqlExpression: null
+      - false
+    post_processing: []
+    row_limit: 5000
+    series_limit: 0
+    series_limit_metric:
+      aggregate: MAX
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: course_grade
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 10990
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: Float64
+        type_generic: 0
+        verbose_name: Course Grade
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: false
+      label: MAX(Course Grade)
+      optionName: metric_0woj6b3chi2_ihsomqnfpk9
+      sqlExpression: null
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: At-risk learners
 uuid: 447a194b-dbed-4a82-a899-2df8e01e84b1
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information.yaml

@@ -7,6 +7,7 @@ description: null
 params:
   adhoc_filters: []
   all_columns: []
+  annotation_layers: []
   color_pn: true
   column_config:
     Avg Course Grade:
@@ -67,9 +68,84 @@ params:
   temporal_columns_lookup: {}
   time_grain_sqla: P1D
   viz_type: table
-query_context: '{"datasource":{"id":282,"type":"table"},"force":false,"queries":[{"filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":["org","course_key","course_name","course_run"],"metrics":["graded_learners","avg_course_grade","median_course_grade"],"orderby":[["graded_learners",false]],"annotation_layers":[],"row_limit":1000,"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"post_processing":[]}],"form_data":{"datasource":"282__table","viz_type":"table","slice_id":528,"query_mode":"aggregate","groupby":["org","course_key","course_name","course_run"],"time_grain_sqla":"P1D","temporal_columns_lookup":{},"metrics":["graded_learners","avg_course_grade","median_course_grade"],"all_columns":[],"percent_metrics":[],"adhoc_filters":[],"order_by_cols":[],"row_limit":1000,"server_page_length":10,"order_desc":true,"table_timestamp_format":"smart_date","show_cell_bars":true,"color_pn":true,"column_config":{"Avg
-  Course Grade":{"d3NumberFormat":"~g","d3SmallNumberFormat":"~g"},"Median Course
-  Grade":{"d3NumberFormat":"~g","d3SmallNumberFormat":"~g"}},"conditional_formatting":[{"column":"graded_learners","colorScheme":"#ACE1C4","operator":">","targetValue":0}],"extra_form_data":{},"dashboards":[629],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 282
+    type: table
+  force: false
+  form_data:
+    adhoc_filters: []
+    all_columns: []
+    color_pn: true
+    column_config:
+      Avg Course Grade:
+        d3NumberFormat: ~g
+        d3SmallNumberFormat: ~g
+      Median Course Grade:
+        d3NumberFormat: ~g
+        d3SmallNumberFormat: ~g
+    conditional_formatting:
+    - colorScheme: '#ACE1C4'
+      column: graded_learners
+      operator: '>'
+      targetValue: 0
+    dashboards:
+    - 629
+    datasource: 282__table
+    extra_form_data: {}
+    force: false
+    groupby:
+    - org
+    - course_key
+    - course_name
+    - course_run
+    metrics:
+    - graded_learners
+    - avg_course_grade
+    - median_course_grade
+    order_by_cols: []
+    order_desc: true
+    percent_metrics: []
+    query_mode: aggregate
+    result_format: json
+    result_type: full
+    row_limit: 1000
+    server_page_length: 10
+    show_cell_bars: true
+    slice_id: 528
+    table_timestamp_format: smart_date
+    temporal_columns_lookup: {}
+    time_grain_sqla: P1D
+    viz_type: table
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - org
+    - course_key
+    - course_name
+    - course_run
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1D
+      where: ''
+    filters: []
+    metrics:
+    - graded_learners
+    - avg_course_grade
+    - median_course_grade
+    order_desc: true
+    orderby:
+    - - graded_learners
+      - false
+    post_processing: []
+    row_limit: 1000
+    series_limit: 0
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Course Information
 uuid: fa249dda-78da-4ccc-9ef3-39177e6aae0c
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Cumulative_Enrollments_by_Track.yaml

@@ -61,9 +61,132 @@ params:
   y_axis_title_margin: 15
   y_axis_title_position: Left
   zoomable: true
-query_context: '{"datasource":{"id":424,"type":"table"},"force":false,"queries":[{"filters":[{"col":"emission_time","op":"TEMPORAL_RANGE","val":"No
-  filter"}],"extras":{"time_grain_sqla":"P1M","having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1M","columnType":"BASE_AXIS","sqlExpression":"emission_time","label":"emission_time","expressionType":"SQL"},"enrollment_mode"],"metrics":["number_of_learners"],"orderby":[["number_of_learners",false]],"annotation_layers":[],"row_limit":10000,"series_columns":["enrollment_mode"],"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"time_offsets":[],"post_processing":[{"operation":"pivot","options":{"index":["emission_time"],"columns":["enrollment_mode"],"aggregates":{"number_of_learners":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"cum","options":{"operator":"sum","columns":{"number_of_learners":"number_of_learners"}}},{"operation":"rename","options":{"columns":{"number_of_learners":null},"level":0,"inplace":true}},{"operation":"flatten"}]}],"form_data":{"datasource":"424__table","viz_type":"echarts_area","slice_id":439,"x_axis":"emission_time","time_grain_sqla":"P1M","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":["number_of_learners"],"groupby":["enrollment_mode"],"adhoc_filters":[{"clause":"WHERE","comparator":"No
-  filter","datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_utjjqw9427d_5p5ur7mob2","isExtra":false,"isNew":false,"operator":"TEMPORAL_RANGE","sqlExpression":null,"subject":"emission_time"}],"order_desc":true,"row_limit":10000,"truncate_metric":true,"show_empty_columns":true,"rolling_type":"cumsum","comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"x_axis_title_margin":15,"y_axis_title_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","seriesType":"line","opacity":0.2,"show_value":false,"only_total":true,"show_extra_controls":false,"markerEnabled":true,"markerSize":6,"zoomable":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","legendMargin":null,"x_axis_time_format":"smart_date","rich_tooltip":true,"tooltipTimeFormat":"smart_date","y_axis_format":"~g","truncateXAxis":true,"y_axis_bounds":[null,null],"extra_form_data":{},"dashboards":[629],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 424
+    type: table
+  force: false
+  form_data:
+    adhoc_filters:
+    - clause: WHERE
+      comparator: No filter
+      datasourceWarning: false
+      expressionType: SIMPLE
+      filterOptionName: filter_utjjqw9427d_5p5ur7mob2
+      isExtra: false
+      isNew: false
+      operator: TEMPORAL_RANGE
+      sqlExpression: null
+      subject: emission_time
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 629
+    datasource: 424__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby:
+    - enrollment_mode
+    legendMargin: null
+    legendOrientation: top
+    legendType: scroll
+    markerEnabled: true
+    markerSize: 6
+    metrics:
+    - number_of_learners
+    only_total: true
+    opacity: 0.2
+    order_desc: true
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    rolling_type: cumsum
+    row_limit: 10000
+    seriesType: line
+    show_empty_columns: true
+    show_extra_controls: false
+    show_legend: true
+    show_value: false
+    slice_id: 439
+    sort_series_type: sum
+    time_grain_sqla: P1M
+    tooltipTimeFormat: smart_date
+    truncateXAxis: true
+    truncate_metric: true
+    viz_type: echarts_area
+    x_axis: emission_time
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: smart_date
+    x_axis_title_margin: 15
+    y_axis_bounds:
+    - null
+    - null
+    y_axis_format: ~g
+    y_axis_title_margin: 15
+    y_axis_title_position: Left
+    zoomable: true
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: emission_time
+      sqlExpression: emission_time
+      timeGrain: P1M
+    - enrollment_mode
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1M
+      where: ''
+    filters:
+    - col: emission_time
+      op: TEMPORAL_RANGE
+      val: No filter
+    metrics:
+    - number_of_learners
+    order_desc: true
+    orderby:
+    - - number_of_learners
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          number_of_learners:
+            operator: mean
+        columns:
+        - enrollment_mode
+        drop_missing_columns: false
+        index:
+        - emission_time
+    - operation: cum
+      options:
+        columns:
+          number_of_learners: number_of_learners
+        operator: sum
+    - operation: rename
+      options:
+        columns:
+          number_of_learners: null
+        inplace: true
+        level: 0
+    - operation: flatten
+    row_limit: 10000
+    series_columns:
+    - enrollment_mode
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Cumulative Enrollments by Track
 uuid: f207c896-030a-462b-b69f-6416230d50b6
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Cumulative_Interactions.yaml

@@ -56,9 +56,124 @@ params:
   y_axis_title_margin: 15
   y_axis_title_position: Left
   zoomable: true
-query_context: '{"datasource":{"id":61,"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":"visited_on","label":"visited_on","expressionType":"SQL"}],"metrics":["views","number_of_learners"],"orderby":[["views",false]],"annotation_layers":[],"row_limit":1000,"series_columns":[],"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"time_offsets":[],"post_processing":[{"operation":"pivot","options":{"index":["visited_on"],"columns":[],"aggregates":{"views":{"operator":"mean"},"number_of_learners":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"cum","options":{"operator":"sum","columns":{"views":"views","number_of_learners":"number_of_learners"}}},{"operation":"flatten"}]}],"form_data":{"datasource":"61__table","viz_type":"echarts_timeseries_line","slice_id":140,"x_axis":"visited_on","time_grain_sqla":"P1M","xAxisForceCategorical":true,"x_axis_sort":"Views","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":["views","number_of_learners"],"groupby":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No
-  filter","expressionType":"SIMPLE","operator":"TEMPORAL_RANGE","subject":"visited_on"}],"order_desc":true,"row_limit":1000,"truncate_metric":true,"show_empty_columns":true,"rolling_type":"cumsum","comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"x_axis_title_margin":15,"y_axis_title_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","sort_series_ascending":true,"color_scheme":"supersetColors","seriesType":"line","show_value":false,"only_total":true,"opacity":0.2,"markerEnabled":true,"markerSize":7,"zoomable":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","legendMargin":null,"x_axis_time_format":"smart_date","rich_tooltip":true,"tooltipTimeFormat":"smart_date","y_axis_format":",d","truncateXAxis":true,"y_axis_bounds":[null,null],"extra_form_data":{},"dashboards":[629],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 61
+    type: table
+  force: false
+  form_data:
+    adhoc_filters:
+    - clause: WHERE
+      comparator: No filter
+      expressionType: SIMPLE
+      operator: TEMPORAL_RANGE
+      subject: visited_on
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 629
+    datasource: 61__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendMargin: null
+    legendOrientation: top
+    legendType: scroll
+    markerEnabled: true
+    markerSize: 7
+    metrics:
+    - views
+    - number_of_learners
+    only_total: true
+    opacity: 0.2
+    order_desc: true
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    rolling_type: cumsum
+    row_limit: 1000
+    seriesType: line
+    show_empty_columns: true
+    show_legend: true
+    show_value: false
+    slice_id: 140
+    sort_series_ascending: true
+    sort_series_type: sum
+    time_grain_sqla: P1M
+    tooltipTimeFormat: smart_date
+    truncateXAxis: true
+    truncate_metric: true
+    viz_type: echarts_timeseries_line
+    xAxisForceCategorical: true
+    x_axis: visited_on
+    x_axis_sort: Views
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: smart_date
+    x_axis_title_margin: 15
+    y_axis_bounds:
+    - null
+    - null
+    y_axis_format: ',d'
+    y_axis_title_margin: 15
+    y_axis_title_position: Left
+    zoomable: true
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: visited_on
+      sqlExpression: visited_on
+      timeGrain: P1M
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1M
+      where: ''
+    filters:
+    - col: visited_on
+      op: TEMPORAL_RANGE
+      val: No filter
+    metrics:
+    - views
+    - number_of_learners
+    order_desc: true
+    orderby:
+    - - views
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          number_of_learners:
+            operator: mean
+          views:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - visited_on
+    - operation: cum
+      options:
+        columns:
+          number_of_learners: number_of_learners
+          views: views
+        operator: sum
+    - operation: flatten
+    row_limit: 1000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Cumulative Interactions
 uuid: c44e43b5-ba69-4805-8d01-3b04dcbf2cb6
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Cumulative_Interactions_at-risk.yaml

@@ -99,20 +99,228 @@ params:
   y_axis_title_margin: 15
   y_axis_title_position: Left
   zoomable: true
-query_context: '{"datasource":{"id":1228,"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":"visited_on","label":"visited_on","expressionType":"SQL"}],"metrics":[{"aggregate":"SUM","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"page_count","description":null,"expression":"","filterable":true,"groupby":true,"id":13997,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"UInt64","type_generic":0,"verbose_name":"Page
-  Count","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Total
-  Views","optionName":"metric_pydx11wjnw_8z80flv3i5f","sqlExpression":null},{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":"","filterable":true,"groupby":true,"id":14001,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Total
-  Learners","optionName":"metric_w4k3yirnsj_hatijp1t74p","sqlExpression":null}],"orderby":[[{"aggregate":"SUM","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"page_count","description":null,"expression":"","filterable":true,"groupby":true,"id":13997,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"UInt64","type_generic":0,"verbose_name":"Page
-  Count","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Total
-  Views","optionName":"metric_pydx11wjnw_8z80flv3i5f","sqlExpression":null},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":["visited_on"],"columns":[],"aggregates":{"Total
-  Views":{"operator":"mean"},"Total Learners":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"1228__table","viz_type":"echarts_timeseries_line","slice_id":2209,"x_axis":"visited_on","time_grain_sqla":"P1M","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":[{"aggregate":"SUM","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"page_count","description":null,"expression":"","filterable":true,"groupby":true,"id":13997,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"UInt64","type_generic":0,"verbose_name":"Page
-  Count","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Total
-  Views","optionName":"metric_pydx11wjnw_8z80flv3i5f","sqlExpression":null},{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":"","filterable":true,"groupby":true,"id":14001,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Total
-  Learners","optionName":"metric_w4k3yirnsj_hatijp1t74p","sqlExpression":null}],"groupby":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No
-  filter","expressionType":"SIMPLE","operator":"TEMPORAL_RANGE","subject":"visited_on"}],"order_desc":true,"row_limit":10000,"truncate_metric":true,"show_empty_columns":true,"comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"x_axis_title_margin":15,"y_axis_title_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","sort_series_ascending":true,"color_scheme":"supersetColors","seriesType":"line","only_total":true,"opacity":0.2,"markerEnabled":true,"markerSize":6,"zoomable":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"smart_date","rich_tooltip":true,"tooltipTimeFormat":"smart_date","y_axis_format":",d","truncateXAxis":true,"y_axis_bounds":[null,null],"extra_form_data":{},"dashboards":[6096],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 1228
+    type: table
+  force: false
+  form_data:
+    adhoc_filters:
+    - clause: WHERE
+      comparator: No filter
+      expressionType: SIMPLE
+      operator: TEMPORAL_RANGE
+      subject: visited_on
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 6096
+    datasource: 1228__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendOrientation: top
+    legendType: scroll
+    markerEnabled: true
+    markerSize: 6
+    metrics:
+    - aggregate: SUM
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: page_count
+        description: null
+        expression: ''
+        filterable: true
+        groupby: true
+        id: 13997
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: UInt64
+        type_generic: 0
+        verbose_name: Page Count
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Total Views
+      optionName: metric_pydx11wjnw_8z80flv3i5f
+      sqlExpression: null
+    - aggregate: COUNT_DISTINCT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: ''
+        filterable: true
+        groupby: true
+        id: 14001
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Total Learners
+      optionName: metric_w4k3yirnsj_hatijp1t74p
+      sqlExpression: null
+    only_total: true
+    opacity: 0.2
+    order_desc: true
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 10000
+    seriesType: line
+    show_empty_columns: true
+    show_legend: true
+    slice_id: 2209
+    sort_series_ascending: true
+    sort_series_type: sum
+    time_grain_sqla: P1M
+    tooltipTimeFormat: smart_date
+    truncateXAxis: true
+    truncate_metric: true
+    viz_type: echarts_timeseries_line
+    x_axis: visited_on
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: smart_date
+    x_axis_title_margin: 15
+    y_axis_bounds:
+    - null
+    - null
+    y_axis_format: ',d'
+    y_axis_title_margin: 15
+    y_axis_title_position: Left
+    zoomable: true
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: visited_on
+      sqlExpression: visited_on
+      timeGrain: P1M
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1M
+      where: ''
+    filters:
+    - col: visited_on
+      op: TEMPORAL_RANGE
+      val: No filter
+    metrics:
+    - aggregate: SUM
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: page_count
+        description: null
+        expression: ''
+        filterable: true
+        groupby: true
+        id: 13997
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: UInt64
+        type_generic: 0
+        verbose_name: Page Count
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Total Views
+      optionName: metric_pydx11wjnw_8z80flv3i5f
+      sqlExpression: null
+    - aggregate: COUNT_DISTINCT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: ''
+        filterable: true
+        groupby: true
+        id: 14001
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Total Learners
+      optionName: metric_w4k3yirnsj_hatijp1t74p
+      sqlExpression: null
+    order_desc: true
+    orderby:
+    - - aggregate: SUM
+        column:
+          advanced_data_type: null
+          certification_details: null
+          certified_by: null
+          column_name: page_count
+          description: null
+          expression: ''
+          filterable: true
+          groupby: true
+          id: 13997
+          is_certified: false
+          is_dttm: false
+          python_date_format: null
+          type: UInt64
+          type_generic: 0
+          verbose_name: Page Count
+          warning_markdown: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: true
+        label: Total Views
+        optionName: metric_pydx11wjnw_8z80flv3i5f
+        sqlExpression: null
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          Total Learners:
+            operator: mean
+          Total Views:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - visited_on
+    - operation: flatten
+    row_limit: 10000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Cumulative Interactions (at-risk)
 uuid: 3a22091f-4686-4a1d-a66d-b36541844b36
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Current_Enrollees.yaml

@@ -28,6 +28,7 @@ params:
     operatorId: IN
     sqlExpression: null
     subject: enrollment_status
+  annotation_layers: []
   conditional_formatting: []
   extra_form_data: {}
   header_font_size: 0.4
@@ -36,9 +37,74 @@ params:
   time_format: smart_date
   viz_type: big_number_total
   y_axis_format: ',d'
-query_context: '{"datasource":{"id":271,"type":"table"},"force":false,"queries":[{"filters":[{"col":"emission_time","op":"TEMPORAL_RANGE","val":"No
-  filter"},{"col":"enrollment_status","op":"IN","val":["registered"]}],"extras":{"having":"","where":""},"applied_time_extras":{},"columns":[],"metrics":["number_of_learners"],"annotation_layers":[],"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{}}],"form_data":{"datasource":"271__table","viz_type":"big_number_total","slice_id":229,"metric":"number_of_learners","adhoc_filters":[{"clause":"WHERE","comparator":"No
-  filter","datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_w289d0y7sjh_5e8k4qfsgou","isExtra":false,"isNew":false,"operator":"TEMPORAL_RANGE","sqlExpression":null,"subject":"emission_time"},{"clause":"WHERE","comparator":["registered"],"datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_ft5qci1uk74_ejjj76o6scl","isExtra":false,"isNew":false,"operator":"IN","operatorId":"IN","sqlExpression":null,"subject":"enrollment_status"}],"header_font_size":0.4,"subheader_font_size":0.2,"y_axis_format":",d","time_format":"smart_date","conditional_formatting":[],"extra_form_data":{},"dashboards":[629],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 271
+    type: table
+  force: false
+  form_data:
+    adhoc_filters:
+    - clause: WHERE
+      comparator: No filter
+      datasourceWarning: false
+      expressionType: SIMPLE
+      filterOptionName: filter_w289d0y7sjh_5e8k4qfsgou
+      isExtra: false
+      isNew: false
+      operator: TEMPORAL_RANGE
+      sqlExpression: null
+      subject: emission_time
+    - clause: WHERE
+      comparator:
+      - registered
+      datasourceWarning: false
+      expressionType: SIMPLE
+      filterOptionName: filter_ft5qci1uk74_ejjj76o6scl
+      isExtra: false
+      isNew: false
+      operator: IN
+      operatorId: IN
+      sqlExpression: null
+      subject: enrollment_status
+    conditional_formatting: []
+    dashboards:
+    - 629
+    datasource: 271__table
+    extra_form_data: {}
+    force: false
+    header_font_size: 0.4
+    metric: number_of_learners
+    result_format: json
+    result_type: full
+    slice_id: 229
+    subheader_font_size: 0.2
+    time_format: smart_date
+    viz_type: big_number_total
+    y_axis_format: ',d'
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns: []
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      where: ''
+    filters:
+    - col: emission_time
+      op: TEMPORAL_RANGE
+      val: No filter
+    - col: enrollment_status
+      op: IN
+      val:
+      - registered
+    metrics:
+    - number_of_learners
+    order_desc: true
+    series_limit: 0
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Current Enrollees
 uuid: 00de2f72-b3ed-4994-b231-fd3cf29d758d
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Distribution_of_Course_Grades.yaml

@@ -67,15 +67,167 @@ params:
   y_axis_title: Number of Learners
   y_axis_title_margin: 30
   y_axis_title_position: Left
-query_context: '{"datasource":{"id":1180,"type":"table"},"force":false,"queries":[{"filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1D","columnType":"BASE_AXIS","sqlExpression":"grade_bucket","label":"grade_bucket","expressionType":"SQL"}],"metrics":[{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_339trgmf439_uyz1qjvy3z9","sqlExpression":null}],"orderby":[[{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_339trgmf439_uyz1qjvy3z9","sqlExpression":null},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":["grade_bucket"],"columns":[],"aggregates":{"Number
-  of Learners":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"1180__table","viz_type":"echarts_timeseries_bar","slice_id":2805,"x_axis":"grade_bucket","time_grain_sqla":"P1D","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":[{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_339trgmf439_uyz1qjvy3z9","sqlExpression":null}],"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":"Grade
-  Bucket","x_axis_title_margin":30,"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,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"smart_date","y_axis_format":"SMART_NUMBER","truncateXAxis":true,"y_axis_bounds":[null,null],"rich_tooltip":true,"tooltipTimeFormat":"smart_date","extra_form_data":{},"dashboards":[6096],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 1180
+    type: table
+  force: false
+  form_data:
+    adhoc_filters: []
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 6096
+    datasource: 1180__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendOrientation: top
+    legendType: scroll
+    metrics:
+    - aggregate: COUNT_DISTINCT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 13538
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Number of Learners
+      optionName: metric_339trgmf439_uyz1qjvy3z9
+      sqlExpression: null
+    only_total: true
+    order_desc: true
+    orientation: vertical
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 10000
+    show_empty_columns: true
+    show_legend: true
+    slice_id: 2805
+    sort_series_type: sum
+    time_grain_sqla: P1D
+    tooltipTimeFormat: smart_date
+    truncateXAxis: true
+    truncate_metric: true
+    viz_type: echarts_timeseries_bar
+    x_axis: grade_bucket
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: smart_date
+    x_axis_title: Grade Bucket
+    x_axis_title_margin: 30
+    y_axis_bounds:
+    - null
+    - null
+    y_axis_format: SMART_NUMBER
+    y_axis_title: Number of Learners
+    y_axis_title_margin: 30
+    y_axis_title_position: Left
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: grade_bucket
+      sqlExpression: grade_bucket
+      timeGrain: P1D
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1D
+      where: ''
+    filters: []
+    metrics:
+    - aggregate: COUNT_DISTINCT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 13538
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Number of Learners
+      optionName: metric_339trgmf439_uyz1qjvy3z9
+      sqlExpression: null
+    order_desc: true
+    orderby:
+    - - aggregate: COUNT_DISTINCT
+        column:
+          advanced_data_type: null
+          certification_details: null
+          certified_by: null
+          column_name: actor_id
+          description: null
+          expression: null
+          filterable: true
+          groupby: true
+          id: 13538
+          is_certified: false
+          is_dttm: false
+          python_date_format: null
+          type: String
+          type_generic: 1
+          verbose_name: Actor ID
+          warning_markdown: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: true
+        label: Number of Learners
+        optionName: metric_339trgmf439_uyz1qjvy3z9
+        sqlExpression: null
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          Number of Learners:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - grade_bucket
+    - operation: flatten
+    row_limit: 10000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Distribution of Course Grades
 uuid: cd3479d8-3574-4b77-9e1e-2ad176989b4d
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Distribution_of_Current_Course_Grade.yaml

@@ -43,7 +43,95 @@ params:
   y_axis_format: SMART_NUMBER
   y_axis_title_margin: 15
   y_axis_title_position: Left
-query_context: '{"datasource":{"id":282,"type":"table"},"force":false,"queries":[{"filters":[],"extras":{"having":"","where":""},"applied_time_extras":{},"columns":[{"columnType":"BASE_AXIS","sqlExpression":"grade_bucket","label":"grade_bucket","expressionType":"SQL"}],"metrics":["number_of_learners"],"orderby":[["number_of_learners",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":["grade_bucket"],"columns":[],"aggregates":{"number_of_learners":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"282__table","viz_type":"echarts_timeseries_bar","slice_id":532,"x_axis":"grade_bucket","xAxisForceCategorical":false,"x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":["number_of_learners"],"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_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","show_value":true,"only_total":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"smart_date","y_axis_format":"SMART_NUMBER","truncateXAxis":true,"y_axis_bounds":[null,null],"rich_tooltip":true,"tooltipTimeFormat":"smart_date","extra_form_data":{},"dashboards":[629],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 282
+    type: table
+  force: false
+  form_data:
+    adhoc_filters: []
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 629
+    datasource: 282__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendOrientation: top
+    legendType: scroll
+    metrics:
+    - number_of_learners
+    only_total: true
+    order_desc: true
+    orientation: vertical
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 10000
+    show_empty_columns: true
+    show_legend: true
+    show_value: true
+    slice_id: 532
+    sort_series_type: sum
+    tooltipTimeFormat: smart_date
+    truncateXAxis: true
+    truncate_metric: true
+    viz_type: echarts_timeseries_bar
+    xAxisForceCategorical: false
+    x_axis: grade_bucket
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: smart_date
+    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
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: grade_bucket
+      sqlExpression: grade_bucket
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      where: ''
+    filters: []
+    metrics:
+    - number_of_learners
+    order_desc: true
+    orderby:
+    - - number_of_learners
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          number_of_learners:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - grade_bucket
+    - operation: flatten
+    row_limit: 10000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Distribution of Current Course Grade
 uuid: ea565658-6796-40e8-9d1e-01ffd0778bc9
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollees_per_Enrollment_Track.yaml

@@ -65,9 +65,124 @@ params:
   y_axis_format: ',d'
   y_axis_title_margin: 15
   y_axis_title_position: Left
-query_context: '{"datasource":{"id":424,"type":"table"},"force":false,"queries":[{"filters":[{"col":"emission_time","op":"TEMPORAL_RANGE","val":"No
-  filter"},{"col":"enrollment_status","op":"IN","val":["registered"]}],"extras":{"having":"","where":""},"applied_time_extras":{},"columns":[{"columnType":"BASE_AXIS","sqlExpression":"enrollment_mode","label":"enrollment_mode","expressionType":"SQL"}],"metrics":["number_of_learners"],"orderby":[["number_of_learners",false]],"annotation_layers":[],"row_limit":100,"series_columns":[],"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"time_offsets":[],"post_processing":[{"operation":"pivot","options":{"index":["enrollment_mode"],"columns":[],"aggregates":{"number_of_learners":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"424__table","viz_type":"echarts_timeseries_bar","slice_id":120,"x_axis":"enrollment_mode","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":["number_of_learners"],"groupby":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No
-  filter","datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_3lacmmheoza_5bcm089g49o","isExtra":false,"isNew":false,"operator":"TEMPORAL_RANGE","sqlExpression":null,"subject":"emission_time"},{"clause":"WHERE","comparator":["registered"],"datasourceWarning":false,"expressionType":"SIMPLE","filterOptionName":"filter_qttcfymcil_aplt776mxl","isExtra":false,"isNew":false,"operator":"IN","operatorId":"IN","sqlExpression":null,"subject":"enrollment_status"}],"order_desc":true,"row_limit":100,"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_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","show_value":true,"only_total":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","legendMargin":null,"x_axis_time_format":"smart_date","y_axis_format":",d","truncateXAxis":true,"y_axis_bounds":[null,null],"rich_tooltip":true,"tooltipTimeFormat":"smart_date","extra_form_data":{},"dashboards":[629],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 424
+    type: table
+  force: false
+  form_data:
+    adhoc_filters:
+    - clause: WHERE
+      comparator: No filter
+      datasourceWarning: false
+      expressionType: SIMPLE
+      filterOptionName: filter_3lacmmheoza_5bcm089g49o
+      isExtra: false
+      isNew: false
+      operator: TEMPORAL_RANGE
+      sqlExpression: null
+      subject: emission_time
+    - clause: WHERE
+      comparator:
+      - registered
+      datasourceWarning: false
+      expressionType: SIMPLE
+      filterOptionName: filter_qttcfymcil_aplt776mxl
+      isExtra: false
+      isNew: false
+      operator: IN
+      operatorId: IN
+      sqlExpression: null
+      subject: enrollment_status
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 629
+    datasource: 424__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendMargin: null
+    legendOrientation: top
+    legendType: scroll
+    metrics:
+    - number_of_learners
+    only_total: true
+    order_desc: true
+    orientation: vertical
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 100
+    show_empty_columns: true
+    show_legend: true
+    show_value: true
+    slice_id: 120
+    sort_series_type: sum
+    tooltipTimeFormat: smart_date
+    truncateXAxis: true
+    truncate_metric: true
+    viz_type: echarts_timeseries_bar
+    x_axis: enrollment_mode
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: smart_date
+    x_axis_title_margin: 15
+    y_axis_bounds:
+    - null
+    - null
+    y_axis_format: ',d'
+    y_axis_title_margin: 15
+    y_axis_title_position: Left
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: enrollment_mode
+      sqlExpression: enrollment_mode
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      where: ''
+    filters:
+    - col: emission_time
+      op: TEMPORAL_RANGE
+      val: No filter
+    - col: enrollment_status
+      op: IN
+      val:
+      - registered
+    metrics:
+    - number_of_learners
+    order_desc: true
+    orderby:
+    - - number_of_learners
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          number_of_learners:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - enrollment_mode
+    - operation: flatten
+    row_limit: 100
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Enrollees per Enrollment Track
 uuid: e584199e-0ed6-42bf-afb9-db3b9fe4132b
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Event_Activity.yaml

@@ -60,9 +60,131 @@ params:
   y_axis_title_margin: 15
   y_axis_title_position: Left
   zoomable: true
-query_context: '{"datasource":{"id":830,"type":"table"},"force":false,"queries":[{"filters":[{"col":"emission_hour","op":"TEMPORAL_RANGE","val":"No
-  filter"}],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1D","columnType":"BASE_AXIS","sqlExpression":"emission_hour","label":"emission_hour","expressionType":"SQL"}],"metrics":[{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":false,"label":"uniqCombinedMerge(events_cnt)","optionName":"metric_7kfvvdo0026_su07rkgdx7","sqlExpression":"uniqCombinedMerge(events_cnt)"}],"orderby":[[{"aggregate":null,"column":null,"datasourceWarning":false,"expressionType":"SQL","hasCustomLabel":false,"label":"uniqCombinedMerge(events_cnt)","optionName":"metric_7kfvvdo0026_su07rkgdx7","sqlExpression":"uniqCombinedMerge(events_cnt)"},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":["emission_hour"],"columns":[],"aggregates":{"uniqCombinedMerge(events_cnt)":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"830__table","viz_type":"echarts_timeseries_line","slice_id":3401,"x_axis":"emission_hour","time_grain_sqla":"P1D","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":false,"label":"uniqCombinedMerge(events_cnt)","optionName":"metric_7kfvvdo0026_su07rkgdx7","sqlExpression":"uniqCombinedMerge(events_cnt)"}],"groupby":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No
-  filter","expressionType":"SIMPLE","operator":"TEMPORAL_RANGE","subject":"emission_hour"}],"order_desc":true,"row_limit":10000,"truncate_metric":false,"show_empty_columns":true,"comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"x_axis_title_margin":15,"y_axis_title_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","seriesType":"line","show_value":false,"only_total":true,"opacity":0.2,"markerEnabled":false,"markerSize":6,"zoomable":true,"show_legend":false,"legendType":"scroll","legendOrientation":"top","legendMargin":null,"x_axis_time_format":"%Y-%m-%d","rich_tooltip":true,"tooltipTimeFormat":"smart_date","y_axis_format":"SMART_NUMBER","truncateXAxis":false,"y_axis_bounds":[null,null],"extra_form_data":{},"dashboards":[2422],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 830
+    type: table
+  force: false
+  form_data:
+    adhoc_filters:
+    - clause: WHERE
+      comparator: No filter
+      expressionType: SIMPLE
+      operator: TEMPORAL_RANGE
+      subject: emission_hour
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 2422
+    datasource: 830__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendMargin: null
+    legendOrientation: top
+    legendType: scroll
+    markerEnabled: false
+    markerSize: 6
+    metrics:
+    - aggregate: null
+      column: null
+      datasourceWarning: false
+      expressionType: SQL
+      hasCustomLabel: false
+      label: uniqCombinedMerge(events_cnt)
+      optionName: metric_7kfvvdo0026_su07rkgdx7
+      sqlExpression: uniqCombinedMerge(events_cnt)
+    only_total: true
+    opacity: 0.2
+    order_desc: true
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 10000
+    seriesType: line
+    show_empty_columns: true
+    show_legend: false
+    show_value: false
+    slice_id: 3401
+    sort_series_type: sum
+    time_grain_sqla: P1D
+    tooltipTimeFormat: smart_date
+    truncateXAxis: false
+    truncate_metric: false
+    viz_type: echarts_timeseries_line
+    x_axis: emission_hour
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: '%Y-%m-%d'
+    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: true
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: emission_hour
+      sqlExpression: emission_hour
+      timeGrain: P1D
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1D
+      where: ''
+    filters:
+    - col: emission_hour
+      op: TEMPORAL_RANGE
+      val: No filter
+    metrics:
+    - aggregate: null
+      column: null
+      datasourceWarning: false
+      expressionType: SQL
+      hasCustomLabel: false
+      label: uniqCombinedMerge(events_cnt)
+      optionName: metric_7kfvvdo0026_su07rkgdx7
+      sqlExpression: uniqCombinedMerge(events_cnt)
+    order_desc: true
+    orderby:
+    - - aggregate: null
+        column: null
+        datasourceWarning: false
+        expressionType: SQL
+        hasCustomLabel: false
+        label: uniqCombinedMerge(events_cnt)
+        optionName: metric_7kfvvdo0026_su07rkgdx7
+        sqlExpression: uniqCombinedMerge(events_cnt)
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          uniqCombinedMerge(events_cnt):
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - emission_hour
+    - operation: flatten
+    row_limit: 10000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Event Activity
 uuid: abc9bf92-2b32-42a5-8cd0-d383de777619
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Evolution_of_Engagement_at-risk.yaml

@@ -99,20 +99,228 @@ params:
   y_axis_title_margin: 15
   y_axis_title_position: Left
   zoomable: true
-query_context: '{"datasource":{"id":1228,"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":"visited_on","label":"visited_on","expressionType":"SQL"}],"metrics":[{"aggregate":"SUM","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"page_count","description":null,"expression":"","filterable":true,"groupby":true,"id":13997,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"UInt64","type_generic":0,"verbose_name":"Page
-  Count","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Total
-  Views","optionName":"metric_b6ne4x0igqc_ggxaomlidqn","sqlExpression":null},{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":"","filterable":true,"groupby":true,"id":14001,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Total
-  Learners","optionName":"metric_h6pmq3ijrfp_ei6cfisqim","sqlExpression":null}],"orderby":[[{"aggregate":"SUM","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"page_count","description":null,"expression":"","filterable":true,"groupby":true,"id":13997,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"UInt64","type_generic":0,"verbose_name":"Page
-  Count","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Total
-  Views","optionName":"metric_b6ne4x0igqc_ggxaomlidqn","sqlExpression":null},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":["visited_on"],"columns":[],"aggregates":{"Total
-  Views":{"operator":"mean"},"Total Learners":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"1228__table","viz_type":"echarts_timeseries_line","slice_id":2211,"x_axis":"visited_on","time_grain_sqla":"P1M","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":[{"aggregate":"SUM","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"page_count","description":null,"expression":"","filterable":true,"groupby":true,"id":13997,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"UInt64","type_generic":0,"verbose_name":"Page
-  Count","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Total
-  Views","optionName":"metric_b6ne4x0igqc_ggxaomlidqn","sqlExpression":null},{"aggregate":"COUNT_DISTINCT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":"","filterable":true,"groupby":true,"id":14001,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Total
-  Learners","optionName":"metric_h6pmq3ijrfp_ei6cfisqim","sqlExpression":null}],"groupby":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No
-  filter","expressionType":"SIMPLE","operator":"TEMPORAL_RANGE","subject":"visited_on"}],"order_desc":true,"row_limit":10000,"truncate_metric":true,"show_empty_columns":true,"comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"x_axis_title_margin":15,"y_axis_title_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","sort_series_ascending":true,"color_scheme":"supersetColors","seriesType":"line","only_total":true,"opacity":0.2,"markerEnabled":true,"markerSize":6,"zoomable":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"smart_date","rich_tooltip":true,"tooltipTimeFormat":"smart_date","y_axis_format":",d","truncateXAxis":true,"y_axis_bounds":[null,null],"extra_form_data":{},"dashboards":[6096],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 1228
+    type: table
+  force: false
+  form_data:
+    adhoc_filters:
+    - clause: WHERE
+      comparator: No filter
+      expressionType: SIMPLE
+      operator: TEMPORAL_RANGE
+      subject: visited_on
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 6096
+    datasource: 1228__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendOrientation: top
+    legendType: scroll
+    markerEnabled: true
+    markerSize: 6
+    metrics:
+    - aggregate: SUM
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: page_count
+        description: null
+        expression: ''
+        filterable: true
+        groupby: true
+        id: 13997
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: UInt64
+        type_generic: 0
+        verbose_name: Page Count
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Total Views
+      optionName: metric_b6ne4x0igqc_ggxaomlidqn
+      sqlExpression: null
+    - aggregate: COUNT_DISTINCT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: ''
+        filterable: true
+        groupby: true
+        id: 14001
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Total Learners
+      optionName: metric_h6pmq3ijrfp_ei6cfisqim
+      sqlExpression: null
+    only_total: true
+    opacity: 0.2
+    order_desc: true
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 10000
+    seriesType: line
+    show_empty_columns: true
+    show_legend: true
+    slice_id: 2211
+    sort_series_ascending: true
+    sort_series_type: sum
+    time_grain_sqla: P1M
+    tooltipTimeFormat: smart_date
+    truncateXAxis: true
+    truncate_metric: true
+    viz_type: echarts_timeseries_line
+    x_axis: visited_on
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: smart_date
+    x_axis_title_margin: 15
+    y_axis_bounds:
+    - null
+    - null
+    y_axis_format: ',d'
+    y_axis_title_margin: 15
+    y_axis_title_position: Left
+    zoomable: true
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: visited_on
+      sqlExpression: visited_on
+      timeGrain: P1M
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1M
+      where: ''
+    filters:
+    - col: visited_on
+      op: TEMPORAL_RANGE
+      val: No filter
+    metrics:
+    - aggregate: SUM
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: page_count
+        description: null
+        expression: ''
+        filterable: true
+        groupby: true
+        id: 13997
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: UInt64
+        type_generic: 0
+        verbose_name: Page Count
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Total Views
+      optionName: metric_b6ne4x0igqc_ggxaomlidqn
+      sqlExpression: null
+    - aggregate: COUNT_DISTINCT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: ''
+        filterable: true
+        groupby: true
+        id: 14001
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Total Learners
+      optionName: metric_h6pmq3ijrfp_ei6cfisqim
+      sqlExpression: null
+    order_desc: true
+    orderby:
+    - - aggregate: SUM
+        column:
+          advanced_data_type: null
+          certification_details: null
+          certified_by: null
+          column_name: page_count
+          description: null
+          expression: ''
+          filterable: true
+          groupby: true
+          id: 13997
+          is_certified: false
+          is_dttm: false
+          python_date_format: null
+          type: UInt64
+          type_generic: 0
+          verbose_name: Page Count
+          warning_markdown: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: true
+        label: Total Views
+        optionName: metric_b6ne4x0igqc_ggxaomlidqn
+        sqlExpression: null
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          Total Learners:
+            operator: mean
+          Total Views:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - visited_on
+    - operation: flatten
+    row_limit: 10000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Evolution of Engagement (at-risk)
 uuid: ffa98e7f-7bed-4435-a1c1-472a46a4d269
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Evolution_of_engagement.yaml

@@ -54,9 +54,116 @@ params:
   y_axis_title_margin: 15
   y_axis_title_position: Left
   zoomable: true
-query_context: '{"datasource":{"id":61,"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":"visited_on","label":"visited_on","expressionType":"SQL"}],"metrics":["number_of_learners","views"],"orderby":[["number_of_learners",false]],"annotation_layers":[],"row_limit":1000,"series_columns":[],"series_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{},"time_offsets":[],"post_processing":[{"operation":"pivot","options":{"index":["visited_on"],"columns":[],"aggregates":{"number_of_learners":{"operator":"mean"},"views":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"61__table","viz_type":"echarts_timeseries_line","slice_id":345,"x_axis":"visited_on","time_grain_sqla":"P1M","xAxisForceCategorical":true,"x_axis_sort":"Views","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":["number_of_learners","views"],"groupby":[],"adhoc_filters":[{"clause":"WHERE","comparator":"No
-  filter","expressionType":"SIMPLE","operator":"TEMPORAL_RANGE","subject":"visited_on"}],"order_desc":true,"row_limit":1000,"truncate_metric":true,"show_empty_columns":true,"comparison_type":"values","annotation_layers":[],"forecastPeriods":10,"forecastInterval":0.8,"x_axis_title_margin":15,"y_axis_title_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","sort_series_ascending":true,"color_scheme":"supersetColors","seriesType":"line","show_value":false,"only_total":true,"opacity":0.2,"markerEnabled":true,"markerSize":6,"zoomable":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"smart_date","rich_tooltip":true,"tooltipTimeFormat":"smart_date","y_axis_format":",d","truncateXAxis":true,"y_axis_bounds":[null,null],"extra_form_data":{},"dashboards":[629],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 61
+    type: table
+  force: false
+  form_data:
+    adhoc_filters:
+    - clause: WHERE
+      comparator: No filter
+      expressionType: SIMPLE
+      operator: TEMPORAL_RANGE
+      subject: visited_on
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 629
+    datasource: 61__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendOrientation: top
+    legendType: scroll
+    markerEnabled: true
+    markerSize: 6
+    metrics:
+    - number_of_learners
+    - views
+    only_total: true
+    opacity: 0.2
+    order_desc: true
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 1000
+    seriesType: line
+    show_empty_columns: true
+    show_legend: true
+    show_value: false
+    slice_id: 345
+    sort_series_ascending: true
+    sort_series_type: sum
+    time_grain_sqla: P1M
+    tooltipTimeFormat: smart_date
+    truncateXAxis: true
+    truncate_metric: true
+    viz_type: echarts_timeseries_line
+    xAxisForceCategorical: true
+    x_axis: visited_on
+    x_axis_sort: Views
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: smart_date
+    x_axis_title_margin: 15
+    y_axis_bounds:
+    - null
+    - null
+    y_axis_format: ',d'
+    y_axis_title_margin: 15
+    y_axis_title_position: Left
+    zoomable: true
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: visited_on
+      sqlExpression: visited_on
+      timeGrain: P1M
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1M
+      where: ''
+    filters:
+    - col: visited_on
+      op: TEMPORAL_RANGE
+      val: No filter
+    metrics:
+    - number_of_learners
+    - views
+    order_desc: true
+    orderby:
+    - - number_of_learners
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          number_of_learners:
+            operator: mean
+          views:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - visited_on
+    - operation: flatten
+    row_limit: 1000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Evolution of engagement
 uuid: d3ae0546-37a8-4841-a57b-8087a6c33049
 version: 1.0.0

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Last_visit_date.yaml

@@ -67,15 +67,167 @@ params:
   y_axis_format: SMART_NUMBER
   y_axis_title_margin: 15
   y_axis_title_position: Left
-query_context: '{"datasource":{"id":1180,"type":"table"},"force":false,"queries":[{"filters":[],"extras":{"time_grain_sqla":"P1D","having":"","where":""},"applied_time_extras":{},"columns":[{"timeGrain":"P1D","columnType":"BASE_AXIS","sqlExpression":"last_visited","label":"last_visited","expressionType":"SQL"}],"metrics":[{"aggregate":"COUNT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_orthejcnotd_6ealxq45fqk","sqlExpression":null}],"orderby":[[{"aggregate":"COUNT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_orthejcnotd_6ealxq45fqk","sqlExpression":null},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":["last_visited"],"columns":[],"aggregates":{"Number
-  of Learners":{"operator":"mean"}},"drop_missing_columns":false}},{"operation":"flatten"}]}],"form_data":{"datasource":"1180__table","viz_type":"echarts_timeseries_bar","slice_id":2148,"x_axis":"last_visited","time_grain_sqla":"P1D","x_axis_sort_asc":true,"x_axis_sort_series":"name","x_axis_sort_series_ascending":true,"metrics":[{"aggregate":"COUNT","column":{"advanced_data_type":null,"certification_details":null,"certified_by":null,"column_name":"actor_id","description":null,"expression":null,"filterable":true,"groupby":true,"id":13538,"is_certified":false,"is_dttm":false,"python_date_format":null,"type":"String","type_generic":1,"verbose_name":"Actor
-  ID","warning_markdown":null},"datasourceWarning":false,"expressionType":"SIMPLE","hasCustomLabel":true,"label":"Number
-  of Learners","optionName":"metric_orthejcnotd_6ealxq45fqk","sqlExpression":null}],"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":"Date
-  visited","x_axis_title_margin":100,"y_axis_title_margin":15,"y_axis_title_position":"Left","sort_series_type":"sum","color_scheme":"supersetColors","only_total":true,"show_legend":true,"legendType":"scroll","legendOrientation":"top","x_axis_time_format":"%Y-%m-%d","xAxisLabelRotation":45,"y_axis_format":"SMART_NUMBER","truncateXAxis":true,"y_axis_bounds":[null,null],"rich_tooltip":true,"tooltipTimeFormat":"smart_date","extra_form_data":{},"dashboards":[6096],"force":false,"result_format":"json","result_type":"full"},"result_format":"json","result_type":"full"}'
+query_context:
+  datasource:
+    id: 1180
+    type: table
+  force: false
+  form_data:
+    adhoc_filters: []
+    annotation_layers: []
+    color_scheme: supersetColors
+    comparison_type: values
+    dashboards:
+    - 6096
+    datasource: 1180__table
+    extra_form_data: {}
+    force: false
+    forecastInterval: 0.8
+    forecastPeriods: 10
+    groupby: []
+    legendOrientation: top
+    legendType: scroll
+    metrics:
+    - aggregate: COUNT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 13538
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Number of Learners
+      optionName: metric_orthejcnotd_6ealxq45fqk
+      sqlExpression: null
+    only_total: true
+    order_desc: true
+    orientation: vertical
+    result_format: json
+    result_type: full
+    rich_tooltip: true
+    row_limit: 10000
+    show_empty_columns: true
+    show_legend: true
+    slice_id: 2148
+    sort_series_type: sum
+    time_grain_sqla: P1D
+    tooltipTimeFormat: smart_date
+    truncateXAxis: true
+    truncate_metric: true
+    viz_type: echarts_timeseries_bar
+    xAxisLabelRotation: 45
+    x_axis: last_visited
+    x_axis_sort_asc: true
+    x_axis_sort_series: name
+    x_axis_sort_series_ascending: true
+    x_axis_time_format: '%Y-%m-%d'
+    x_axis_title: Date visited
+    x_axis_title_margin: 100
+    y_axis_bounds:
+    - null
+    - null
+    y_axis_format: SMART_NUMBER
+    y_axis_title_margin: 15
+    y_axis_title_position: Left
+  queries:
+  - annotation_layers: []
+    applied_time_extras: {}
+    columns:
+    - columnType: BASE_AXIS
+      expressionType: SQL
+      label: last_visited
+      sqlExpression: last_visited
+      timeGrain: P1D
+    custom_form_data: {}
+    custom_params: {}
+    extras:
+      having: ''
+      time_grain_sqla: P1D
+      where: ''
+    filters: []
+    metrics:
+    - aggregate: COUNT
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: actor_id
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 13538
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: String
+        type_generic: 1
+        verbose_name: Actor ID
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Number of Learners
+      optionName: metric_orthejcnotd_6ealxq45fqk
+      sqlExpression: null
+    order_desc: true
+    orderby:
+    - - aggregate: COUNT
+        column:
+          advanced_data_type: null
+          certification_details: null
+          certified_by: null
+          column_name: actor_id
+          description: null
+          expression: null
+          filterable: true
+          groupby: true
+          id: 13538
+          is_certified: false
+          is_dttm: false
+          python_date_format: null
+          type: String
+          type_generic: 1
+          verbose_name: Actor ID
+          warning_markdown: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: true
+        label: Number of Learners
+        optionName: metric_orthejcnotd_6ealxq45fqk
+        sqlExpression: null
+      - false
+    post_processing:
+    - operation: pivot
+      options:
+        aggregates:
+          Number of Learners:
+            operator: mean
+        columns: []
+        drop_missing_columns: false
+        index:
+        - last_visited
+    - operation: flatten
+    row_limit: 10000
+    series_columns: []
+    series_limit: 0
+    time_offsets: []
+    url_params: {}
+  result_format: json
+  result_type: full
 slice_name: Last visit date
 uuid: 6c2b1008-96c9-426d-b2fe-68aa1de7b10d
 version: 1.0.0