merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Times are now rendered using the browsers time zone (#2438)

This commit is contained in:
Ahmad Farhat 2021-01-17 14:48:51 -05:00 committed by GitHub
parent fed6ca4d03
commit 4bf0811136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -83,6 +83,8 @@ gem 'google-cloud-storage', '~> 1.26'
gem 'pluck_to_hash', '~> 1.0.2'
gem 'local_time', '~> 2.1.0'
group :production do
# Use a postgres database in production.
gem 'pg', '~> 0.18'

2
Gemfile.lock
View File

@ -202,6 +202,7 @@ GEM
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
local_time (2.1.0)
lograge (0.11.2)
actionpack (>= 4)
activesupport (>= 4)
@ -479,6 +480,7 @@ DEPENDENCIES
jquery-rails (~> 4.4)
jquery-ui-rails
listen (~> 3.0.5)
local_time (~> 2.1.0)
lograge
net-ldap
omniauth

1
app/assets/javascripts/application.js
View File

@ -35,4 +35,5 @@
//= require jquery-ui/widgets/sortable
//= require pickr.min.js
//= require bootstrap-select.min.js
//= require local-time
//= require_tree .

7
app/helpers/admins_helper.rb
View File

@ -31,13 +31,6 @@ module AdminsHelper
@running_room_bbb_ids.include?(id)
end
# Returns a more friendly/readable date time object
def friendly_time(date)
return "" if date.nil? # Handle invalid dates
I18n.l date, format: "%B %d, %Y %H:%M UTC"
end
# Site Settings
def admin_invite_registration

6
app/helpers/application_helper.rb
View File

@ -135,4 +135,10 @@ module ApplicationHelper
def show_signin
!@hide_signin.present?
end
# Returns a more friendly/readable date time object
def view_date(date)
return "" if date.nil? # Handle invalid dates
local_time(date)
end
end

5
app/helpers/recordings_helper.rb
View File

@ -17,11 +17,6 @@
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
module RecordingsHelper
# Helper for converting BigBlueButton dates into the desired format.
def recording_date(date)
I18n.l date, format: "%B %d, %Y"
end
# Helper for converting BigBlueButton dates into a nice length string.
def recording_length(playbacks)
# Looping through playbacks array and returning first non-zero length value

2
app/views/admins/components/_invited_users_table.html.erb
View File

@ -24,7 +24,7 @@
<div><%= user.email %></div>
</td>
<td>
<div><%= friendly_time(user.updated_at) %></div>
<div><%= view_date(user.updated_at) %></div>
</td>
<td>
<div>

2
app/views/admins/components/_manage_users_table.html.erb
View File

@ -48,7 +48,7 @@
<tr data-user-uid="<%= user.uid %>">
<td>
<div><%= user.name %></div>
<div class="small text-muted"><%= [t("administrator.users.table.created"), ": ", user.created_at].join %></div>
<div class="small text-muted"><%= [t("administrator.users.table.created"), ": ", view_date(user.created_at)].join.html_safe %></div>
</td>
<td class="user-email"><%= user.email && user.email != "" ? user.email : user.username%></td>
<td><%= user.provider %></td>

2
app/views/admins/components/_server_recording_row.html.erb
View File

@ -26,7 +26,7 @@
<a><i id="edit-record" class="fa fa-edit align-top ml-2" data-edit-recordid="<%= recording[:recordID] %>"></i></a>
</div>
<div class="small text-muted">
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
<%= t("recording.recorded_on", date: view_date(recording[:startTime])).html_safe %>
</div>
<div class="small text-muted">
<%= recording_owner_email(recording[:meetingID]) %>

6
app/views/admins/components/_server_room_row.html.erb
View File

@ -26,11 +26,11 @@
<div class="small text-muted">
<% running = room_is_running(room.bbb_id) %>
<% if running %>
<%= t("administrator.rooms.table.started", session: friendly_time(room.last_session)) %>
<%= t("administrator.rooms.table.started", session: view_date(room.last_session)).html_safe %>
<% elsif room.last_session.present? %>
<%= t("administrator.rooms.table.ended", session: friendly_time(room.last_session)) %>
<%= t("administrator.rooms.table.ended", session: view_date(room.last_session)).html_safe %>
<% else %>
<%= [t("administrator.users.table.created"), ": ", friendly_time(room.created_at)].join %>
<%= [t("administrator.users.table.created"), ": ", view_date(room.created_at)].join.html_safe %>
<% end %>
</div>
</td>

2
app/views/rooms/components/_room_block.html.erb
View File

@ -35,7 +35,7 @@
</div>
<div class="small text-muted">
<% if room.sessions > 0 %>
<i><%= t("room.last_session", session: recording_date(room.last_session)) %></i>
<i><%= t("room.last_session", session: view_date(room.last_session)).html_safe %></i>
<% else %>
<i><%= t("room.no_sessions") %></i>
<% end %>

2
app/views/shared/components/_public_recording_row.html.erb
View File

@ -26,7 +26,7 @@
</span>
</div>
<div class="small text-muted">
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
<%= t("recording.recorded_on", date: view_date(recording[:startTime])).html_safe %>
</div>
</td>
<% if recording_thumbnails? %>

2
app/views/shared/components/_recording_row.html.erb
View File

@ -27,7 +27,7 @@
<a><i id="edit-record" class="fa fa-edit align-top ml-2" data-edit-recordid="<%= recording[:recordID] %>"></i></a>
</div>
<div class="small text-muted">
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>
<%= t("recording.recorded_on", date: view_date(recording[:startTime])).html_safe %>
</div>
</td>
<% if recording_thumbnails? %>

7
spec/helpers/recordings_helper_spec.rb
View File

@ -19,13 +19,6 @@
require "rails_helper"
describe RecordingsHelper do
describe "#recording_date" do
it "formats the date" do
date = DateTime.parse("2019-03-28 19:35:15 UTC")
expect(helper.recording_date(date)).to eql("March 28, 2019")
end
end
describe "#recording_length" do
it "returns the time if length > 60" do
playbacks = [{ type: "test", length: 85 }]