@@ -63,8 +63,8 @@ def application_distribution_data
6363 end
6464
6565 def schools_confirmed_data
66- schools = Questionnaire . joins ( :school ) . group ( ' schools.name' ) . where ( "acc_status = 'rsvp_confirmed'" ) . order ( "schools.name ASC" ) . count
67- schools_riding = Questionnaire . joins ( :school ) . group ( ' schools.name' ) . where ( "acc_status = 'rsvp_confirmed' AND bus_list_id" ) . count
66+ schools = Questionnaire . joins ( :school ) . group ( " schools.name" ) . where ( "acc_status = 'rsvp_confirmed'" ) . order ( "schools.name ASC" ) . count
67+ schools_riding = Questionnaire . joins ( :school ) . group ( " schools.name" ) . where ( "acc_status = 'rsvp_confirmed' AND bus_list_id" ) . count
6868 schools = schools . map do |name , count |
6969 bus_count_row = schools_riding . select { |school_bus_name , _ | school_bus_name == name }
7070 bus_count = bus_count_row ? bus_count_row [ name ] || 0 : 0
@@ -73,7 +73,7 @@ def schools_confirmed_data
7373 end
7474 render json : [
7575 { name : "Not riding bus" , data : schools . sort_by { |_ , no_bus , bus | [ bus , no_bus ] } . reverse } ,
76- { name : "Riding bus" , data : schools_riding }
76+ { name : "Riding bus" , data : schools_riding } ,
7777 ]
7878 end
7979
@@ -85,7 +85,7 @@ def schools_applied_data
8585 "late_waitlist" => { } ,
8686 "waitlist" => { } ,
8787 "accepted" => { } ,
88- "rsvp_confirmed" => { }
88+ "rsvp_confirmed" => { } ,
8989 }
9090 # Temporary fix
9191 # result = Questionnaire.joins(:school).group(:acc_status, "schools.name").where("schools.questionnaire_count >= 5").order("schools.questionnaire_count DESC").order("schools.name ASC").count
@@ -104,7 +104,7 @@ def schools_applied_data
104104 { name : "Late Waitlisted" , data : counted_schools [ "late_waitlist" ] } ,
105105 { name : "RSVP Denied" , data : counted_schools [ "rsvp_denied" ] } ,
106106 { name : "Denied" , data : counted_schools [ "denied" ] } ,
107- { name : "Pending" , data : counted_schools [ "pending" ] }
107+ { name : "Pending" , data : counted_schools [ "pending" ] } ,
108108 ]
109109 end
110110
0 commit comments