mirror of
https://github.com/rickbarrette/simple-aircraft-manager-rails.git
synced 2026-11-17 23:50:36 -05:00
Time zones: each person's own, and TZ for the installation
- Requests run in the viewer's zone: Profile -> Time zone, else their device's (a tz cookie set from the browser), else the installation's; times show in it and "today" is the local date (a new flight's date) - Docker's TZ sets the installation zone (default UTC): scheduled jobs run on its clock (recurring.yml), and it's used before a device's zone is known - The weekly reminder email is worked out in the recipient's zone - Signatures, record history and exports keep exact UTC timestamps - users.time_zone; README, .env.example and guide updated Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
03b9ad65cb
commit
9662c7ae16
17 files changed
+156
-12
No files matched your search
@@ -1,6 +1,7 @@
|
||||
class ApplicationController < ActionController::Base
|
||||
default_form_builder AppFormBuilder
|
||||
include Authentication
|
||||
include TimeZones
|
||||
allow_browser versions: :modern
|
||||
|
||||
prepend_before_action :redirect_to_setup
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
# Each request runs in the viewer's time zone: the one chosen in Profile, else
|
||||
# the device's (a "tz" cookie the page sets from the browser), else the
|
||||
# installation's default (TZ). That decides how times show and
|
||||
# what "today" is (e.g. a new flight's date). Signatures, the record history
|
||||
# and exports keep exact UTC timestamps.
|
||||
module TimeZones
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
around_action :use_time_zone
|
||||
helper_method :device_time_zone, :device_time_zone_label
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def use_time_zone(&)
|
||||
Time.use_zone(Current.user&.time_zone.presence || device_time_zone || Time.zone_default, &)
|
||||
end
|
||||
|
||||
# "(GMT-08:00) Pacific Time (US & Canada)" for America/Los_Angeles.
|
||||
def device_time_zone_label
|
||||
return unless (zone = ActiveSupport::TimeZone[device_time_zone.to_s])
|
||||
(ActiveSupport::TimeZone.all.find { _1.tzinfo.identifier == zone.tzinfo.identifier } || zone).to_s
|
||||
end
|
||||
|
||||
# The browser's zone, when it's one we know.
|
||||
def device_time_zone
|
||||
name = cookies[:tz].to_s.first(64)
|
||||
ActiveSupport::TimeZone[name] && name if name.present?
|
||||
end
|
||||
end
|
||||
@@ -7,7 +7,7 @@ class ProfilesController < ApplicationController
|
||||
# left open somewhere can't be turned into a takeover of the account.
|
||||
def update
|
||||
@user = current_user
|
||||
attrs = params.require(:user).permit(:name, :email_address, :password, :password_confirmation, :reminder_emails)
|
||||
attrs = params.require(:user).permit(:name, :email_address, :password, :password_confirmation, :reminder_emails, :time_zone)
|
||||
attrs = attrs.except(:password, :password_confirmation) if attrs[:password].blank?
|
||||
new_email = User.normalize_value_for(:email_address, attrs[:email_address].to_s) if attrs.key?(:email_address)
|
||||
sensitive = (new_email && new_email != @user.email_address) || attrs.key?(:password)
|
||||
|
||||
@@ -42,6 +42,15 @@ window.addEventListener("beforeinstallprompt", (event) => {
|
||||
document.dispatchEvent(new CustomEvent("install:available"))
|
||||
})
|
||||
|
||||
// The device's time zone, so times show in it and "today" is the local date
|
||||
// (unless a zone is chosen in Profile).
|
||||
try {
|
||||
const zone = Intl.DateTimeFormat().resolvedOptions().timeZone
|
||||
if (zone && !document.cookie.split("; ").includes(`tz=${encodeURIComponent(zone)}`)) {
|
||||
document.cookie = `tz=${encodeURIComponent(zone)}; path=/; max-age=31536000; samesite=lax`
|
||||
}
|
||||
} catch (_) { /* no Intl */ }
|
||||
|
||||
// Label each table cell with its column header, so phone CSS can show rows as
|
||||
// cards ("Status: In Service"). Skips tables marked .table-keep.
|
||||
function labelTableCells(root = document) {
|
||||
|
||||
@@ -25,6 +25,12 @@ class ReminderMailer < ApplicationMailer
|
||||
end
|
||||
|
||||
def weekly(user)
|
||||
Time.use_zone(user.time_zone.presence || Time.zone_default) { weekly_in_zone(user) }
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def weekly_in_zone(user)
|
||||
@user = user
|
||||
@items = self.class.items_for(user)
|
||||
@certificates = self.class.expiring_certificates_for(user)
|
||||
|
||||
@@ -52,7 +52,7 @@ class SystemInfo
|
||||
"SQLite" => SQLite3::SQLITE_VERSION,
|
||||
"Bundler" => Bundler::VERSION,
|
||||
t(:environment) => Rails.env,
|
||||
t(:time_zone) => Time.zone.name
|
||||
t(:time_zone) => Time.zone_default.name
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
@@ -3,6 +3,9 @@ class User < ApplicationRecord
|
||||
has_many :sessions, dependent: :destroy
|
||||
has_many :aircraft_roles, dependent: :destroy
|
||||
has_many :push_subscriptions, dependent: :delete_all
|
||||
|
||||
normalizes :time_zone, with: ->(z) { z.strip.presence }
|
||||
validates :time_zone, inclusion: { in: ->(_) { ActiveSupport::TimeZone.all.map(&:name) } }, allow_nil: true
|
||||
has_many :aircraft, through: :aircraft_roles
|
||||
has_one :air_trail_connection, dependent: :destroy
|
||||
has_many :certificates, -> { ordered }, class_name: "UserCertificate", dependent: :destroy
|
||||
|
||||
@@ -5,6 +5,13 @@
|
||||
<%= f.field :email_address, as: :email, label: t(".email") %>
|
||||
<%= f.field :reminder_emails, as: :checkbox, label: t(".weekly_maintenance_reminders"),
|
||||
hint: t(MailSettings.configured? ? ".a_monday_email_about_overdue" : ".reminders_once_email_set_up") %>
|
||||
<div>
|
||||
<%= f.label :time_zone, t(".time_zone"), class: "label" %>
|
||||
<%= f.time_zone_select :time_zone, ActiveSupport::TimeZone.us_zones,
|
||||
{ include_blank: t(".time_zone_automatic", zone: device_time_zone_label || t(".time_zone_unknown")) },
|
||||
class: "input" %>
|
||||
<p class="hint"><%= t(".time_zone_hint", now: fmt_time(Time.current)) %></p>
|
||||
</div>
|
||||
<%= f.field :password, as: :password, label: t(".new_password"), hint: t(".leave_blank_to_keep_your", min: User::PASSWORD_MIN), autocomplete: "new-password" %>
|
||||
<%= f.field :password_confirmation, as: :password, label: t(".confirm_new_password"), autocomplete: "new-password" %>
|
||||
<div>
|
||||
|
||||
Reference in new issue
Block a user