Merge branch 'main' of https://github.com/TEAMSchools/teamster into claude/review-kfwd-persistence-model-dYUQA

Author: Anthony Walters

.claude/settings.local.json

@@ -1,4 +1,11 @@
 {
+  "permissions": {
+    "allow": [
+      "Bash(python -m pytest tests/ -x -q)",
+      "Read(//home/vscode/.claude/plugins/cache/dagster/dignified-python/0.0.8/skills/dignified-python/references/**)",
+      "Read(//home/vscode/.claude/plugins/cache/dagster/dignified-python/0.0.8/skills/dignified-python/**)"
+    ]
+  },
   "enabledPlugins": {
     "dagster-expert@dagster": true,
     "dagster-integrations@dagster": true,

src/dbt/kipptaf/models/extracts/tableau/intermediate/int_tableau__finalsite_student_scaffold.sql

@@ -1,7 +1,6 @@
 with
     stacked_data as (
-
-        /* denominator groupings for inquiries, applications, waitlisted, offers,
+        /* EVER denominator groupings for inquiries, applications, offers,
            assigned school and accepted. need distinct to bring only one row per
            student when they have multiple statuses per group */
         select distinct
@@ -42,7 +41,7 @@ with
                 when 'Offers'
                 then 3
                 when 'Accepted'
-                then 5
+                then 4
                 else 0
             end as grouped_status_order,
 
@@ -109,7 +108,7 @@ with
 
         union all
 
-        -- currently enrolled numerator
+        -- CURRENT enrolled numerator
         select
             aligned_enrollment_academic_year,
             aligned_enrollment_academic_year_display,
@@ -139,21 +138,108 @@ with
 
             'All' as aligned_enrollment_type,
 
-            7 as grouped_status_order,
+            8 as grouped_status_order,
 
             status_start_date as grouped_status_start_date,
 
         from {{ ref("int_students__finalsite_student_roster") }}
         where
             detailed_status = 'Enrolled'
+            and latest_status = 'Enrolled'
+            and status_start_date is not null
+            and not qa_flag
+
+        union all
+
+        -- CURRENT waitlisted numerator
+        select
+            aligned_enrollment_academic_year,
+            aligned_enrollment_academic_year_display,
+            enrollment_academic_year,
+            enrollment_academic_year_display,
+            current_academic_year,
+            next_academic_year,
+            org,
+            region,
+            schoolid,
+            school,
+            finalsite_enrollment_id as finalsite_id,
+            powerschool_student_number,
+            first_name,
+            last_name,
+            grade_level,
+            aligned_enrollment_academic_year_grade_level,
+            self_contained,
+            enrollment_academic_year_enrollment_type,
+            detailed_status as grouped_status,
+            sre_academic_year_start,
+            sre_academic_year_end,
+            is_enrolled_fdos,
+            is_enrolled_oct01,
+            is_enrolled_oct15,
+            latest_status,
+
+            'All' as aligned_enrollment_type,
+
+            0 as grouped_status_order,
+
+            status_start_date as grouped_status_start_date,
+
+        from {{ ref("int_students__finalsite_student_roster") }}
+        where
+            detailed_status = 'Waitlisted'
+            and latest_status = 'Waitlisted'
+            and status_start_date is not null
+            and not qa_flag
+
+        union all
+
+        -- CURRENT enrollment in progress numerator
+        select
+            aligned_enrollment_academic_year,
+            aligned_enrollment_academic_year_display,
+            enrollment_academic_year,
+            enrollment_academic_year_display,
+            current_academic_year,
+            next_academic_year,
+            org,
+            region,
+            schoolid,
+            school,
+            finalsite_enrollment_id as finalsite_id,
+            powerschool_student_number,
+            first_name,
+            last_name,
+            grade_level,
+            aligned_enrollment_academic_year_grade_level,
+            self_contained,
+            enrollment_academic_year_enrollment_type,
+            detailed_status as grouped_status,
+            sre_academic_year_start,
+            sre_academic_year_end,
+            is_enrolled_fdos,
+            is_enrolled_oct01,
+            is_enrolled_oct15,
+            latest_status,
+
+            'All' as aligned_enrollment_type,
+
+            7 as grouped_status_order,
+
+            status_start_date as grouped_status_start_date,
+
+        from {{ ref("int_students__finalsite_student_roster") }}
+        where
+            detailed_status = 'Enrollment In Progress'
+            and latest_status = 'Enrollment In Progress'
             and status_start_date is not null
             and not qa_flag
 
         union all
 
-        /* numerator groupings for pending offer and currently accepted need distinct
-           to bring only one row per student when they have multiple statuses per
-           group */
+        /* CURRENT numerator groupings for pending offers and currently accepted need
+           distinct to bring only one row per student when they have multiple statuses
+           per group */
         select distinct
             aligned_enrollment_academic_year,
             aligned_enrollment_academic_year_display,
@@ -183,7 +269,7 @@ with
 
             'All' as aligned_enrollment_type,
 
-            if(status_group_numerator = 'Pending Offers', 4, 6) as grouped_status_order,
+            if(status_group_numerator = 'Pending Offers', 6, 5) as grouped_status_order,
 
             max(status_start_date) over (
                 partition by
@@ -195,13 +281,26 @@ with
         from {{ ref("int_students__finalsite_student_roster") }}
         where
             status_group_numerator is not null
+            and detailed_status != 'Waitlisted'
+            and latest_status in (
+                'Accepted',
+                'Assigned School',
+                'Campus Transfer Requested',
+                'Enrollment In Progress',
+                'Not Enrolling',
+                'Enrolled',
+                'Mid Year Withdrawal',
+                'Never Atended',
+                'Retained',
+                'Summer Withdraw'
+            )
             and status_start_date is not null
             and not qa_flag
 
         union all
 
-        /* numerator for conversion metrics groupings need distinct to bring only one
-           row per student when they have multiple statuses per group */
+        /* CURRENT numerator for conversion metrics groupings need distinct to bring
+           only one row per student when they have multiple statuses per group */
         select distinct
             aligned_enrollment_academic_year,
             aligned_enrollment_academic_year_display,
@@ -244,6 +343,15 @@ with
         where
             conversion_metric_numerator is not null
             and status_start_date is not null
+            and latest_status in (
+                'Enrollment In Progress',
+                'Not Enrolling',
+                'Enrolled',
+                'Mid Year Withdrawal',
+                'Never Attended',
+                'Retained',
+                'Summer Withdrawal'
+            )
             and not qa_flag
     )