New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
In cohort view, add columns for assigned workshop/fit #19727
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 0 additions & 18 deletions
18
dashboard/app/serializers/api/v1/pd/application_cohort_view_serializer.rb
This file was deleted.
Oops, something went wrong.
27 changes: 27 additions & 0 deletions
27
dashboard/app/serializers/api/v1/pd/facilitator_application_cohort_view_serializer.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
class Api::V1::Pd::FacilitatorApplicationCohortViewSerializer < ActiveModel::Serializer | ||
attributes :id, :date_accepted, :applicant_name, :district_name, :school_name, :email, | ||
:notified, :assigned_fit, :registered_fit | ||
|
||
def date_accepted | ||
object.accepted_at.try(:strftime, '%b %e') | ||
end | ||
|
||
def email | ||
object.user.email | ||
end | ||
|
||
def notified | ||
# TODO: (mehal) implement this | ||
'Not implemented' | ||
end | ||
|
||
def assigned_fit | ||
# TODO: (mehal) implement this | ||
'Not implemented' | ||
end | ||
|
||
def registered_fit | ||
# TODO: (mehal) implement this | ||
'Not implemented' | ||
end | ||
end |
31 changes: 31 additions & 0 deletions
31
dashboard/app/serializers/api/v1/pd/teacher_application_cohort_view_serializer.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
class Api::V1::Pd::TeacherApplicationCohortViewSerializer < ActiveModel::Serializer | ||
attributes :id, :date_accepted, :applicant_name, :district_name, :school_name, :email, | ||
:notified, :assigned_workshop, :registered_workshop, :accepted_teachercon | ||
|
||
def date_accepted | ||
object.accepted_at.try(:strftime, '%b %e') | ||
end | ||
|
||
def email | ||
object.user.email | ||
end | ||
|
||
def notified | ||
# TODO: (mehal) implement this | ||
'Not implemented' | ||
end | ||
|
||
def assigned_workshop | ||
# TODO: (mehal) implement this | ||
'Not implemented' | ||
end | ||
|
||
def registered_workshop | ||
# TODO: (mehal) implement this | ||
'Not implemented' | ||
end | ||
|
||
def accepted_teachercon | ||
'Not implemented' | ||
end | ||
end |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how about, above on line 100
Then this method can be simplified to:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want accepted date to be cleared if the application is un-accepted