consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3507 from consul/proposals-user-segment

Browse Source 
Proposals authors user segment
This commit is contained in:
Alberto
2019-05-20 14:00:15 +02:00
committed by GitHub
parent d845c6e973 61ae4d0ba2
commit 7db1cac3bc
5 changed files with 73 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
app/views/admin/newsletters/show.html.erb
View File

@@ -4,56 +4,55 @@
<% recipients_count = @newsletter.valid_segment_recipient? ? @newsletter.list_of_recipient_emails.count : 0 %> <% recipients_count = @newsletter.valid_segment_recipient? ? @newsletter.list_of_recipient_emails.count : 0 %>
<div class="small-12 column callout highlight"> <div class="small-12 column callout highlight">
<div class="small-12 medium-2 column"> <div class="small-12 medium-2 column">
<strong><%= t("admin.newsletters.show.sent_at") %></strong><br> <strong><%= t("admin.newsletters.show.sent_at") %></strong><br>
<% if @newsletter.draft? %> <% if @newsletter.draft? %>
<%= t("admin.newsletters.index.draft") %> <%= t("admin.newsletters.index.draft") %>
<% else %> <% else %>
<%= l @newsletter.sent_at.to_date %> <%= l @newsletter.sent_at.to_date %>
<% end %> <% end %>
</div> </div>
<div class="small-12 medium-6 column"> <div class="small-12 medium-6 column">
<strong><%= t("admin.newsletters.show.from") %></strong><br> <strong><%= t("admin.newsletters.show.from") %></strong><br>
<%= @newsletter.from %> <%= @newsletter.from %>
</div> </div>
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">
<strong><%= t("admin.newsletters.show.subject") %></strong><br> <strong><%= t("admin.newsletters.show.subject") %></strong><br>
<%= @newsletter.subject %> <%= @newsletter.subject %>
</div> </div>
<div class="small-12 column"> <div class="small-12 column">
<strong><%= t("admin.newsletters.show.segment_recipient") %></strong><br> <strong><%= t("admin.newsletters.show.segment_recipient") %></strong><br>
<%= segment_name(@newsletter.segment_recipient) %> <%= segment_name(@newsletter.segment_recipient) %>
<%= t("admin.newsletters.show.affected_users", n: recipients_count) %> <%= t("admin.newsletters.show.affected_users", n: recipients_count) %>
</div>
<div class="small-12 column">
<strong>
<%= t("admin.newsletters.show.sent_emails", count: @newsletter.activities.count) %>
</strong>
</div>
</div> </div>
<div class="small-12 column"> <div class="small-12 column">
<strong><%= t("admin.newsletters.show.body") %></strong> <strong>
<p class="help-text" id="phase-description-help-text"> <%= t("admin.newsletters.show.sent_emails", count: @newsletter.activities.count) %>
<%= t("admin.newsletters.show.body_help_text") %> </strong>
</p>
</div> </div>
</div>
<div class="newsletter-body-content"> <div class="small-12 column">
<%= render file: "app/views/layouts/_mailer_header.html.erb" %> <strong><%= t("admin.newsletters.show.body") %></strong>
<p class="help-text" id="phase-description-help-text">
<%= t("admin.newsletters.show.body_help_text") %>
</p>
</div>
<table cellpadding="0" cellspacing="0" border="0" style="background: #fff; margin: 0 auto; max-width: 700px; width:100%;"> <div class="newsletter-body-content">
<tbody> <%= render file: "app/views/layouts/_mailer_header.html.erb" %>
<tr>
<%= render file: "app/views/mailer/newsletter.html.erb" %>
</tr>
</tbody>
</table>
<%= render file: "app/views/layouts/_mailer_footer.html.erb" %> <table cellpadding="0" cellspacing="0" border="0" style="background: #fff; margin: 0 auto; max-width: 700px; width:100%;">
</div> <tbody>
<tr>
<%= render file: "app/views/mailer/newsletter.html.erb" %>
</tr>
</tbody>
</table>
<%= render file: "app/views/layouts/_mailer_footer.html.erb" %>
</div> </div>
<% if @newsletter.draft? && @newsletter.valid_segment_recipient? %> <% if @newsletter.draft? && @newsletter.valid_segment_recipient? %>

