show last active time in words
in user recommendation email show the last active time using action_view time_ago_in_words helper
This commit is contained in:
parent
6ea439b435
commit
529d3fc891
|
|
@ -31,6 +31,7 @@ end
|
|||
gem 'activerecord', '= 4.2.8'
|
||||
gem 'railties', '= 4.2.8'
|
||||
gem 'actionmailer', '= 4.2.8'
|
||||
gem 'actionview', '= 4.2.8'
|
||||
gem 'rails-observers', '0.1.2'
|
||||
gem 'protected_attributes' # needed to support attr_accessible
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ require 'tzinfo'
|
|||
require 'stripe'
|
||||
require 'zip-codes'
|
||||
require 'email_validator'
|
||||
require 'action_view'
|
||||
|
||||
ActiveRecord::Base.raise_in_transactional_callbacks = true
|
||||
require "jam_ruby/lib/timezone"
|
||||
|
|
|
|||
|
|
@ -414,7 +414,7 @@ module JamRuby
|
|||
|
||||
mail(:to => user.email, :subject => EmailNewMusicianMatch.subject) do |format|
|
||||
format.text
|
||||
format.html { render layout: "user_mailer_beta" }
|
||||
#format.html { render layout: "user_mailer_beta" }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
<div><strong><%= musician.first_name %> <%= musician.last_name %></strong></div>
|
||||
<div>Latency To You: <%= latency_info(latency) %></div>
|
||||
<% if musician.last_active_timestamp -%>
|
||||
<div>Last Active On: <%= Time.at(musician.last_active_timestamp).strftime('%m-%d-%Y %H:%M') %></div>
|
||||
<div>Last Active On: <%= time_ago_in_words(Time.at(musician.last_active_timestamp)) %> ago</div>
|
||||
<% end -%>
|
||||
</div>
|
||||
<div class="instruments">
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ The following musicians have joined JamKazam within the last week and have low i
|
|||
<%= musician.first_name %> <%= musician.last_name %>
|
||||
Latency To You: <%= latency_info(latency) %>
|
||||
<% if musician.last_active_timestamp -%>
|
||||
Last Active On: <%= Time.at(musician.last_active_timestamp).strftime('%m-%d-%Y %H:%M') %> ago
|
||||
Last Active On: <%= time_ago_in_words(Time.at(musician.last_active_timestamp)) %> ago
|
||||
<% end -%>
|
||||
<% musician.musician_instruments.each do |mi| -%>
|
||||
<%= mi.description %> (<%= @instrument_proficiencies[mi.proficiency_level.to_s.to_sym] %>)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,13 @@ module JamRuby
|
|||
|
||||
begin
|
||||
|
||||
recipients = User.where("users.subscribe_email = ? AND users.subscribe_email_for_user_match = ? AND NOT COALESCE(users.user_match_email_sent_at, ?) > ?", true, true, 7.days.ago, 6.days.ago).where.not(id: email_sending.sent_user_ids).order("CASE WHEN users.email IN ('#{PRIORITY_RECIPIENTS.map {|str| "\"#{str}\""}.join(',')}') THEN 0 ELSE 1 END, last_active_at DESC").select("users.*, GREATEST(updated_at, last_jam_updated_at) AS last_active_at")
|
||||
recipients = User.where("users.subscribe_email = ? AND
|
||||
users.subscribe_email_for_user_match = ?
|
||||
AND NOT COALESCE(users.user_match_email_sent_at, ?) > ?",
|
||||
true, true, 7.days.ago, 6.days.ago).where.not(id: email_sending.sent_user_ids).order("
|
||||
CASE WHEN users.email IN ('#{PRIORITY_RECIPIENTS.map {|str| "\"#{str}\""}.join(',')}')
|
||||
THEN 0 ELSE 1 END, last_active_at DESC").select("users.*,
|
||||
GREATEST(updated_at, last_jam_updated_at) AS last_active_at")
|
||||
|
||||
AdminMailer.ugly({to: APP_CONFIG.user_match_monitoring_email,
|
||||
subject:"Weekly user match email sending job started.",
|
||||
|
|
|
|||
Loading…
Reference in New Issue