diff --git a/tutoraspects/plugin.py b/tutoraspects/plugin.py index bcd7de94d..ee80a862c 100644 --- a/tutoraspects/plugin.py +++ b/tutoraspects/plugin.py @@ -75,13 +75,6 @@ "reference/course_overview_dashboard.html)
" "* [Superset Resources](https://github.com/apache/superset#resources)
", ), - ( - "ASPECTS_INSTRUCTOR_HELP_MARKDOWN", - "## Help
" - "* [Aspects Reference](https://docs.openedx.org/projects/openedx-aspects/page/" - "reference/course_overview_dashboard.html)
" - "* [Superset Resources](https://github.com/apache/superset#resources)
", - ), ( "ASPECTS_LEARNER_GROUPS_HELP_MARKDOWN", "## Help
" @@ -103,6 +96,13 @@ "reference/individual_learner_dashboard.html)
" "* [Superset Resources](https://github.com/apache/superset#resources)
", ), + ( + "ASPECTS_COURSE_COMPARISON_HELP_MARKDOWN", + "## Help
" + "* [Aspects Reference](https://docs.openedx.org/projects/openedx-aspects/page/" + "reference/course_comparison_dashboard.html)
" + "* [Superset Resources](https://github.com/apache/superset#resources)
", + ), ("ASPECTS_ENABLE_INSTRUCTOR_DASHBOARD_PLUGIN", True), # Whether to show the link to go to Superset in the instructor dashboard tab ("SUPERSET_SHOW_INSTRUCTOR_DASHBOARD_LINK", True), diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_ccdd7d.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_ccdd7d.yaml index 82a7de2c5..cbb2d1355 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_ccdd7d.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Info_ccdd7d.yaml @@ -32,8 +32,9 @@ params: - course_name - expressionType: SQL label: More details - sqlExpression: | - {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_run', 'w863AfFgi') }}{% endraw %} + sqlExpression: |- + {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_run', 'w863AfFgi') }} + {% endraw %} metrics: - enrollees - active_count @@ -83,8 +84,9 @@ query_context: - course_name - expressionType: SQL label: More details - sqlExpression: | - {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_run', 'w863AfFgi') }}{% endraw %} + sqlExpression: |- + {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_run', 'w863AfFgi') }} + {% endraw %} metrics: - enrollees - active_count @@ -110,8 +112,9 @@ query_context: - course_name - expressionType: SQL label: More details - sqlExpression: | - {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_run', 'w863AfFgi') }}{% endraw %} + sqlExpression: |- + {% raw %}{{ get_filtered_dashboard_link('course-dashboard', 'course_run', 'w863AfFgi') }} + {% endraw %} custom_form_data: {} custom_params: {} extras: diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_fa249d.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_fa249d.yaml deleted file mode 100644 index 9d68ebc37..000000000 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_fa249d.yaml +++ /dev/null @@ -1,189 +0,0 @@ -_file_name: Course_Information_fa249d.yaml -cache_timeout: null -certification_details: null -certified_by: null -dataset_uuid: f25fdc4e-ce79-4f4c-9fc6-3dfe91690493 -description: null -params: - adhoc_filters: - - clause: WHERE - comparator: No filter - datasourceWarning: false - expressionType: SIMPLE - filterOptionName: filter_6yivq3tfsx5_ple4axtqz6 - isExtra: false - isNew: false - operator: TEMPORAL_RANGE - sqlExpression: null - subject: enrolled_at - all_columns: [] - color_pn: true - column_config: - Avg Course Grade: - d3NumberFormat: ~g - d3SmallNumberFormat: ~g - Median Course Grade: - d3NumberFormat: ~g - d3SmallNumberFormat: ~g - conditional_formatting: - - colorScheme: '#EFA1AA' - column: avg_course_grade - operator: < - targetValue: 50 - - colorScheme: '#ACE1C4' - column: avg_course_grade - operator: "\u2265" - targetValue: 70 - - colorScheme: '#ACE1C4' - column: median_course_grade - operator: "\u2265" - targetValue: 70 - - colorScheme: '#FDE380' - column: median_course_grade - operator: "\u2264 x \u2264" - targetValueLeft: '50' - targetValueRight: '70' - - colorScheme: '#EFA1AA' - column: median_course_grade - operator: < - targetValue: 50 - - colorScheme: '#ACE1C4' - column: active_within_7_days - operator: '>' - targetValue: 0 - extra_form_data: {} - groupby: - - org - - course_key - - course_name - - course_run - metrics: - - active_within_7_days - - avg_course_grade - - median_course_grade - order_by_cols: [] - order_desc: true - percent_metrics: [] - query_mode: aggregate - row_limit: 1000 - server_page_length: 10 - show_cell_bars: true - table_timestamp_format: smart_date - temporal_columns_lookup: - enrolled_at: true - viz_type: table -query_context: - datasource: - id: 301 - type: table - force: false - form_data: - adhoc_filters: - - clause: WHERE - comparator: No filter - datasourceWarning: false - expressionType: SIMPLE - filterOptionName: filter_6yivq3tfsx5_ple4axtqz6 - isExtra: false - isNew: false - operator: TEMPORAL_RANGE - sqlExpression: null - subject: enrolled_at - all_columns: [] - color_pn: true - column_config: - Avg Course Grade: - d3NumberFormat: ~g - d3SmallNumberFormat: ~g - Median Course Grade: - d3NumberFormat: ~g - d3SmallNumberFormat: ~g - conditional_formatting: - - colorScheme: '#EFA1AA' - column: avg_course_grade - operator: < - targetValue: 50 - - colorScheme: '#ACE1C4' - column: avg_course_grade - operator: "\u2265" - targetValue: 70 - - colorScheme: '#ACE1C4' - column: median_course_grade - operator: "\u2265" - targetValue: 70 - - colorScheme: '#FDE380' - column: median_course_grade - operator: "\u2264 x \u2264" - targetValueLeft: '50' - targetValueRight: '70' - - colorScheme: '#EFA1AA' - column: median_course_grade - operator: < - targetValue: 50 - - colorScheme: '#ACE1C4' - column: active_within_7_days - operator: '>' - targetValue: 0 - dashboards: - - 581 - datasource: 301__table - extra_form_data: {} - force: false - groupby: - - org - - course_key - - course_name - - course_run - metrics: - - active_within_7_days - - 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: 1481 - table_timestamp_format: smart_date - temporal_columns_lookup: - enrolled_at: true - viz_type: table - queries: - - annotation_layers: [] - applied_time_extras: {} - columns: - - org - - course_key - - course_name - - course_run - custom_form_data: {} - custom_params: {} - extras: - having: '' - where: '' - filters: - - col: enrolled_at - op: TEMPORAL_RANGE - val: No filter - metrics: - - active_within_7_days - - avg_course_grade - - median_course_grade - order_desc: true - orderby: - - - active_within_7_days - - 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 -viz_type: table diff --git a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/At-Risk_Learners.yaml b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/At-Risk_Learners.yaml index b9b1c2657..e1d047db7 100644 --- a/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/At-Risk_Learners.yaml +++ b/tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/dashboards/At-Risk_Learners.yaml @@ -989,8 +989,7 @@ position: children: [] id: MARKDOWN-mH--KD6qFl meta: - code: '## Help
* [Aspects Reference](https://docs.openedx.org/projects/openedx-aspects/page/reference/learner_groups_dashboard.html)
* - [Superset Resources](https://github.com/apache/superset#resources)
' + code: '{{ASPECTS_LEARNER_GROUPS_HELP_MARKDOWN}}' height: 50 width: 12 parents: 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 9fd139524..be7c7ec51 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: - '1467': + '1154': crossFilters: chartsInScope: - - 1500 - - 1501 - - 1502 - - 1503 - - 1504 - - 1505 - - 1506 - - 1507 - - 1508 + - 314 + - 399 + - 407 + - 422 + - 757 + - 776 + - 963 + - 1252 + - 1407 scope: global - id: 1467 - '1500': + id: 1154 + '1252': crossFilters: chartsInScope: - - 1467 - - 1501 - - 1502 - - 1503 - - 1504 - - 1505 - - 1506 - - 1507 - - 1508 + - 314 + - 399 + - 407 + - 422 + - 757 + - 776 + - 963 + - 1154 + - 1407 scope: global - id: 1500 - '1501': + id: 1252 + '1407': crossFilters: chartsInScope: - - 1467 - - 1500 - - 1502 - - 1503 - - 1504 - - 1505 - - 1506 - - 1507 - - 1508 + - 314 + - 399 + - 407 + - 422 + - 757 + - 776 + - 963 + - 1154 + - 1252 scope: global - id: 1501 - '1502': + id: 1407 + '314': crossFilters: chartsInScope: - - 1467 - - 1500 - - 1501 - - 1503 - - 1504 - - 1505 - - 1506 - - 1507 - - 1508 + - 399 + - 407 + - 422 + - 757 + - 776 + - 963 + - 1154 + - 1252 + - 1407 scope: global - id: 1502 - '1503': + id: 314 + '399': crossFilters: chartsInScope: - - 1467 - - 1500 - - 1501 - - 1502 - - 1504 - - 1505 - - 1506 - - 1507 - - 1508 + - 314 + - 407 + - 422 + - 757 + - 776 + - 963 + - 1154 + - 1252 + - 1407 scope: global - id: 1503 - '1504': + id: 399 + '407': crossFilters: chartsInScope: - - 1467 - - 1500 - - 1501 - - 1502 - - 1503 - - 1505 - - 1506 - - 1507 - - 1508 + - 314 + - 399 + - 422 + - 757 + - 776 + - 963 + - 1154 + - 1252 + - 1407 scope: global - id: 1504 - '1505': + id: 407 + '422': crossFilters: chartsInScope: - - 1467 - - 1500 - - 1501 - - 1502 - - 1503 - - 1504 - - 1506 - - 1507 - - 1508 + - 314 + - 399 + - 407 + - 757 + - 776 + - 963 + - 1154 + - 1252 + - 1407 scope: global - id: 1505 - '1506': + id: 422 + '757': crossFilters: chartsInScope: - - 1467 - - 1500 - - 1501 - - 1502 - - 1503 - - 1504 - - 1505 - - 1507 - - 1508 + - 314 + - 399 + - 407 + - 422 + - 776 + - 963 + - 1154 + - 1252 + - 1407 scope: global - id: 1506 - '1507': + id: 757 + '776': crossFilters: chartsInScope: - - 1467 - - 1500 - - 1501 - - 1502 - - 1503 - - 1504 - - 1505 - - 1506 - - 1508 + - 314 + - 399 + - 407 + - 422 + - 757 + - 963 + - 1154 + - 1252 + - 1407 scope: global - id: 1507 - '1508': + id: 776 + '963': crossFilters: chartsInScope: - - 1467 - - 1500 - - 1501 - - 1502 - - 1503 - - 1504 - - 1505 - - 1506 - - 1507 + - 314 + - 399 + - 407 + - 422 + - 757 + - 776 + - 1154 + - 1252 + - 1407 scope: global - id: 1508 + id: 963 color_scheme: supersetColors color_scheme_domain: - '#1FA8C9' @@ -171,23 +171,24 @@ metadata: - '#9EE5E5' - '#D1C6BC' cross_filters_enabled: true + default_filters: '{}' expanded_slices: - '104': true - '109': true - '56': true - '75': true + '1252': true + '399': true + '422': true + '776': true global_chart_configuration: chartsInScope: - - 1467 - - 1500 - - 1501 - - 1502 - - 1503 - - 1504 - - 1505 - - 1506 - - 1507 - - 1508 + - 314 + - 399 + - 407 + - 422 + - 757 + - 776 + - 963 + - 1154 + - 1252 + - 1407 scope: excluded: [] rootPath: @@ -349,7 +350,7 @@ position: children: [] id: CHART-explore-1467-1 meta: - chartId: 82 + chartId: 963 height: 50 sliceName: Video Engagement uuid: 5b00f792-233c-4ee6-9411-7df49f4b5061 @@ -364,7 +365,7 @@ position: children: [] id: CHART-explore-1500-1 meta: - chartId: 25 + chartId: 314 height: 50 sliceName: Course Info uuid: b2fff8a7-3ace-4075-9a3f-5fa5b99f81bb @@ -379,7 +380,7 @@ position: children: [] id: CHART-explore-1501-1 meta: - chartId: 125 + chartId: 757 height: 50 sliceName: Course Info uuid: ccdd7d98-4722-490b-a0b2-077380a7c7eb @@ -394,7 +395,7 @@ position: children: [] id: CHART-explore-1502-1 meta: - chartId: 19 + chartId: 1154 height: 50 sliceName: Enrollment Counts uuid: 7eaf5bc2-0067-424b-a50b-607cf54c086a @@ -409,7 +410,7 @@ position: children: [] id: CHART-explore-1503-1 meta: - chartId: 63 + chartId: 407 height: 50 sliceName: Enrollment Counts uuid: 8230a366-957d-4667-a2ff-3cbcb2f25f60 @@ -424,7 +425,7 @@ position: children: [] id: CHART-explore-1504-1 meta: - chartId: 75 + chartId: 399 height: 50 sliceName: Learner Performance Breakdown uuid: b73b0a5c-4861-402e-a39c-d73333a4d911 @@ -439,7 +440,7 @@ position: children: [] id: CHART-explore-1505-1 meta: - chartId: 104 + chartId: 776 height: 50 sliceName: Learner Performance Breakdown uuid: d414b144-467b-456b-b899-9cfb3579faba @@ -454,7 +455,7 @@ position: children: [] id: CHART-explore-1506-1 meta: - chartId: 109 + chartId: 1252 height: 50 sliceName: Learner Performance uuid: b518f341-9ed4-4c23-bb88-6c1d497aa260 @@ -469,7 +470,7 @@ position: children: [] id: CHART-explore-1507-1 meta: - chartId: 56 + chartId: 422 height: 50 sliceName: Learner Performance uuid: b0e170ce-26f1-4452-a3c0-49b41fa6e529 @@ -478,13 +479,13 @@ position: - ROOT_ID - TABS-6vozRyRn2o - TAB-GuHDMLqRC - - ROW-kZVNsJuoh + - ROW--qwRXTzHx type: CHART CHART-explore-1508-1: children: [] id: CHART-explore-1508-1 meta: - chartId: 145 + chartId: 1407 height: 50 sliceName: Video Engagement uuid: 6b7610a7-41d0-4d14-be81-62a5a8f22d62 @@ -493,7 +494,7 @@ position: - ROOT_ID - TABS-6vozRyRn2o - TAB-GuHDMLqRC - - ROW-hKzUoke28 + - ROW-iMG3T4uBu type: CHART DASHBOARD_VERSION_KEY: v2 GRID_ID: @@ -507,6 +508,19 @@ position: meta: text: Course Comparison Dashboard type: HEADER + MARKDOWN--58PhJEjOUMAiLp5cc3Ke: + children: [] + id: MARKDOWN--58PhJEjOUMAiLp5cc3Ke + meta: + code: '{{ASPECTS_COURSE_COMPARISON_HELP_MARKDOWN}}' + height: 50 + width: 12 + parents: + - ROOT_ID + - TABS-6vozRyRn2o + - TAB-pNxBWKV3CpZWotDqqnxUm + - ROW-NDV_0Ufsw2LFn5TKvNs6w + type: MARKDOWN ROOT_ID: children: - TABS-6vozRyRn2o @@ -534,6 +548,17 @@ position: - TABS-6vozRyRn2o - TAB-J31MdXj-sa type: ROW + ROW-NDV_0Ufsw2LFn5TKvNs6w: + children: + - MARKDOWN--58PhJEjOUMAiLp5cc3Ke + id: ROW-NDV_0Ufsw2LFn5TKvNs6w + meta: + background: BACKGROUND_TRANSPARENT + parents: + - ROOT_ID + - TABS-6vozRyRn2o + - TAB-pNxBWKV3CpZWotDqqnxUm + type: ROW ROW-RgmR2MvEK: children: - CHART-explore-1502-1 @@ -656,10 +681,23 @@ position: - ROOT_ID - TABS-6vozRyRn2o type: TAB + TAB-pNxBWKV3CpZWotDqqnxUm: + children: + - ROW-NDV_0Ufsw2LFn5TKvNs6w + id: TAB-pNxBWKV3CpZWotDqqnxUm + meta: + defaultText: Tab title + placeholder: Tab title + text: Help + parents: + - ROOT_ID + - TABS-6vozRyRn2o + type: TAB TABS-6vozRyRn2o: children: - TAB-J31MdXj-sa - TAB-GuHDMLqRC + - TAB-pNxBWKV3CpZWotDqqnxUm id: TABS-6vozRyRn2o meta: {} parents: