Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Minor tweaks to Me > My Mentees and retired/inactive dashboard step. #2113

Merged
merged 1 commit into from
Oct 1, 2024
Merged

Minor tweaks to Me > My Mentees and retired/inactive dashboard step. #2113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions app/components/mentee-list.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,20 @@
</h4>
<div class="card-subtitle h5 mb-2">
{{#if (eq mentee.mentor_status "pass")}}
<UiBadge @text="passed" @type="success" />
<UiBadge @text="passed" @type="success"/>
{{else if (eq mentee.mentor_status "bonk")}}
<UiBadge @text="bonked" @type="danger" />
<UiBadge @text="bonked" @type="danger"/>
{{else if (eq mentee.mentor_status "self-bonk")}}
<UiBadge @text="self bonked" @type="gray" />
<UiBadge @text="self bonked" @type="gray"/>
{{else}}
<UiBadge @text="pending" @type="warning" />
<UiBadge @text="pending" @type="warning"/>
{{/if}}
</div>

{{#if mentee.formerly_known_as}}
<p class="card-text">
<b>Formerly Known As</b><br>
{{mentee.formerly_known_as}}
</p>
{{/if}}
<p class="card-text">
<p class="card-text">
<b>Mentors</b><br>
{{#each mentee.mentors as |mentor mentorIdx|}}
{{if mentorIdx ", "}}{{mentor.callsign}}
{{#each mentee.mentors as |mentor |}}
{{mentor.callsign}}<br>
{{/each}}
</p>
{{#if (eq mentee.mentor_status "pass")}}
Expand All @@ -61,11 +55,17 @@
{{/if}}
</p>
{{/if}}
{{#if mentee.formerly_known_as}}
<p class="card-text">
<b>Formerly Known As</b><br>
{{mentee.formerly_known_as}}
</p>
{{/if}}
{{#if @contactAction}}
<p class="card-text">
<b>Last Contact</b><br>
{{#if mentee.last_contact}}
{{mentee.last_contact}}
{{mdy-format mentee.last_contact}}
{{else}}
<i>never</i>
{{/if}}
Expand Down
4 changes: 2 additions & 2 deletions app/constants/dashboard-steps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@ export const AFTER_EVENT_STATUS_ADVISORY = {
name: 'Retired Status',
email: 'VCEmail',
result: ACTION_NEEDED,
message: htmlSafe("<p>Your status has been changed to <i>retired</i> because you have not rangered 5 or more consecutive events.</p>" +
message: htmlSafe("<p>Your status has been changed to <i>retired</i> because you have not rangered in 5 or more events.</p>" +
"<p>If you wish to volunteer with the Rangers next event, you will need to attend a full day's " +
"In-Person Training, and walk a Cheetah Cub shift with a Mentor.</p><p>The Mentor Cadre will restore your active status at the end of the Cheetah Cub shift if they determine you are fit to resume rangering.</p>Contact the Volunteer Coordinators for more information.")
};
Expand All @@ -943,7 +943,7 @@ export const AFTER_EVENT_STATUS_ADVISORY = {
email: 'VCEmail',
result: ACTION_NEEDED,
message: htmlSafe(
`<p>Your status has been changed to <i>${person.status}</i> because you have not rangered 3 or more consecutive events.<p>` +
`<p>Your status has been changed to <i>${person.status}</i> because you have not rangered in 3 or more events.<p>` +
"<p>If you wish to volunteer with the Rangers next event, you will need to attend a full day's " +
"In-Person Training, and work a non-training, non-mentee shift.</p><p>Your active status will be automatically restored upon completing a shift that is neither a training nor a mentee shift.</p> Contact the Volunteer Coordinators for more information.")
};
Expand Down
6 changes: 3 additions & 3 deletions app/templates/me/mentors.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<BackToHome/>
<p>
You may send a contact message to one of your Mentors by clicking on the 'Contact' button below their callsign.
A Mentor may not be able to receive a message if they are no longer with the department.
You can send a message to one of your Mentors by clicking the ‘Contact’ button next to their callsign. Please note
that if a Mentor is no longer with the department, it is possible they may not receive the message.
</p>
{{#each this.mentors as |event|}}
<UiSection>
<:title>
Year {{event.year}}
{{#if (eq event.status "pass")}}
- <span class="text-success">{{fa-icon "check"}} Passed</span>
- <UiBadge @type="success">passed</UiBadge>
{{/if}}
</:title>
<:body>
Expand Down