Merge pull request #25226 from code-dot-org/staging

DTT (Staging > Test) [robo-dtt]

apps/src/code-studio/pd/application_dashboard/summary.jsx

@@ -137,8 +137,12 @@ export class Summary extends React.Component {
   }
 }
 
-export default connect(state => ({
-  regionalPartnerFilter: state.regionalPartners.regionalPartnerFilter,
-  isWorkshopAdmin: state.applicationDashboard.permissions.workshopAdmin,
-  showRegionalPartnerDropdown: state.regionalPartners.regionalPartners.length > 1
-}))(Summary);
+export default connect(state => {
+  const isWorkshopAdmin = state.applicationDashboard.permissions.workshopAdmin;
+
+  return {
+    regionalPartnerFilter: state.regionalPartners.regionalPartnerFilter,
+    isWorkshopAdmin,
+    showRegionalPartnerDropdown: isWorkshopAdmin || state.regionalPartners.regionalPartners.length > 1
+  };
+})(Summary);

aws/redshift/tables/csf_workshop_attendance.sql

@@ -221,7 +221,8 @@ AS(
          pdw.funded,
          pdw.funding_type,
          capacity,
-         CASE WHEN pdw.regional_partner_id IS NOT NULL THEN 1 ELSE 0 END AS trained_by_regional_partner,
+         CASE WHEN pdw.regional_partner_id IS NOT NULL THEN 1 ELSE 0 END AS trained_by_regional_partner,-- using this definition for now for regional_partner_dash
+         CASE WHEN pdw.funding_type = 'partner' THEN 1 ELSE 0 END AS trained_by_regional_partner_truth,  -- temporary until we figure out how ed team wants to present data to RPs
          CASE WHEN rp1.name IS NOT NULL THEN rp1.name
               WHEN rp2.name IS NOT NULL THEN rp2.name 
               ELSE 'No Partner' END 
@@ -263,7 +264,7 @@ AS(
         ON  rpm.regional_partner_id = rp2.id  
     WHERE pdw.course = 'CS Fundamentals'
     AND   (pdw.subject IN ( 'Intro Workshop', 'Intro', 'Deep Dive Workshop')  or pdw.subject is null)
-    group by 1, 2, 3, 4, 5,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, u.name, 20, 21, 23
+    group by 1, 2, 3, 4, 5,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, u.name, 21, 22, 24 
   ),
 
 sections_based 
@@ -286,6 +287,7 @@ AS(
            else null  
            end::int as capacity,
          0 AS trained_by_regional_partner,
+         0 AS trained_by_reginal_partner_truth,  -- temporary until we figure out how ed team wants to present data to RPs
          CASE WHEN rp.name IS NOT NULL THEN rp.name ELSE 'No Partner' END as regional_partner_name,
          rpm.regional_partner_id AS regional_partner_id,
          ssz.zip as zip,
@@ -297,7 +299,7 @@ AS(
          sy.school_year, 
          0 AS not_attended,
          0 AS future_event
-    FROM anlysis.csf_teachers_trained tt
+    FROM analysis.csf_teachers_trained tt
     JOIN dashboard_production.sections se 
        ON se.id = tt.section_id 
     JOIN dashboard_production_pii.users u -- join to get facilitator data

aws/redshift/tables/regional_partner_stats_csf.sql

@@ -35,7 +35,7 @@ select
     CASE WHEN days_to_complete <= 365 and completed_before_training = 0 then 1 else 0 end as completed_365,
     CASE WHEN days_to_start <= 365  then 1 else 0 end as started_365_or_before,
     CASE WHEN days_to_complete <= 365  then 1 else 0 end as completed_365_or_before
-  from public.mb_csf_teachers_trained tt
+  from analysis.csf_teachers_trained tt
     left join analysis.csf_started_teachers st on st.user_id = tt.user_id  
     left join analysis.csf_completed_teachers ct on ct.user_id = tt.user_id  
   group by 1, 2, 3
@@ -47,7 +47,7 @@ repeat_trainings as
     user_id,
     min(trained_at) as first_training
   from 
-    public.mb_csf_teachers_trained
+    analysis.csf_teachers_trained
   group by 1
 ),
 
@@ -113,6 +113,7 @@ select
          csfa.workshop_id,
          CASE WHEN csfa.subject is null THEN 'Intro Workshop' else csfa.subject END as subject,
          CASE WHEN csfa.trained_by_regional_partner is null then 0 else csfa.trained_by_regional_partner END as trained_by_regional_partner,
+         CASE WHEN csfa.trained_by_regional_partner_truth is null then 0 else csfa.trained_by_regional_partner_truth END as trained_by_regional_partner_truth, -- temporary while we figure out how to present to RPs
          d.trained_at as trained_at,
          coalesce(csfa.workshop_date, d.trained_at)  as workshop_date, 
          CASE WHEN rt.first_training != d.trained_at then 1 else 0 end as repeat_training,
@@ -143,7 +144,7 @@ select
           -- student gender
           sa.students_female as students_female_total,
           sa.students_gender as students_gender_total
-  FROM public.mb_csf_teachers_trained d 
+  FROM analysis.csf_teachers_trained d 
   JOIN analysis.training_school_years sy on d.trained_at between sy.started_at and sy.ended_at
 -- school info
   LEFT JOIN dashboard_production_pii.users u  -- users needed to get school_info_id