diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_7eaf5b.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_7eaf5b.yaml index 012fd94d..c44538ee 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_7eaf5b.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_7eaf5b.yaml @@ -12,7 +12,6 @@ params: operator: TEMPORAL_RANGE subject: emission_time aggregateFunction: Sum - annotation_layers: [] colOrder: key_a_to_z colSubTotals: false conditional_formatting: [] @@ -22,6 +21,7 @@ params: - enrollment_mode groupbyRows: - course_name + - org metrics: - enrollees metricsLayout: COLUMNS @@ -29,12 +29,11 @@ params: rowOrder: key_a_to_z row_limit: 10000 temporal_columns_lookup: {} - time_grain_sqla: P1D valueFormat: SMART_NUMBER viz_type: pivot_table_v2 query_context: datasource: - id: 221 + id: 261 type: table force: false form_data: @@ -49,8 +48,8 @@ query_context: colSubTotals: false conditional_formatting: [] dashboards: - - 3141 - datasource: 221__table + - 1111 + datasource: 261__table date_format: smart_date extra_form_data: {} force: false @@ -58,6 +57,7 @@ query_context: - enrollment_mode groupbyRows: - course_name + - org metrics: - enrollees metricsLayout: COLUMNS @@ -68,7 +68,6 @@ query_context: row_limit: 10000 slice_id: 161 temporal_columns_lookup: {} - time_grain_sqla: P1D valueFormat: SMART_NUMBER viz_type: pivot_table_v2 queries: @@ -77,11 +76,11 @@ query_context: columns: - enrollment_mode - course_name + - org custom_form_data: {} custom_params: {} extras: having: '' - time_grain_sqla: P1D where: '' filters: - col: emission_time diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_8230a3.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_8230a3.yaml index 11e2b3e3..b9b1407a 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_8230a3.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_8230a3.yaml @@ -12,7 +12,6 @@ params: operator: TEMPORAL_RANGE subject: emission_time aggregateFunction: Sum - annotation_layers: [] colOrder: key_a_to_z colSubTotals: false conditional_formatting: [] @@ -22,6 +21,7 @@ params: - enrollment_mode groupbyRows: - course_run + - course_name metrics: - enrollees metricsLayout: COLUMNS @@ -29,12 +29,11 @@ params: rowOrder: key_a_to_z row_limit: 50000 temporal_columns_lookup: {} - time_grain_sqla: P1D valueFormat: SMART_NUMBER viz_type: pivot_table_v2 query_context: datasource: - id: 221 + id: 261 type: table force: false form_data: @@ -49,8 +48,8 @@ query_context: colSubTotals: false conditional_formatting: [] dashboards: - - 3141 - datasource: 221__table + - 1111 + datasource: 261__table date_format: smart_date extra_form_data: {} force: false @@ -58,6 +57,7 @@ query_context: - enrollment_mode groupbyRows: - course_run + - course_name metrics: - enrollees metricsLayout: COLUMNS @@ -66,9 +66,8 @@ query_context: result_type: full rowOrder: key_a_to_z row_limit: 50000 - slice_id: 1081 + slice_id: 1141 temporal_columns_lookup: {} - time_grain_sqla: P1D valueFormat: SMART_NUMBER viz_type: pivot_table_v2 queries: @@ -77,11 +76,11 @@ query_context: columns: - enrollment_mode - course_run + - course_name custom_form_data: {} custom_params: {} extras: having: '' - time_grain_sqla: P1D where: '' filters: - col: emission_time diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_b73b0a.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_b73b0a.yaml index 36bf9a8d..94e9a943 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_b73b0a.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_b73b0a.yaml @@ -26,6 +26,7 @@ params: - active - at_risk minorTicks: false + only_total: true orientation: horizontal rich_tooltip: false row_limit: 10 @@ -40,16 +41,22 @@ params: truncate_metric: false viz_type: echarts_timeseries_bar xAxisLabelRotation: 0 - x_axis: course_name + x_axis: name_org x_axis_sort_series: sum x_axis_sort_series_ascending: false x_axis_time_format: smart_date x_axis_title: '' x_axis_title_margin: 15 + y_axis_bounds: + - null + - null + y_axis_format: SMART_NUMBER + y_axis_title_margin: 15 + y_axis_title_position: Left zoomable: false query_context: datasource: - id: 464 + id: 504 type: table force: false form_data: @@ -63,8 +70,8 @@ query_context: color_scheme: supersetColors contributionMode: null dashboards: - - 3441 - datasource: 464__table + - 1111 + datasource: 504__table extra_form_data: {} force: false groupby: [] @@ -77,6 +84,7 @@ query_context: - active - at_risk minorTicks: false + only_total: true orientation: horizontal result_format: json result_type: full @@ -85,7 +93,7 @@ query_context: show_empty_columns: false show_legend: true show_value: false - slice_id: 1504 + slice_id: 461 sort_series_ascending: true sort_series_type: name stack: null @@ -94,12 +102,18 @@ query_context: truncate_metric: false viz_type: echarts_timeseries_bar xAxisLabelRotation: 0 - x_axis: course_name + x_axis: name_org x_axis_sort_series: sum x_axis_sort_series_ascending: false x_axis_time_format: smart_date x_axis_title: '' x_axis_title_margin: 15 + y_axis_bounds: + - null + - null + y_axis_format: SMART_NUMBER + y_axis_title_margin: 15 + y_axis_title_position: Left zoomable: false queries: - annotation_layers: [] @@ -107,8 +121,8 @@ query_context: columns: - columnType: BASE_AXIS expressionType: SQL - label: course_name - sqlExpression: course_name + label: name_org + sqlExpression: name_org custom_form_data: {} custom_params: {} extras: @@ -142,7 +156,7 @@ query_context: columns: [] drop_missing_columns: true index: - - course_name + - name_org - operation: flatten row_limit: 10 series_columns: [] diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_d414b1.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_d414b1.yaml index 43f8b460..51e2fe0c 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_d414b1.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Learner_Performance_Breakdown_d414b1.yaml @@ -9,13 +9,8 @@ params: adhoc_filters: - clause: WHERE comparator: No filter - datasourceWarning: false expressionType: SIMPLE - filterOptionName: filter_noj2mkjbumn_edkgbebkld8 - isExtra: false - isNew: false operator: TEMPORAL_RANGE - sqlExpression: null subject: enrolled_at annotation_layers: [] color_scheme: supersetColors @@ -31,6 +26,7 @@ params: - at_risk - active minorTicks: false + only_total: true orientation: horizontal rich_tooltip: false row_limit: 10 @@ -40,42 +36,42 @@ params: sort_series_ascending: true sort_series_type: name stack: null - timeseries_limit_metric: null tooltipTimeFormat: smart_date truncateXAxis: false truncate_metric: true viz_type: echarts_timeseries_bar xAxisLabelRotation: 0 - x_axis: course_run + x_axis: run_name x_axis_sort_series: name x_axis_sort_series_ascending: true x_axis_time_format: smart_date x_axis_title: '' x_axis_title_margin: 15 + y_axis_bounds: + - null + - null + y_axis_format: SMART_NUMBER + y_axis_title_margin: 15 + y_axis_title_position: Left zoomable: false query_context: datasource: - id: 464 + id: 504 type: table force: false form_data: adhoc_filters: - clause: WHERE comparator: No filter - datasourceWarning: false expressionType: SIMPLE - filterOptionName: filter_noj2mkjbumn_edkgbebkld8 - isExtra: false - isNew: false operator: TEMPORAL_RANGE - sqlExpression: null subject: enrolled_at annotation_layers: [] color_scheme: supersetColors contributionMode: null dashboards: - - 3441 - datasource: 464__table + - 1111 + datasource: 504__table extra_form_data: {} force: false groupby: [] @@ -88,6 +84,7 @@ query_context: - at_risk - active minorTicks: false + only_total: true orientation: horizontal result_format: json result_type: full @@ -96,22 +93,27 @@ query_context: show_empty_columns: false show_legend: true show_value: false - slice_id: 1505 + slice_id: 101 sort_series_ascending: true sort_series_type: name stack: null - timeseries_limit_metric: null tooltipTimeFormat: smart_date truncateXAxis: false truncate_metric: true viz_type: echarts_timeseries_bar xAxisLabelRotation: 0 - x_axis: course_run + x_axis: run_name x_axis_sort_series: name x_axis_sort_series_ascending: true x_axis_time_format: smart_date x_axis_title: '' x_axis_title_margin: 15 + y_axis_bounds: + - null + - null + y_axis_format: SMART_NUMBER + y_axis_title_margin: 15 + y_axis_title_position: Left zoomable: false queries: - annotation_layers: [] @@ -119,8 +121,8 @@ query_context: columns: - columnType: BASE_AXIS expressionType: SQL - label: course_run - sqlExpression: course_run + label: run_name + sqlExpression: run_name custom_form_data: {} custom_params: {} extras: @@ -154,7 +156,7 @@ query_context: columns: [] drop_missing_columns: true index: - - course_run + - run_name - operation: flatten row_limit: 10 series_columns: [] diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Comparison_Dashboard.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Comparison_Dashboard.yaml index 3556f7f6..bf2690c5 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Comparison_Dashboard.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/Course_Comparison_Dashboard.yaml @@ -8,146 +8,146 @@ dashboard_title: Course Comparison Dashboard description: null metadata: chart_configuration: - '1154': + '101': crossFilters: chartsInScope: - - 314 - - 399 - - 407 - - 422 - - 757 - - 776 - - 963 - - 1252 - - 1407 + - 61 + - 161 + - 201 + - 461 + - 541 + - 641 + - 1121 + - 1141 + - 1461 scope: global - id: 1154 - '1252': + id: 101 + '1121': crossFilters: chartsInScope: - - 314 - - 399 - - 407 - - 422 - - 757 - - 776 - - 963 - - 1154 - - 1407 + - 61 + - 101 + - 161 + - 201 + - 461 + - 541 + - 641 + - 1141 + - 1461 scope: global - id: 1252 - '1407': + id: 1121 + '1141': crossFilters: chartsInScope: - - 314 - - 399 - - 407 - - 422 - - 757 - - 776 - - 963 - - 1154 - - 1252 + - 61 + - 101 + - 161 + - 201 + - 461 + - 541 + - 641 + - 1121 + - 1461 scope: global - id: 1407 - '314': + id: 1141 + '1461': crossFilters: chartsInScope: - - 399 - - 407 - - 422 - - 757 - - 776 - - 963 - - 1154 - - 1252 - - 1407 + - 61 + - 101 + - 161 + - 201 + - 461 + - 541 + - 641 + - 1121 + - 1141 scope: global - id: 314 - '399': + id: 1461 + '161': crossFilters: chartsInScope: - - 314 - - 407 - - 422 - - 757 - - 776 - - 963 - - 1154 - - 1252 - - 1407 + - 61 + - 101 + - 201 + - 461 + - 541 + - 641 + - 1121 + - 1141 + - 1461 scope: global - id: 399 - '407': + id: 161 + '201': crossFilters: chartsInScope: - - 314 - - 399 - - 422 - - 757 - - 776 - - 963 - - 1154 - - 1252 - - 1407 + - 61 + - 101 + - 161 + - 461 + - 541 + - 641 + - 1121 + - 1141 + - 1461 scope: global - id: 407 - '422': + id: 201 + '461': crossFilters: chartsInScope: - - 314 - - 399 - - 407 - - 757 - - 776 - - 963 - - 1154 - - 1252 - - 1407 + - 61 + - 101 + - 161 + - 201 + - 541 + - 641 + - 1121 + - 1141 + - 1461 scope: global - id: 422 - '757': + id: 461 + '541': crossFilters: chartsInScope: - - 314 - - 399 - - 407 - - 422 - - 776 - - 963 - - 1154 - - 1252 - - 1407 + - 61 + - 101 + - 161 + - 201 + - 461 + - 641 + - 1121 + - 1141 + - 1461 scope: global - id: 757 - '776': + id: 541 + '61': crossFilters: chartsInScope: - - 314 - - 399 - - 407 - - 422 - - 757 - - 963 - - 1154 - - 1252 - - 1407 + - 101 + - 161 + - 201 + - 461 + - 541 + - 641 + - 1121 + - 1141 + - 1461 scope: global - id: 776 - '963': + id: 61 + '641': crossFilters: chartsInScope: - - 314 - - 399 - - 407 - - 422 - - 757 - - 776 - - 1154 - - 1252 - - 1407 + - 61 + - 101 + - 161 + - 201 + - 461 + - 541 + - 1121 + - 1141 + - 1461 scope: global - id: 963 + id: 641 color_scheme: supersetColors color_scheme_domain: - '#1FA8C9' @@ -178,16 +178,16 @@ metadata: '61': true global_chart_configuration: chartsInScope: - - 314 - - 399 - - 407 - - 422 - - 757 - - 776 - - 963 - - 1154 - - 1252 - - 1407 + - 61 + - 101 + - 161 + - 201 + - 461 + - 541 + - 641 + - 1121 + - 1141 + - 1461 scope: excluded: [] rootPath: diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_information.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_information.yaml index 56c142e2..653ce796 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_information.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/course_information.yaml @@ -93,6 +93,19 @@ columns: python_date_format: null type: LowCardinality(String) verbose_name: Org +- advanced_data_type: null + column_name: course_key + description: null + expression: null + extra: + warning_markdown: null + filterable: true + groupby: true + is_active: true + is_dttm: false + python_date_format: null + type: LowCardinality(String) + verbose_name: Course Key database_uuid: 21174b6c-4d40-4958-8161-d6c3cf5e77b6 default_endpoint: null description: null diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/learner_performance_breakdown.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/learner_performance_breakdown.yaml index 50def381..0642c66c 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/learner_performance_breakdown.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/datasets/learner_performance_breakdown.yaml @@ -6,8 +6,7 @@ columns: column_name: actor_id description: null expression: null - extra: - warning_markdown: null + extra: {} filterable: true groupby: true is_active: true @@ -19,8 +18,7 @@ columns: column_name: approving_state description: null expression: null - extra: - warning_markdown: null + extra: {} filterable: true groupby: true is_active: true @@ -32,8 +30,7 @@ columns: column_name: course_name description: null expression: null - extra: - warning_markdown: null + extra: {} filterable: true groupby: true is_active: true @@ -45,8 +42,7 @@ columns: column_name: course_run description: null expression: null - extra: - warning_markdown: null + extra: {} filterable: true groupby: true is_active: true @@ -58,8 +54,7 @@ columns: column_name: learner_status description: null expression: null - extra: - warning_markdown: null + extra: {} filterable: true groupby: true is_active: true @@ -71,8 +66,7 @@ columns: column_name: org description: null expression: null - extra: - warning_markdown: null + extra: {} filterable: true groupby: true is_active: true @@ -80,6 +74,42 @@ columns: python_date_format: null type: LowCardinality(String) verbose_name: Org +- advanced_data_type: null + column_name: course_key + description: null + expression: null + extra: {} + filterable: true + groupby: true + is_active: true + is_dttm: false + python_date_format: null + type: LowCardinality(String) + verbose_name: Course Key +- advanced_data_type: null + column_name: name_org + description: null + expression: null + extra: {} + filterable: true + groupby: true + is_active: true + is_dttm: false + python_date_format: null + type: String + verbose_name: Name Org +- advanced_data_type: null + column_name: run_name + description: null + expression: null + extra: {} + filterable: true + groupby: true + is_active: true + is_dttm: false + python_date_format: null + type: String + verbose_name: Run Name database_uuid: 21174b6c-4d40-4958-8161-d6c3cf5e77b6 default_endpoint: null description: null diff --git a/tutoraspects/templates/openedx-assets/queries/learner_performance_breakdown.sql b/tutoraspects/templates/openedx-assets/queries/learner_performance_breakdown.sql index 595a33eb..c5f46ac1 100644 --- a/tutoraspects/templates/openedx-assets/queries/learner_performance_breakdown.sql +++ b/tutoraspects/templates/openedx-assets/queries/learner_performance_breakdown.sql @@ -14,7 +14,9 @@ select then 'at-risk' else 'other' end as learner_status, - fss.course_key as course_key + fss.course_key as course_key, + concat(course_run, ' - ', course_name) as run_name, + concat(course_name, ' - ', org) as name_org from {{ DBT_PROFILE_TARGET_DATABASE }}.fact_student_status fss left join {{ ASPECTS_XAPI_DATABASE }}.fact_learner_last_course_visit fllcv using org, course_key, actor_id