fix: dashboard updates for sumac

tutoraspects/plugin.py

@@ -129,12 +129,6 @@
                     "uuid": "abae8a25-1ba4-4653-81bd-d3937a162a11",
                     "allow_translations": True,
                 },
-                {
-                    "name": "Course Comparison Dashboard",
-                    "slug": "course-comparison",
-                    "uuid": "c6c7062d-dd90-4292-b9cf-84f7b9f38e73",
-                    "allow_translations": True,
-                },
             ],
         ),
         # The following settings are used to configure the Superset dashboards
@@ -391,7 +385,7 @@
         # For now we are pulling this from github, which should allow maximum
         # flexibility for forking, running branches, specific versions, etc.
         ("DBT_REPOSITORY", "https://github.com/openedx/aspects-dbt"),
-        ("DBT_BRANCH", "v3.33.1"),
+        ("DBT_BRANCH", "v3.33.2"),
         ("DBT_SSH_KEY", ""),
         ("DBT_STATE_DIR", "/app/aspects-dbt/state"),
         ("DBT_PROFILES_DIR", "/app/aspects/dbt/"),

tutoraspects/templates/aspects/apps/superset/pythonpath/aspects_asset_list.yaml

@@ -1,5 +1,6 @@
 unused_uuids:
   datasets:
+  - 4df7005e-3a7e-4979-a4e3-e70f22d36daa # At Risk problem results
   charts:
   - a433e3cc-8ed5-454a-8b17-5dd75cfc84e4 # Course Info
   - e0098cfe-a312-4c49-8efd-7e74256b6ea4 # Course info
@@ -11,6 +12,7 @@ unused_uuids:
   - 4250c976-a9b7-43ff-b5ad-8dd00a5acef7 # Learner performance breakdown
   - 9c3f7291-1bd9-4b2f-abc0-472aad3aff06 # Learner performance breakdown
   - 8b0535a8-a43f-49bf-9d50-439a16bd3f74 # Video engagement
+  - fa249dda-78da-4ccc-9ef3-39177e6aae0c # Course Information
 
 ignored_uuids:
   datasets:

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

@@ -12,6 +12,7 @@ params:
     operator: TEMPORAL_RANGE
     subject: emission_time
   all_columns: []
+  annotation_layers: []
   color_pn: false
   column_config:
     active_count:

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

@@ -12,6 +12,7 @@ params:
     operator: TEMPORAL_RANGE
     subject: emission_time
   all_columns: []
+  annotation_layers: []
   color_pn: false
   column_config:
     Current Enrollees:

tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_fa249d.yaml → tutoraspects/templates/aspects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_f909e0.yaml

@@ -1,4 +1,4 @@
-_file_name: Course_Information_fa249d.yaml
+_file_name: Course_Information_f909e0.yaml
 cache_timeout: null
 certification_details: null
 certified_by: null
@@ -12,7 +12,6 @@ params:
     operator: TEMPORAL_RANGE
     subject: enrolled_at
   all_columns: []
-  annotation_layers: []
   color_pn: true
   column_config:
     Avg Course Grade:
@@ -22,10 +21,6 @@ params:
       d3NumberFormat: ~g
       d3SmallNumberFormat: ~g
   conditional_formatting:
-  - colorScheme: '#ACE1C4'
-    column: active_within
-    operator: "\u2265"
-    targetValue: 0
   - colorScheme: '#EFA1AA'
     column: avg_course_grade
     operator: <
@@ -47,31 +42,56 @@ params:
     column: median_course_grade
     operator: <
     targetValue: 50
+  - colorScheme: '#ACE1C4'
+    column: Active Within Last 7 Days
+    operator: '>'
+    targetValue: 0
   extra_form_data: {}
   groupby:
   - org
   - course_key
   - course_name
   - course_run
   metrics:
-  - active_within
+  - aggregate: AVG
+    column:
+      advanced_data_type: null
+      certification_details: null
+      certified_by: null
+      column_name: active_within_last_7_days
+      description: null
+      expression: null
+      filterable: true
+      groupby: true
+      id: 683
+      is_certified: false
+      is_dttm: false
+      python_date_format: null
+      type: UInt64
+      type_generic: 0
+      verbose_name: Active Within Last 7 Days
+      warning_markdown: null
+    datasourceWarning: false
+    expressionType: SIMPLE
+    hasCustomLabel: true
+    label: Active Within Last 7 Days
+    optionName: metric_9ysvoht7z9_7zzqrfsnybt
+    sqlExpression: null
   - 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
-  time_grain_sqla: P1D
   viz_type: table
 query_context:
   datasource:
-    id: 38
+    id: 60
     type: table
   force: false
   form_data:
@@ -91,10 +111,6 @@ query_context:
         d3NumberFormat: ~g
         d3SmallNumberFormat: ~g
     conditional_formatting:
-    - colorScheme: '#ACE1C4'
-      column: active_within
-      operator: "\u2265"
-      targetValue: 0
     - colorScheme: '#EFA1AA'
       column: avg_course_grade
       operator: <