1
config/locales/en/admin.yml
View File

@@ -753,6 +753,7 @@ en:
segment_recipient: segment_recipient:
all_users: All users all_users: All users
administrators: Administrators administrators: Administrators
all_proposal_authors: Proposal authors (including archived and retired)
proposal_authors: Proposal authors proposal_authors: Proposal authors
investment_authors: Investment authors in the current budget investment_authors: Investment authors in the current budget
feasible_and_undecided_investment_authors: "Authors of some investment in the current budget that does not comply with: [valuation finished unfesasible]" feasible_and_undecided_investment_authors: "Authors of some investment in the current budget that does not comply with: [valuation finished unfesasible]"

1
config/locales/es/admin.yml
View File

@@ -752,6 +752,7 @@ es:
segment_recipient: segment_recipient:
all_users: Todos los usuarios all_users: Todos los usuarios
administrators: Administradores administrators: Administradores
all_proposal_authors: Usuarios autores de propuestas (incluyendo archivadas y retiradas)
proposal_authors: Usuarios autores de propuestas proposal_authors: Usuarios autores de propuestas
investment_authors: Usuarios autores de proyectos de gasto en los actuales presupuestos investment_authors: Usuarios autores de proyectos de gasto en los actuales presupuestos
feasible_and_undecided_investment_authors: "Usuarios autores de algún proyecto de gasto en los actuales presupuestos que no cumpla: [evaluación finalizada inviable]" feasible_and_undecided_investment_authors: "Usuarios autores de algún proyecto de gasto en los actuales presupuestos que no cumpla: [evaluación finalizada inviable]"

9
lib/user_segments.rb
View File

@@ -1,12 +1,13 @@
class UserSegments class UserSegments
SEGMENTS = %w(all_users SEGMENTS = %w[all_users
administrators administrators
all_proposal_authors
proposal_authors proposal_authors
investment_authors investment_authors
feasible_and_undecided_investment_authors feasible_and_undecided_investment_authors
selected_investment_authors selected_investment_authors
winner_investment_authors winner_investment_authors
not_supported_on_current_budget) not_supported_on_current_budget]
def self.all_users def self.all_users
User.active User.active
@@ -16,6 +17,10 @@ class UserSegments
all_users.administrators all_users.administrators
end end
def self.all_proposal_authors
author_ids(Proposal.pluck(:author_id).uniq)
end
def self.proposal_authors def self.proposal_authors
author_ids(Proposal.not_archived.not_retired.pluck(:author_id).uniq) author_ids(Proposal.not_archived.not_retired.pluck(:author_id).uniq)
end end

22
spec/lib/user_segments_spec.rb
View File

@@ -27,6 +27,28 @@ describe UserSegments do
end end
end end
describe "#all_proposal_authors" do
it "returns users that have created a proposal even if is archived or retired" do
create(:proposal, author: user1)
create(:proposal, :archived, author: user2)
create(:proposal, retired_at: Time.current, author: user3)
all_proposal_authors = described_class.all_proposal_authors
expect(all_proposal_authors).to include user1
expect(all_proposal_authors).to include user2
expect(all_proposal_authors).to include user3
end
it "does not return duplicated users" do
create(:proposal, author: user1)
create(:proposal, :archived, author: user1)
create(:proposal, retired_at: Time.current, author: user1)
all_proposal_authors = described_class.all_proposal_authors
expect(all_proposal_authors).to contain_exactly(user1)
end
end
describe "#proposal_authors" do describe "#proposal_authors" do
it "returns users that have created a proposal" do it "returns users that have created a proposal" do
proposal = create(:proposal, author: user1) proposal = create(:proposal, author: user1)