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

feat(message): added a confirmation modal to send messages #272

Merged
merged 8 commits into from
Jul 25, 2020
Merged

feat(message): added a confirmation modal to send messages #272

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0e523f3
feat(message): added a confirmation modal to send messages
JeremyRudman Jun 23, 2020
6f49ace
fix: houndci formatting errors
JeremyRudman Jul 18, 2020
f712fb7
Merge branch '2.0' into issue-98
cbaudouinjr Jul 23, 2020
a87619f
fix(messages): fixed error and made changes to text
JeremyRudman Jul 23, 2020
54a138a
Merge branch 'issue-98' of https://github.com/codeRIT/hackathon-manag…
JeremyRudman Jul 23, 2020
5fee2f3
fix: houndci styling changes
JeremyRudman Jul 23, 2020
9a8b0e1
feat: made email modal text black instead of red
JeremyRudman Jul 23, 2020
e8f8419
refactor: Adds number delimiter to recipients, changes cancel outline
cbaudouinjr Jul 25, 2020
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: 25 additions & 3 deletions app/views/manage/messages/show.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
:ruby
begin
recipient_count = pluralize(BulkMessageJob.build_recipients(@message.recipients).count, "recipient")
recipient_count = pluralize(BulkMessageJob.build_recipients(@message.recipients).count, "Recipient")
number_of_recipients = BulkMessageJob.build_recipients(@message.recipients).count
recipient_plural = "Recipient"
if number_of_recipients > 1
recipient_plural = "Recipients"
end

rescue => recipient_error
end

Expand All @@ -10,9 +16,25 @@
- if recipient_error.present?
%button.btn.btn-sm.btn-outline-secondary{disabled: 'disabled', title: 'Cannot deliver when there is a recipient error; see error above.'} Deliver
- else
= link_to deliver_manage_message_path(@message), method: :patch, data: { confirm: "Are you sure? The message \"#{@message.name}\" will be sent to #{recipient_count}." }, class: 'btn btn-sm btn-primary' do
%button.btn.btn-sm.btn-primary{"data-toggle"=>"modal", "data-target"=>"#confirm-messages"}
%span.fa.fa-send.icon-space-r-half
Send
%span Send
.modal{:id => "confirm-messages"}
.modal-dialog{:role => "document"}
.modal-content
.modal-header
%h5{:class => "modal-title"} Confirm
.modal-body
%p Are you sure? The message "#{@message.name}" will be sent to:
%h3.center
%span.font-weight-bold
= number_with_delimiter(number_of_recipients)
%span
= recipient_plural
.modal-footer
%button.btn.btn-outline-secondary{'data-dismiss'=>"modal"} Close
= link_to deliver_manage_message_path(@message), method: :patch, class: 'btn btn-danger' do
%span Send Message
- if @message.can_edit?
= link_to 'Edit', edit_manage_message_path(@message), class: 'btn btn-sm btn-outline-secondary'
= link_to 'Delete', manage_message_path(@message), method: :delete, data: { confirm: "Are you sure? The message \"#{@message.name}\" will be permanently erased. This action is irreversible." }, class: 'btn btn-sm btn-outline-secondary'
Expand Down