@@ -116,9 +132,13 @@ query_context:
       column: median_course_grade
       operator: <
       targetValue: 50
+    - colorScheme: '#ACE1C4'
+      column: Active Within Last 7 Days
+      operator: '>'
+      targetValue: 0
     dashboards:
-    - 17
-    datasource: 38__table
+    - 24
+    datasource: 60__table
     extra_form_data: {}
     force: false
     groupby:
@@ -127,7 +147,30 @@ query_context:
     - course_name
     - course_run
     metrics:
-    - active_within
+    - aggregate: AVG
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: active_within_last_7_days
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 683
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: UInt64
+        type_generic: 0
+        verbose_name: Active Within Last 7 Days
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Active Within Last 7 Days
+      optionName: metric_9ysvoht7z9_7zzqrfsnybt
+      sqlExpression: null
     - avg_course_grade
     - median_course_grade
     order_by_cols: []
@@ -137,13 +180,11 @@ query_context:
     result_format: json
     result_type: full
     row_limit: 1000
-    server_page_length: 10
     show_cell_bars: true
-    slice_id: 49
+    slice_id: 119
     table_timestamp_format: smart_date
     temporal_columns_lookup:
       enrolled_at: true
-    time_grain_sqla: P1D
     viz_type: table
   queries:
   - annotation_layers: []
@@ -157,19 +198,64 @@ query_context:
     custom_params: {}
     extras:
       having: ''
-      time_grain_sqla: P1D
       where: ''
     filters:
     - col: enrolled_at
       op: TEMPORAL_RANGE
       val: No filter
     metrics:
-    - active_within
+    - aggregate: AVG
+      column:
+        advanced_data_type: null
+        certification_details: null
+        certified_by: null
+        column_name: active_within_last_7_days
+        description: null
+        expression: null
+        filterable: true
+        groupby: true
+        id: 683
+        is_certified: false
+        is_dttm: false
+        python_date_format: null
+        type: UInt64
+        type_generic: 0
+        verbose_name: Active Within Last 7 Days
+        warning_markdown: null
+      datasourceWarning: false
+      expressionType: SIMPLE
+      hasCustomLabel: true
+      label: Active Within Last 7 Days
+      optionName: metric_9ysvoht7z9_7zzqrfsnybt
+      sqlExpression: null
     - avg_course_grade
     - median_course_grade
     order_desc: true
     orderby:
-    - - active_within
+    - - aggregate: AVG
+        column:
+          advanced_data_type: null
+          certification_details: null
+          certified_by: null
+          column_name: active_within_last_7_days
+          description: null
+          expression: null
+          filterable: true
+          groupby: true
+          id: 683
+          is_certified: false
+          is_dttm: false
+          python_date_format: null
+          type: UInt64
+          type_generic: 0
+          verbose_name: Active Within Last 7 Days
+          warning_markdown: null
+        datasourceWarning: false
+        expressionType: SIMPLE
+        hasCustomLabel: true
+        label: Active Within Last 7 Days
+        optionName: metric_9ysvoht7z9_7zzqrfsnybt
+        sqlExpression: null
       - false
     post_processing: []
     row_limit: 1000
@@ -178,6 +264,6 @@ query_context:
   result_format: json
   result_type: full
 slice_name: Course Information
-uuid: fa249dda-78da-4ccc-9ef3-39177e6aae0c
+uuid: f909e03a-06a9-4d04-9ea0-243a576093d4
 version: 1.0.0
 viz_type: table

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

@@ -31,9 +31,7 @@ params:
   markerSize: 6
   metrics:
   - number_of_learners
-  only_total: true
   opacity: 0.2
-  order_desc: true
   rich_tooltip: true
   rolling_type: cumsum
   row_limit: 10000
@@ -49,21 +47,15 @@ params:
   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_format: SMART_NUMBER
   y_axis_title_margin: 15
   y_axis_title_position: Left
   zoomable: true
 query_context:
   datasource:
-    id: 29
+    id: 24
     type: table
   force: false
   form_data:
@@ -81,7 +73,9 @@ query_context:
     annotation_layers: []
     color_scheme: supersetColors
     comparison_type: values
-    datasource: 29__table
+    dashboards:
+    - 24
+    datasource: 24__table
     extra_form_data: {}
     force: false
     forecastInterval: 0.8
@@ -95,9 +89,7 @@ query_context:
     markerSize: 6
     metrics:
     - number_of_learners
-    only_total: true
     opacity: 0.2
-    order_desc: true
     result_format: json
     result_type: full
     rich_tooltip: true
@@ -108,23 +100,17 @@ query_context:
     show_extra_controls: false
     show_legend: true
     show_value: false
-    slice_id: 30
+    slice_id: 41
     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_format: SMART_NUMBER
     y_axis_title_margin: 15
     y_axis_title_position: Left
     zoomable: true