mirror of
https://github.com/rickbarrette/simple-aircraft-manager-rails.git
synced 2026-11-17 23:50:36 -05:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f534541467 | ||
|
|
8d5f57da81 | ||
|
|
89ed0a76f9 | ||
|
|
3f45b557c2 | ||
|
|
bff6a05173 |
No files matched your search
@@ -2,6 +2,31 @@
|
|||||||
|
|
||||||
Each release has a **version** (year.month.release, e.g. 2026.11.0) and a **build** (the exact source commit, shown on Admin → About). The newest release is first.
|
Each release has a **version** (year.month.release, e.g. 2026.11.0) and a **build** (the exact source commit, shown on Admin → About). The newest release is first.
|
||||||
|
|
||||||
|
## 2026.11.3
|
||||||
|
|
||||||
|
### Installed app
|
||||||
|
|
||||||
|
- **Works without signal.** While you're online the app saves, for each of your aircraft, the Overview, weight and balance, Log Flight and Report Squawk pages and its photo, plus the Fleet page. At the plane with no signal, open the app and use it as usual; a saved copy says when it was saved.
|
||||||
|
- **Report Squawk offline**, photos included, like Log Flight. Saved items are sent when the connection is back (on Android even with the app closed), only ever under the account that saved them, and the number waiting shows on the app icon.
|
||||||
|
- **Notifications** (Profile → This device): a grounding squawk on your aircraft, items newly overdue on aircraft you own (checked each morning), and requests to sign a logbook entry. On iPhone and iPad they work in the installed app.
|
||||||
|
- **Shortcuts**: a long press on the app icon offers Log Flight and Report Squawk.
|
||||||
|
- **Install help** on Profile, and a **Reload** notice when a new version is installed.
|
||||||
|
- Signing out clears what the device saved for offline use.
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
|
||||||
|
- Each section shows its main action as a button; imports, exports, printing and tools are under **More**. The aircraft's **More** menu has the status report and, for owners, Access & sharing, editing the aircraft and its downloads.
|
||||||
|
- Oil Analysis is under **Oil & Fuel**; the tabs fit on one line.
|
||||||
|
- The header shows your role on the aircraft, and no longer shows "Available" (the usual status).
|
||||||
|
- **Print selected** in the logbook appears once an entry is ticked; the logbook filter applies as you change it.
|
||||||
|
- Dates read the same everywhere (the logbook list, notes, audits, About).
|
||||||
|
- All the app's text is in one translation file; see Translating in the README.
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
|
||||||
|
- The flight statistics' cards fit two to a row on phones, and **By year** shows that it opens.
|
||||||
|
- Various unused code removed.
|
||||||
|
|
||||||
## 2026.11.2
|
## 2026.11.2
|
||||||
|
|
||||||
### Changes
|
### Changes
|
||||||
|
|||||||
+1
-1
@@ -30,7 +30,7 @@ FROM base AS build
|
|||||||
|
|
||||||
# Install packages needed to build gems
|
# Install packages needed to build gems
|
||||||
RUN apt-get update -qq && \
|
RUN apt-get update -qq && \
|
||||||
apt-get install --no-install-recommends -y build-essential git libyaml-dev pkg-config && \
|
apt-get install --no-install-recommends -y build-essential git libssl-dev libyaml-dev pkg-config && \
|
||||||
rm -rf /var/lib/apt/lists /var/cache/apt/archives
|
rm -rf /var/lib/apt/lists /var/cache/apt/archives
|
||||||
|
|
||||||
# Install application gems
|
# Install application gems
|
||||||
|
|||||||
@@ -23,10 +23,9 @@ gem "bcrypt", "~> 3.1.7"
|
|||||||
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
||||||
gem "tzinfo-data", platforms: %i[ windows jruby ]
|
gem "tzinfo-data", platforms: %i[ windows jruby ]
|
||||||
|
|
||||||
# Use the database-backed adapters for Rails.cache, Active Job, and Action Cable
|
# Use the database-backed adapters for Rails.cache and Active Job
|
||||||
gem "solid_cache"
|
gem "solid_cache"
|
||||||
gem "solid_queue"
|
gem "solid_queue"
|
||||||
gem "solid_cable"
|
|
||||||
|
|
||||||
# Reduces boot times through caching; required in config/boot.rb
|
# Reduces boot times through caching; required in config/boot.rb
|
||||||
gem "bootsnap", require: false
|
gem "bootsnap", require: false
|
||||||
@@ -56,12 +55,6 @@ group :development do
|
|||||||
gem "web-console"
|
gem "web-console"
|
||||||
end
|
end
|
||||||
|
|
||||||
group :test do
|
|
||||||
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
|
|
||||||
gem "capybara"
|
|
||||||
gem "selenium-webdriver"
|
|
||||||
end
|
|
||||||
|
|
||||||
gem "chartkick", "~> 5.2"
|
gem "chartkick", "~> 5.2"
|
||||||
|
|
||||||
gem "json", "~> 3.1"
|
gem "json", "~> 3.1"
|
||||||
@@ -85,4 +78,7 @@ gem "omniauth-rails_csrf_protection", "~> 2.0"
|
|||||||
|
|
||||||
gem "prawn", "~> 2.5" # printable logbook entries
|
gem "prawn", "~> 2.5" # printable logbook entries
|
||||||
gem "rotp", "~> 6.3" # authenticator app (TOTP) codes
|
gem "rotp", "~> 6.3" # authenticator app (TOTP) codes
|
||||||
|
|
||||||
|
# Push notifications to installed apps and browsers (Web Push, VAPID)
|
||||||
|
gem "web-push", "~> 3.1"
|
||||||
gem "rqrcode", "~> 3.1" # QR code for setting up the authenticator
|
gem "rqrcode", "~> 3.1" # QR code for setting up the authenticator
|
||||||
+10
-30
@@ -100,15 +100,6 @@ GEM
|
|||||||
brakeman (8.1.0)
|
brakeman (8.1.0)
|
||||||
racc
|
racc
|
||||||
builder (3.3.0)
|
builder (3.3.0)
|
||||||
capybara (3.40.0)
|
|
||||||
addressable
|
|
||||||
matrix
|
|
||||||
mini_mime (>= 0.1.3)
|
|
||||||
nokogiri (~> 1.11)
|
|
||||||
rack (>= 1.6.0)
|
|
||||||
rack-test (>= 0.6.3)
|
|
||||||
regexp_parser (>= 1.5, < 3.0)
|
|
||||||
xpath (~> 3.2)
|
|
||||||
caxlsx (4.5.0)
|
caxlsx (4.5.0)
|
||||||
htmlentities (~> 4.3, >= 4.3.4)
|
htmlentities (~> 4.3, >= 4.3.4)
|
||||||
marcel (~> 1.0)
|
marcel (~> 1.0)
|
||||||
@@ -180,6 +171,8 @@ GEM
|
|||||||
bindata
|
bindata
|
||||||
faraday (~> 2.0)
|
faraday (~> 2.0)
|
||||||
faraday-follow_redirects
|
faraday-follow_redirects
|
||||||
|
jwt (3.3.0)
|
||||||
|
base64
|
||||||
kamal (2.12.0)
|
kamal (2.12.0)
|
||||||
activesupport (>= 7.0)
|
activesupport (>= 7.0)
|
||||||
base64 (~> 0.2)
|
base64 (~> 0.2)
|
||||||
@@ -268,6 +261,7 @@ GEM
|
|||||||
tzinfo
|
tzinfo
|
||||||
validate_url
|
validate_url
|
||||||
webfinger (~> 2.0)
|
webfinger (~> 2.0)
|
||||||
|
openssl (4.0.2)
|
||||||
opentelemetry-api (1.11.1)
|
opentelemetry-api (1.11.1)
|
||||||
logger
|
logger
|
||||||
ostruct (0.6.3)
|
ostruct (0.6.3)
|
||||||
@@ -404,16 +398,6 @@ GEM
|
|||||||
ruby-progressbar (1.13.0)
|
ruby-progressbar (1.13.0)
|
||||||
rubyzip (3.7.0)
|
rubyzip (3.7.0)
|
||||||
securerandom (0.4.1)
|
securerandom (0.4.1)
|
||||||
selenium-webdriver (4.52.0)
|
|
||||||
base64 (~> 0.2)
|
|
||||||
logger (~> 1.4)
|
|
||||||
rubyzip (>= 1.2.2, < 4.0)
|
|
||||||
websocket (~> 1.0)
|
|
||||||
solid_cable (4.1.0)
|
|
||||||
actioncable (>= 7.2)
|
|
||||||
activejob (>= 7.2)
|
|
||||||
activerecord (>= 7.2)
|
|
||||||
railties (>= 7.2)
|
|
||||||
solid_cache (1.0.10)
|
solid_cache (1.0.10)
|
||||||
activejob (>= 7.2)
|
activejob (>= 7.2)
|
||||||
activerecord (>= 7.2)
|
activerecord (>= 7.2)
|
||||||
@@ -485,6 +469,9 @@ GEM
|
|||||||
actionview (>= 8.0.0)
|
actionview (>= 8.0.0)
|
||||||
bindex (>= 0.4.0)
|
bindex (>= 0.4.0)
|
||||||
railties (>= 8.0.0)
|
railties (>= 8.0.0)
|
||||||
|
web-push (3.1.0)
|
||||||
|
jwt (~> 3.0)
|
||||||
|
openssl (>= 3.0)
|
||||||
webfinger (2.1.3)
|
webfinger (2.1.3)
|
||||||
activesupport
|
activesupport
|
||||||
faraday (~> 2.0)
|
faraday (~> 2.0)
|
||||||
@@ -493,13 +480,10 @@ GEM
|
|||||||
addressable (>= 2.8.0)
|
addressable (>= 2.8.0)
|
||||||
crack (>= 0.3.2)
|
crack (>= 0.3.2)
|
||||||
hashdiff (>= 0.4.0, < 2.0.0)
|
hashdiff (>= 0.4.0, < 2.0.0)
|
||||||
websocket (1.2.11)
|
|
||||||
websocket-driver (0.8.2)
|
websocket-driver (0.8.2)
|
||||||
base64
|
base64
|
||||||
websocket-extensions (>= 0.1.0)
|
websocket-extensions (>= 0.1.0)
|
||||||
websocket-extensions (0.1.5)
|
websocket-extensions (0.1.5)
|
||||||
xpath (3.2.0)
|
|
||||||
nokogiri (~> 1.8)
|
|
||||||
zeitwerk (2.8.3)
|
zeitwerk (2.8.3)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
@@ -518,7 +502,6 @@ DEPENDENCIES
|
|||||||
bcrypt (~> 3.1.7)
|
bcrypt (~> 3.1.7)
|
||||||
bootsnap
|
bootsnap
|
||||||
brakeman
|
brakeman
|
||||||
capybara
|
|
||||||
caxlsx (~> 4.5)
|
caxlsx (~> 4.5)
|
||||||
chartkick (~> 5.2)
|
chartkick (~> 5.2)
|
||||||
commonmarker (~> 2.10)
|
commonmarker (~> 2.10)
|
||||||
@@ -540,8 +523,6 @@ DEPENDENCIES
|
|||||||
rqrcode (~> 3.1)
|
rqrcode (~> 3.1)
|
||||||
rubocop-rails-omakase
|
rubocop-rails-omakase
|
||||||
rubyzip (~> 3.7)
|
rubyzip (~> 3.7)
|
||||||
selenium-webdriver
|
|
||||||
solid_cable
|
|
||||||
solid_cache
|
solid_cache
|
||||||
solid_queue
|
solid_queue
|
||||||
sqlite3 (>= 2.1)
|
sqlite3 (>= 2.1)
|
||||||
@@ -551,6 +532,7 @@ DEPENDENCIES
|
|||||||
turbo-rails
|
turbo-rails
|
||||||
tzinfo-data
|
tzinfo-data
|
||||||
web-console
|
web-console
|
||||||
|
web-push (~> 3.1)
|
||||||
webmock (~> 3.34)
|
webmock (~> 3.34)
|
||||||
|
|
||||||
CHECKSUMS
|
CHECKSUMS
|
||||||
@@ -584,7 +566,6 @@ CHECKSUMS
|
|||||||
bootsnap (1.26.1) sha256=5b5bd90f8f13ea338627c1d56ffbe2ea25e743ac48c2afec1a9bea3a06a264e2
|
bootsnap (1.26.1) sha256=5b5bd90f8f13ea338627c1d56ffbe2ea25e743ac48c2afec1a9bea3a06a264e2
|
||||||
brakeman (8.1.0) sha256=cfa9e5214e4925842f4bc849a64f8a7e6c5d0425fe98eac8d7b7bc60fdc17e07
|
brakeman (8.1.0) sha256=cfa9e5214e4925842f4bc849a64f8a7e6c5d0425fe98eac8d7b7bc60fdc17e07
|
||||||
builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
|
builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
|
||||||
capybara (3.40.0) sha256=42dba720578ea1ca65fd7a41d163dd368502c191804558f6e0f71b391054aeef
|
|
||||||
caxlsx (4.5.0) sha256=e3d98d859f148df05d5462086b5079b523f29c1766b569535f1d68629ce743ff
|
caxlsx (4.5.0) sha256=e3d98d859f148df05d5462086b5079b523f29c1766b569535f1d68629ce743ff
|
||||||
chartkick (5.3.0) sha256=19a2bba39decf54c4939d3f31460535f8814c85045672ba2ed616c6897325b00
|
chartkick (5.3.0) sha256=19a2bba39decf54c4939d3f31460535f8814c85045672ba2ed616c6897325b00
|
||||||
chunky_png (1.4.0) sha256=89d5b31b55c0cf4da3cf89a2b4ebc3178d8abe8cbaf116a1dba95668502fdcfe
|
chunky_png (1.4.0) sha256=89d5b31b55c0cf4da3cf89a2b4ebc3178d8abe8cbaf116a1dba95668502fdcfe
|
||||||
@@ -624,6 +605,7 @@ CHECKSUMS
|
|||||||
irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
|
irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
|
||||||
json (3.1.0) sha256=3ce7ccf8fde58960177a3a756c31f292a4c1e1dedee884547096a5b0604e3bd8
|
json (3.1.0) sha256=3ce7ccf8fde58960177a3a756c31f292a4c1e1dedee884547096a5b0604e3bd8
|
||||||
json-jwt (1.17.2) sha256=97e37c1c3e22e9e1d74a1c0d77319c5cdc8a636226e5dbb1664b0b34eddcf1c9
|
json-jwt (1.17.2) sha256=97e37c1c3e22e9e1d74a1c0d77319c5cdc8a636226e5dbb1664b0b34eddcf1c9
|
||||||
|
jwt (3.3.0) sha256=44cc34fbc341c148233cf66641522b4bce0dfb1ce55e8073f05c56f44f4ee546
|
||||||
kamal (2.12.0) sha256=c51d1ab085e515470f98d0c0f043637122b5ebf76e8b610cb1fbbed0b7f9b8fa
|
kamal (2.12.0) sha256=c51d1ab085e515470f98d0c0f043637122b5ebf76e8b610cb1fbbed0b7f9b8fa
|
||||||
language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
|
language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
|
||||||
lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
|
lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
|
||||||
@@ -656,6 +638,7 @@ CHECKSUMS
|
|||||||
omniauth-rails_csrf_protection (2.0.1) sha256=c6e3204d7e3925bb537cb52d50fdfc9f05293f1a9d87c5d4ab4ca3a39ba8c32d
|
omniauth-rails_csrf_protection (2.0.1) sha256=c6e3204d7e3925bb537cb52d50fdfc9f05293f1a9d87c5d4ab4ca3a39ba8c32d
|
||||||
omniauth_openid_connect (0.8.0) sha256=1f2f3890386e2a742221cee0d2e903b78d874e6fab9ea3bfa31c1462f4793d25
|
omniauth_openid_connect (0.8.0) sha256=1f2f3890386e2a742221cee0d2e903b78d874e6fab9ea3bfa31c1462f4793d25
|
||||||
openid_connect (2.5.0) sha256=659aff8edce0907798e3f6837e5f27ae2937ae8735216f3e900ab8daa29e39c4
|
openid_connect (2.5.0) sha256=659aff8edce0907798e3f6837e5f27ae2937ae8735216f3e900ab8daa29e39c4
|
||||||
|
openssl (4.0.2) sha256=1037ad2868ae58df9ad917891c0c0f9815a1172f6846d4bcdd508e4c2ee747c2
|
||||||
opentelemetry-api (1.11.1) sha256=d07f9987ea6240b3fd5ed5dd7450f93c58e403e0553e804069c23ae18ba61ff7
|
opentelemetry-api (1.11.1) sha256=d07f9987ea6240b3fd5ed5dd7450f93c58e403e0553e804069c23ae18ba61ff7
|
||||||
ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
|
ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
|
||||||
parallel (2.3.0) sha256=f75a3e904101ce6a1ccb6b8dc800cbafd42166d83330192438dcf29395167a6f
|
parallel (2.3.0) sha256=f75a3e904101ce6a1ccb6b8dc800cbafd42166d83330192438dcf29395167a6f
|
||||||
@@ -700,8 +683,6 @@ CHECKSUMS
|
|||||||
ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
|
ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
|
||||||
rubyzip (3.7.0) sha256=65c19294da75297a939006f3516deacc33185fbd721ff1954f7a231db6d3e121
|
rubyzip (3.7.0) sha256=65c19294da75297a939006f3516deacc33185fbd721ff1954f7a231db6d3e121
|
||||||
securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
|
securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
|
||||||
selenium-webdriver (4.52.0) sha256=5d45ba100ea8b57f5a8c25979a636d48b4c60c39973478930d78e884bdeecd2d
|
|
||||||
solid_cable (4.1.0) sha256=828e3d509207b82b4f05f4e9c85f696994710679b52d511aa7f97ebd212d3226
|
|
||||||
solid_cache (1.0.10) sha256=bc05a2fb3ac78a6f43cbb5946679cf9db67dd30d22939ededc385cb93e120d41
|
solid_cache (1.0.10) sha256=bc05a2fb3ac78a6f43cbb5946679cf9db67dd30d22939ededc385cb93e120d41
|
||||||
solid_queue (1.7.2) sha256=a22685e1d2ee14ce7b4e5d4592c9d8e837951884c51555609dee58679ed03325
|
solid_queue (1.7.2) sha256=a22685e1d2ee14ce7b4e5d4592c9d8e837951884c51555609dee58679ed03325
|
||||||
sqlite3 (2.10.2-aarch64-linux-gnu) sha256=e9aea2c2b3476fc875dd8a89313a9a2862818519c0186bfb5b56d6f57bb08d98
|
sqlite3 (2.10.2-aarch64-linux-gnu) sha256=e9aea2c2b3476fc875dd8a89313a9a2862818519c0186bfb5b56d6f57bb08d98
|
||||||
@@ -741,12 +722,11 @@ CHECKSUMS
|
|||||||
useragent (0.16.11) sha256=700e6413ad4bb954bb63547fa098dddf7b0ebe75b40cc6f93b8d54255b173844
|
useragent (0.16.11) sha256=700e6413ad4bb954bb63547fa098dddf7b0ebe75b40cc6f93b8d54255b173844
|
||||||
validate_url (1.0.15) sha256=72fe164c0713d63a9970bd6700bea948babbfbdcec392f2342b6704042f57451
|
validate_url (1.0.15) sha256=72fe164c0713d63a9970bd6700bea948babbfbdcec392f2342b6704042f57451
|
||||||
web-console (4.3.0) sha256=e13b71301cdfc2093f155b5aa3a622db80b4672d1f2f713119cc7ec7ac6a6da4
|
web-console (4.3.0) sha256=e13b71301cdfc2093f155b5aa3a622db80b4672d1f2f713119cc7ec7ac6a6da4
|
||||||
|
web-push (3.1.0) sha256=501ab00340c58fb70dabda59f28a86b3cccb0930c6f1f30721b2a5b24de7187d
|
||||||
webfinger (2.1.3) sha256=567a52bde77fb38ca6b67e55db755f988766ec4651c1d24916a65aa70540695c
|
webfinger (2.1.3) sha256=567a52bde77fb38ca6b67e55db755f988766ec4651c1d24916a65aa70540695c
|
||||||
webmock (3.34.0) sha256=72eed29dc8c00148d592acaedaaa6b869e2e397de57dfc8602b84aa834f46b33
|
webmock (3.34.0) sha256=72eed29dc8c00148d592acaedaaa6b869e2e397de57dfc8602b84aa834f46b33
|
||||||
websocket (1.2.11) sha256=b7e7a74e2410b5e85c25858b26b3322f29161e300935f70a0e0d3c35e0462737
|
|
||||||
websocket-driver (0.8.2) sha256=97c556b019bf3410b4961002ac501621e9322d3f8a7bc02161a09301cc4c4146
|
websocket-driver (0.8.2) sha256=97c556b019bf3410b4961002ac501621e9322d3f8a7bc02161a09301cc4c4146
|
||||||
websocket-extensions (0.1.5) sha256=1c6ba63092cda343eb53fc657110c71c754c56484aad42578495227d717a8241
|
websocket-extensions (0.1.5) sha256=1c6ba63092cda343eb53fc657110c71c754c56484aad42578495227d717a8241
|
||||||
xpath (3.2.0) sha256=6dfda79d91bb3b949b947ecc5919f042ef2f399b904013eb3ef6d20dd3a4082e
|
|
||||||
zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5
|
zeitwerk (2.8.3) sha256=2c85125a8467ce069e20123d1e709a08955c9d29c118c25b46b7b7fafdbb92e5
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ The port aims to be **easy to host**. It runs as one process with one SQLite dat
|
|||||||
|
|
||||||
## Stack
|
## Stack
|
||||||
|
|
||||||
- Ruby 4.0, Rails 8.1, SQLite. Solid Queue, Solid Cache, and Solid Cable all use SQLite, so there are no extra services. Background jobs (nightly backup and records check, weekly reminders and AD search) run in the web process.
|
- Ruby 4.0, Rails 8.1, SQLite. Solid Queue and Solid Cache both use SQLite, so there are no extra services. Background jobs (nightly backup and records check, weekly reminders and AD search) run in the web process.
|
||||||
- Hotwire (Turbo and Stimulus) with importmap, so there is no Node build step. Tailwind CSS 4 runs through `tailwindcss-rails`.
|
- Hotwire (Turbo and Stimulus) with importmap, so there is no Node build step. Tailwind CSS 4 runs through `tailwindcss-rails`.
|
||||||
- Active Storage on local disk handles pictures, document pages, squawk attachments, and track logs. Identical files are stored once (hard links).
|
- Active Storage on local disk handles pictures, document pages, squawk attachments, and track logs. Identical files are stored once (hard links).
|
||||||
- Chartkick and Chart.js draw the oil and fuel charts.
|
- Chartkick and Chart.js draw the oil and fuel charts.
|
||||||
@@ -74,6 +74,8 @@ The app is a standard Rails app. Run `bin/rails db:prepare && bin/thrust bin/rai
|
|||||||
| `APP_HOST` | Host name the app is reached at, used in email links (password resets, sign-in links, signing invitations, reminders). |
|
| `APP_HOST` | Host name the app is reached at, used in email links (password resets, sign-in links, signing invitations, reminders). |
|
||||||
| `SMTP_ADDRESS`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `MAIL_FROM` | Optional. They enable email: password resets and **Email me a sign-in link**. Without them an admin resets passwords from **Users**. Check the setup with **Admin → About → Send test email**. |
|
| `SMTP_ADDRESS`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `MAIL_FROM` | Optional. They enable email: password resets and **Email me a sign-in link**. Without them an admin resets passwords from **Users**. Check the setup with **Admin → About → Send test email**. |
|
||||||
| `SMTP_TLS` | `true` for servers that use TLS from the start. That's the default on port 465; other ports upgrade with STARTTLS. |
|
| `SMTP_TLS` | `true` for servers that use TLS from the start. That's the default on port 465; other ports upgrade with STARTTLS. |
|
||||||
|
| `VAPID_PUBLIC_KEY`, `VAPID_PRIVATE_KEY` | Optional. The key pair that signs push notifications (generate with `bin/rails runner 'k = WebPush.generate_key; puts k.public_key, k.private_key'`). Without them the app generates a pair once and keeps it in `storage/vapid_keys.json`. Changing it turns notifications off on every device until they're turned on again. |
|
||||||
|
| `APP_LOCALE` | Optional. The app's language, e.g. `es` for `config/locales/es.yml` (see [Translating](#translating)). Default `en`. |
|
||||||
| `ANTHROPIC_API_KEY` | Optional. Lets Claude transcribe scanned logbook pages into entries (**Logbook → Import scans**). Without it, scans are only uploaded. |
|
| `ANTHROPIC_API_KEY` | Optional. Lets Claude transcribe scanned logbook pages into entries (**Logbook → Import scans**). Without it, scans are only uploaded. |
|
||||||
| `LOGBOOK_AI_MODEL`, `LOGBOOK_AI_EFFORT` | Optional. The Claude model and effort used for transcription (default `claude-opus-5-5`, `high`). |
|
| `LOGBOOK_AI_MODEL`, `LOGBOOK_AI_EFFORT` | Optional. The Claude model and effort used for transcription (default `claude-opus-5-5`, `high`). |
|
||||||
| `APP_URL` | Optional public base URL, e.g. `https://aircraft.example.com` (default `https://APP_HOST`). Used for the SSO and Google Drive redirect URIs. |
|
| `APP_URL` | Optional public base URL, e.g. `https://aircraft.example.com` (default `https://APP_HOST`). Used for the SSO and Google Drive redirect URIs. |
|
||||||
@@ -120,7 +122,7 @@ The app also makes a verified copy of the main database every night in `storage/
|
|||||||
|
|
||||||
For an off-site copy without extra tools, **Admin → Off-site Backup** connects a Google Drive account: each night the verified database copy and any new uploaded files are copied there, and a restore test checks them. Setup and restoring are in the [administration guide](docs/guide/administration.md#off-site-backup-to-google-drive). Keep `SECRET_KEY_BASE` somewhere safe off the server: stored secrets (API keys, the Drive connection) and electronic signature seals depend on it.
|
For an off-site copy without extra tools, **Admin → Off-site Backup** connects a Google Drive account: each night the verified database copy and any new uploaded files are copied there, and a restore test checks them. Setup and restoring are in the [administration guide](docs/guide/administration.md#off-site-backup-to-google-drive). Keep `SECRET_KEY_BASE` somewhere safe off the server: stored secrets (API keys, the Drive connection) and electronic signature seals depend on it.
|
||||||
|
|
||||||
To back up or move a single aircraft with all its files, use **Access & Sharing → Download .sam.zip** (or `bin/rails "sam:export[N12345]"`). Import it from **Fleet → Import** (or `bin/rails "sam:import[file.sam.zip,owner@example.com]"`). The archive format is the original Simple Aircraft Manager's, so archives move between the two apps.
|
To back up or move a single aircraft with all its files, use **More → Download .sam.zip** on the aircraft (or `bin/rails "sam:export[N12345]"`). Import it from **Fleet → More → Import from a .sam.zip archive** (or `bin/rails "sam:import[file.sam.zip,owner@example.com]"`). The archive format is the original Simple Aircraft Manager's, so archives move between the two apps.
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
@@ -196,7 +198,19 @@ The MCP server for AI agents, invitation codes, per-aircraft feature switches, t
|
|||||||
|
|
||||||
### Added in this port
|
### Added in this port
|
||||||
|
|
||||||
AirTrail sync and export, an airport database, FAA DRS AD import, spreadsheet flight import, engine monitor data (CGR-30P/C) with interactive charts, AvLab and Blackstone oil analysis import with trends, multiple squawk attachments with a photo viewer, AI logbook transcription with Claude (images and PDFs), printable logbook entries, electronic signatures and recordkeeping along the lines of AC 120-78B (record history, nightly integrity checks, records package, procedures and audits), off-site backup to Google Drive, a user guide, and an installable PWA.
|
AirTrail sync and export, an airport database, FAA DRS AD import, spreadsheet flight import, engine monitor data (CGR-30P/C) with interactive charts, AvLab and Blackstone oil analysis import with trends, multiple squawk attachments with a photo viewer, AI logbook transcription with Claude (images and PDFs), printable logbook entries, electronic signatures and recordkeeping along the lines of AC 120-78B (record history, nightly integrity checks, records package, procedures and audits), off-site backup to Google Drive, a user guide, and an installable app (PWA) that logs flights and squawks offline, keeps pre-flight pages for use without signal, and sends push notifications.
|
||||||
|
|
||||||
|
## Translating
|
||||||
|
|
||||||
|
Every piece of text the app shows (pages, emails, messages, labels, printed logbook entries, the procedures and records-package text, and the scripts' messages) is in [`config/locales/en.yml`](config/locales/en.yml). To translate the app:
|
||||||
|
|
||||||
|
1. Copy `en.yml` to `<locale>.yml` (for example `es.yml`), change the top key from `en:` to `es:`, and translate the values. Keep the `%{name}` placeholders and any HTML tags in keys ending in `_html`. Keys with `one:` / `other:` are counted forms.
|
||||||
|
2. For month and day names in dates, also add that language's standard Rails translations (for example from the [rails-i18n](https://github.com/svenfuchs/rails-i18n) project).
|
||||||
|
3. Set `APP_LOCALE=es` and restart. Anything not yet translated shows in English.
|
||||||
|
|
||||||
|
Where the text lives in `en.yml`: `labels:` are the names of stored values (statuses, types, priorities); `activerecord:` holds field names and validation messages; `flash:` holds the messages shown after an action; `services:`, `models:` and `helpers:` hold text built in Ruby; `js:` holds the scripts' text; the rest are keyed by page (`<controller>.<view>.<key>`). The user guide under Help is Markdown in `docs/guide` and is translated separately.
|
||||||
|
|
||||||
|
In development and tests a missing translation raises an error, so a page that uses a key not in `en.yml` fails its test.
|
||||||
|
|
||||||
## Disclaimer
|
## Disclaimer
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,9 @@
|
|||||||
@utility btn-danger { @apply btn bg-surface text-red-700 ring-1 ring-red-300 ring-inset hover:bg-red-50; }
|
@utility btn-danger { @apply btn bg-surface text-red-700 ring-1 ring-red-300 ring-inset hover:bg-red-50; }
|
||||||
@utility btn-sm { @apply px-2 py-1 text-xs; }
|
@utility btn-sm { @apply px-2 py-1 text-xs; }
|
||||||
@utility link { @apply text-sky-700 hover:underline; }
|
@utility link { @apply text-sky-700 hover:underline; }
|
||||||
|
/* The "More" menu (ApplicationHelper#more_menu): secondary actions, one per row. */
|
||||||
|
@utility menu { @apply absolute right-0 z-30 mt-2 w-60 rounded-md bg-surface py-1 shadow-lg ring-1 ring-slate-200; }
|
||||||
|
@utility menu-item { @apply block w-full px-4 py-2 text-left text-sm text-slate-700 hover:bg-slate-100 cursor-pointer; }
|
||||||
|
|
||||||
@utility card { @apply rounded-lg bg-surface shadow-sm ring-1 ring-slate-200; }
|
@utility card { @apply rounded-lg bg-surface shadow-sm ring-1 ring-slate-200; }
|
||||||
@utility card-header { @apply flex flex-wrap items-center justify-between gap-3 border-b border-slate-200 px-4 py-3; }
|
@utility card-header { @apply flex flex-wrap items-center justify-between gap-3 border-b border-slate-200 px-4 py-3; }
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
module ApplicationCable
|
|
||||||
class Connection < ActionCable::Connection::Base
|
|
||||||
identified_by :current_user
|
|
||||||
|
|
||||||
def connect
|
|
||||||
set_current_user || reject_unauthorized_connection
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
def set_current_user
|
|
||||||
if session = Session.find_by(id: cookies.signed[:session_id])
|
|
||||||
self.current_user = session.user
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -4,31 +4,31 @@ class AdAlertsController < ApplicationController
|
|||||||
include AircraftScoped
|
include AircraftScoped
|
||||||
before_action :require_owner!
|
before_action :require_owner!
|
||||||
before_action :set_alert, only: %i[track dismiss]
|
before_action :set_alert, only: %i[track dismiss]
|
||||||
rate_limit to: 5, within: 1.minute, only: :check, with: -> { redirect_to aircraft_airworthiness_directives_path(@aircraft), alert: "Try again in a minute." }
|
rate_limit to: 5, within: 1.minute, only: :check, with: -> { redirect_to aircraft_airworthiness_directives_path(@aircraft), alert: t("flash.ad_alerts.try_again_in_a") }
|
||||||
|
|
||||||
def check
|
def check
|
||||||
found = AdWatch.new(@aircraft).check!
|
found = AdWatch.new(@aircraft).check!
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"),
|
redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"),
|
||||||
notice: found.any? ? "Found #{helpers.pluralize(found.size, 'newly published AD')} to review." : "No new ADs found for #{AdWatch.new(@aircraft).terms.map(&:label).uniq.to_sentence}."
|
notice: found.any? ? t("flash.ad_alerts.found", count: found.size) : t("flash.ad_alerts.none_found", terms: AdWatch.new(@aircraft).terms.map(&:label).uniq.to_sentence)
|
||||||
rescue AdWatch::Error => e
|
rescue AdWatch::Error => e
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft), alert: "Couldn't check for new ADs: #{e.message}."
|
redirect_to aircraft_airworthiness_directives_path(@aircraft), alert: t("flash.ad_alerts.couldn_t_check_for", message: e.message)
|
||||||
end
|
end
|
||||||
|
|
||||||
def track
|
def track
|
||||||
ad = @alert.track!
|
ad = @alert.track!
|
||||||
log_event("ad", "AD tracked from the Federal Register: #{ad.name}")
|
log_event("ad", t("flash.ad_alerts.ad_tracked_from_the", name: ad.name))
|
||||||
redirect_to edit_aircraft_airworthiness_directive_path(@aircraft, ad),
|
redirect_to edit_aircraft_airworthiness_directive_path(@aircraft, ad),
|
||||||
notice: "#{ad.name} is now tracked. Set its applicability and recurrence from the AD's text, then record compliance or mark it not applicable."
|
notice: t("flash.ad_alerts.is_now_tracked_set", name: ad.name)
|
||||||
end
|
end
|
||||||
|
|
||||||
def dismiss
|
def dismiss
|
||||||
@alert.dismiss!
|
@alert.dismiss!
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"), notice: "Dismissed."
|
redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"), notice: t("flash.ad_alerts.dismissed")
|
||||||
end
|
end
|
||||||
|
|
||||||
def terms
|
def terms
|
||||||
@aircraft.update!(ad_watch_terms: params[:ad_watch_terms].to_s.strip.first(500).presence)
|
@aircraft.update!(ad_watch_terms: params[:ad_watch_terms].to_s.strip.first(500).presence)
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"), notice: "Search terms saved."
|
redirect_to aircraft_airworthiness_directives_path(@aircraft, anchor: "new-ads"), notice: t("flash.ad_alerts.search_terms_saved")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ class AdCompliancesController < ApplicationController
|
|||||||
aircraft_hours_at_compliance: @aircraft.current_hours,
|
aircraft_hours_at_compliance: @aircraft.current_hours,
|
||||||
compliance_method: params[:not_applicable] == "1" ? "not_applicable" : "inspection")
|
compliance_method: params[:not_applicable] == "1" ? "not_applicable" : "inspection")
|
||||||
@compliance.apply_method
|
@compliance.apply_method
|
||||||
@compliance.compliance_notes = "Not applicable: " if @compliance.not_applicable?
|
@compliance.compliance_notes = t("flash.ad_compliances.not_applicable_prefix") if @compliance.not_applicable?
|
||||||
@compliance.fill_next_due
|
@compliance.fill_next_due
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ class AdCompliancesController < ApplicationController
|
|||||||
@compliance = AdCompliance.new(compliance_params.merge(aircraft: @aircraft))
|
@compliance = AdCompliance.new(compliance_params.merge(aircraft: @aircraft))
|
||||||
if @compliance.save
|
if @compliance.save
|
||||||
log_event("ad", "#{@compliance.not_applicable? ? "Marked N/A" : "Compliance recorded"}: #{@compliance.airworthiness_directive.name}")
|
log_event("ad", "#{@compliance.not_applicable? ? "Marked N/A" : "Compliance recorded"}: #{@compliance.airworthiness_directive.name}")
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "Compliance recorded."
|
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.ad_compliances.compliance_recorded")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -27,8 +27,8 @@ class AdCompliancesController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @compliance.update(compliance_params)
|
if @compliance.update(compliance_params)
|
||||||
log_event("ad", "Compliance updated: #{@compliance.airworthiness_directive.name}")
|
log_event("ad", t("flash.ad_compliances.compliance_updated_2", name: @compliance.airworthiness_directive.name))
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "Compliance updated."
|
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.ad_compliances.compliance_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -36,8 +36,8 @@ class AdCompliancesController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@compliance.destroy!
|
@compliance.destroy!
|
||||||
log_event("ad", "Compliance deleted: #{@compliance.airworthiness_directive.name}")
|
log_event("ad", t("flash.ad_compliances.compliance_deleted", name: @compliance.airworthiness_directive.name))
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "Compliance record deleted."
|
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.ad_compliances.compliance_record_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ class AdImportsController < ApplicationController
|
|||||||
|
|
||||||
def show
|
def show
|
||||||
@token = params[:token].to_s
|
@token = params[:token].to_s
|
||||||
return redirect_to_upload("Upload expired. Please upload the file again.") unless stored_file?(@token)
|
return redirect_to_upload(t("flash.uploads.expired")) unless stored_file?(@token)
|
||||||
@filename = params[:filename].to_s
|
@filename = params[:filename].to_s
|
||||||
@import = AdImport.new(@aircraft, path: stored_path(@token), filename: @filename)
|
@import = AdImport.new(@aircraft, path: stored_path(@token), filename: @filename)
|
||||||
@import.rows
|
@import.rows
|
||||||
@@ -24,7 +24,7 @@ class AdImportsController < ApplicationController
|
|||||||
|
|
||||||
def confirm
|
def confirm
|
||||||
token = params[:token].to_s
|
token = params[:token].to_s
|
||||||
return redirect_to_upload("Upload expired. Please upload the file again.") unless stored_file?(token)
|
return redirect_to_upload(t("flash.uploads.expired")) unless stored_file?(token)
|
||||||
import = AdImport.new(@aircraft, path: stored_path(token), filename: params[:filename])
|
import = AdImport.new(@aircraft, path: stored_path(token), filename: params[:filename])
|
||||||
# Only AD numbers present in the uploaded file; values are checked against AdImport::ACTIONS.
|
# Only AD numbers present in the uploaded file; values are checked against AdImport::ACTIONS.
|
||||||
decisions = params.fetch(:decisions, {}).permit(*import.rows.map(&:number)).to_h
|
decisions = params.fetch(:decisions, {}).permit(*import.rows.map(&:number)).to_h
|
||||||
@@ -34,8 +34,8 @@ class AdImportsController < ApplicationController
|
|||||||
models_covered: DrsImport.covered(@aircraft, import.rows.flat_map(&:models)))
|
models_covered: DrsImport.covered(@aircraft, import.rows.flat_map(&:models)))
|
||||||
discard_upload(token)
|
discard_upload(token)
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft),
|
redirect_to aircraft_airworthiness_directives_path(@aircraft),
|
||||||
notice: "Imported #{result[:tracked]} ADs to track and #{result[:not_applicable]} marked N/A; " \
|
notice: t("flash.ad_imports.imported_ads_to_track", tracked: result[:tracked], not_applicable: result[:not_applicable],
|
||||||
"#{result[:updated]} existing ADs updated, #{result[:skipped]} skipped."
|
updated: result[:updated], skipped: result[:skipped])
|
||||||
rescue AdImport::Error => e
|
rescue AdImport::Error => e
|
||||||
redirect_to_upload(e.message)
|
redirect_to_upload(e.message)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
class Admin::AboutController < ApplicationController
|
class Admin::AboutController < ApplicationController
|
||||||
before_action :require_admin!
|
before_action :require_admin!
|
||||||
rate_limit to: 5, within: 1.minute, only: %i[test_email test_reminder check_records], with: -> { redirect_to admin_about_path, alert: "Try again in a minute." }
|
rate_limit to: 5, within: 1.minute, only: %i[test_email test_reminder check_records], with: -> { redirect_to admin_about_path, alert: t("flash.admin_about.try_again_in_a") }
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@info = SystemInfo.new
|
@info = SystemInfo.new
|
||||||
@@ -11,33 +11,33 @@ class Admin::AboutController < ApplicationController
|
|||||||
backup = DatabaseBackup.run!
|
backup = DatabaseBackup.run!
|
||||||
check = RecordsIntegrity.check!
|
check = RecordsIntegrity.check!
|
||||||
if backup.ok && check.ok
|
if backup.ok && check.ok
|
||||||
redirect_to admin_about_path(anchor: "records"), notice: "Backed up and checked: no problems found."
|
redirect_to admin_about_path(anchor: "records"), notice: t("flash.admin_about.backed_up_and_checked")
|
||||||
else
|
else
|
||||||
redirect_to admin_about_path(anchor: "records"), alert: "The records check found problems; see Records below."
|
redirect_to admin_about_path(anchor: "records"), alert: t("flash.admin_about.the_records_check_found")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# This week's reminder for the current admin, now.
|
# This week's reminder for the current admin, now.
|
||||||
def test_reminder
|
def test_reminder
|
||||||
return redirect_to(admin_about_path, alert: "Email isn't set up yet.") unless MailSettings.configured?
|
return redirect_to(admin_about_path, alert: t("flash.admin_about.email_isn_t_set")) unless MailSettings.configured?
|
||||||
unless ReminderMailer.anything_for?(current_user)
|
unless ReminderMailer.anything_for?(current_user)
|
||||||
return redirect_to admin_about_path, notice: "Nothing needs attention on the aircraft you own or your certificates, so there's no reminder to send."
|
return redirect_to admin_about_path, notice: t("flash.admin_about.nothing_needs_attention_on")
|
||||||
end
|
end
|
||||||
ReminderMailer.weekly(current_user).deliver_now
|
ReminderMailer.weekly(current_user).deliver_now
|
||||||
redirect_to admin_about_path, notice: "Reminder sent to #{current_user.email_address}."
|
redirect_to admin_about_path, notice: t("flash.admin_about.reminder_sent_to", email_address: current_user.email_address)
|
||||||
rescue StandardError => e
|
rescue StandardError => e
|
||||||
redirect_to admin_about_path, alert: "Sending failed: #{e.class.name.demodulize}: #{e.message.to_s.squish.truncate(240)}"
|
redirect_to admin_about_path, alert: t("flash.admin_about.sending_failed", error: e.class.name.demodulize, message: e.message.to_s.squish.truncate(240))
|
||||||
end
|
end
|
||||||
|
|
||||||
# Sends right away (not via the job queue) so problems show up here.
|
# Sends right away (not via the job queue) so problems show up here.
|
||||||
def test_email
|
def test_email
|
||||||
unless MailSettings.configured?
|
unless MailSettings.configured?
|
||||||
return redirect_to admin_about_path, alert: "Email isn't set up yet: set SMTP_ADDRESS (and SMTP_PORT, SMTP_USERNAME, SMTP_PASSWORD, MAIL_FROM)."
|
return redirect_to admin_about_path, alert: t("flash.admin_about.email_isn_t_set_2")
|
||||||
end
|
end
|
||||||
AdminMailer.test_email(current_user).deliver_now
|
AdminMailer.test_email(current_user).deliver_now
|
||||||
redirect_to admin_about_path, notice: "Test email sent to #{current_user.email_address}. If it doesn't arrive, check the spam folder."
|
redirect_to admin_about_path, notice: t("flash.admin_about.test_email_sent_to", email_address: current_user.email_address)
|
||||||
rescue StandardError => e # SMTP, DNS, TLS and timeout errors alike
|
rescue StandardError => e # SMTP, DNS, TLS and timeout errors alike
|
||||||
Rails.logger.warn("[test email] #{e.class}: #{e.message}")
|
Rails.logger.warn("[test email] #{e.class}: #{e.message}")
|
||||||
redirect_to admin_about_path, alert: "Sending failed: #{e.class.name.demodulize}: #{e.message.to_s.squish.truncate(240)}"
|
redirect_to admin_about_path, alert: t("flash.admin_about.sending_failed_2", error: e.class.name.demodulize, message: e.message.to_s.squish.truncate(240))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -16,11 +16,11 @@ class Admin::AirportsController < ApplicationController
|
|||||||
# Queue a download + sync from OurAirports.
|
# Queue a download + sync from OurAirports.
|
||||||
def refresh
|
def refresh
|
||||||
if AirportUpdate.in_progress.exists?
|
if AirportUpdate.in_progress.exists?
|
||||||
redirect_to admin_airports_path, alert: "An update is already running."
|
redirect_to admin_airports_path, alert: t("flash.admin_airports.an_update_is_already")
|
||||||
else
|
else
|
||||||
update = AirportUpdate.create!(source_url: AirportData::SOURCE_URL, requested_by: current_user)
|
update = AirportUpdate.create!(source_url: AirportData::SOURCE_URL, requested_by: current_user)
|
||||||
AirportUpdateJob.perform_later(update.id)
|
AirportUpdateJob.perform_later(update.id)
|
||||||
redirect_to admin_airports_path, notice: "Airport update started. Refresh this page in a minute or two."
|
redirect_to admin_airports_path, notice: t("flash.admin_airports.airport_update_started_refresh")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -31,7 +31,7 @@ class Admin::AirportsController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@airport = Airport.new(airport_params.merge(custom: true))
|
@airport = Airport.new(airport_params.merge(custom: true))
|
||||||
if @airport.save
|
if @airport.save
|
||||||
redirect_to admin_airports_path, notice: "Custom airport #{@airport.ident} added."
|
redirect_to admin_airports_path, notice: t("flash.admin_airports.custom_airport_added", ident: @airport.ident)
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -41,7 +41,7 @@ class Admin::AirportsController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @airport.update(airport_params)
|
if @airport.update(airport_params)
|
||||||
redirect_to admin_airports_path, notice: "#{@airport.ident} updated."
|
redirect_to admin_airports_path, notice: t("flash.admin_airports.updated", ident: @airport.ident)
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -49,7 +49,7 @@ class Admin::AirportsController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@airport.destroy!
|
@airport.destroy!
|
||||||
redirect_to admin_airports_path, notice: "#{@airport.ident} removed."
|
redirect_to admin_airports_path, notice: t("flash.admin_airports.removed", ident: @airport.ident)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ class Admin::AuditsController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
answers = params.fetch(:answers, {}).permit(RecordsAudit::MANUAL.keys.index_with { %i[passed note] }).to_h
|
answers = params.fetch(:answers, {}).permit(RecordsAudit::MANUAL.keys.index_with { %i[passed note] }).to_h
|
||||||
run = RecordsAudit.new.record!(user: current_user, answers: answers, notes: params[:notes], sample_ids: Array(params[:sample_ids]).map(&:to_i))
|
run = RecordsAudit.new.record!(user: current_user, answers: answers, notes: params[:notes], sample_ids: Array(params[:sample_ids]).map(&:to_i))
|
||||||
redirect_to admin_audit_path(run), notice: run.passed ? "Audit recorded: everything passed." : "Audit recorded, with items that didn't pass. Note what's being done about them."
|
redirect_to admin_audit_path(run), notice: run.passed ? t("flash.admin_audits.passed") : t("flash.admin_audits.not_passed")
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ class Admin::ComponentTypesController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@component_type = ComponentType.new(type_params)
|
@component_type = ComponentType.new(type_params)
|
||||||
if @component_type.save
|
if @component_type.save
|
||||||
redirect_to admin_component_types_path, notice: "Component type created."
|
redirect_to admin_component_types_path, notice: t("flash.admin_component_types.component_type_created")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -23,7 +23,7 @@ class Admin::ComponentTypesController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @component_type.update(type_params)
|
if @component_type.update(type_params)
|
||||||
redirect_to admin_component_types_path, notice: "Component type updated."
|
redirect_to admin_component_types_path, notice: t("flash.admin_component_types.component_type_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -31,7 +31,7 @@ class Admin::ComponentTypesController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
if @component_type.destroy
|
if @component_type.destroy
|
||||||
redirect_to admin_component_types_path, notice: "Component type deleted."
|
redirect_to admin_component_types_path, notice: t("flash.admin_component_types.component_type_deleted")
|
||||||
else
|
else
|
||||||
redirect_to admin_component_types_path, alert: @component_type.errors.full_messages.to_sentence
|
redirect_to admin_component_types_path, alert: @component_type.errors.full_messages.to_sentence
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ class Admin::LogbookTemplatesController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@template = LogbookTemplate.new(template_params)
|
@template = LogbookTemplate.new(template_params)
|
||||||
if @template.save
|
if @template.save
|
||||||
redirect_to admin_logbook_templates_path, notice: "Template added."
|
redirect_to admin_logbook_templates_path, notice: t("flash.admin_logbook_templates.template_added")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -24,7 +24,7 @@ class Admin::LogbookTemplatesController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @template.update(template_params)
|
if @template.update(template_params)
|
||||||
redirect_to admin_logbook_templates_path, notice: "Template updated."
|
redirect_to admin_logbook_templates_path, notice: t("flash.admin_logbook_templates.template_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -32,12 +32,12 @@ class Admin::LogbookTemplatesController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@template.destroy!
|
@template.destroy!
|
||||||
redirect_to admin_logbook_templates_path, notice: "Template deleted."
|
redirect_to admin_logbook_templates_path, notice: t("flash.admin_logbook_templates.template_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
def restore
|
def restore
|
||||||
added = LogbookTemplate.restore_defaults!
|
added = LogbookTemplate.restore_defaults!
|
||||||
redirect_to admin_logbook_templates_path, notice: added.positive? ? "Restored #{helpers.pluralize(added, 'built-in template')}." : "All the built-in templates are already here."
|
redirect_to admin_logbook_templates_path, notice: added.positive? ? t("flash.admin_logbook_templates.restored", count: added) : t("flash.admin_logbook_templates.all_present")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -16,12 +16,12 @@ class Admin::OffsiteBackupsController < ApplicationController
|
|||||||
changed_client = attrs[:client_id].present? && attrs[:client_id].strip != @connection.client_id
|
changed_client = attrs[:client_id].present? && attrs[:client_id].strip != @connection.client_id
|
||||||
@connection.disconnect! if changed_client && @connection.connected?
|
@connection.disconnect! if changed_client && @connection.connected?
|
||||||
@connection.update!(attrs.transform_values(&:strip))
|
@connection.update!(attrs.transform_values(&:strip))
|
||||||
redirect_to admin_offsite_backup_path, notice: "Saved. Now connect your Google account."
|
redirect_to admin_offsite_backup_path, notice: t("flash.admin_offsite_backups.saved_now_connect_your")
|
||||||
end
|
end
|
||||||
|
|
||||||
# Off to Google to grant access (a link, so no form-action CSP entry is needed).
|
# Off to Google to grant access (a link, so no form-action CSP entry is needed).
|
||||||
def connect
|
def connect
|
||||||
return redirect_to(admin_offsite_backup_path, alert: "Enter the Google OAuth client ID and secret first.") unless @connection.configured?
|
return redirect_to(admin_offsite_backup_path, alert: t("flash.admin_offsite_backups.enter_the_google_oauth")) unless @connection.configured?
|
||||||
session[:offsite_oauth_state] = state = SecureRandom.urlsafe_base64(24)
|
session[:offsite_oauth_state] = state = SecureRandom.urlsafe_base64(24)
|
||||||
redirect_to GoogleDriveClient.authorize_url(client_id: @connection.client_id, redirect_uri: @connection.redirect_uri, state: state),
|
redirect_to GoogleDriveClient.authorize_url(client_id: @connection.client_id, redirect_uri: @connection.redirect_uri, state: state),
|
||||||
allow_other_host: true
|
allow_other_host: true
|
||||||
@@ -30,9 +30,9 @@ class Admin::OffsiteBackupsController < ApplicationController
|
|||||||
def callback
|
def callback
|
||||||
expected = session.delete(:offsite_oauth_state)
|
expected = session.delete(:offsite_oauth_state)
|
||||||
unless expected.present? && params[:state].present? && ActiveSupport::SecurityUtils.secure_compare(expected, params[:state].to_s)
|
unless expected.present? && params[:state].present? && ActiveSupport::SecurityUtils.secure_compare(expected, params[:state].to_s)
|
||||||
return redirect_to(admin_offsite_backup_path, alert: "That Google sign-in didn't match a request from here. Try connecting again.")
|
return redirect_to(admin_offsite_backup_path, alert: t("flash.admin_offsite_backups.that_google_sign_in"))
|
||||||
end
|
end
|
||||||
return redirect_to(admin_offsite_backup_path, alert: "Google Drive wasn't connected (#{params[:error]}).") if params[:error].present? || params[:code].blank?
|
return redirect_to(admin_offsite_backup_path, alert: t("flash.admin_offsite_backups.google_drive_wasn_t", error: params[:error])) if params[:error].present? || params[:code].blank?
|
||||||
|
|
||||||
token = GoogleDriveClient.exchange_code(client_id: @connection.client_id, client_secret: @connection.client_secret,
|
token = GoogleDriveClient.exchange_code(client_id: @connection.client_id, client_secret: @connection.client_secret,
|
||||||
code: params[:code].to_s, redirect_uri: @connection.redirect_uri)
|
code: params[:code].to_s, redirect_uri: @connection.redirect_uri)
|
||||||
@@ -42,25 +42,25 @@ class Admin::OffsiteBackupsController < ApplicationController
|
|||||||
@connection.ensure_folders!(drive)
|
@connection.ensure_folders!(drive)
|
||||||
Rails.logger.info("[offsite] #{current_user.email_address} connected Google Drive #{@connection.account_email}")
|
Rails.logger.info("[offsite] #{current_user.email_address} connected Google Drive #{@connection.account_email}")
|
||||||
OffsiteBackupJob.perform_later
|
OffsiteBackupJob.perform_later
|
||||||
redirect_to admin_offsite_backup_path, notice: "Google Drive connected (#{@connection.account_email}). The first off-site backup has started; it copies every uploaded file, so it can take a while."
|
redirect_to admin_offsite_backup_path, notice: t("flash.admin_offsite_backups.google_drive_connected_the", account_email: @connection.account_email)
|
||||||
rescue GoogleDriveClient::Error => e
|
rescue GoogleDriveClient::Error => e
|
||||||
redirect_to admin_offsite_backup_path, alert: "Couldn't connect Google Drive: #{e.message}"
|
redirect_to admin_offsite_backup_path, alert: t("flash.admin_offsite_backups.couldn_t_connect_google", message: e.message)
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@connection.disconnect!
|
@connection.disconnect!
|
||||||
Rails.logger.info("[offsite] #{current_user.email_address} disconnected Google Drive")
|
Rails.logger.info("[offsite] #{current_user.email_address} disconnected Google Drive")
|
||||||
redirect_to admin_offsite_backup_path, notice: "Google Drive disconnected. The copies already there stay in your Drive."
|
redirect_to admin_offsite_backup_path, notice: t("flash.admin_offsite_backups.google_drive_disconnected_the")
|
||||||
end
|
end
|
||||||
|
|
||||||
def backup_now
|
def backup_now
|
||||||
OffsiteBackupJob.perform_later
|
OffsiteBackupJob.perform_later
|
||||||
redirect_to admin_offsite_backup_path, notice: "Off-site backup started. Refresh in a minute to see the result."
|
redirect_to admin_offsite_backup_path, notice: t("flash.admin_offsite_backups.off_site_backup_started")
|
||||||
end
|
end
|
||||||
|
|
||||||
def restore_test
|
def restore_test
|
||||||
OffsiteBackupJob.perform_later("restore_test")
|
OffsiteBackupJob.perform_later("restore_test")
|
||||||
redirect_to admin_offsite_backup_path, notice: "Restore test started. Refresh in a minute to see the result."
|
redirect_to admin_offsite_backup_path, notice: t("flash.admin_offsite_backups.restore_test_started_refresh")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ class Admin::ProceduresController < ApplicationController
|
|||||||
if @policy.update(params.require(:recordkeeping_policy).permit(:operator_name, :responsible_name, :responsible_title, :hosting_description,
|
if @policy.update(params.require(:recordkeeping_policy).permit(:operator_name, :responsible_name, :responsible_title, :hosting_description,
|
||||||
:offsite_backup_description, :audit_interval_months, :audit_sample_size,
|
:offsite_backup_description, :audit_interval_months, :audit_sample_size,
|
||||||
:additional_procedures))
|
:additional_procedures))
|
||||||
redirect_to admin_procedures_path, notice: "Saved. Review the draft and adopt it as a new revision when it's right."
|
redirect_to admin_procedures_path, notice: t("flash.admin_procedures.saved_review_the_draft")
|
||||||
else
|
else
|
||||||
@revisions = ProceduresRevision.latest_first
|
@revisions = ProceduresRevision.latest_first
|
||||||
render :show, status: :unprocessable_entity
|
render :show, status: :unprocessable_entity
|
||||||
@@ -29,14 +29,14 @@ class Admin::ProceduresController < ApplicationController
|
|||||||
def adopt
|
def adopt
|
||||||
policy = RecordkeepingPolicy.current
|
policy = RecordkeepingPolicy.current
|
||||||
if policy.unfilled_fields.any?
|
if policy.unfilled_fields.any?
|
||||||
return redirect_to(admin_procedures_path, alert: "Fill in the [bracketed] blanks first: #{policy.unfilled_fields.to_sentence}.")
|
return redirect_to(admin_procedures_path, alert: t("flash.admin_procedures.fill_in_the_bracketed", items: policy.unfilled_fields.to_sentence))
|
||||||
end
|
end
|
||||||
return redirect_to(admin_procedures_path, alert: "Fill in the operator, responsible person, hosting and off-site backup (or connect Google Drive) first.") unless policy.complete?
|
return redirect_to(admin_procedures_path, alert: t("flash.admin_procedures.fill_in_the_operator")) unless policy.complete?
|
||||||
number = (ProceduresRevision.maximum(:number) || 0) + 1
|
number = (ProceduresRevision.maximum(:number) || 0) + 1
|
||||||
revision = ProceduresRevision.create!(number: number, adopted_by: current_user, adopted_at: Time.current,
|
revision = ProceduresRevision.create!(number: number, adopted_by: current_user, adopted_at: Time.current,
|
||||||
summary: params[:summary].to_s.strip.first(500).presence || "Revision #{number}",
|
summary: params[:summary].to_s.strip.first(500).presence || "Revision #{number}",
|
||||||
content: draft_html(number: number, summary: params[:summary].to_s.strip.first(500)))
|
content: draft_html(number: number, summary: params[:summary].to_s.strip.first(500)))
|
||||||
redirect_to admin_procedures_path, notice: "Revision #{revision.number} adopted. Print it or keep the PDF with your records."
|
redirect_to admin_procedures_path, notice: t("flash.admin_procedures.revision_adopted_print_it", number: revision.number)
|
||||||
end
|
end
|
||||||
|
|
||||||
def revision
|
def revision
|
||||||
@@ -48,7 +48,7 @@ class Admin::ProceduresController < ApplicationController
|
|||||||
|
|
||||||
def draft_html(number: nil, summary: nil)
|
def draft_html(number: nil, summary: nil)
|
||||||
render_to_string(partial: "admin/procedures/document",
|
render_to_string(partial: "admin/procedures/document",
|
||||||
locals: { policy: RecordkeepingPolicy.current, number: number || "#{(ProceduresRevision.maximum(:number) || 0) + 1} (draft)",
|
locals: { policy: RecordkeepingPolicy.current, number: number || t("flash.admin_procedures.draft_number", number: (ProceduresRevision.maximum(:number) || 0) + 1),
|
||||||
adopted_at: number ? Time.current : nil, adopted_by: number ? current_user : nil,
|
adopted_at: number ? Time.current : nil, adopted_by: number ? current_user : nil,
|
||||||
revisions: ProceduresRevision.latest_first.to_a, summary: summary })
|
revisions: ProceduresRevision.latest_first.to_a, summary: summary })
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ class Admin::SettingsController < ApplicationController
|
|||||||
@errors = records.flat_map { _1.errors.full_messages }
|
@errors = records.flat_map { _1.errors.full_messages }
|
||||||
if @errors.empty?
|
if @errors.empty?
|
||||||
Rails.logger.info("[settings] #{current_user.email_address} changed #{submitted.inspect}")
|
Rails.logger.info("[settings] #{current_user.email_address} changed #{submitted.inspect}")
|
||||||
redirect_to edit_admin_settings_path, notice: "Settings saved."
|
redirect_to edit_admin_settings_path, notice: t("flash.admin_settings.settings_saved")
|
||||||
else
|
else
|
||||||
@values = %w[max_upload_mb backups_kept offsite_backups_kept documents_claude_text].index_with { Setting.integer(_1) }.merge(submitted)
|
@values = %w[max_upload_mb backups_kept offsite_backups_kept documents_claude_text].index_with { Setting.integer(_1) }.merge(submitted)
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ class Admin::UsersController < ApplicationController
|
|||||||
@user = User.new(user_params)
|
@user = User.new(user_params)
|
||||||
@user.admin = admin_flag
|
@user.admin = admin_flag
|
||||||
if @user.save
|
if @user.save
|
||||||
redirect_to admin_users_path, notice: "User #{@user.email_address} created."
|
redirect_to admin_users_path, notice: t("flash.admin_users.user_created", email_address: @user.email_address)
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -26,12 +26,12 @@ class Admin::UsersController < ApplicationController
|
|||||||
attrs = user_params
|
attrs = user_params
|
||||||
attrs = attrs.except(:password, :password_confirmation) if attrs[:password].blank?
|
attrs = attrs.except(:password, :password_confirmation) if attrs[:password].blank?
|
||||||
if @user == current_user && !admin_flag
|
if @user == current_user && !admin_flag
|
||||||
return redirect_to admin_users_path, alert: "You can't remove your own admin rights."
|
return redirect_to admin_users_path, alert: t("flash.admin_users.you_can_t_remove")
|
||||||
end
|
end
|
||||||
@user.admin = admin_flag
|
@user.admin = admin_flag
|
||||||
if @user.update(attrs)
|
if @user.update(attrs)
|
||||||
@user.sessions.where.not(id: Current.session.id).destroy_all if attrs.key?(:password) # new password signs them out
|
@user.sessions.where.not(id: Current.session.id).destroy_all if attrs.key?(:password) # new password signs them out
|
||||||
redirect_to admin_users_path, notice: "User updated."
|
redirect_to admin_users_path, notice: t("flash.admin_users.user_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -41,7 +41,7 @@ class Admin::UsersController < ApplicationController
|
|||||||
# keeping their account, so the signatures they made stay attributed.
|
# keeping their account, so the signatures they made stay attributed.
|
||||||
def unlock
|
def unlock
|
||||||
@user.unlock!
|
@user.unlock!
|
||||||
redirect_to admin_users_path, notice: "#{@user.email_address} unlocked."
|
redirect_to admin_users_path, notice: t("flash.admin_users.unlocked", email_address: @user.email_address)
|
||||||
end
|
end
|
||||||
|
|
||||||
# For a user who lost their authenticator: they sign in with their password
|
# For a user who lost their authenticator: they sign in with their password
|
||||||
@@ -49,28 +49,28 @@ class Admin::UsersController < ApplicationController
|
|||||||
def reset_two_factor
|
def reset_two_factor
|
||||||
@user.disable_otp!
|
@user.disable_otp!
|
||||||
Rails.logger.info("[auth] #{current_user.email_address} turned off two-factor for #{@user.email_address}")
|
Rails.logger.info("[auth] #{current_user.email_address} turned off two-factor for #{@user.email_address}")
|
||||||
redirect_to admin_users_path, notice: "Two-factor turned off for #{@user.email_address}. Ask them to set it up again from their profile."
|
redirect_to admin_users_path, notice: t("flash.admin_users.two_factor_turned_off", email_address: @user.email_address)
|
||||||
end
|
end
|
||||||
|
|
||||||
def disable
|
def disable
|
||||||
return redirect_to admin_users_path, alert: "You can't disable yourself." if @user == current_user
|
return redirect_to admin_users_path, alert: t("flash.admin_users.you_can_t_disable") if @user == current_user
|
||||||
@user.update!(disabled_at: Time.current)
|
@user.update!(disabled_at: Time.current)
|
||||||
@user.sessions.destroy_all
|
@user.sessions.destroy_all
|
||||||
redirect_to admin_users_path, notice: "#{@user.email_address} disabled: signed out, can't sign in or sign entries. Their past signatures are kept."
|
redirect_to admin_users_path, notice: t("flash.admin_users.disabled_signed_out_can", email_address: @user.email_address)
|
||||||
end
|
end
|
||||||
|
|
||||||
def enable
|
def enable
|
||||||
@user.update!(disabled_at: nil)
|
@user.update!(disabled_at: nil)
|
||||||
redirect_to admin_users_path, notice: "#{@user.email_address} enabled."
|
redirect_to admin_users_path, notice: t("flash.admin_users.enabled", email_address: @user.email_address)
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
return redirect_to admin_users_path, alert: "You can't delete yourself." if @user == current_user
|
return redirect_to admin_users_path, alert: t("flash.admin_users.you_can_t_delete") if @user == current_user
|
||||||
if @user.entry_signatures.exists?
|
if @user.entry_signatures.exists?
|
||||||
return redirect_to admin_users_path, alert: "#{@user.email_address} has signed logbook entries; disable the account instead of deleting it."
|
return redirect_to admin_users_path, alert: t("flash.admin_users.has_signed_logbook_entries", email_address: @user.email_address)
|
||||||
end
|
end
|
||||||
@user.destroy!
|
@user.destroy!
|
||||||
redirect_to admin_users_path, notice: "User deleted."
|
redirect_to admin_users_path, notice: t("flash.admin_users.user_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class AirTrailConnectionsController < ApplicationController
|
|||||||
# Link existing AirTrail flights and push everything else, in the background.
|
# Link existing AirTrail flights and push everything else, in the background.
|
||||||
def sync
|
def sync
|
||||||
AirTrailBackfillJob.perform_later(@connection.id)
|
AirTrailBackfillJob.perform_later(@connection.id)
|
||||||
redirect_to air_trail_connection_path, notice: "Sync started. Refresh this page in a minute to see progress."
|
redirect_to air_trail_connection_path, notice: t("flash.air_trail_connections.sync_started_refresh_this")
|
||||||
end
|
end
|
||||||
|
|
||||||
def map_airport
|
def map_airport
|
||||||
@@ -42,9 +42,9 @@ class AirTrailConnectionsController < ApplicationController
|
|||||||
match = target.present? && AirTrailSyncer.new(@connection).map_airport(code, target)
|
match = target.present? && AirTrailSyncer.new(@connection).map_airport(code, target)
|
||||||
if match
|
if match
|
||||||
AirTrailBackfillJob.perform_later(@connection.id) # retry flights that needed it
|
AirTrailBackfillJob.perform_later(@connection.id) # retry flights that needed it
|
||||||
redirect_to air_trail_connection_path, notice: "#{code} mapped to #{match['icao']} (#{match['name']}). Retrying affected flights."
|
redirect_to air_trail_connection_path, notice: t("flash.air_trail_connections.mapped_to_retrying_affected", code: code, icao: match["icao"], name: match["name"])
|
||||||
else
|
else
|
||||||
redirect_to air_trail_connection_path, alert: "AirTrail has no airport matching “#{target}”."
|
redirect_to air_trail_connection_path, alert: t("flash.air_trail_connections.airtrail_has_no_airport", target: target)
|
||||||
end
|
end
|
||||||
rescue AirTrailClient::Error => e
|
rescue AirTrailClient::Error => e
|
||||||
redirect_to air_trail_connection_path, alert: e.message
|
redirect_to air_trail_connection_path, alert: e.message
|
||||||
@@ -53,7 +53,7 @@ class AirTrailConnectionsController < ApplicationController
|
|||||||
# Stops syncing. Flights already in AirTrail are left there.
|
# Stops syncing. Flights already in AirTrail are left there.
|
||||||
def destroy
|
def destroy
|
||||||
@connection.destroy!
|
@connection.destroy!
|
||||||
redirect_to air_trail_connection_path, notice: "AirTrail disconnected. Flights already in AirTrail were left as they are."
|
redirect_to air_trail_connection_path, notice: t("flash.air_trail_connections.airtrail_disconnected_flights_already")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
@@ -81,9 +81,9 @@ class AirTrailConnectionsController < ApplicationController
|
|||||||
missing = me.dig("credential", "kind") == "apiKey" ? AirTrailConnection::REQUIRED_SCOPES - scopes : []
|
missing = me.dig("credential", "kind") == "apiKey" ? AirTrailConnection::REQUIRED_SCOPES - scopes : []
|
||||||
@connection.update!(remote_user_id: me["id"], remote_username: me["username"], checked_at: Time.current,
|
@connection.update!(remote_user_id: me["id"], remote_username: me["username"], checked_at: Time.current,
|
||||||
status: missing.empty? ? "ok" : "error",
|
status: missing.empty? ? "ok" : "error",
|
||||||
last_error: missing.empty? ? nil : "API key is missing scopes: #{missing.join(', ')}")
|
last_error: missing.empty? ? nil : t("flash.air_trail_connections.missing_scopes", scopes: missing.join(", ")))
|
||||||
if missing.empty?
|
if missing.empty?
|
||||||
flash[:notice] = "Connected to AirTrail as #{me['username']}."
|
flash[:notice] = t("flash.air_trail_connections.connected_to_airtrail_as", username: me["username"])
|
||||||
else
|
else
|
||||||
flash[:alert] = @connection.last_error
|
flash[:alert] = @connection.last_error
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ class AircraftController < ApplicationController
|
|||||||
@aircraft.roles.create!(user: current_user, role: "owner")
|
@aircraft.roles.create!(user: current_user, role: "owner")
|
||||||
@aircraft.log_event!("aircraft", "Aircraft created")
|
@aircraft.log_event!("aircraft", "Aircraft created")
|
||||||
end
|
end
|
||||||
redirect_to @aircraft, notice: "#{@aircraft.tail_number} added."
|
redirect_to @aircraft, notice: t("flash.aircraft.added", tail_number: @aircraft.tail_number)
|
||||||
rescue ActiveRecord::RecordInvalid
|
rescue ActiveRecord::RecordInvalid
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -38,8 +38,8 @@ class AircraftController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @aircraft.update(aircraft_params)
|
if @aircraft.update(aircraft_params)
|
||||||
log_event("aircraft", "Aircraft details updated")
|
log_event("aircraft", t("flash.aircraft.aircraft_details_updated"))
|
||||||
redirect_to @aircraft, notice: "Aircraft updated."
|
redirect_to @aircraft, notice: t("flash.aircraft.aircraft_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -47,7 +47,7 @@ class AircraftController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@aircraft.destroy!
|
@aircraft.destroy!
|
||||||
redirect_to root_path, notice: "#{@aircraft.tail_number} deleted."
|
redirect_to root_path, notice: t("flash.aircraft.deleted", tail_number: @aircraft.tail_number)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Pilots and above: set absolute tach/hobbs readings.
|
# Pilots and above: set absolute tach/hobbs readings.
|
||||||
@@ -55,11 +55,11 @@ class AircraftController < ApplicationController
|
|||||||
delta = HoursService.new(@aircraft).update_hours!(
|
delta = HoursService.new(@aircraft).update_hours!(
|
||||||
tach_time: params.require(:tach_time), hobbs_time: params[:hobbs_time]
|
tach_time: params.require(:tach_time), hobbs_time: params[:hobbs_time]
|
||||||
)
|
)
|
||||||
redirect_to @aircraft, notice: "Hours updated (#{delta >= 0 ? '+' : ''}#{delta})."
|
redirect_to @aircraft, notice: t("flash.aircraft.hours_updated", delta: "#{'+' if delta >= 0}#{delta}")
|
||||||
rescue AircraftGroundedError => e
|
rescue AircraftGroundedError => e
|
||||||
redirect_to @aircraft, alert: e.message
|
redirect_to @aircraft, alert: e.message
|
||||||
rescue ArgumentError
|
rescue ArgumentError
|
||||||
redirect_to @aircraft, alert: "Enter a valid tach reading."
|
redirect_to @aircraft, alert: t("flash.aircraft.enter_a_valid_tach")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ class AircraftExportsController < ApplicationController
|
|||||||
Dir[EXPORT_DIR.join("*.zip")].each { |old| File.delete(old) if File.mtime(old) < 1.hour.ago }
|
Dir[EXPORT_DIR.join("*.zip")].each { |old| File.delete(old) if File.mtime(old) < 1.hour.ago }
|
||||||
path = EXPORT_DIR.join("#{SecureRandom.hex(12)}.zip").to_s
|
path = EXPORT_DIR.join("#{SecureRandom.hex(12)}.zip").to_s
|
||||||
exporter.write_to(path)
|
exporter.write_to(path)
|
||||||
log_event("aircraft", "Aircraft exported (.sam.zip)")
|
log_event("aircraft", t("flash.aircraft_exports.aircraft_exported_sam_zip"))
|
||||||
# Generic binary, not application/zip: Safari unzips zip downloads into a
|
# Generic binary, not application/zip: Safari unzips zip downloads into a
|
||||||
# folder ("Open safe files"), and the archive must stay one file to import.
|
# folder ("Open safe files"), and the archive must stay one file to import.
|
||||||
send_file path, filename: exporter.filename, type: "application/octet-stream", disposition: "attachment"
|
send_file path, filename: exporter.filename, type: "application/octet-stream", disposition: "attachment"
|
||||||
|
|||||||
@@ -8,14 +8,14 @@ class AircraftImportsController < ApplicationController
|
|||||||
|
|
||||||
def create
|
def create
|
||||||
file = params[:archive]
|
file = params[:archive]
|
||||||
return redirect_to(new_aircraft_import_path, alert: "Choose a .sam.zip file.") if file.blank?
|
return redirect_to(new_aircraft_import_path, alert: t("flash.aircraft_imports.choose_a_sam_zip")) if file.blank?
|
||||||
|
|
||||||
preview = AircraftArchive::Importer.check(file.tempfile.path)
|
preview = AircraftArchive::Importer.check(file.tempfile.path)
|
||||||
tail = params[:tail_number].to_s.strip.upcase.presence || preview.tail_number.to_s.upcase
|
tail = params[:tail_number].to_s.strip.upcase.presence || preview.tail_number.to_s.upcase
|
||||||
if Aircraft.where("UPPER(tail_number) = ?", tail).exists?
|
if Aircraft.where("UPPER(tail_number) = ?", tail).exists?
|
||||||
@preview = preview
|
@preview = preview
|
||||||
@conflict = tail
|
@conflict = tail
|
||||||
flash.now[:alert] = "An aircraft #{tail} already exists. Choose another tail number for the imported one."
|
flash.now[:alert] = t("flash.aircraft_imports.an_aircraft_already_exists", tail: tail)
|
||||||
return render :new, status: :unprocessable_entity
|
return render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@ class AircraftImportsController < ApplicationController
|
|||||||
AircraftImportJob.perform_later(import.id)
|
AircraftImportJob.perform_later(import.id)
|
||||||
redirect_to aircraft_import_path(import)
|
redirect_to aircraft_import_path(import)
|
||||||
rescue AircraftArchive::Error => e
|
rescue AircraftArchive::Error => e
|
||||||
redirect_to new_aircraft_import_path, alert: "That archive can't be imported: #{e.message}"
|
redirect_to new_aircraft_import_path, alert: t("flash.aircraft_imports.that_archive_can_t", message: e.message)
|
||||||
end
|
end
|
||||||
|
|
||||||
def show; end
|
def show; end
|
||||||
|
|||||||
@@ -12,12 +12,12 @@ class AircraftRolesController < ApplicationController
|
|||||||
user = User.find_by(email_address: params[:email_address].to_s.strip.downcase)
|
user = User.find_by(email_address: params[:email_address].to_s.strip.downcase)
|
||||||
unless user
|
unless user
|
||||||
return redirect_to aircraft_aircraft_roles_path(@aircraft),
|
return redirect_to aircraft_aircraft_roles_path(@aircraft),
|
||||||
alert: "No user with that email. Ask an administrator to create their account first."
|
alert: t("flash.aircraft_roles.no_user_with_that")
|
||||||
end
|
end
|
||||||
role = @aircraft.roles.new(user: user, role: params[:role])
|
role = @aircraft.roles.new(user: user, role: params[:role])
|
||||||
if role.save
|
if role.save
|
||||||
log_event("role", "#{user.display_name} added as #{role.role}")
|
log_event("role", t("flash.aircraft_roles.added_as", display_name: user.display_name, role: role.role))
|
||||||
redirect_to aircraft_aircraft_roles_path(@aircraft), notice: "#{user.display_name} added."
|
redirect_to aircraft_aircraft_roles_path(@aircraft), notice: t("flash.aircraft_roles.added", display_name: user.display_name)
|
||||||
else
|
else
|
||||||
redirect_to aircraft_aircraft_roles_path(@aircraft), alert: role.errors.full_messages.to_sentence
|
redirect_to aircraft_aircraft_roles_path(@aircraft), alert: role.errors.full_messages.to_sentence
|
||||||
end
|
end
|
||||||
@@ -26,24 +26,24 @@ class AircraftRolesController < ApplicationController
|
|||||||
def update
|
def update
|
||||||
role = @aircraft.roles.find(params[:id])
|
role = @aircraft.roles.find(params[:id])
|
||||||
if demoting_last_owner?(role, params[:role])
|
if demoting_last_owner?(role, params[:role])
|
||||||
return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: "An aircraft must keep at least one owner."
|
return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: t("flash.aircraft_roles.an_aircraft_must_keep")
|
||||||
end
|
end
|
||||||
role.update!(role: params[:role])
|
role.update!(role: params[:role])
|
||||||
log_event("role", "#{role.user.display_name} changed to #{role.role}")
|
log_event("role", t("flash.aircraft_roles.changed_to", display_name: role.user.display_name, role: role.role))
|
||||||
redirect_to aircraft_aircraft_roles_path(@aircraft), notice: "Role updated."
|
redirect_to aircraft_aircraft_roles_path(@aircraft), notice: t("flash.aircraft_roles.role_updated")
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
role = @aircraft.roles.find(params[:id])
|
role = @aircraft.roles.find(params[:id])
|
||||||
if role.user == current_user
|
if role.user == current_user
|
||||||
return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: "You can't remove yourself."
|
return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: t("flash.aircraft_roles.you_can_t_remove")
|
||||||
end
|
end
|
||||||
if demoting_last_owner?(role, nil)
|
if demoting_last_owner?(role, nil)
|
||||||
return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: "An aircraft must keep at least one owner."
|
return redirect_to aircraft_aircraft_roles_path(@aircraft), alert: t("flash.aircraft_roles.an_aircraft_must_keep_2")
|
||||||
end
|
end
|
||||||
role.destroy!
|
role.destroy!
|
||||||
log_event("role", "#{role.user.display_name} removed")
|
log_event("role", t("flash.aircraft_roles.removed", display_name: role.user.display_name))
|
||||||
redirect_to aircraft_aircraft_roles_path(@aircraft), notice: "Access removed."
|
redirect_to aircraft_aircraft_roles_path(@aircraft), notice: t("flash.aircraft_roles.access_removed")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -14,6 +14,6 @@ class AirportCodesController < ApplicationController
|
|||||||
fixes = params.fetch(:fixes, {}).permit(*standardizer.unknown.map(&:code)).to_h
|
fixes = params.fetch(:fixes, {}).permit(*standardizer.unknown.map(&:code)).to_h
|
||||||
.select { |code, _| Array(params[:fix]).include?(code) }
|
.select { |code, _| Array(params[:fix]).include?(code) }
|
||||||
updated = standardizer.apply!(codes, fixes: fixes)
|
updated = standardizer.apply!(codes, fixes: fixes)
|
||||||
redirect_to aircraft_flight_logs_path(@aircraft), notice: "Updated #{updated} airport entries across your flights."
|
redirect_to aircraft_flight_logs_path(@aircraft), notice: t("flash.airport_codes.updated_airport_entries_across", count: updated)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -23,8 +23,8 @@ class AirworthinessDirectivesController < ApplicationController
|
|||||||
@ad.save!
|
@ad.save!
|
||||||
apply_applicability(@ad, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids)
|
apply_applicability(@ad, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids)
|
||||||
end
|
end
|
||||||
log_event("ad", "#{@ad.bulletin_label} added: #{@ad.name}")
|
log_event("ad", t("flash.airworthiness_directives.added_2", bulletin_label: @ad.bulletin_label, name: @ad.name))
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "#{@ad.bulletin_label} added."
|
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.airworthiness_directives.added", bulletin_label: @ad.bulletin_label)
|
||||||
rescue ActiveRecord::RecordInvalid
|
rescue ActiveRecord::RecordInvalid
|
||||||
@applies_to_airframe = applies_to_airframe?
|
@applies_to_airframe = applies_to_airframe?
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
@@ -34,8 +34,8 @@ class AirworthinessDirectivesController < ApplicationController
|
|||||||
def attach
|
def attach
|
||||||
ad = AirworthinessDirective.find(params[:airworthiness_directive_id])
|
ad = AirworthinessDirective.find(params[:airworthiness_directive_id])
|
||||||
ad.aircraft << @aircraft unless ad.aircraft.include?(@aircraft)
|
ad.aircraft << @aircraft unless ad.aircraft.include?(@aircraft)
|
||||||
log_event("ad", "#{ad.bulletin_label} linked: #{ad.name}")
|
log_event("ad", t("flash.airworthiness_directives.linked_2", bulletin_label: ad.bulletin_label, name: ad.name))
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "#{ad.name} linked."
|
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.airworthiness_directives.linked", name: ad.name)
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
@@ -47,8 +47,8 @@ class AirworthinessDirectivesController < ApplicationController
|
|||||||
@ad.update!(ad_params)
|
@ad.update!(ad_params)
|
||||||
apply_applicability(@ad, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids)
|
apply_applicability(@ad, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids)
|
||||||
end
|
end
|
||||||
log_event("ad", "#{@ad.bulletin_label} updated: #{@ad.name}")
|
log_event("ad", t("flash.airworthiness_directives.updated_2", bulletin_label: @ad.bulletin_label, name: @ad.name))
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "#{@ad.bulletin_label} updated."
|
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.airworthiness_directives.updated", bulletin_label: @ad.bulletin_label)
|
||||||
rescue ActiveRecord::RecordInvalid
|
rescue ActiveRecord::RecordInvalid
|
||||||
@applies_to_airframe = applies_to_airframe?
|
@applies_to_airframe = applies_to_airframe?
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
@@ -57,8 +57,8 @@ class AirworthinessDirectivesController < ApplicationController
|
|||||||
# Removes the AD from this aircraft (the shared AD record survives if other aircraft use it).
|
# Removes the AD from this aircraft (the shared AD record survives if other aircraft use it).
|
||||||
def destroy
|
def destroy
|
||||||
detach_from_aircraft(@ad)
|
detach_from_aircraft(@ad)
|
||||||
log_event("ad", "#{@ad.bulletin_label} removed: #{@ad.name}")
|
log_event("ad", t("flash.airworthiness_directives.removed", bulletin_label: @ad.bulletin_label, name: @ad.name))
|
||||||
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: "#{@ad.name} removed from #{@aircraft.tail_number}."
|
redirect_to aircraft_airworthiness_directives_path(@aircraft), notice: t("flash.airworthiness_directives.removed_from", name: @ad.name, tail_number: @aircraft.tail_number)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -24,6 +24,6 @@ class ApplicationController < ActionController::Base
|
|||||||
end
|
end
|
||||||
|
|
||||||
def require_admin!
|
def require_admin!
|
||||||
redirect_to root_path, alert: "Admins only." unless current_user&.admin?
|
redirect_to root_path, alert: t("flash.application.admins_only") unless current_user&.admin?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -8,14 +8,14 @@ class CalendarFeedsController < ApplicationController
|
|||||||
|
|
||||||
def show
|
def show
|
||||||
user = User.active.find_by(calendar_token: params[:token].to_s) or return head(:not_found)
|
user = User.active.find_by(calendar_token: params[:token].to_s) or return head(:not_found)
|
||||||
cal = Ical.new("Aircraft maintenance")
|
cal = Ical.new(t("flash.calendar_feeds.name"))
|
||||||
host = Sso.app_url
|
host = Sso.app_url
|
||||||
user.accessible_aircraft.ordered.each do |aircraft|
|
user.accessible_aircraft.ordered.each do |aircraft|
|
||||||
DueList.new(aircraft).items.each do |i|
|
DueList.new(aircraft).items.each do |i|
|
||||||
when_text = [ ("projected from recent flying" if i.projected), ("at #{i.due_hours} hrs" if i.due_hours) ].compact.join(", ")
|
when_text = [ (t("flash.calendar_feeds.projected") if i.projected), (t("flash.calendar_feeds.at_hours", hours: i.due_hours) if i.due_hours) ].compact.join(", ")
|
||||||
cal.add(uid: "#{aircraft.id}-#{i.key}@simple-aircraft-manager", date: i.date,
|
cal.add(uid: "#{aircraft.id}-#{i.key}@simple-aircraft-manager", date: i.date,
|
||||||
summary: "#{aircraft.tail_number}: #{i.title}#{' (overdue)' if i.overdue?}",
|
summary: t(i.overdue? ? "flash.calendar_feeds.summary_overdue" : "flash.calendar_feeds.summary", tail_number: aircraft.tail_number, title: i.title),
|
||||||
description: [ "#{aircraft.tail_number}: #{i.title}", when_text.presence ].compact.join("\n"), url: "#{host}#{i.path}")
|
description: [ t("flash.calendar_feeds.summary", tail_number: aircraft.tail_number, title: i.title), when_text.presence ].compact.join("\n"), url: "#{host}#{i.path}")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
send_data cal.to_s, type: "text/calendar; charset=utf-8", disposition: "inline", filename: "aircraft-maintenance.ics"
|
send_data cal.to_s, type: "text/calendar; charset=utf-8", disposition: "inline", filename: "aircraft-maintenance.ics"
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
class CalendarTokensController < ApplicationController
|
class CalendarTokensController < ApplicationController
|
||||||
def create
|
def create
|
||||||
current_user.regenerate_calendar_token
|
current_user.regenerate_calendar_token
|
||||||
redirect_to edit_profile_path(anchor: "calendar"), notice: "Calendar link ready. Any earlier link no longer works."
|
redirect_to edit_profile_path(anchor: "calendar"), notice: t("flash.calendar_tokens.calendar_link_ready_any")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -35,8 +35,8 @@ class ComponentsController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@component = @aircraft.components.new(component_params)
|
@component = @aircraft.components.new(component_params)
|
||||||
if @component.save
|
if @component.save
|
||||||
log_event("component", "Component added: #{@component}")
|
log_event("component", t("flash.components.component_added_2", component: @component))
|
||||||
redirect_to aircraft_components_path(@aircraft), notice: "Component added."
|
redirect_to aircraft_components_path(@aircraft), notice: t("flash.components.component_added")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -46,8 +46,8 @@ class ComponentsController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @component.update(component_params)
|
if @component.update(component_params)
|
||||||
log_event("component", "Component updated: #{@component}")
|
log_event("component", t("flash.components.component_updated_2", component: @component))
|
||||||
redirect_to aircraft_components_path(@aircraft), notice: "Component updated."
|
redirect_to aircraft_components_path(@aircraft), notice: t("flash.components.component_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -55,8 +55,8 @@ class ComponentsController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@component.destroy!
|
@component.destroy!
|
||||||
log_event("component", "Component deleted: #{@component}")
|
log_event("component", t("flash.components.component_deleted_2", component: @component))
|
||||||
redirect_to aircraft_components_path(@aircraft), notice: "Component deleted."
|
redirect_to aircraft_components_path(@aircraft), notice: t("flash.components.component_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
# Always zeroes hours since overhaul; reset_in_service=1 also zeroes the
|
# Always zeroes hours since overhaul; reset_in_service=1 also zeroes the
|
||||||
@@ -64,8 +64,8 @@ class ComponentsController < ApplicationController
|
|||||||
def reset_service
|
def reset_service
|
||||||
replaced = params[:reset_in_service] == "1"
|
replaced = params[:reset_in_service] == "1"
|
||||||
@component.reset_service!(reset_in_service: replaced)
|
@component.reset_service!(reset_in_service: replaced)
|
||||||
log_event("component", "#{replaced ? 'Replaced' : 'Serviced'}: #{@component}")
|
log_event("component", t(replaced ? "flash.components.replaced_event" : "flash.components.serviced_event", component: @component))
|
||||||
redirect_to aircraft_components_path(@aircraft), notice: "#{@component} #{replaced ? 'replaced' : 'serviced'}."
|
redirect_to aircraft_components_path(@aircraft), notice: t(replaced ? "flash.components.replaced" : "flash.components.serviced", component: @component)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ module AircraftScoped
|
|||||||
def require_owner!
|
def require_owner!
|
||||||
return if owner?
|
return if owner?
|
||||||
redirect_back fallback_location: aircraft_path(@aircraft),
|
redirect_back fallback_location: aircraft_path(@aircraft),
|
||||||
alert: "Only owners can do that."
|
alert: t("flash.common.only_owners_can_do")
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns id only if it belongs to the given (aircraft-scoped) relation; else nil.
|
# Returns id only if it belongs to the given (aircraft-scoped) relation; else nil.
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ module EntrySigning
|
|||||||
certificate = current_user.certificates.find_by(id: params[:certificate_id])
|
certificate = current_user.certificates.find_by(id: params[:certificate_id])
|
||||||
method = reauthenticated_method
|
method = reauthenticated_method
|
||||||
unless params[:confirm] == "1"
|
unless params[:confirm] == "1"
|
||||||
return signing_failed(entry, "Tick the box to confirm you're signing this entry.")
|
return signing_failed(entry, t("flash.signing.confirm_box"))
|
||||||
end
|
end
|
||||||
unless method
|
unless method
|
||||||
return signing_failed(entry, "This account is locked for a few minutes after too many failed tries.") if current_user.reload.locked?
|
return signing_failed(entry, t("flash.signing.locked")) if current_user.reload.locked?
|
||||||
return signing_failed(entry, "Re-enter your password#{' and a current authenticator code' if current_user.otp_enabled?} (or sign in again with #{Sso.label}) to sign.")
|
return signing_failed(entry, t(current_user.otp_enabled? ? "flash.signing.reauth_otp" : "flash.signing.reauth", provider: Sso.label))
|
||||||
end
|
end
|
||||||
current_user.clear_failed_sign_ins!
|
current_user.clear_failed_sign_ins!
|
||||||
|
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ module StoredUpload
|
|||||||
|
|
||||||
# Returns [token, nil] on success or [nil, error message].
|
# Returns [token, nil] on success or [nil, error message].
|
||||||
def store_upload(file)
|
def store_upload(file)
|
||||||
return [ nil, "Choose a file to upload." ] unless file.respond_to?(:path)
|
return [ nil, I18n.t("flash.uploads.choose_file") ] unless file.respond_to?(:path)
|
||||||
return [ nil, "File is too large." ] if file.size > UPLOAD_MAX_SIZE
|
return [ nil, I18n.t("flash.uploads.too_large") ] if file.size > UPLOAD_MAX_SIZE
|
||||||
ext = File.extname(file.original_filename.to_s).delete(".").downcase
|
ext = File.extname(file.original_filename.to_s).delete(".").downcase
|
||||||
return [ nil, "Upload an .xlsx or .csv file." ] unless ext.in?(UPLOAD_EXTENSIONS)
|
return [ nil, I18n.t("flash.uploads.spreadsheet_only") ] unless ext.in?(UPLOAD_EXTENSIONS)
|
||||||
|
|
||||||
FileUtils.mkdir_p(UPLOAD_DIR)
|
FileUtils.mkdir_p(UPLOAD_DIR)
|
||||||
Dir.glob(UPLOAD_DIR.join("*")).each { |f| File.delete(f) if File.mtime(f) < 1.day.ago }
|
Dir.glob(UPLOAD_DIR.join("*")).each { |f| File.delete(f) if File.mtime(f) < 1.day.ago }
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ class ConsumableRecordsController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@record = @aircraft.consumable_records.new(record_params)
|
@record = @aircraft.consumable_records.new(record_params)
|
||||||
if @record.save
|
if @record.save
|
||||||
log_event(@record.record_type, "#{@record.record_type.capitalize} added: #{@record.quantity_added} #{@record.unit}")
|
log_event(@record.record_type, t("flash.consumable_records.added_event", type: ConsumableRecord::TYPES[@record.record_type], quantity: @record.quantity_added, unit: @record.unit))
|
||||||
redirect_to aircraft_consumable_records_path(@aircraft), notice: "Record added."
|
redirect_to aircraft_consumable_records_path(@aircraft), notice: t("flash.consumable_records.record_added")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -38,8 +38,8 @@ class ConsumableRecordsController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @record.update(record_params)
|
if @record.update(record_params)
|
||||||
log_event(@record.record_type, "#{@record.record_type.capitalize} record updated")
|
log_event(@record.record_type, t("flash.consumable_records.updated_event", type: ConsumableRecord::TYPES[@record.record_type]))
|
||||||
redirect_to aircraft_consumable_records_path(@aircraft), notice: "Record updated."
|
redirect_to aircraft_consumable_records_path(@aircraft), notice: t("flash.consumable_records.record_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -47,8 +47,8 @@ class ConsumableRecordsController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@record.destroy!
|
@record.destroy!
|
||||||
log_event(@record.record_type, "#{@record.record_type.capitalize} record deleted")
|
log_event(@record.record_type, t("flash.consumable_records.deleted_event", type: ConsumableRecord::TYPES[@record.record_type]))
|
||||||
redirect_to aircraft_consumable_records_path(@aircraft), notice: "Record deleted."
|
redirect_to aircraft_consumable_records_path(@aircraft), notice: t("flash.consumable_records.record_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -16,9 +16,9 @@ class DirectUploadsController < ActiveStorage::DirectUploadsController
|
|||||||
def check_upload
|
def check_upload
|
||||||
error =
|
error =
|
||||||
if !UploadValidation::ALLOWED_CONTENT_TYPES.include?(blob_args[:content_type])
|
if !UploadValidation::ALLOWED_CONTENT_TYPES.include?(blob_args[:content_type])
|
||||||
"#{blob_args[:filename]} isn't an allowed file type"
|
t("errors.messages.file_type", file: blob_args[:filename])
|
||||||
elsif blob_args[:byte_size].to_i > UploadValidation.max_size
|
elsif blob_args[:byte_size].to_i > UploadValidation.max_size
|
||||||
"#{blob_args[:filename]} is over the #{UploadValidation.max_size / 1.megabyte} MB upload limit"
|
t("errors.messages.file_size", file: blob_args[:filename], limit: UploadValidation.max_size / 1.megabyte)
|
||||||
end
|
end
|
||||||
render json: { error: error }, status: :unprocessable_entity if error
|
render json: { error: error }, status: :unprocessable_entity if error
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ class DocumentCollectionsController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@collection = @aircraft.document_collections.new(collection_params)
|
@collection = @aircraft.document_collections.new(collection_params)
|
||||||
if @collection.save
|
if @collection.save
|
||||||
log_event("document", "Collection created: #{@collection.name}")
|
log_event("document", t("flash.document_collections.collection_created_2", name: @collection.name))
|
||||||
redirect_to aircraft_documents_path(@aircraft), notice: "Collection created."
|
redirect_to aircraft_documents_path(@aircraft), notice: t("flash.document_collections.collection_created")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -21,8 +21,8 @@ class DocumentCollectionsController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @collection.update(collection_params)
|
if @collection.update(collection_params)
|
||||||
log_event("document", "Collection updated: #{@collection.name}")
|
log_event("document", t("flash.document_collections.collection_updated_2", name: @collection.name))
|
||||||
redirect_to aircraft_documents_path(@aircraft), notice: "Collection updated."
|
redirect_to aircraft_documents_path(@aircraft), notice: t("flash.document_collections.collection_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -30,8 +30,8 @@ class DocumentCollectionsController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@collection.destroy!
|
@collection.destroy!
|
||||||
log_event("document", "Collection deleted: #{@collection.name}")
|
log_event("document", t("flash.document_collections.collection_deleted", name: @collection.name))
|
||||||
redirect_to aircraft_documents_path(@aircraft), notice: "Collection and its documents deleted."
|
redirect_to aircraft_documents_path(@aircraft), notice: t("flash.document_collections.collection_and_its_documents")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ class DocumentsController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@document = @aircraft.documents.new(document_params)
|
@document = @aircraft.documents.new(document_params)
|
||||||
if @document.save
|
if @document.save
|
||||||
log_event("document", "Document added: #{@document.name}")
|
log_event("document", t("flash.documents.document_added_2", name: @document.name))
|
||||||
redirect_to aircraft_document_path(@aircraft, @document), notice: "Document added."
|
redirect_to aircraft_document_path(@aircraft, @document), notice: t("flash.documents.document_added")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -36,15 +36,15 @@ class DocumentsController < ApplicationController
|
|||||||
def bulk_create
|
def bulk_create
|
||||||
@bulk = bulk_defaults.merge(params.slice(:doc_type, :visibility, :document_collection_id, :new_collection).permit!.to_h.symbolize_keys)
|
@bulk = bulk_defaults.merge(params.slice(:doc_type, :visibility, :document_collection_id, :new_collection).permit!.to_h.symbolize_keys)
|
||||||
files = Array(params[:files]).compact_blank
|
files = Array(params[:files]).compact_blank
|
||||||
return bulk_error("Choose some files to upload.") if files.empty?
|
return bulk_error(t("flash.documents.choose_files")) if files.empty?
|
||||||
return bulk_error("Upload at most #{MAX_BULK_FILES} files at a time.") if files.size > MAX_BULK_FILES
|
return bulk_error(t("flash.documents.too_many_files", max: MAX_BULK_FILES)) if files.size > MAX_BULK_FILES
|
||||||
|
|
||||||
names = Array(params[:names])
|
names = Array(params[:names])
|
||||||
rejected = []
|
rejected = []
|
||||||
groups = {}
|
groups = {}
|
||||||
files.each_with_index do |file, i|
|
files.each_with_index do |file, i|
|
||||||
upload = file.is_a?(String) ? unattached_blob(file) : file
|
upload = file.is_a?(String) ? unattached_blob(file) : file
|
||||||
next rejected << "file #{i + 1} (upload expired, try again)" unless upload
|
next rejected << t("flash.documents.upload_expired", number: i + 1) unless upload
|
||||||
name = names[i].to_s.squish.presence || File.basename(upload_filename(upload), ".*").tr("_", " ").squish.presence || "Untitled"
|
name = names[i].to_s.squish.presence || File.basename(upload_filename(upload), ".*").tr("_", " ").squish.presence || "Untitled"
|
||||||
(groups[name.first(255)] ||= []) << upload
|
(groups[name.first(255)] ||= []) << upload
|
||||||
end
|
end
|
||||||
@@ -58,18 +58,18 @@ class DocumentsController < ApplicationController
|
|||||||
if doc.save
|
if doc.save
|
||||||
created << doc
|
created << doc
|
||||||
else
|
else
|
||||||
rejected << "#{name} (#{doc.errors.full_messages.to_sentence})"
|
rejected << t("flash.documents.rejected_file", name: name, errors: doc.errors.full_messages.to_sentence)
|
||||||
pages.each { _1.purge_later if _1.is_a?(ActiveStorage::Blob) }
|
pages.each { _1.purge_later if _1.is_a?(ActiveStorage::Blob) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if created.empty?
|
if created.empty?
|
||||||
@aircraft.document_collections.find_by(id: collection_id)&.destroy if @bulk[:new_collection].present?
|
@aircraft.document_collections.find_by(id: collection_id)&.destroy if @bulk[:new_collection].present?
|
||||||
return bulk_error("Nothing was uploaded: #{rejected.to_sentence}.")
|
return bulk_error(t("flash.documents.nothing_uploaded", items: rejected.to_sentence))
|
||||||
end
|
end
|
||||||
|
|
||||||
log_event("document", "#{helpers.pluralize(created.size, 'document')} uploaded", notes: created.map(&:name).join(", ").truncate(1000))
|
log_event("document", t("flash.documents.bulk_uploaded_event", count: created.size), notes: created.map(&:name).join(", ").truncate(1000))
|
||||||
flash[:alert] = "Not uploaded: #{rejected.to_sentence}." if rejected.any?
|
flash[:alert] = t("flash.documents.not_uploaded", items: rejected.to_sentence) if rejected.any?
|
||||||
redirect_to aircraft_documents_path(@aircraft), notice: "#{helpers.pluralize(created.size, 'document')} uploaded.", status: :see_other
|
redirect_to aircraft_documents_path(@aircraft), notice: t("flash.documents.bulk_uploaded", count: created.size), status: :see_other
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit; end
|
def edit; end
|
||||||
@@ -81,8 +81,8 @@ class DocumentsController < ApplicationController
|
|||||||
@document.pages.attach(new_pages) if new_pages.present?
|
@document.pages.attach(new_pages) if new_pages.present?
|
||||||
Array(params[:remove_page_ids]).each { |id| @document.pages.find_by(id: id)&.purge_later }
|
Array(params[:remove_page_ids]).each { |id| @document.pages.find_by(id: id)&.purge_later }
|
||||||
if @document.save
|
if @document.save
|
||||||
log_event("document", "Document updated: #{@document.name}")
|
log_event("document", t("flash.documents.document_updated_2", name: @document.name))
|
||||||
redirect_to aircraft_document_path(@aircraft, @document), notice: "Document updated."
|
redirect_to aircraft_document_path(@aircraft, @document), notice: t("flash.documents.document_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -90,8 +90,8 @@ class DocumentsController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@document.destroy!
|
@document.destroy!
|
||||||
log_event("document", "Document deleted: #{@document.name}")
|
log_event("document", t("flash.documents.document_deleted_2", name: @document.name))
|
||||||
redirect_to aircraft_documents_path(@aircraft), notice: "Document deleted."
|
redirect_to aircraft_documents_path(@aircraft), notice: t("flash.documents.document_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
@@ -120,7 +120,7 @@ class DocumentsController < ApplicationController
|
|||||||
def bulk_collection
|
def bulk_collection
|
||||||
return [ scoped_id(@aircraft.document_collections, @bulk[:document_collection_id]), nil ] if @bulk[:new_collection].blank?
|
return [ scoped_id(@aircraft.document_collections, @bulk[:document_collection_id]), nil ] if @bulk[:new_collection].blank?
|
||||||
col = @aircraft.document_collections.create(name: @bulk[:new_collection].squish, visibility: @bulk[:visibility].presence || "private")
|
col = @aircraft.document_collections.create(name: @bulk[:new_collection].squish, visibility: @bulk[:visibility].presence || "private")
|
||||||
col.persisted? ? [ col.id, nil ] : [ nil, "Couldn't create the collection: #{col.errors.full_messages.to_sentence}." ]
|
col.persisted? ? [ col.id, nil ] : [ nil, t("flash.documents.collection_failed", errors: col.errors.full_messages.to_sentence) ]
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_document = @document = @aircraft.documents.find(params[:id])
|
def set_document = @document = @aircraft.documents.find(params[:id])
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ class EntrySignaturesController < ApplicationController
|
|||||||
|
|
||||||
def create
|
def create
|
||||||
sign_entry(@entry) do |signature|
|
sign_entry(@entry) do |signature|
|
||||||
redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: "Signed. #{EntrySignature::LABEL} #{signature.signer_name}, #{signature.certificate_label} #{signature.certificate_number}."
|
redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: t("flash.entry_signatures.signed", label: EntrySignature.label, signer_name: signature.signer_name, certificate_label: signature.certificate_label, certificate_number: signature.certificate_number)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ class FlightImportsController < ApplicationController
|
|||||||
# Preview.
|
# Preview.
|
||||||
def show
|
def show
|
||||||
@token = params[:token].to_s
|
@token = params[:token].to_s
|
||||||
return redirect_to_upload("Upload expired. Please upload the file again.") unless stored_file?(@token)
|
return redirect_to_upload(t("flash.uploads.expired")) unless stored_file?(@token)
|
||||||
|
|
||||||
@filename = params[:filename].to_s
|
@filename = params[:filename].to_s
|
||||||
@starting_tach = params[:starting_tach].presence
|
@starting_tach = params[:starting_tach].presence
|
||||||
@@ -31,17 +31,17 @@ class FlightImportsController < ApplicationController
|
|||||||
|
|
||||||
def confirm
|
def confirm
|
||||||
token = params[:token].to_s
|
token = params[:token].to_s
|
||||||
return redirect_to_upload("Upload expired. Please upload the file again.") unless stored_file?(token)
|
return redirect_to_upload(t("flash.uploads.expired")) unless stored_file?(token)
|
||||||
|
|
||||||
import = build_import(token, params[:filename], starting_tach: params[:starting_tach], starting_hobbs: params[:starting_hobbs])
|
import = build_import(token, params[:filename], starting_tach: params[:starting_tach], starting_hobbs: params[:starting_hobbs])
|
||||||
count = import.import!(user: current_user, update_aircraft_hours: params[:update_aircraft_hours] == "1")
|
count = import.import!(user: current_user, update_aircraft_hours: params[:update_aircraft_hours] == "1")
|
||||||
discard_upload(token)
|
discard_upload(token)
|
||||||
redirect_to aircraft_flight_logs_path(@aircraft), notice: "Imported #{count} flights."
|
redirect_to aircraft_flight_logs_path(@aircraft), notice: t("flash.flight_imports.imported_flights", count: count)
|
||||||
rescue FlightImport::Error => e
|
rescue FlightImport::Error => e
|
||||||
redirect_to new_aircraft_flight_import_path(@aircraft), alert: e.message
|
redirect_to new_aircraft_flight_import_path(@aircraft), alert: e.message
|
||||||
rescue AircraftGroundedError
|
rescue AircraftGroundedError
|
||||||
redirect_to aircraft_flight_logs_path(@aircraft),
|
redirect_to aircraft_flight_logs_path(@aircraft),
|
||||||
alert: "Flights imported, but aircraft hours weren't updated: the aircraft is grounded and enforcement is on."
|
alert: t("flash.flight_imports.flights_imported_but_aircraft")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -26,12 +26,12 @@ class FlightLogsController < ApplicationController
|
|||||||
begin
|
begin
|
||||||
@track = TrackParser.parse_attachment(@flight_log.track_log)
|
@track = TrackParser.parse_attachment(@flight_log.track_log)
|
||||||
rescue TrackParser::Error => e
|
rescue TrackParser::Error => e
|
||||||
@track_error = "Couldn't read track: #{e.message}"
|
@track_error = t("flash.flight_logs.track_unreadable", message: e.message)
|
||||||
end
|
end
|
||||||
begin
|
begin
|
||||||
@engine_data = EngineDataParser.parse_attachment(@flight_log.engine_data)
|
@engine_data = EngineDataParser.parse_attachment(@flight_log.engine_data)
|
||||||
rescue EngineDataParser::Error, ActiveStorage::FileNotFoundError => e
|
rescue EngineDataParser::Error, ActiveStorage::FileNotFoundError => e
|
||||||
@engine_data_error = "Couldn't read engine data: #{e.message}"
|
@engine_data_error = t("flash.flight_logs.engine_data_unreadable", message: e.message)
|
||||||
end
|
end
|
||||||
@air_trail_connection = @flight_log.user&.air_trail_connection
|
@air_trail_connection = @flight_log.user&.air_trail_connection
|
||||||
@air_trail_sync = @flight_log.air_trail_syncs.first
|
@air_trail_sync = @flight_log.air_trail_syncs.first
|
||||||
@@ -57,12 +57,12 @@ class FlightLogsController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
# Already received (sent again from the offline queue): don't log it twice.
|
# Already received (sent again from the offline queue): don't log it twice.
|
||||||
if (key = params.dig(:flight_log, :client_key).to_s.presence) && @aircraft.flight_logs.exists?(client_key: key.first(64))
|
if (key = params.dig(:flight_log, :client_key).to_s.presence) && @aircraft.flight_logs.exists?(client_key: key.first(64))
|
||||||
return redirect_to(aircraft_flight_logs_path(@aircraft), notice: "Flight already logged.")
|
return redirect_to(aircraft_flight_logs_path(@aircraft), notice: t("flash.flight_logs.flight_already_logged"))
|
||||||
end
|
end
|
||||||
@flight_log = @aircraft.flight_logs.new(flight_log_params)
|
@flight_log = @aircraft.flight_logs.new(flight_log_params)
|
||||||
if @flight_log.valid?
|
if @flight_log.valid?
|
||||||
HoursService.new(@aircraft).log_flight!(@flight_log)
|
HoursService.new(@aircraft).log_flight!(@flight_log)
|
||||||
redirect_to aircraft_flight_logs_path(@aircraft), notice: "Flight logged (#{@flight_log.tach_time} hrs)."
|
redirect_to aircraft_flight_logs_path(@aircraft), notice: t("flash.flight_logs.flight_logged_hrs", tach_time: @flight_log.tach_time)
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -73,11 +73,11 @@ class FlightLogsController < ApplicationController
|
|||||||
|
|
||||||
def attach_engine_data
|
def attach_engine_data
|
||||||
file = params.dig(:flight_log, :engine_data)
|
file = params.dig(:flight_log, :engine_data)
|
||||||
return redirect_to(aircraft_flight_log_path(@aircraft, @flight_log), alert: "Choose an engine data file.") if file.blank?
|
return redirect_to(aircraft_flight_log_path(@aircraft, @flight_log), alert: t("flash.flight_logs.choose_an_engine_data")) if file.blank?
|
||||||
|
|
||||||
@flight_log.engine_data = file
|
@flight_log.engine_data = file
|
||||||
if @flight_log.save
|
if @flight_log.save
|
||||||
redirect_to aircraft_flight_log_path(@aircraft, @flight_log), notice: "Engine data attached."
|
redirect_to aircraft_flight_log_path(@aircraft, @flight_log), notice: t("flash.flight_logs.engine_data_attached")
|
||||||
else
|
else
|
||||||
redirect_to aircraft_flight_log_path(@aircraft, @flight_log), alert: @flight_log.errors.full_messages.to_sentence
|
redirect_to aircraft_flight_log_path(@aircraft, @flight_log), alert: @flight_log.errors.full_messages.to_sentence
|
||||||
end
|
end
|
||||||
@@ -85,14 +85,14 @@ class FlightLogsController < ApplicationController
|
|||||||
|
|
||||||
def remove_engine_data
|
def remove_engine_data
|
||||||
@flight_log.engine_data.purge_later
|
@flight_log.engine_data.purge_later
|
||||||
redirect_to aircraft_flight_log_path(@aircraft, @flight_log), notice: "Engine data removed."
|
redirect_to aircraft_flight_log_path(@aircraft, @flight_log), notice: t("flash.flight_logs.engine_data_removed")
|
||||||
end
|
end
|
||||||
|
|
||||||
# Deleting a flight does not roll back hours; correct those with an hours update.
|
# Deleting a flight does not roll back hours; correct those with an hours update.
|
||||||
def destroy
|
def destroy
|
||||||
@aircraft.flight_logs.find(params[:id]).destroy!
|
@aircraft.flight_logs.find(params[:id]).destroy!
|
||||||
log_event("flight", "Flight log deleted")
|
log_event("flight", t("flash.flight_logs.flight_log_deleted"))
|
||||||
redirect_to aircraft_flight_logs_path(@aircraft), notice: "Flight log deleted. Aircraft hours were not changed."
|
redirect_to aircraft_flight_logs_path(@aircraft), notice: t("flash.flight_logs.flight_log_deleted_aircraft")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
@@ -108,7 +108,7 @@ class FlightLogsController < ApplicationController
|
|||||||
|
|
||||||
def require_engine_data_access!
|
def require_engine_data_access!
|
||||||
return if manage_engine_data?
|
return if manage_engine_data?
|
||||||
redirect_to aircraft_flight_log_path(@aircraft, @flight_log), alert: "Only owners or the flight's pilot can do that."
|
redirect_to aircraft_flight_log_path(@aircraft, @flight_log), alert: t("flash.flight_logs.only_owners_or_the")
|
||||||
end
|
end
|
||||||
|
|
||||||
def flight_log_params
|
def flight_log_params
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ class InspectionRecordsController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@record = InspectionRecord.new(record_params.merge(aircraft: @aircraft))
|
@record = InspectionRecord.new(record_params.merge(aircraft: @aircraft))
|
||||||
if @record.save
|
if @record.save
|
||||||
log_event("inspection", "Inspection completed: #{@record.inspection_type.name}")
|
log_event("inspection", t("flash.inspection_records.inspection_completed", name: @record.inspection_type.name))
|
||||||
redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection recorded."
|
redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_records.inspection_recorded")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -23,8 +23,8 @@ class InspectionRecordsController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @record.update(record_params)
|
if @record.update(record_params)
|
||||||
log_event("inspection", "Inspection record updated: #{@record.inspection_type.name}")
|
log_event("inspection", t("flash.inspection_records.inspection_record_updated_2", name: @record.inspection_type.name))
|
||||||
redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection record updated."
|
redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_records.inspection_record_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -32,8 +32,8 @@ class InspectionRecordsController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@record.destroy!
|
@record.destroy!
|
||||||
log_event("inspection", "Inspection record deleted: #{@record.inspection_type.name}")
|
log_event("inspection", t("flash.inspection_records.inspection_record_deleted_2", name: @record.inspection_type.name))
|
||||||
redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection record deleted."
|
redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_records.inspection_record_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ class InspectionTypesController < ApplicationController
|
|||||||
@inspection_type = InspectionType.new(required: true, recurring: true)
|
@inspection_type = InspectionType.new(required: true, recurring: true)
|
||||||
@applies_to_airframe = true
|
@applies_to_airframe = true
|
||||||
if (@major_record = ica_record)
|
if (@major_record = ica_record)
|
||||||
@inspection_type.name = "ICA: #{@major_record.title}".first(120)
|
@inspection_type.name = t("flash.inspection_types.ica_name", title: @major_record.title).first(120)
|
||||||
@applies_to_airframe = @major_record.component.nil?
|
@applies_to_airframe = @major_record.component.nil?
|
||||||
@inspection_type.components = [ @major_record.component ] if @major_record.component
|
@inspection_type.components = [ @major_record.component ] if @major_record.component
|
||||||
elsif (component = @aircraft.components.find_by(id: params[:component_id]))
|
elsif (component = @aircraft.components.find_by(id: params[:component_id]))
|
||||||
# From a component's page: applies to that part, e.g. "Magneto 500-hour inspection".
|
# From a component's page: applies to that part, e.g. "Magneto 500-hour inspection".
|
||||||
@inspection_type.name = "#{component} inspection"
|
@inspection_type.name = t("flash.inspection_types.component_name", component: component)
|
||||||
@inspection_type.components = [ component ]
|
@inspection_type.components = [ component ]
|
||||||
@applies_to_airframe = false
|
@applies_to_airframe = false
|
||||||
end
|
end
|
||||||
@@ -26,11 +26,11 @@ class InspectionTypesController < ApplicationController
|
|||||||
apply_applicability(@inspection_type, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids)
|
apply_applicability(@inspection_type, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids)
|
||||||
ica_record&.update!(ica_inspection_type: @inspection_type)
|
ica_record&.update!(ica_inspection_type: @inspection_type)
|
||||||
end
|
end
|
||||||
log_event("inspection", "Inspection type added: #{@inspection_type.name}")
|
log_event("inspection", t("flash.inspection_types.inspection_type_added_2", name: @inspection_type.name))
|
||||||
if (record = ica_record)
|
if (record = ica_record)
|
||||||
redirect_to aircraft_major_record_path(@aircraft, record), notice: "ICA inspection added. Record when it was last done to see when it's next due."
|
redirect_to aircraft_major_record_path(@aircraft, record), notice: t("flash.inspection_types.ica_inspection_added_record")
|
||||||
else
|
else
|
||||||
redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection type added."
|
redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_types.inspection_type_added")
|
||||||
end
|
end
|
||||||
rescue ActiveRecord::RecordInvalid
|
rescue ActiveRecord::RecordInvalid
|
||||||
@applies_to_airframe = applies_to_airframe?
|
@applies_to_airframe = applies_to_airframe?
|
||||||
@@ -47,8 +47,8 @@ class InspectionTypesController < ApplicationController
|
|||||||
@inspection_type.update!(type_params)
|
@inspection_type.update!(type_params)
|
||||||
apply_applicability(@inspection_type, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids)
|
apply_applicability(@inspection_type, to_airframe: applies_to_airframe?, component_ids: applicable_component_ids)
|
||||||
end
|
end
|
||||||
log_event("inspection", "Inspection type updated: #{@inspection_type.name}")
|
log_event("inspection", t("flash.inspection_types.inspection_type_updated_2", name: @inspection_type.name))
|
||||||
redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection type updated."
|
redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_types.inspection_type_updated")
|
||||||
rescue ActiveRecord::RecordInvalid
|
rescue ActiveRecord::RecordInvalid
|
||||||
@applies_to_airframe = applies_to_airframe?
|
@applies_to_airframe = applies_to_airframe?
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
@@ -56,8 +56,8 @@ class InspectionTypesController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
detach_from_aircraft(@inspection_type)
|
detach_from_aircraft(@inspection_type)
|
||||||
log_event("inspection", "Inspection type removed: #{@inspection_type.name}")
|
log_event("inspection", t("flash.inspection_types.inspection_type_removed", name: @inspection_type.name))
|
||||||
redirect_to aircraft_inspections_path(@aircraft), notice: "Inspection removed from #{@aircraft.tail_number}."
|
redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.inspection_types.inspection_removed_from", tail_number: @aircraft.tail_number)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ class InvitedSigningsController < ApplicationController
|
|||||||
include EntrySigning
|
include EntrySigning
|
||||||
allow_unauthenticated_access only: %i[show account]
|
allow_unauthenticated_access only: %i[show account]
|
||||||
before_action :set_invitation
|
before_action :set_invitation
|
||||||
rate_limit to: 10, within: 15.minutes, only: :account, with: -> { redirect_to new_session_path, alert: "Try again later." }
|
rate_limit to: 10, within: 15.minutes, only: :account, with: -> { redirect_to new_session_path, alert: t("flash.invited_signings.try_again_later") }
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@entry = @invitation.logbook_entry
|
@entry = @invitation.logbook_entry
|
||||||
@@ -24,13 +24,13 @@ class InvitedSigningsController < ApplicationController
|
|||||||
def account
|
def account
|
||||||
return redirect_to(invited_signing_path(params[:token])) if authenticated?
|
return redirect_to(invited_signing_path(params[:token])) if authenticated?
|
||||||
if User.exists?(email_address: @invitation.email) || !Sso.password_login?
|
if User.exists?(email_address: @invitation.email) || !Sso.password_login?
|
||||||
return redirect_to invited_signing_path(params[:token]), alert: "Sign in to continue."
|
return redirect_to invited_signing_path(params[:token]), alert: t("flash.invited_signings.sign_in_to_continue")
|
||||||
end
|
end
|
||||||
user = User.new(params.permit(:name, :password, :password_confirmation).merge(email_address: @invitation.email))
|
user = User.new(params.permit(:name, :password, :password_confirmation).merge(email_address: @invitation.email))
|
||||||
if user.save
|
if user.save
|
||||||
reset_session
|
reset_session
|
||||||
start_new_session_for user
|
start_new_session_for user
|
||||||
redirect_to invited_signing_path(params[:token]), notice: "Account created. Add your certificate, then sign."
|
redirect_to invited_signing_path(params[:token]), notice: t("flash.invited_signings.account_created_add_your")
|
||||||
else
|
else
|
||||||
@entry = @invitation.logbook_entry
|
@entry = @invitation.logbook_entry
|
||||||
@account_errors = user.errors.full_messages
|
@account_errors = user.errors.full_messages
|
||||||
@@ -44,7 +44,7 @@ class InvitedSigningsController < ApplicationController
|
|||||||
return render(:wrong_account) unless current_user.email_address == @invitation.email
|
return render(:wrong_account) unless current_user.email_address == @invitation.email
|
||||||
sign_entry(@entry) do |signature|
|
sign_entry(@entry) do |signature|
|
||||||
@invitation.update!(used_at: Time.current, user: current_user)
|
@invitation.update!(used_at: Time.current, user: current_user)
|
||||||
redirect_to invited_signing_path(params[:token]), notice: "Signed. #{EntrySignature::LABEL} #{signature.signer_name}, #{signature.certificate_label} #{signature.certificate_number}."
|
redirect_to invited_signing_path(params[:token]), notice: t("flash.invited_signings.signed", label: EntrySignature.label, signer_name: signature.signer_name, certificate_label: signature.certificate_label, certificate_number: signature.certificate_number)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ class LoadingSetupsController < ApplicationController
|
|||||||
@setup = LoadingSetup.from_params(permitted.to_h)
|
@setup = LoadingSetup.from_params(permitted.to_h)
|
||||||
if @setup.valid?
|
if @setup.valid?
|
||||||
@aircraft.update!(loading_stations: @setup.stations_json, cg_envelope: @setup.envelope.map { |w, cg| [ w.to_f, cg.to_f ] })
|
@aircraft.update!(loading_stations: @setup.stations_json, cg_envelope: @setup.envelope.map { |w, cg| [ w.to_f, cg.to_f ] })
|
||||||
log_event("aircraft", "Loading stations and CG envelope updated")
|
log_event("aircraft", t("flash.loading_setups.loading_stations_and_cg"))
|
||||||
redirect_to aircraft_weight_balance_records_path(@aircraft), notice: "Loading setup saved."
|
redirect_to aircraft_weight_balance_records_path(@aircraft), notice: t("flash.loading_setups.loading_setup_saved")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -18,10 +18,10 @@ class LogbookEntriesController < ApplicationController
|
|||||||
# Someone has checked a transcribed entry against the scan.
|
# Someone has checked a transcribed entry against the scan.
|
||||||
def verify
|
def verify
|
||||||
@entry.update!(verified: true)
|
@entry.update!(verified: true)
|
||||||
log_event("logbook", "Transcribed logbook entry verified: #{@entry.date}")
|
log_event("logbook", t("flash.logbook_entries.transcribed_logbook_entry_verified", date: @entry.date))
|
||||||
next_entry = @aircraft.logbook_entries.unverified.order(:date, :id).first
|
next_entry = @aircraft.logbook_entries.unverified.order(:date, :id).first
|
||||||
redirect_to next_entry ? aircraft_logbook_entry_path(@aircraft, next_entry) : aircraft_logbook_entries_path(@aircraft),
|
redirect_to next_entry ? aircraft_logbook_entry_path(@aircraft, next_entry) : aircraft_logbook_entries_path(@aircraft),
|
||||||
notice: next_entry ? "Verified. Here's the next one to check." : "Verified. All transcribed entries are checked."
|
notice: next_entry ? t("flash.logbook_entries.verified_next") : t("flash.logbook_entries.verified_all")
|
||||||
end
|
end
|
||||||
|
|
||||||
def show; end
|
def show; end
|
||||||
@@ -36,11 +36,11 @@ class LogbookEntriesController < ApplicationController
|
|||||||
@entry.supersedes = correctable(params.dig(:logbook_entry, :supersedes_id))
|
@entry.supersedes = correctable(params.dig(:logbook_entry, :supersedes_id))
|
||||||
@entry.assign_parts(parts_params, @aircraft)
|
@entry.assign_parts(parts_params, @aircraft)
|
||||||
if @entry.save
|
if @entry.save
|
||||||
log_event("logbook", "Logbook entry #{@entry.supersedes ? 'correction ' : ''}added (#{@entry.date})")
|
log_event("logbook", t(@entry.supersedes ? "flash.logbook_entries.correction_added_event" : "flash.logbook_entries.logbook_entry_added", date: @entry.date))
|
||||||
record_parts_service
|
record_parts_service
|
||||||
record_inspections
|
record_inspections
|
||||||
redirect_to aircraft_logbook_entry_path(@aircraft, @entry),
|
redirect_to aircraft_logbook_entry_path(@aircraft, @entry),
|
||||||
notice: @entry.supersedes ? "Correction saved. Sign it to supersede the original entry." : "Logbook entry added."
|
notice: @entry.supersedes ? t("flash.logbook_entries.correction_saved") : t("flash.logbook_entries.added")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -52,8 +52,8 @@ class LogbookEntriesController < ApplicationController
|
|||||||
@entry.assign_attributes(entry_params)
|
@entry.assign_attributes(entry_params)
|
||||||
@entry.assign_parts(parts_params, @aircraft)
|
@entry.assign_parts(parts_params, @aircraft)
|
||||||
if @entry.save
|
if @entry.save
|
||||||
log_event("logbook", "Logbook entry updated (#{@entry.date})")
|
log_event("logbook", t("flash.logbook_entries.logbook_entry_updated_2", date: @entry.date))
|
||||||
redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: "Logbook entry updated."
|
redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: t("flash.logbook_entries.logbook_entry_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -61,8 +61,8 @@ class LogbookEntriesController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@entry.destroy!
|
@entry.destroy!
|
||||||
log_event("logbook", "Logbook entry deleted (#{@entry.date})")
|
log_event("logbook", t("flash.logbook_entries.logbook_entry_deleted_2", date: @entry.date))
|
||||||
redirect_to aircraft_logbook_entries_path(@aircraft), notice: "Logbook entry deleted."
|
redirect_to aircraft_logbook_entries_path(@aircraft), notice: t("flash.logbook_entries.logbook_entry_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
@@ -70,7 +70,7 @@ class LogbookEntriesController < ApplicationController
|
|||||||
# Signed entries are locked (AC 120-78B 2.1.2.8): changes go in a correction.
|
# Signed entries are locked (AC 120-78B 2.1.2.8): changes go in a correction.
|
||||||
def require_unsigned
|
def require_unsigned
|
||||||
return unless @entry.signed?
|
return unless @entry.signed?
|
||||||
redirect_to aircraft_logbook_entry_path(@aircraft, @entry), alert: "This entry is signed, so it can't be changed or deleted. Make a correction entry instead."
|
redirect_to aircraft_logbook_entry_path(@aircraft, @entry), alert: t("flash.logbook_entries.this_entry_is_signed")
|
||||||
end
|
end
|
||||||
|
|
||||||
# A signed, not yet superseded entry of this aircraft.
|
# A signed, not yet superseded entry of this aircraft.
|
||||||
@@ -99,7 +99,7 @@ class LogbookEntriesController < ApplicationController
|
|||||||
part = @entry.parts.find { _1.component_id == id.to_i } or next
|
part = @entry.parts.find { _1.component_id == id.to_i } or next
|
||||||
component = part.component
|
component = part.component
|
||||||
component.service_from_entry!(date: @entry.date, hours_at_entry: part.hours_at_entry, flown_since: flown, replaced: p["service"] == "replaced")
|
component.service_from_entry!(date: @entry.date, hours_at_entry: part.hours_at_entry, flown_since: flown, replaced: p["service"] == "replaced")
|
||||||
log_event("component", "#{p['service'] == 'replaced' ? 'Replaced' : 'Serviced'}: #{component} (logbook entry #{@entry.date})")
|
log_event("component", t(p["service"] == "replaced" ? "flash.logbook_entries.replaced_event" : "flash.logbook_entries.serviced_event", component: component, date: @entry.date))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -110,7 +110,7 @@ class LogbookEntriesController < ApplicationController
|
|||||||
@aircraft.applicable_inspection_types.where(id: ids).find_each do |type|
|
@aircraft.applicable_inspection_types.where(id: ids).find_each do |type|
|
||||||
@aircraft.inspection_records.create!(inspection_type: type, logbook_entry: @entry, date: @entry.date,
|
@aircraft.inspection_records.create!(inspection_type: type, logbook_entry: @entry, date: @entry.date,
|
||||||
aircraft_hours: @entry.aircraft_hours_at_entry)
|
aircraft_hours: @entry.aircraft_hours_at_entry)
|
||||||
log_event("inspection", "Inspection completed: #{type.name} (logbook entry #{@entry.date})")
|
log_event("inspection", t("flash.logbook_entries.inspection_completed_logbook_entry", name: type.name, date: @entry.date))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ class LogbookImportsController < ApplicationController
|
|||||||
|
|
||||||
def create
|
def create
|
||||||
files = Array(params[:pages]).compact_blank
|
files = Array(params[:pages]).compact_blank
|
||||||
return redirect_to(new_aircraft_logbook_import_path(@aircraft), alert: "Choose the scanned pages to upload.") if files.empty?
|
return redirect_to(new_aircraft_logbook_import_path(@aircraft), alert: t("flash.logbook_imports.choose_the_scanned_pages")) if files.empty?
|
||||||
|
|
||||||
# Page order follows the file names ("page-002" before "page-010").
|
# Page order follows the file names ("page-002" before "page-010").
|
||||||
files = files.sort_by { |f| f.original_filename.to_s.downcase.scan(/\d+|\D+/).map { _1.match?(/\d/) ? [ 0, _1.to_i ] : [ 1, _1 ] } }
|
files = files.sort_by { |f| f.original_filename.to_s.downcase.scan(/\d+|\D+/).map { _1.match?(/\d/) ? [ 0, _1.to_i ] : [ 1, _1 ] } }
|
||||||
@@ -32,7 +32,7 @@ class LogbookImportsController < ApplicationController
|
|||||||
import = @aircraft.logbook_imports.create!(user: current_user, document: document, log_type: params[:log_type],
|
import = @aircraft.logbook_imports.create!(user: current_user, document: document, log_type: params[:log_type],
|
||||||
transcribe: params[:transcribe] == "1" && LogbookImport.ai_available?)
|
transcribe: params[:transcribe] == "1" && LogbookImport.ai_available?)
|
||||||
end
|
end
|
||||||
log_event("document", "Logbook pages uploaded: #{document.name} (#{files.size} #{'page'.pluralize(files.size)})")
|
log_event("document", t("flash.logbook_imports.pages_uploaded", name: document.name, count: files.size))
|
||||||
LogbookTranscriptionJob.perform_later(import.id)
|
LogbookTranscriptionJob.perform_later(import.id)
|
||||||
redirect_to aircraft_logbook_import_path(@aircraft, import)
|
redirect_to aircraft_logbook_import_path(@aircraft, import)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ class LogbookPrintsController < ApplicationController
|
|||||||
|
|
||||||
def show
|
def show
|
||||||
pdf = LogbookEntryPdf.new(@aircraft, @entries, layout: params[:layout], start_at: params[:start_at])
|
pdf = LogbookEntryPdf.new(@aircraft, @entries, layout: params[:layout], start_at: params[:start_at])
|
||||||
log_event("logbook", "Logbook entries printed (#{@entries.size})")
|
log_event("logbook", t("flash.logbook_prints.logbook_entries_printed", count: @entries.size))
|
||||||
send_data pdf.render, filename: pdf.filename, type: "application/pdf", disposition: "inline"
|
send_data pdf.render, filename: pdf.filename, type: "application/pdf", disposition: "inline"
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -19,6 +19,6 @@ class LogbookPrintsController < ApplicationController
|
|||||||
def set_entries
|
def set_entries
|
||||||
ids = Array(params[:ids]).map(&:to_i).first(200)
|
ids = Array(params[:ids]).map(&:to_i).first(200)
|
||||||
@entries = @aircraft.logbook_entries.where(id: ids).includes(:component, :parts, :signature, inspection_records: :inspection_type).order(:date, :id).to_a
|
@entries = @aircraft.logbook_entries.where(id: ids).includes(:component, :parts, :signature, inspection_records: :inspection_type).order(:date, :id).to_a
|
||||||
redirect_to aircraft_logbook_entries_path(@aircraft), alert: "Choose the entries to print." if @entries.empty?
|
redirect_to aircraft_logbook_entries_path(@aircraft), alert: t("flash.logbook_prints.choose_the_entries_to") if @entries.empty?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -4,7 +4,7 @@ class MaintenanceReportsController < ApplicationController
|
|||||||
|
|
||||||
def show
|
def show
|
||||||
@report = MaintenanceReport.new(@aircraft)
|
@report = MaintenanceReport.new(@aircraft)
|
||||||
log_event("aircraft", "Maintenance status report viewed") if params[:print]
|
log_event("aircraft", t("flash.maintenance_reports.maintenance_status_report_viewed")) if params[:print]
|
||||||
render layout: "report"
|
render layout: "report"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -17,8 +17,8 @@ class MajorRecordsController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@record = @aircraft.major_records.new(record_params)
|
@record = @aircraft.major_records.new(record_params)
|
||||||
if @record.save
|
if @record.save
|
||||||
log_event("major_record", "#{@record.type_label} added: #{@record.title}")
|
log_event("major_record", t("flash.major_records.added", type_label: @record.type_label, title: @record.title))
|
||||||
redirect_to aircraft_major_records_path(@aircraft), notice: "Record added."
|
redirect_to aircraft_major_records_path(@aircraft), notice: t("flash.major_records.record_added")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -28,8 +28,8 @@ class MajorRecordsController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @record.update(record_params)
|
if @record.update(record_params)
|
||||||
log_event("major_record", "#{@record.type_label} updated: #{@record.title}")
|
log_event("major_record", t("flash.major_records.updated", type_label: @record.type_label, title: @record.title))
|
||||||
redirect_to aircraft_major_record_path(@aircraft, @record), notice: "Record updated."
|
redirect_to aircraft_major_record_path(@aircraft, @record), notice: t("flash.major_records.record_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -37,8 +37,8 @@ class MajorRecordsController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@record.destroy!
|
@record.destroy!
|
||||||
log_event("major_record", "#{@record.type_label} deleted: #{@record.title}")
|
log_event("major_record", t("flash.major_records.deleted", type_label: @record.type_label, title: @record.title))
|
||||||
redirect_to aircraft_major_records_path(@aircraft), notice: "Record deleted."
|
redirect_to aircraft_major_records_path(@aircraft), notice: t("flash.major_records.record_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ class NotesController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@note = @aircraft.notes.new(note_params.merge(user: current_user))
|
@note = @aircraft.notes.new(note_params.merge(user: current_user))
|
||||||
if @note.save
|
if @note.save
|
||||||
log_event("note", "Note added")
|
log_event("note", t("flash.notes.note_added_2"))
|
||||||
redirect_to aircraft_notes_path(@aircraft), notice: "Note added."
|
redirect_to aircraft_notes_path(@aircraft), notice: t("flash.notes.note_added")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -30,8 +30,8 @@ class NotesController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @note.update(note_params.merge(edited_at: Time.current))
|
if @note.update(note_params.merge(edited_at: Time.current))
|
||||||
log_event("note", "Note updated")
|
log_event("note", t("flash.notes.note_updated_2"))
|
||||||
redirect_to aircraft_notes_path(@aircraft), notice: "Note updated."
|
redirect_to aircraft_notes_path(@aircraft), notice: t("flash.notes.note_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -39,8 +39,8 @@ class NotesController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@note.destroy!
|
@note.destroy!
|
||||||
log_event("note", "Note deleted")
|
log_event("note", t("flash.notes.note_deleted_2"))
|
||||||
redirect_to aircraft_notes_path(@aircraft), notice: "Note deleted."
|
redirect_to aircraft_notes_path(@aircraft), notice: t("flash.notes.note_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
# The page the installed app shows without a connection. The service worker
|
||||||
|
# keeps a copy when it installs, so it's rendered in the app's language; it
|
||||||
|
# has no session data and inline styles only (nothing else may be cached).
|
||||||
|
class OfflineController < ApplicationController
|
||||||
|
allow_unauthenticated_access
|
||||||
|
skip_before_action :redirect_to_setup
|
||||||
|
|
||||||
|
def show
|
||||||
|
render layout: false
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -24,8 +24,8 @@ class OilAnalysesController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@analysis = @aircraft.oil_analyses.new(analysis_params)
|
@analysis = @aircraft.oil_analyses.new(analysis_params)
|
||||||
if @analysis.save
|
if @analysis.save
|
||||||
log_event("oil_analysis", "Oil analysis added (sampled #{@analysis.sample_date})")
|
log_event("oil_analysis", t("flash.oil_analyses.oil_analysis_added_sampled", sample_date: @analysis.sample_date))
|
||||||
redirect_to aircraft_oil_analysis_path(@aircraft, @analysis), notice: "Oil analysis saved."
|
redirect_to aircraft_oil_analysis_path(@aircraft, @analysis), notice: t("flash.oil_analyses.oil_analysis_saved")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -35,13 +35,13 @@ class OilAnalysesController < ApplicationController
|
|||||||
# earlier samples, so samples already on file are skipped rather than duplicated.
|
# earlier samples, so samples already on file are skipped rather than duplicated.
|
||||||
def import
|
def import
|
||||||
file = params[:report]
|
file = params[:report]
|
||||||
return redirect_to(new_aircraft_oil_analysis_path(@aircraft), alert: "Choose a lab report PDF.") if file.blank?
|
return redirect_to(new_aircraft_oil_analysis_path(@aircraft), alert: t("flash.oil_analyses.choose_a_lab_report")) if file.blank?
|
||||||
|
|
||||||
report = OilReportParser.from_pdf(file.tempfile)
|
report = OilReportParser.from_pdf(file.tempfile)
|
||||||
file.rewind
|
file.rewind
|
||||||
if report.tail_number.present? && normalize_tail(report.tail_number) != normalize_tail(@aircraft.tail_number)
|
if report.tail_number.present? && normalize_tail(report.tail_number) != normalize_tail(@aircraft.tail_number)
|
||||||
return redirect_to(new_aircraft_oil_analysis_path(@aircraft),
|
return redirect_to(new_aircraft_oil_analysis_path(@aircraft),
|
||||||
alert: "That report is for #{report.tail_number}, not #{@aircraft.tail_number}.")
|
alert: t("flash.oil_analyses.that_report_is_for", report_tail: report.tail_number, tail_number: @aircraft.tail_number))
|
||||||
end
|
end
|
||||||
|
|
||||||
engine = engine_for(report)
|
engine = engine_for(report)
|
||||||
@@ -57,20 +57,20 @@ class OilAnalysesController < ApplicationController
|
|||||||
current_record.report.attach(file) if current_record && !current_record.report.attached?
|
current_record.report.attach(file) if current_record && !current_record.report.attached?
|
||||||
|
|
||||||
skipped = report.samples.size - created.size
|
skipped = report.samples.size - created.size
|
||||||
created.each { log_event("oil_analysis", "Oil analysis imported (sampled #{_1.sample_date})") }
|
created.each { log_event("oil_analysis", t("flash.oil_analyses.oil_analysis_imported_sampled", sample_date: _1.sample_date)) }
|
||||||
notice = "Imported #{helpers.pluralize(created.size, 'sample')} from the #{report.lab} report."
|
notice = t("flash.oil_analyses.imported", count: created.size, lab: report.lab)
|
||||||
notice += " #{helpers.pluralize(skipped, 'sample was', plural: 'samples were')} already recorded." if skipped.positive?
|
notice += " #{t('flash.oil_analyses.already_recorded', count: skipped)}" if skipped.positive?
|
||||||
redirect_to aircraft_oil_analyses_path(@aircraft), notice: notice
|
redirect_to aircraft_oil_analyses_path(@aircraft), notice: notice
|
||||||
rescue OilReportParser::Error => e
|
rescue OilReportParser::Error => e
|
||||||
redirect_to new_aircraft_oil_analysis_path(@aircraft), alert: "Couldn't import that report: #{e.message}"
|
redirect_to new_aircraft_oil_analysis_path(@aircraft), alert: t("flash.oil_analyses.couldn_t_import_that", message: e.message)
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit; end
|
def edit; end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
if @analysis.update(analysis_params)
|
if @analysis.update(analysis_params)
|
||||||
log_event("oil_analysis", "Oil analysis updated (sampled #{@analysis.sample_date})")
|
log_event("oil_analysis", t("flash.oil_analyses.oil_analysis_updated_sampled", sample_date: @analysis.sample_date))
|
||||||
redirect_to aircraft_oil_analysis_path(@aircraft, @analysis), notice: "Oil analysis updated."
|
redirect_to aircraft_oil_analysis_path(@aircraft, @analysis), notice: t("flash.oil_analyses.oil_analysis_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -78,8 +78,8 @@ class OilAnalysesController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@analysis.destroy!
|
@analysis.destroy!
|
||||||
log_event("oil_analysis", "Oil analysis deleted (sampled #{@analysis.sample_date})")
|
log_event("oil_analysis", t("flash.oil_analyses.oil_analysis_deleted_sampled", sample_date: @analysis.sample_date))
|
||||||
redirect_to aircraft_oil_analyses_path(@aircraft), notice: "Oil analysis deleted."
|
redirect_to aircraft_oil_analyses_path(@aircraft), notice: t("flash.oil_analyses.oil_analysis_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ class PasswordsController < ApplicationController
|
|||||||
allow_unauthenticated_access
|
allow_unauthenticated_access
|
||||||
before_action :require_password_login
|
before_action :require_password_login
|
||||||
before_action :set_user_by_token, only: %i[ edit update ]
|
before_action :set_user_by_token, only: %i[ edit update ]
|
||||||
rate_limit to: 5, within: 15.minutes, only: :create, with: -> { redirect_to new_session_path, alert: "Try again later." }
|
rate_limit to: 5, within: 15.minutes, only: :create, with: -> { redirect_to new_session_path, alert: t("flash.passwords.try_again_later") }
|
||||||
rate_limit to: 10, within: 15.minutes, only: :update, with: -> { redirect_to new_session_path, alert: "Try again later." }
|
rate_limit to: 10, within: 15.minutes, only: :update, with: -> { redirect_to new_session_path, alert: t("flash.passwords.try_again_later_2") }
|
||||||
|
|
||||||
def new
|
def new
|
||||||
end
|
end
|
||||||
@@ -13,7 +13,7 @@ class PasswordsController < ApplicationController
|
|||||||
PasswordsMailer.reset(user).deliver_later
|
PasswordsMailer.reset(user).deliver_later
|
||||||
end
|
end
|
||||||
|
|
||||||
redirect_to new_session_path, notice: "Password reset instructions sent (if user with that email address exists)."
|
redirect_to new_session_path, notice: t("flash.passwords.password_reset_instructions_sent")
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
@@ -22,7 +22,7 @@ class PasswordsController < ApplicationController
|
|||||||
def update
|
def update
|
||||||
if params[:password].present? && @user.update(params.permit(:password, :password_confirmation))
|
if params[:password].present? && @user.update(params.permit(:password, :password_confirmation))
|
||||||
@user.sessions.destroy_all # a reset signs out every device
|
@user.sessions.destroy_all # a reset signs out every device
|
||||||
redirect_to new_session_path, notice: "Password has been reset."
|
redirect_to new_session_path, notice: t("flash.passwords.password_has_been_reset")
|
||||||
else
|
else
|
||||||
redirect_to edit_password_path(params[:token]), alert: @user.errors.full_messages.to_sentence.presence || "Enter a new password."
|
redirect_to edit_password_path(params[:token]), alert: @user.errors.full_messages.to_sentence.presence || "Enter a new password."
|
||||||
end
|
end
|
||||||
@@ -30,12 +30,12 @@ class PasswordsController < ApplicationController
|
|||||||
|
|
||||||
private
|
private
|
||||||
def require_password_login
|
def require_password_login
|
||||||
redirect_to new_session_path, alert: "Sign in with #{Sso.label}." unless Sso.password_login?
|
redirect_to new_session_path, alert: t("flash.passwords.sign_in_with", label: Sso.label) unless Sso.password_login?
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_user_by_token
|
def set_user_by_token
|
||||||
@user = User.find_by_password_reset_token!(params[:token])
|
@user = User.find_by_password_reset_token!(params[:token])
|
||||||
rescue ActiveSupport::MessageVerifier::InvalidSignature
|
rescue ActiveSupport::MessageVerifier::InvalidSignature
|
||||||
redirect_to new_password_path, alert: "Password reset link is invalid or has expired."
|
redirect_to new_password_path, alert: t("flash.passwords.password_reset_link_is")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -14,13 +14,13 @@ class ProfilesController < ApplicationController
|
|||||||
# Checked before assigning: setting a new password replaces the digest at once.
|
# Checked before assigning: setting a new password replaces the digest at once.
|
||||||
if sensitive && !@user.authenticate_password(params.dig(:user, :current_password).to_s)
|
if sensitive && !@user.authenticate_password(params.dig(:user, :current_password).to_s)
|
||||||
@user.assign_attributes(attrs.except(:password, :password_confirmation))
|
@user.assign_attributes(attrs.except(:password, :password_confirmation))
|
||||||
@user.errors.add(:base, "Enter your current password to change your email or password")
|
@user.errors.add(:base, :current_password_needed)
|
||||||
return render :edit, status: :unprocessable_entity
|
return render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@user.assign_attributes(attrs)
|
@user.assign_attributes(attrs)
|
||||||
if @user.save
|
if @user.save
|
||||||
@user.sessions.where.not(id: Current.session.id).destroy_all if attrs.key?(:password)
|
@user.sessions.where.not(id: Current.session.id).destroy_all if attrs.key?(:password)
|
||||||
redirect_to root_path, notice: "Profile updated."
|
redirect_to root_path, notice: t("flash.profiles.profile_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -28,6 +28,6 @@ class ProfilesController < ApplicationController
|
|||||||
|
|
||||||
def sign_out_others
|
def sign_out_others
|
||||||
count = current_user.sessions.where.not(id: Current.session.id).destroy_all.size
|
count = current_user.sessions.where.not(id: Current.session.id).destroy_all.size
|
||||||
redirect_to edit_profile_path, notice: "Signed out #{helpers.pluralize(count, 'other session')}."
|
redirect_to edit_profile_path, notice: t("flash.profiles.signed_out_others", count: count)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# Notifications on this device (Profile): the browser's push subscription is
|
||||||
|
# saved here when the user turns them on, and removed when they turn them off.
|
||||||
|
class PushSubscriptionsController < ApplicationController
|
||||||
|
def create
|
||||||
|
sub = params.require(:subscription).permit(:endpoint, keys: %i[p256dh auth])
|
||||||
|
record = PushSubscription.find_or_initialize_by(endpoint: sub[:endpoint].to_s)
|
||||||
|
record.assign_attributes(user: current_user, p256dh: sub.dig(:keys, :p256dh), auth: sub.dig(:keys, :auth),
|
||||||
|
user_agent: request.user_agent.to_s.first(250))
|
||||||
|
record.save ? head(:created) : head(:unprocessable_entity)
|
||||||
|
end
|
||||||
|
|
||||||
|
def destroy
|
||||||
|
current_user.push_subscriptions.where(endpoint: params[:endpoint].to_s).destroy_all
|
||||||
|
head :no_content
|
||||||
|
end
|
||||||
|
|
||||||
|
# A notification to this user's devices, to check they arrive.
|
||||||
|
def test
|
||||||
|
PushNotifier.notify(current_user, :test, path: edit_profile_path, tag: "test")
|
||||||
|
head :accepted
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -18,17 +18,17 @@ class RecordVersionsController < ApplicationController
|
|||||||
def restore
|
def restore
|
||||||
version = RecordVersion.where(aircraft_id: @aircraft.id, event: "unlink", item_type: SHARED.keys).find(params[:id])
|
version = RecordVersion.where(aircraft_id: @aircraft.id, event: "unlink", item_type: SHARED.keys).find(params[:id])
|
||||||
record = SHARED.fetch(version.item_type).find_by(id: version.item_id)
|
record = SHARED.fetch(version.item_type).find_by(id: version.item_id)
|
||||||
return redirect_to(aircraft_record_versions_path(@aircraft), alert: "That record no longer exists.") unless record
|
return redirect_to(aircraft_record_versions_path(@aircraft), alert: t("flash.record_versions.that_record_no_longer")) unless record
|
||||||
c = version.changes_hash
|
c = version.changes_hash
|
||||||
if c["applies_to"] == "component"
|
if c["applies_to"] == "component"
|
||||||
component = @aircraft.components.find_by(id: c["component_id"])
|
component = @aircraft.components.find_by(id: c["component_id"])
|
||||||
return redirect_to(aircraft_record_versions_path(@aircraft), alert: "That component no longer exists; edit the record's applicability instead.") unless component
|
return redirect_to(aircraft_record_versions_path(@aircraft), alert: t("flash.record_versions.that_component_no_longer")) unless component
|
||||||
record.components << component unless record.components.include?(component)
|
record.components << component unless record.components.include?(component)
|
||||||
else
|
else
|
||||||
record.aircraft << @aircraft unless record.aircraft.include?(@aircraft)
|
record.aircraft << @aircraft unless record.aircraft.include?(@aircraft)
|
||||||
end
|
end
|
||||||
log_event(version.item_type == "AirworthinessDirective" ? "ad" : "inspection", "Restored: #{record} applies again")
|
log_event(version.item_type == "AirworthinessDirective" ? "ad" : "inspection", "Restored: #{record} applies again")
|
||||||
redirect_to aircraft_record_versions_path(@aircraft), notice: "#{record} applies to #{@aircraft.tail_number} again."
|
redirect_to aircraft_record_versions_path(@aircraft), notice: t("flash.record_versions.applies_to_again", record: record, tail_number: @aircraft.tail_number)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Whether an unlink can still be undone (the record exists and isn't linked that way now).
|
# Whether an unlink can still be undone (the record exists and isn't linked that way now).
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ class RecordsPackagesController < ApplicationController
|
|||||||
Dir[dir.join("*.zip")].each { |old| File.delete(old) if File.mtime(old) < 1.hour.ago }
|
Dir[dir.join("*.zip")].each { |old| File.delete(old) if File.mtime(old) < 1.hour.ago }
|
||||||
path = dir.join("#{SecureRandom.hex(12)}.zip").to_s
|
path = dir.join("#{SecureRandom.hex(12)}.zip").to_s
|
||||||
package.write_to(path)
|
package.write_to(path)
|
||||||
log_event("aircraft", "Records package downloaded")
|
log_event("aircraft", t("flash.records_packages.records_package_downloaded"))
|
||||||
# Generic binary, not application/zip: Safari unzips zip downloads into a
|
# Generic binary, not application/zip: Safari unzips zip downloads into a
|
||||||
# folder ("Open safe files"); the package should stay one file to hand over.
|
# folder ("Open safe files"); the package should stay one file to hand over.
|
||||||
send_file path, filename: package.filename, type: "application/octet-stream", disposition: "attachment"
|
send_file path, filename: package.filename, type: "application/octet-stream", disposition: "attachment"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# One search box across the records of the aircraft the user can see
|
# One search box across the records of the aircraft the user can see
|
||||||
# (or one aircraft, from its own pages).
|
# (or one aircraft, from its own pages).
|
||||||
class SearchesController < ApplicationController
|
class SearchesController < ApplicationController
|
||||||
rate_limit to: 60, within: 1.minute, with: -> { redirect_to root_path, alert: "Too many searches; wait a moment." }
|
rate_limit to: 60, within: 1.minute, with: -> { redirect_to root_path, alert: t("flash.searches.too_many_searches_wait") }
|
||||||
|
|
||||||
def show
|
def show
|
||||||
fleet = current_user.accessible_aircraft.ordered.to_a
|
fleet = current_user.accessible_aircraft.ordered.to_a
|
||||||
|
|||||||
@@ -1,45 +1,44 @@
|
|||||||
class SessionsController < ApplicationController
|
class SessionsController < ApplicationController
|
||||||
allow_unauthenticated_access only: %i[new create two_factor verify_two_factor]
|
allow_unauthenticated_access only: %i[new create two_factor verify_two_factor]
|
||||||
rate_limit to: 10, within: 3.minutes, only: %i[create verify_two_factor], with: -> { redirect_to new_session_url, alert: "Try again later." }
|
rate_limit to: 10, within: 3.minutes, only: %i[create verify_two_factor], with: -> { redirect_to new_session_url, alert: t("flash.sessions.try_again_later") }
|
||||||
|
|
||||||
FAILED = "Try another email address or password. After #{User::LOCK_AFTER} failed tries in a row an account is locked for #{User::LOCK_FOR.inspect}.".freeze
|
|
||||||
|
|
||||||
def new
|
def new
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
return redirect_to new_session_path, alert: "Sign in with #{Sso.label}." unless Sso.password_login?
|
return redirect_to new_session_path, alert: t("flash.sessions.sign_in_with", label: Sso.label) unless Sso.password_login?
|
||||||
|
|
||||||
if (user = User.authenticate_with_lockout(email_address: params[:email_address], password: params[:password])) && user.disabled?
|
if (user = User.authenticate_with_lockout(email_address: params[:email_address], password: params[:password])) && user.disabled?
|
||||||
redirect_to new_session_path, alert: "This account is disabled."
|
redirect_to new_session_path, alert: t("flash.sessions.this_account_is_disabled")
|
||||||
elsif user
|
elsif user
|
||||||
begin_sign_in user, return_to: after_authentication_url
|
begin_sign_in user, return_to: after_authentication_url
|
||||||
else
|
else
|
||||||
redirect_to new_session_path(email_address: params[:email_address].to_s.first(200)), alert: FAILED
|
redirect_to new_session_path(email_address: params[:email_address].to_s.first(200)), alert: t("flash.sessions.failed", tries: User::LOCK_AFTER, minutes: User::LOCK_FOR.in_minutes.to_i)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Second step for accounts with an authenticator app.
|
# Second step for accounts with an authenticator app.
|
||||||
def two_factor
|
def two_factor
|
||||||
redirect_to new_session_path, alert: "Sign in again." unless pending_otp_user
|
redirect_to new_session_path, alert: t("flash.sessions.sign_in_again") unless pending_otp_user
|
||||||
end
|
end
|
||||||
|
|
||||||
def verify_two_factor
|
def verify_two_factor
|
||||||
user = pending_otp_user
|
user = pending_otp_user
|
||||||
return redirect_to(new_session_path, alert: "That took too long. Sign in again.") unless user
|
return redirect_to(new_session_path, alert: t("flash.sessions.that_took_too_long")) unless user
|
||||||
if user.locked?
|
if user.locked?
|
||||||
reset_session
|
reset_session
|
||||||
redirect_to new_session_path, alert: FAILED
|
redirect_to new_session_path, alert: t("flash.sessions.failed", tries: User::LOCK_AFTER, minutes: User::LOCK_FOR.in_minutes.to_i)
|
||||||
elsif user.verify_second_factor(params[:code])
|
elsif user.verify_second_factor(params[:code])
|
||||||
user.clear_failed_sign_ins!
|
user.clear_failed_sign_ins!
|
||||||
return_to = after_authentication_url
|
return_to = after_authentication_url
|
||||||
reset_session
|
reset_session
|
||||||
start_new_session_for user
|
start_new_session_for user
|
||||||
notice = user.recovery_codes_left < 3 ? "Signed in. You have #{user.recovery_codes_left} recovery codes left: make new ones on your profile." : nil
|
notice = user.recovery_codes_left < 3 ? t("flash.sessions.few_recovery_codes", count: user.recovery_codes_left) : nil
|
||||||
redirect_to return_to, notice: notice
|
redirect_to return_to, notice: notice
|
||||||
else
|
else
|
||||||
user.register_failed_sign_in!
|
user.register_failed_sign_in!
|
||||||
redirect_to two_factor_session_path, alert: "That code didn't match. Try the current code from your authenticator app, or a recovery code."
|
redirect_to two_factor_session_path, alert: t("flash.sessions.that_code_didn_t")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ class SetupController < ApplicationController
|
|||||||
@user.admin = true
|
@user.admin = true
|
||||||
if @user.save
|
if @user.save
|
||||||
start_new_session_for @user
|
start_new_session_for @user
|
||||||
redirect_to root_path, notice: "Welcome! You're the administrator. Add your first aircraft."
|
redirect_to root_path, notice: t("flash.setup.welcome_you_re_the")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ class ShareTokensController < ApplicationController
|
|||||||
token = @aircraft.share_tokens.new(params.require(:share_token).permit(:label, :privilege, :expires_at))
|
token = @aircraft.share_tokens.new(params.require(:share_token).permit(:label, :privilege, :expires_at))
|
||||||
token.created_by = current_user
|
token.created_by = current_user
|
||||||
if token.save
|
if token.save
|
||||||
log_event("aircraft", "Share link created (#{token.privilege})", notes: token.label)
|
log_event("aircraft", t("flash.share_tokens.share_link_created_2", privilege: token.privilege), notes: token.label)
|
||||||
redirect_to aircraft_aircraft_roles_path(@aircraft), notice: "Share link created."
|
redirect_to aircraft_aircraft_roles_path(@aircraft), notice: t("flash.share_tokens.share_link_created")
|
||||||
else
|
else
|
||||||
redirect_to aircraft_aircraft_roles_path(@aircraft), alert: token.errors.full_messages.to_sentence
|
redirect_to aircraft_aircraft_roles_path(@aircraft), alert: token.errors.full_messages.to_sentence
|
||||||
end
|
end
|
||||||
@@ -16,7 +16,7 @@ class ShareTokensController < ApplicationController
|
|||||||
def destroy
|
def destroy
|
||||||
token = @aircraft.share_tokens.find(params[:id])
|
token = @aircraft.share_tokens.find(params[:id])
|
||||||
token.destroy!
|
token.destroy!
|
||||||
log_event("aircraft", "Share link revoked", notes: token.label)
|
log_event("aircraft", t("flash.share_tokens.share_link_revoked_2"), notes: token.label)
|
||||||
redirect_to aircraft_aircraft_roles_path(@aircraft), notice: "Share link revoked."
|
redirect_to aircraft_aircraft_roles_path(@aircraft), notice: t("flash.share_tokens.share_link_revoked")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
# The installed app's home-screen shortcuts (Log Flight, Report Squawk): the
|
||||||
|
# form for your aircraft, or a list to choose from when you have several.
|
||||||
|
class ShortcutsController < ApplicationController
|
||||||
|
def log_flight = go(:log_flight, ->(a) { new_aircraft_flight_log_path(a) })
|
||||||
|
def report_squawk = go(:report_squawk, ->(a) { new_aircraft_squawk_path(a) })
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def go(action, path)
|
||||||
|
aircraft = current_user.accessible_aircraft.ordered.to_a
|
||||||
|
return redirect_to(path.(aircraft.first)) if aircraft.one?
|
||||||
|
@title = t("shortcuts.choose.#{action}")
|
||||||
|
@choices = aircraft.map { [ _1, path.(_1) ] }
|
||||||
|
render :choose
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -7,8 +7,8 @@ class SignInLinksController < ApplicationController
|
|||||||
allow_unauthenticated_access
|
allow_unauthenticated_access
|
||||||
before_action :require_email_sign_in
|
before_action :require_email_sign_in
|
||||||
before_action :set_user_by_token, only: %i[show consume]
|
before_action :set_user_by_token, only: %i[show consume]
|
||||||
rate_limit to: 5, within: 15.minutes, only: :create, with: -> { redirect_to new_sign_in_link_path, alert: "Try again later." }
|
rate_limit to: 5, within: 15.minutes, only: :create, with: -> { redirect_to new_sign_in_link_path, alert: t("flash.sign_in_links.try_again_later") }
|
||||||
rate_limit to: 20, within: 15.minutes, only: :consume, with: -> { redirect_to new_session_path, alert: "Try again later." }
|
rate_limit to: 20, within: 15.minutes, only: :consume, with: -> { redirect_to new_session_path, alert: t("flash.sign_in_links.try_again_later_2") }
|
||||||
|
|
||||||
def new
|
def new
|
||||||
end
|
end
|
||||||
@@ -18,25 +18,25 @@ class SignInLinksController < ApplicationController
|
|||||||
SessionsMailer.sign_in_link(user).deliver_later
|
SessionsMailer.sign_in_link(user).deliver_later
|
||||||
end
|
end
|
||||||
# Same answer either way, so this can't be used to find accounts.
|
# Same answer either way, so this can't be used to find accounts.
|
||||||
redirect_to new_session_path, notice: "If there's an account for that address, a sign-in link is on its way. It works once, for 15 minutes."
|
redirect_to new_session_path, notice: t("flash.sign_in_links.if_there_s_an")
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
end
|
end
|
||||||
|
|
||||||
def consume
|
def consume
|
||||||
return redirect_to new_session_path, alert: "This account is disabled." if @user.disabled?
|
return redirect_to new_session_path, alert: t("flash.sign_in_links.this_account_is_disabled") if @user.disabled?
|
||||||
begin_sign_in @user, return_to: root_path, notice: "Signed in." # signing in also spends the link
|
begin_sign_in @user, return_to: root_path, notice: t("flash.sign_in_links.signed_in") # signing in also spends the link
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def require_email_sign_in
|
def require_email_sign_in
|
||||||
redirect_to new_session_path, alert: "Sign in with #{Sso.label}." unless Sso.password_login?
|
redirect_to new_session_path, alert: t("flash.sign_in_links.sign_in_with", label: Sso.label) unless Sso.password_login?
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_user_by_token
|
def set_user_by_token
|
||||||
@user = User.find_by_token_for(:email_sign_in, params[:token].to_s)
|
@user = User.find_by_token_for(:email_sign_in, params[:token].to_s)
|
||||||
redirect_to new_sign_in_link_path, alert: "That sign-in link has expired or was already used. Get a new one below." unless @user
|
redirect_to new_sign_in_link_path, alert: t("flash.sign_in_links.that_sign_in_link") unless @user
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -3,22 +3,26 @@ class SigningInvitationsController < ApplicationController
|
|||||||
include AircraftScoped
|
include AircraftScoped
|
||||||
before_action :require_owner!
|
before_action :require_owner!
|
||||||
before_action :set_entry
|
before_action :set_entry
|
||||||
rate_limit to: 10, within: 1.hour, only: :create, with: -> { redirect_back fallback_location: root_path, alert: "Too many invitations; try again later." }
|
rate_limit to: 10, within: 1.hour, only: :create, with: -> { redirect_back fallback_location: root_path, alert: t("flash.signing_invitations.too_many_invitations_try") }
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@invitation = @entry.signing_invitations.new
|
@invitation = @entry.signing_invitations.new
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
return redirect_to(aircraft_logbook_entry_path(@aircraft, @entry), alert: "This entry is already signed.") if @entry.signed?
|
return redirect_to(aircraft_logbook_entry_path(@aircraft, @entry), alert: t("flash.signing_invitations.this_entry_is_already")) if @entry.signed?
|
||||||
unless MailSettings.configured?
|
unless MailSettings.configured?
|
||||||
return redirect_to aircraft_logbook_entry_path(@aircraft, @entry), alert: "Email isn't set up, so invitations can't be sent (Admin → About)."
|
return redirect_to aircraft_logbook_entry_path(@aircraft, @entry), alert: t("flash.signing_invitations.email_isn_t_set")
|
||||||
end
|
end
|
||||||
@invitation = @entry.signing_invitations.new(params.require(:signing_invitation).permit(:email, :message).merge(invited_by: current_user))
|
@invitation = @entry.signing_invitations.new(params.require(:signing_invitation).permit(:email, :message).merge(invited_by: current_user))
|
||||||
if @invitation.save
|
if @invitation.save
|
||||||
SigningInvitationMailer.invite(@invitation, @invitation.token).deliver_later
|
SigningInvitationMailer.invite(@invitation, @invitation.token).deliver_later
|
||||||
log_event("logbook", "Signature requested from #{@invitation.email} (#{@entry.date} entry)")
|
if (invitee = User.active.find_by(email_address: @invitation.email))
|
||||||
redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: "Invitation sent to #{@invitation.email}. The link works once, for #{SigningInvitation::VALID_FOR.inspect}."
|
PushNotifier.notify(invitee, :signing_request, path: invited_signing_path(@invitation.token), tag: "sign-#{@invitation.id}",
|
||||||
|
tail: @aircraft.tail_number, name: current_user.display_name)
|
||||||
|
end
|
||||||
|
log_event("logbook", t("flash.signing_invitations.signature_requested_from_entry", email: @invitation.email, date: @entry.date))
|
||||||
|
redirect_to aircraft_logbook_entry_path(@aircraft, @entry), notice: t("flash.signing_invitations.invitation_sent_to_the", email: @invitation.email, days: SigningInvitation::VALID_FOR.in_days.to_i)
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -15,10 +15,18 @@ class SquawksController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
|
# Already received (sent again from the offline queue): don't report it twice.
|
||||||
|
if (key = params.dig(:squawk, :client_key).to_s.presence) && @aircraft.squawks.exists?(client_key: key.first(64))
|
||||||
|
return redirect_to(aircraft_squawks_path(@aircraft), notice: t("flash.squawks.already_reported"))
|
||||||
|
end
|
||||||
@squawk = @aircraft.squawks.new(squawk_params.merge(reported_by: current_user))
|
@squawk = @aircraft.squawks.new(squawk_params.merge(reported_by: current_user))
|
||||||
if @squawk.save
|
if @squawk.save
|
||||||
log_event("squawk", "Squawk reported: #{@squawk.priority_label}", notes: @squawk.issue_reported.truncate(200))
|
log_event("squawk", t("flash.squawks.squawk_reported_2", priority_label: @squawk.priority_label), notes: @squawk.issue_reported.truncate(200))
|
||||||
redirect_to aircraft_squawks_path(@aircraft), notice: "Squawk reported."
|
if @squawk.grounding?
|
||||||
|
PushNotifier.notify(@aircraft.users.merge(User.active).where.not(id: current_user.id), :grounding_squawk, path: aircraft_squawks_path(@aircraft),
|
||||||
|
tag: "squawk-#{@squawk.id}", tail: @aircraft.tail_number, issue: @squawk.issue_reported.truncate(120))
|
||||||
|
end
|
||||||
|
redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.squawk_reported")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -30,8 +38,8 @@ class SquawksController < ApplicationController
|
|||||||
@squawk.assign_attributes(squawk_params.except(:attachments))
|
@squawk.assign_attributes(squawk_params.except(:attachments))
|
||||||
change_attachments
|
change_attachments
|
||||||
if @squawk.save
|
if @squawk.save
|
||||||
log_event("squawk", "Squawk updated")
|
log_event("squawk", t("flash.squawks.squawk_updated_2"))
|
||||||
redirect_to aircraft_squawks_path(@aircraft), notice: "Squawk updated."
|
redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.squawk_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -42,7 +50,7 @@ class SquawksController < ApplicationController
|
|||||||
def resolution
|
def resolution
|
||||||
@entry = @aircraft.logbook_entries.new(date: Date.current, entry_type: "MAINTENANCE", log_type: "AC",
|
@entry = @aircraft.logbook_entries.new(date: Date.current, entry_type: "MAINTENANCE", log_type: "AC",
|
||||||
aircraft_hours_at_entry: @aircraft.current_hours,
|
aircraft_hours_at_entry: @aircraft.current_hours,
|
||||||
text: "Corrected: #{@squawk.issue_reported}", component: @squawk.component,
|
text: t("flash.squawks.corrected_text", issue: @squawk.issue_reported), component: @squawk.component,
|
||||||
component_hours_at_entry: @squawk.component&.hours_in_service,
|
component_hours_at_entry: @squawk.component&.hours_in_service,
|
||||||
component_since_overhaul_at_entry: @squawk.component&.hours_since_overhaul)
|
component_since_overhaul_at_entry: @squawk.component&.hours_since_overhaul)
|
||||||
@entry.log_type = "ENG" if @squawk.component&.engine?
|
@entry.log_type = "ENG" if @squawk.component&.engine?
|
||||||
@@ -56,13 +64,13 @@ class SquawksController < ApplicationController
|
|||||||
@entry = @aircraft.logbook_entries.new(resolution_entry_params.merge(entry_type: "MAINTENANCE"))
|
@entry = @aircraft.logbook_entries.new(resolution_entry_params.merge(entry_type: "MAINTENANCE"))
|
||||||
@entry.assign_parts(params.fetch(:logbook_entry, {}).permit(parts: {})[:parts]&.to_h || {}, @aircraft)
|
@entry.assign_parts(params.fetch(:logbook_entry, {}).permit(parts: {})[:parts]&.to_h || {}, @aircraft)
|
||||||
return render(:resolution, status: :unprocessable_entity) unless @entry.save
|
return render(:resolution, status: :unprocessable_entity) unless @entry.save
|
||||||
log_event("logbook", "Logbook entry added: #{@entry.date}")
|
log_event("logbook", t("flash.squawks.logbook_entry_added", date: @entry.date))
|
||||||
@entry
|
@entry
|
||||||
when "existing" then @aircraft.logbook_entries.find_by(id: params[:logbook_entry_id])
|
when "existing" then @aircraft.logbook_entries.find_by(id: params[:logbook_entry_id])
|
||||||
end
|
end
|
||||||
@squawk.resolve!(notes: params[:resolution_notes], logbook_entry: entry)
|
@squawk.resolve!(notes: params[:resolution_notes], logbook_entry: entry)
|
||||||
log_event("squawk", "Squawk resolved", notes: @squawk.issue_reported.truncate(200))
|
log_event("squawk", t("flash.squawks.squawk_resolved_2"), notes: @squawk.issue_reported.truncate(200))
|
||||||
redirect_to aircraft_squawks_path(@aircraft), notice: "Squawk resolved#{' and recorded in the logbook' if entry}."
|
redirect_to aircraft_squawks_path(@aircraft), notice: t(entry ? "flash.squawks.resolved_logged" : "flash.squawks.squawk_resolved")
|
||||||
end
|
end
|
||||||
|
|
||||||
def deferral; end
|
def deferral; end
|
||||||
@@ -70,8 +78,8 @@ class SquawksController < ApplicationController
|
|||||||
def defer
|
def defer
|
||||||
if @squawk.defer(checks: params[:checks], name: params[:deferred_by_name], role: params[:deferred_by_role],
|
if @squawk.defer(checks: params[:checks], name: params[:deferred_by_name], role: params[:deferred_by_role],
|
||||||
action: params[:deferral_action], notes: params[:deferral_notes])
|
action: params[:deferral_action], notes: params[:deferral_notes])
|
||||||
log_event("squawk", "Inoperative item deferred (91.213(d))", notes: @squawk.issue_reported.truncate(200))
|
log_event("squawk", t("flash.squawks.inoperative_item_deferred_91"), notes: @squawk.issue_reported.truncate(200))
|
||||||
redirect_to aircraft_squawks_path(@aircraft), notice: "Deferred. Keep the placard in place until it's fixed."
|
redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.deferred_keep_the_placard")
|
||||||
else
|
else
|
||||||
render :deferral, status: :unprocessable_entity
|
render :deferral, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -79,20 +87,20 @@ class SquawksController < ApplicationController
|
|||||||
|
|
||||||
def undefer
|
def undefer
|
||||||
@squawk.undefer!
|
@squawk.undefer!
|
||||||
log_event("squawk", "Deferral removed", notes: @squawk.issue_reported.truncate(200))
|
log_event("squawk", t("flash.squawks.deferral_removed_2"), notes: @squawk.issue_reported.truncate(200))
|
||||||
redirect_to aircraft_squawks_path(@aircraft), notice: "Deferral removed."
|
redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.deferral_removed")
|
||||||
end
|
end
|
||||||
|
|
||||||
def reopen
|
def reopen
|
||||||
@squawk.update!(resolved: false, resolved_at: nil)
|
@squawk.update!(resolved: false, resolved_at: nil)
|
||||||
log_event("squawk", "Squawk reopened")
|
log_event("squawk", t("flash.squawks.squawk_reopened_2"))
|
||||||
redirect_to aircraft_squawks_path(@aircraft), notice: "Squawk reopened."
|
redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.squawk_reopened")
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@squawk.destroy!
|
@squawk.destroy!
|
||||||
log_event("squawk", "Squawk deleted")
|
log_event("squawk", t("flash.squawks.squawk_deleted_2"))
|
||||||
redirect_to aircraft_squawks_path(@aircraft), notice: "Squawk deleted."
|
redirect_to aircraft_squawks_path(@aircraft), notice: t("flash.squawks.squawk_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
@@ -118,7 +126,8 @@ class SquawksController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def squawk_params
|
def squawk_params
|
||||||
params.require(:squawk).permit(:priority, :issue_reported, :component_id, :notes, attachments: [])
|
params.require(:squawk).permit(:priority, :issue_reported, :component_id, :notes, :client_key, attachments: [])
|
||||||
.tap { |p| p[:component_id] = scoped_id(@aircraft.components, p[:component_id]) if p.key?(:component_id) }
|
.tap { |p| p[:component_id] = scoped_id(@aircraft.components, p[:component_id]) if p.key?(:component_id) }
|
||||||
|
.tap { |p| p[:client_key] = p[:client_key].to_s.first(64).presence if p.key?(:client_key) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
class SsoController < ApplicationController
|
class SsoController < ApplicationController
|
||||||
allow_unauthenticated_access only: %i[callback failure]
|
allow_unauthenticated_access only: %i[callback failure]
|
||||||
before_action :require_sso
|
before_action :require_sso
|
||||||
rate_limit to: 20, within: 3.minutes, only: :callback, with: -> { redirect_to new_session_path, alert: "Try again later." }
|
rate_limit to: 20, within: 3.minutes, only: :callback, with: -> { redirect_to new_session_path, alert: t("flash.sso.try_again_later") }
|
||||||
|
|
||||||
def callback
|
def callback
|
||||||
auth = request.env["omniauth.auth"]
|
auth = request.env["omniauth.auth"]
|
||||||
@@ -20,11 +20,10 @@ class SsoController < ApplicationController
|
|||||||
user = User.find_by(sso_uid: auth.uid) || link_by_email(auth) || create_user(auth)
|
user = User.find_by(sso_uid: auth.uid) || link_by_email(auth) || create_user(auth)
|
||||||
unless user
|
unless user
|
||||||
email = auth.info&.email.presence
|
email = auth.info&.email.presence
|
||||||
return redirect_to new_session_path, alert: "There's no account for #{email || 'that sign-in'} here yet. " \
|
return redirect_to new_session_path, alert: t("flash.sso.there_s_no_account", email: email || t("flash.sso.that_sign_in"), provider: Sso.label)
|
||||||
"Ask an administrator to add you, or sign in with your password and link #{Sso.label} from your profile."
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return redirect_to new_session_path, alert: "This account is disabled." if user.disabled?
|
return redirect_to new_session_path, alert: t("flash.sso.this_account_is_disabled") if user.disabled?
|
||||||
|
|
||||||
sync_admin(user, auth)
|
sync_admin(user, auth)
|
||||||
return_to = session[:return_to_after_authenticating]
|
return_to = session[:return_to_after_authenticating]
|
||||||
@@ -34,22 +33,21 @@ class SsoController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
# OmniAuth's error codes; anything else (network errors…) is logged, not shown.
|
# OmniAuth's error codes; anything else (network errors…) is logged, not shown.
|
||||||
FAILURES = { "invalid_credentials" => "invalid credentials", "csrf_detected" => "the sign-in expired, try again",
|
FAILURES = %w[invalid_credentials csrf_detected access_denied timeout].freeze
|
||||||
"access_denied" => "access denied", "timeout" => "timed out" }.freeze
|
|
||||||
|
|
||||||
def failure
|
def failure
|
||||||
reason = FAILURES[params[:message].to_s]
|
reason = t(params[:message], scope: "flash.sso.failures") if FAILURES.include?(params[:message].to_s)
|
||||||
Rails.logger.warn("[sso] sign-in failed: #{params[:message].to_s.truncate(300)}") unless reason
|
Rails.logger.warn("[sso] sign-in failed: #{params[:message].to_s.truncate(300)}") unless reason
|
||||||
redirect_to(authenticated? ? edit_profile_path : new_session_path,
|
redirect_to(authenticated? ? edit_profile_path : new_session_path,
|
||||||
alert: "#{Sso.label} sign-in failed (#{reason || "couldn't reach or verify #{Sso.label}; see the server log"}).")
|
alert: t("flash.sso.failed", provider: Sso.label, reason: reason || t("flash.sso.unreachable", provider: Sso.label)))
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
unless Sso.password_login?
|
unless Sso.password_login?
|
||||||
return redirect_to edit_profile_path, alert: "Password sign-in is off, so unlinking #{Sso.label} would lock you out."
|
return redirect_to edit_profile_path, alert: t("flash.sso.password_sign_in_is", label: Sso.label)
|
||||||
end
|
end
|
||||||
current_user.update!(sso_uid: nil)
|
current_user.update!(sso_uid: nil)
|
||||||
redirect_to edit_profile_path, notice: "#{Sso.label} unlinked. Sign in with your email and password from now on."
|
redirect_to edit_profile_path, notice: t("flash.sso.unlinked_sign_in_with", label: Sso.label)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
@@ -61,16 +59,16 @@ class SsoController < ApplicationController
|
|||||||
# Signed in again (e.g. to sign a logbook entry): note when, and go back.
|
# Signed in again (e.g. to sign a logbook entry): note when, and go back.
|
||||||
def reauthenticated(auth)
|
def reauthenticated(auth)
|
||||||
session[:reauthenticated_at] = Time.current.to_i
|
session[:reauthenticated_at] = Time.current.to_i
|
||||||
redirect_to session.delete(:after_reauth).presence || edit_profile_path, notice: "Signed in again with #{Sso.label}."
|
redirect_to session.delete(:after_reauth).presence || edit_profile_path, notice: t("flash.sso.signed_in_again_with", label: Sso.label)
|
||||||
end
|
end
|
||||||
|
|
||||||
def link(auth)
|
def link(auth)
|
||||||
owner = User.find_by(sso_uid: auth.uid)
|
owner = User.find_by(sso_uid: auth.uid)
|
||||||
if owner && owner != current_user
|
if owner && owner != current_user
|
||||||
redirect_to edit_profile_path, alert: "That #{Sso.label} account is already linked to another user."
|
redirect_to edit_profile_path, alert: t("flash.sso.that_account_is_already", label: Sso.label)
|
||||||
else
|
else
|
||||||
current_user.update!(sso_uid: auth.uid)
|
current_user.update!(sso_uid: auth.uid)
|
||||||
redirect_to edit_profile_path, notice: "#{Sso.label} linked. You can now sign in with it."
|
redirect_to edit_profile_path, notice: t("flash.sso.linked_you_can_now", label: Sso.label)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -7,10 +7,10 @@ class StandardInspectionsController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
added = StandardInspections.add!(@aircraft, params[:templates])
|
added = StandardInspections.add!(@aircraft, params[:templates])
|
||||||
if added.any?
|
if added.any?
|
||||||
log_event("inspection", "Standard inspections added", notes: added.map(&:name).join(", "))
|
log_event("inspection", t("flash.standard_inspections.standard_inspections_added"), notes: added.map(&:name).join(", "))
|
||||||
redirect_to aircraft_inspections_path(@aircraft), notice: "Added #{added.map(&:name).to_sentence}. Record when each was last done to see when it's next due."
|
redirect_to aircraft_inspections_path(@aircraft), notice: t("flash.standard_inspections.added_record_when_each", items: added.map(&:name).to_sentence)
|
||||||
else
|
else
|
||||||
redirect_to new_aircraft_standard_inspections_path(@aircraft), alert: "Nothing new was chosen."
|
redirect_to new_aircraft_standard_inspections_path(@aircraft), alert: t("flash.standard_inspections.nothing_new_was_chosen")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
# Profile → Two-factor: set up an authenticator app (TOTP) for password and
|
# Profile → Two-factor: set up an authenticator app (TOTP) for password and
|
||||||
# emailed-link sign-in, turn it off, or make new recovery codes.
|
# emailed-link sign-in, turn it off, or make new recovery codes.
|
||||||
class TwoFactorsController < ApplicationController
|
class TwoFactorsController < ApplicationController
|
||||||
rate_limit to: 10, within: 5.minutes, only: %i[create destroy recovery_codes], with: -> { redirect_to edit_profile_path(anchor: "two-factor"), alert: "Try again later." }
|
rate_limit to: 10, within: 5.minutes, only: %i[create destroy recovery_codes], with: -> { redirect_to edit_profile_path(anchor: "two-factor"), alert: t("flash.two_factors.try_again_later") }
|
||||||
|
|
||||||
def new
|
def new
|
||||||
return redirect_to(back_path, notice: "Two-factor is already on.") if current_user.otp_enabled?
|
return redirect_to(back_path, notice: t("flash.two_factors.two_factor_is_already")) if current_user.otp_enabled?
|
||||||
session[:pending_otp_secret] ||= User.new_otp_secret
|
session[:pending_otp_secret] ||= User.new_otp_secret
|
||||||
@secret = session[:pending_otp_secret]
|
@secret = session[:pending_otp_secret]
|
||||||
svg = RQRCode::QRCode.new(User.otp_uri(@secret, current_user.email_address)).as_svg(module_size: 4, use_path: true, viewbox: true)
|
svg = RQRCode::QRCode.new(User.otp_uri(@secret, current_user.email_address)).as_svg(module_size: 4, use_path: true, viewbox: true)
|
||||||
@@ -20,22 +20,22 @@ class TwoFactorsController < ApplicationController
|
|||||||
log_security("turned on two-factor")
|
log_security("turned on two-factor")
|
||||||
render :codes
|
render :codes
|
||||||
else
|
else
|
||||||
redirect_to new_two_factor_path(return_to: params[:return_to]), alert: "That code didn't match. Check the time on your phone and try the current code."
|
redirect_to new_two_factor_path(return_to: params[:return_to]), alert: t("flash.two_factors.that_code_didn_t")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def recovery_codes
|
def recovery_codes
|
||||||
return redirect_to(edit_profile_path(anchor: "two-factor"), alert: "That code didn't match.") unless current_user.verify_second_factor(params[:code])
|
return redirect_to(edit_profile_path(anchor: "two-factor"), alert: t("flash.two_factors.that_code_didn_t_2")) unless current_user.verify_second_factor(params[:code])
|
||||||
@codes = current_user.enable_otp!(current_user.otp_secret)
|
@codes = current_user.enable_otp!(current_user.otp_secret)
|
||||||
log_security("made new recovery codes")
|
log_security("made new recovery codes")
|
||||||
render :codes
|
render :codes
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
return redirect_to(edit_profile_path(anchor: "two-factor"), alert: "That code didn't match.") unless current_user.verify_second_factor(params[:code])
|
return redirect_to(edit_profile_path(anchor: "two-factor"), alert: t("flash.two_factors.that_code_didn_t_3")) unless current_user.verify_second_factor(params[:code])
|
||||||
current_user.disable_otp!
|
current_user.disable_otp!
|
||||||
log_security("turned off two-factor")
|
log_security("turned off two-factor")
|
||||||
redirect_to edit_profile_path(anchor: "two-factor"), notice: "Two-factor is off."
|
redirect_to edit_profile_path(anchor: "two-factor"), notice: t("flash.two_factors.two_factor_is_off")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -6,23 +6,23 @@ class UserCertificatesController < ApplicationController
|
|||||||
certificate = current_user.certificates.new(certificate_params)
|
certificate = current_user.certificates.new(certificate_params)
|
||||||
back = safe_return_to || edit_profile_path(anchor: "certificates")
|
back = safe_return_to || edit_profile_path(anchor: "certificates")
|
||||||
if certificate.save
|
if certificate.save
|
||||||
redirect_to back, notice: "#{certificate.kind_label} certificate added."
|
redirect_to back, notice: t("flash.user_certificates.certificate_added", kind_label: certificate.kind_label)
|
||||||
else
|
else
|
||||||
redirect_to back, alert: "Certificate not added: #{certificate.errors.full_messages.to_sentence}."
|
redirect_to back, alert: t("flash.user_certificates.certificate_not_added", items: certificate.errors.full_messages.to_sentence)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
if @certificate.update(certificate_params)
|
if @certificate.update(certificate_params)
|
||||||
redirect_to edit_profile_path(anchor: "certificates"), notice: "Certificate updated."
|
redirect_to edit_profile_path(anchor: "certificates"), notice: t("flash.user_certificates.certificate_updated")
|
||||||
else
|
else
|
||||||
redirect_to edit_profile_path(anchor: "certificates"), alert: "Certificate not updated: #{@certificate.errors.full_messages.to_sentence}."
|
redirect_to edit_profile_path(anchor: "certificates"), alert: t("flash.user_certificates.certificate_not_updated", items: @certificate.errors.full_messages.to_sentence)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@certificate.destroy!
|
@certificate.destroy!
|
||||||
redirect_to edit_profile_path(anchor: "certificates"), notice: "Certificate removed."
|
redirect_to edit_profile_path(anchor: "certificates"), notice: t("flash.user_certificates.certificate_removed")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ class WeightBalanceRecordsController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@record = @aircraft.weight_balance_records.new(record_params)
|
@record = @aircraft.weight_balance_records.new(record_params)
|
||||||
if @record.save
|
if @record.save
|
||||||
log_event("aircraft", "Weight & balance recorded: #{@record.empty_weight} lb @ #{@record.empty_arm} in")
|
log_event("aircraft", t("flash.weight_balance_records.weight_balance_recorded_lb", empty_weight: @record.empty_weight, empty_arm: @record.empty_arm))
|
||||||
redirect_to aircraft_weight_balance_records_path(@aircraft), notice: "Weight & balance saved."
|
redirect_to aircraft_weight_balance_records_path(@aircraft), notice: t("flash.weight_balance_records.weight_balance_saved")
|
||||||
else
|
else
|
||||||
render :new, status: :unprocessable_entity
|
render :new, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -30,8 +30,8 @@ class WeightBalanceRecordsController < ApplicationController
|
|||||||
|
|
||||||
def update
|
def update
|
||||||
if @record.update(record_params)
|
if @record.update(record_params)
|
||||||
log_event("aircraft", "Weight & balance updated (#{@record.date})")
|
log_event("aircraft", t("flash.weight_balance_records.weight_balance_updated_2", date: @record.date))
|
||||||
redirect_to aircraft_weight_balance_records_path(@aircraft), notice: "Weight & balance updated."
|
redirect_to aircraft_weight_balance_records_path(@aircraft), notice: t("flash.weight_balance_records.weight_balance_updated")
|
||||||
else
|
else
|
||||||
render :edit, status: :unprocessable_entity
|
render :edit, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
@@ -39,8 +39,8 @@ class WeightBalanceRecordsController < ApplicationController
|
|||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@record.destroy!
|
@record.destroy!
|
||||||
log_event("aircraft", "Weight & balance record deleted (#{@record.date})")
|
log_event("aircraft", t("flash.weight_balance_records.weight_balance_record_deleted", date: @record.date))
|
||||||
redirect_to aircraft_weight_balance_records_path(@aircraft), notice: "Record deleted."
|
redirect_to aircraft_weight_balance_records_path(@aircraft), notice: t("flash.weight_balance_records.record_deleted")
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
# <%= f.field :public, as: :checkbox, label: "Show on share links" %>
|
# <%= f.field :public, as: :checkbox, label: "Show on share links" %>
|
||||||
class AppFormBuilder < ActionView::Helpers::FormBuilder
|
class AppFormBuilder < ActionView::Helpers::FormBuilder
|
||||||
def field(method, as: :text, label: nil, hint: nil, collection: nil, include_blank: false, wrapper: {}, **opts)
|
def field(method, as: :text, label: nil, hint: nil, collection: nil, include_blank: false, wrapper: {}, **opts)
|
||||||
label_text = label || method.to_s.humanize
|
label_text = label || (object.class.respond_to?(:human_attribute_name) ? object.class.human_attribute_name(method) : method.to_s.humanize)
|
||||||
errors = object.respond_to?(:errors) ? object.errors[method] : []
|
errors = object.respond_to?(:errors) ? object.errors[method] : []
|
||||||
|
|
||||||
if as == :checkbox
|
if as == :checkbox
|
||||||
@@ -35,7 +35,7 @@ class AppFormBuilder < ActionView::Helpers::FormBuilder
|
|||||||
@template.content_tag(:div, class: wrapper[:class]) do
|
@template.content_tag(:div, class: wrapper[:class]) do
|
||||||
label(method, label_text, class: "label") + input +
|
label(method, label_text, class: "label") + input +
|
||||||
(hint ? @template.content_tag(:p, hint, class: "hint") : "".html_safe) +
|
(hint ? @template.content_tag(:p, hint, class: "hint") : "".html_safe) +
|
||||||
errors.map { |e| @template.content_tag(:p, "#{label_text} #{e}", class: "field-error") }.join.html_safe
|
errors.map { |e| @template.content_tag(:p, I18n.t("errors.format", attribute: label_text, message: e), class: "field-error") }.join.html_safe
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -49,10 +49,10 @@ class AppFormBuilder < ActionView::Helpers::FormBuilder
|
|||||||
label(every, label, class: "label") +
|
label(every, label, class: "label") +
|
||||||
@template.content_tag(:div, class: "flex gap-2") do
|
@template.content_tag(:div, class: "flex gap-2") do
|
||||||
number_field(every, class: "input min-w-0 flex-1", min: 1, step: 1, inputmode: "numeric") +
|
number_field(every, class: "input min-w-0 flex-1", min: 1, step: 1, inputmode: "numeric") +
|
||||||
select(:"#{name}_unit", CalendarInterval::UNITS.invert, {}, class: "input w-auto", "aria-label": "#{label} unit")
|
select(:"#{name}_unit", CalendarInterval::UNITS.invert, {}, class: "input w-auto", "aria-label": I18n.t("helpers.form.interval_unit", label: label))
|
||||||
end +
|
end +
|
||||||
(hint ? @template.content_tag(:p, hint, class: "hint") : "".html_safe) +
|
(hint ? @template.content_tag(:p, hint, class: "hint") : "".html_safe) +
|
||||||
errors.map { |e| @template.content_tag(:p, "#{label} #{e}", class: "field-error") }.join.html_safe
|
errors.map { |e| @template.content_tag(:p, I18n.t("errors.format", attribute: label, message: e), class: "field-error") }.join.html_safe
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,35 +1,45 @@
|
|||||||
module AircraftHelper
|
module AircraftHelper
|
||||||
|
OFFLINE_AIRCRAFT = 10
|
||||||
|
|
||||||
|
# What the app saves ahead of time for use without signal (see
|
||||||
|
# offline_prep_controller.js): for each of your aircraft, the Overview, W&B,
|
||||||
|
# Log Flight and Report Squawk pages, and its photo.
|
||||||
|
def offline_pages
|
||||||
|
current_user.accessible_aircraft.ordered.limit(OFFLINE_AIRCRAFT).map do |a|
|
||||||
|
{ tail: a.tail_number, pages: [ aircraft_path(a), aircraft_weight_balance_records_path(a) ],
|
||||||
|
flight: new_aircraft_flight_log_path(a), squawk: new_aircraft_squawk_path(a),
|
||||||
|
picture: (url_for(a.picture) if a.picture.attached?) }.compact
|
||||||
|
end
|
||||||
|
end
|
||||||
# Tabs on the aircraft pages: [label, path, controller names that highlight it, owner_only]
|
# Tabs on the aircraft pages: [label, path, controller names that highlight it, owner_only]
|
||||||
def aircraft_tabs(aircraft)
|
def aircraft_tabs(aircraft)
|
||||||
[
|
[
|
||||||
[ "Overview", aircraft_path(aircraft), %w[aircraft] ],
|
[ I18n.t("helpers.aircraft.overview"), aircraft_path(aircraft), %w[aircraft] ],
|
||||||
[ "Components", aircraft_components_path(aircraft), %w[components] ],
|
[ I18n.t("helpers.aircraft.components"), aircraft_components_path(aircraft), %w[components] ],
|
||||||
[ "Squawks", aircraft_squawks_path(aircraft), %w[squawks] ],
|
[ I18n.t("helpers.aircraft.squawks"), aircraft_squawks_path(aircraft), %w[squawks] ],
|
||||||
[ "Flights", aircraft_flight_logs_path(aircraft), %w[flight_logs flight_imports air_trail_exports airport_codes] ],
|
[ I18n.t("helpers.aircraft.flights"), aircraft_flight_logs_path(aircraft), %w[flight_logs flight_imports air_trail_exports airport_codes] ],
|
||||||
[ "Oil & Fuel", aircraft_consumable_records_path(aircraft), %w[consumable_records] ],
|
[ I18n.t("helpers.aircraft.oil_fuel"), aircraft_consumable_records_path(aircraft), %w[consumable_records oil_analyses] ],
|
||||||
[ "Oil Analysis", aircraft_oil_analyses_path(aircraft), %w[oil_analyses] ],
|
[ I18n.t("helpers.aircraft.logbook"), aircraft_logbook_entries_path(aircraft), %w[logbook_entries] ],
|
||||||
[ "Logbook", aircraft_logbook_entries_path(aircraft), %w[logbook_entries] ],
|
[ I18n.t("helpers.aircraft.inspections"), aircraft_inspections_path(aircraft), %w[inspections inspection_types inspection_records] ],
|
||||||
[ "Inspections", aircraft_inspections_path(aircraft), %w[inspections inspection_types inspection_records] ],
|
[ I18n.t("helpers.aircraft.ads"), aircraft_airworthiness_directives_path(aircraft), %w[airworthiness_directives ad_compliances ad_imports] ],
|
||||||
[ "ADs", aircraft_airworthiness_directives_path(aircraft), %w[airworthiness_directives ad_compliances ad_imports] ],
|
[ I18n.t("helpers.aircraft.documents"), aircraft_documents_path(aircraft), %w[documents document_collections] ],
|
||||||
[ "Documents", aircraft_documents_path(aircraft), %w[documents document_collections] ],
|
[ I18n.t("helpers.aircraft.major_records"), aircraft_major_records_path(aircraft), %w[major_records] ],
|
||||||
[ "Major Records", aircraft_major_records_path(aircraft), %w[major_records] ],
|
[ I18n.t("helpers.aircraft.w_b"), aircraft_weight_balance_records_path(aircraft), %w[weight_balance_records loading_setups] ],
|
||||||
[ "W&B", aircraft_weight_balance_records_path(aircraft), %w[weight_balance_records loading_setups] ],
|
[ I18n.t("helpers.aircraft.notes"), aircraft_notes_path(aircraft), %w[notes] ],
|
||||||
[ "Notes", aircraft_notes_path(aircraft), %w[notes] ],
|
[ I18n.t("helpers.aircraft.activity"), aircraft_events_path(aircraft), %w[events record_versions] ]
|
||||||
[ "Activity", aircraft_events_path(aircraft), %w[events record_versions] ],
|
]
|
||||||
([ "Access & Sharing", aircraft_aircraft_roles_path(aircraft), %w[aircraft_roles share_tokens] ] if owner?)
|
|
||||||
].compact
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def component_options(aircraft, include_blank: true)
|
def component_options(aircraft, include_blank: true)
|
||||||
opts = aircraft.components.where.not(status: "DISPOSED").includes(:component_type).map { [ _1.to_s, _1.id ] }
|
opts = aircraft.components.where.not(status: "DISPOSED").includes(:component_type).map { [ _1.to_s, _1.id ] }
|
||||||
include_blank ? [ [ "— None —", nil ] ] + opts : opts
|
include_blank ? [ [ I18n.t("helpers.aircraft.none"), nil ] ] + opts : opts
|
||||||
end
|
end
|
||||||
|
|
||||||
def document_options(aircraft)
|
def document_options(aircraft)
|
||||||
[ [ "— None —", nil ] ] + aircraft.documents.ordered.map { [ _1.name, _1.id ] }
|
[ [ I18n.t("helpers.aircraft.none"), nil ] ] + aircraft.documents.ordered.map { [ _1.name, _1.id ] }
|
||||||
end
|
end
|
||||||
|
|
||||||
def logbook_options(aircraft)
|
def logbook_options(aircraft)
|
||||||
[ [ "— None —", nil ] ] + aircraft.logbook_entries.recent_first.limit(300).map { [ "#{_1.date} – #{_1.text.truncate(60)}", _1.id ] }
|
[ [ I18n.t("helpers.aircraft.none"), nil ] ] + aircraft.logbook_entries.recent_first.limit(300).map { [ I18n.t("helpers.aircraft.text", date: _1.date, truncate: (_1.text.truncate(60))), _1.id ] }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -7,23 +7,29 @@ module ApplicationHelper
|
|||||||
# How dates and times read across the app: "Nov 8, 2026", "Nov 8, 2026 14:05".
|
# How dates and times read across the app: "Nov 8, 2026", "Nov 8, 2026 14:05".
|
||||||
# (Signatures and the record history keep exact UTC timestamps, 2026-11-08 14:05 UTC.)
|
# (Signatures and the record history keep exact UTC timestamps, 2026-11-08 14:05 UTC.)
|
||||||
def fmt_date(value)
|
def fmt_date(value)
|
||||||
value ? value.to_date.strftime("%b %-d, %Y") : "—"
|
value ? l(value.to_date, format: :app) : "—"
|
||||||
end
|
end
|
||||||
|
|
||||||
def fmt_time(value)
|
def fmt_time(value)
|
||||||
value ? value.in_time_zone.strftime("%b %-d, %Y %H:%M") : "—"
|
value ? l(value.in_time_zone, format: :app) : "—"
|
||||||
|
end
|
||||||
|
|
||||||
|
# Secondary actions (imports, exports, printing, tools) behind one I18n.t("helpers.application.more")
|
||||||
|
# button, so each section shows only its main action. The block gives the
|
||||||
|
# items: links or button_to forms with class "menu-item".
|
||||||
|
def more_menu(label = I18n.t("helpers.application.more"), small: false, &block)
|
||||||
|
tag.details(class: "relative", data: { controller: "dropdown", action: "click@window->dropdown#closeOutside keydown.esc@window->dropdown#close" }) do
|
||||||
|
tag.summary(class: [ "btn-secondary list-none [&::-webkit-details-marker]:hidden", ("btn-sm" if small) ], title: I18n.t("helpers.application.more_actions")) do
|
||||||
|
safe_join([ label, tag.span("▾", class: "text-xs", "aria-hidden": true) ], " ")
|
||||||
|
end + tag.div(capture(&block), class: "menu")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
AIRWORTHINESS_COLORS = { "RED" => "red", "LIMITED" => "blue", "ORANGE" => "orange", "GREEN" => "green", "INFO" => "gray" }.freeze
|
AIRWORTHINESS_COLORS = { "RED" => "red", "LIMITED" => "blue", "ORANGE" => "orange", "GREEN" => "green", "INFO" => "gray" }.freeze
|
||||||
|
|
||||||
def airworthiness_badge(status, large: false)
|
def airworthiness_badge(status, large: false)
|
||||||
tag.span(status.label, class: [ "badge-#{AIRWORTHINESS_COLORS[status.status]}", ("text-sm px-3 py-1" if large) ],
|
tag.span(status.label, class: [ "badge-#{AIRWORTHINESS_COLORS[status.status]}", ("text-sm px-3 py-1" if large) ],
|
||||||
title: Airworthiness::DISCLAIMER)
|
title: Airworthiness.disclaimer)
|
||||||
end
|
|
||||||
|
|
||||||
def airworthiness_dot(status)
|
|
||||||
color = { "RED" => "bg-red-500", "LIMITED" => "bg-sky-500", "ORANGE" => "bg-amber-400", "GREEN" => "bg-emerald-500" }[status.status]
|
|
||||||
tag.span(class: "inline-block h-3 w-3 rounded-full #{color}", title: status.label)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Badge class (or text class) for one airworthiness issue.
|
# Badge class (or text class) for one airworthiness issue.
|
||||||
@@ -33,22 +39,18 @@ module ApplicationHelper
|
|||||||
{ "RED" => "text-red-700", "LIMITED" => "text-sky-700", "INFO" => "text-slate-600" }.fetch(issue.severity, "text-amber-700")
|
{ "RED" => "text-red-700", "LIMITED" => "text-sky-700", "INFO" => "text-slate-600" }.fetch(issue.severity, "text-amber-700")
|
||||||
end
|
end
|
||||||
|
|
||||||
COMPLIANCE_BADGES = {
|
COMPLIANCE_COLORS = { "compliant" => "green", "due_soon" => "orange", "overdue" => "red", "no_compliance" => "red",
|
||||||
"compliant" => [ "green", "Compliant" ], "due_soon" => [ "orange", "Due Soon" ],
|
"never_completed" => "red", "conditional" => "gray", "not_applicable" => "gray" }.freeze
|
||||||
"overdue" => [ "red", "Overdue" ], "no_compliance" => [ "red", "No Record" ],
|
|
||||||
"never_completed" => [ "red", "Never Completed" ], "conditional" => [ "gray", "Conditional" ],
|
|
||||||
"not_applicable" => [ "gray", "N/A" ]
|
|
||||||
}.freeze
|
|
||||||
|
|
||||||
def compliance_badge(status)
|
def compliance_badge(status)
|
||||||
color, text = COMPLIANCE_BADGES.fetch(status, [ "gray", status.to_s.humanize ])
|
color = COMPLIANCE_COLORS.fetch(status, "gray")
|
||||||
tag.span(text, class: "badge-#{color}")
|
tag.span(t(status, scope: "helpers.application.compliance", default: status.to_s.humanize), class: "badge-#{color}")
|
||||||
end
|
end
|
||||||
|
|
||||||
def life_badge(status)
|
def life_badge(status)
|
||||||
return "" unless status
|
return "" unless status
|
||||||
color, text = { overdue: [ "red", "Overdue" ], due_soon: [ "orange", "Due Soon" ], ok: [ "green", "OK" ] }[status]
|
color = { overdue: "red", due_soon: "orange", ok: "green" }[status]
|
||||||
tag.span(text, class: "badge-#{color}")
|
tag.span(t(status, scope: "helpers.application.life"), class: "badge-#{color}")
|
||||||
end
|
end
|
||||||
|
|
||||||
def squawk_priority_badge(squawk)
|
def squawk_priority_badge(squawk)
|
||||||
@@ -72,7 +74,7 @@ module ApplicationHelper
|
|||||||
link_to ad.name, link[0], class: "link", target: "_blank", rel: "noopener noreferrer", title: link[1]
|
link_to ad.name, link[0], class: "link", target: "_blank", rel: "noopener noreferrer", title: link[1]
|
||||||
end
|
end
|
||||||
|
|
||||||
def delete_button(label, path, confirm: "Are you sure?", **opts)
|
def delete_button(label, path, confirm: I18n.t("helpers.application.are_you_sure"), **opts)
|
||||||
button_to label, path, method: :delete, form: { data: { turbo_confirm: confirm }, class: "inline" },
|
button_to label, path, method: :delete, form: { data: { turbo_confirm: confirm }, class: "inline" },
|
||||||
class: opts[:class] || "btn-danger btn-sm"
|
class: opts[:class] || "btn-danger btn-sm"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -21,11 +21,11 @@ module FlightLogsHelper
|
|||||||
[ "CHT", recording.cht_keys, "°F", CYLINDER_COLORS ],
|
[ "CHT", recording.cht_keys, "°F", CYLINDER_COLORS ],
|
||||||
[ "EGT", recording.egt_keys, "°F", CYLINDER_COLORS ],
|
[ "EGT", recording.egt_keys, "°F", CYLINDER_COLORS ],
|
||||||
[ "RPM", [ :rpm ], "rpm" ],
|
[ "RPM", [ :rpm ], "rpm" ],
|
||||||
[ "Manifold pressure", [ :map ], "inHg" ],
|
[ I18n.t("helpers.flight_logs.manifold_pressure"), [ :map ], "inHg" ],
|
||||||
[ "Fuel flow", [ :fuel_flow ], "gph" ],
|
[ I18n.t("helpers.flight_logs.fuel_flow"), [ :fuel_flow ], "gph" ],
|
||||||
[ "Oil temp", [ :oil_t ], "°F" ],
|
[ I18n.t("helpers.flight_logs.oil_temp"), [ :oil_t ], "°F" ],
|
||||||
[ "Oil pressure", [ :oil_p ], "psi" ],
|
[ I18n.t("helpers.flight_logs.oil_pressure"), [ :oil_p ], "psi" ],
|
||||||
[ "Volts", [ :volts ], "V" ]
|
[ I18n.t("helpers.flight_logs.volts"), [ :volts ], "V" ]
|
||||||
].filter_map do |title, keys, unit, colors|
|
].filter_map do |title, keys, unit, colors|
|
||||||
keys = keys.select { recording.channels.key?(_1) }
|
keys = keys.select { recording.channels.key?(_1) }
|
||||||
{ title: title, keys: keys, unit: unit, colors: colors || [ CHART_COLOR ] } if keys.any?
|
{ title: title, keys: keys, unit: unit, colors: colors || [ CHART_COLOR ] } if keys.any?
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ module OilAnalysesHelper
|
|||||||
|
|
||||||
def oil_property(analysis, key)
|
def oil_property(analysis, key)
|
||||||
value = analysis.property(key) or return "—"
|
value = analysis.property(key) or return "—"
|
||||||
_, unit = OilAnalysis::PROPERTIES.fetch(key)
|
unit = OilAnalysis::PROPERTY_UNITS.fetch(key)
|
||||||
number = number_with_precision(value, precision: 2, strip_insignificant_zeros: true)
|
number = number_with_precision(value, precision: 2, strip_insignificant_zeros: true)
|
||||||
unit.present? ? "#{number} #{unit}" : number
|
unit.present? ? "#{number} #{unit}" : number
|
||||||
end
|
end
|
||||||
@@ -24,7 +24,7 @@ module OilAnalysesHelper
|
|||||||
value = analysis.value(element)
|
value = analysis.value(element)
|
||||||
flagged = analysis.flagged?(element)
|
flagged = analysis.flagged?(element)
|
||||||
content = tag.span(ppm(value), class: [ "tabular-nums", ("font-semibold text-red-700" if flagged) ],
|
content = tag.span(ppm(value), class: [ "tabular-nums", ("font-semibold text-red-700" if flagged) ],
|
||||||
title: ("Over #{OilAnalysis::FLAG_RATIO}× the lab average" if flagged))
|
title: (I18n.t("helpers.oil_analyses.over_the_lab_average", ratio: OilAnalysis::FLAG_RATIO) if flagged))
|
||||||
avg = analysis.average(element)
|
avg = analysis.average(element)
|
||||||
avg ? safe_join([ content, tag.div("(#{ppm(avg)})", class: "text-xs text-slate-500 tabular-nums") ]) : content
|
avg ? safe_join([ content, tag.div("(#{ppm(avg)})", class: "text-xs text-slate-500 tabular-nums") ]) : content
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -20,11 +20,28 @@ styleCharts()
|
|||||||
document.addEventListener("turbo:load", restyleCharts)
|
document.addEventListener("turbo:load", restyleCharts)
|
||||||
window.addEventListener("theme:change", restyleCharts)
|
window.addEventListener("theme:change", restyleCharts)
|
||||||
|
|
||||||
// Installable app (PWA): the service worker adds an offline page and caches static assets.
|
// Installable app (PWA): the service worker keeps an offline page, forms and
|
||||||
|
// pre-flight pages, sends saved items in the background and shows notifications.
|
||||||
if ("serviceWorker" in navigator) {
|
if ("serviceWorker" in navigator) {
|
||||||
|
// A new release's worker takes over open pages: offer a reload (not on the first install).
|
||||||
|
const hadWorker = !!navigator.serviceWorker.controller
|
||||||
|
navigator.serviceWorker.addEventListener("controllerchange", () => {
|
||||||
|
if (hadWorker) document.dispatchEvent(new CustomEvent("app:updated"))
|
||||||
|
})
|
||||||
|
// The worker sent saved items in the background: refresh the counts.
|
||||||
|
navigator.serviceWorker.addEventListener("message", (event) => {
|
||||||
|
if (event.data?.type === "queue-changed") document.dispatchEvent(new CustomEvent("offline-queue:changed"))
|
||||||
|
})
|
||||||
window.addEventListener("load", () => navigator.serviceWorker.register("/service-worker.js", { scope: "/" }).catch(() => {}))
|
window.addEventListener("load", () => navigator.serviceWorker.register("/service-worker.js", { scope: "/" }).catch(() => {}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Chrome and Android offer to install the app; keep the offer for the button on the profile page.
|
||||||
|
window.addEventListener("beforeinstallprompt", (event) => {
|
||||||
|
event.preventDefault()
|
||||||
|
window.samInstallPrompt = event
|
||||||
|
document.dispatchEvent(new CustomEvent("install:available"))
|
||||||
|
})
|
||||||
|
|
||||||
// Label each table cell with its column header, so phone CSS can show rows as
|
// Label each table cell with its column header, so phone CSS can show rows as
|
||||||
// cards ("Status: In Service"). Skips tables marked .table-keep.
|
// cards ("Status: In Service"). Skips tables marked .table-keep.
|
||||||
function labelTableCells(root = document) {
|
function labelTableCells(root = document) {
|
||||||
@@ -51,8 +68,18 @@ document.addEventListener("click", (event) => {
|
|||||||
if (target.matches("[data-check-all]")) {
|
if (target.matches("[data-check-all]")) {
|
||||||
target.closest("table")?.querySelectorAll("tbody input[type=checkbox]").forEach((box) => { box.checked = target.checked })
|
target.closest("table")?.querySelectorAll("tbody input[type=checkbox]").forEach((box) => { box.checked = target.checked })
|
||||||
}
|
}
|
||||||
|
if (target.type === "checkbox") showSelectionActions()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Actions on ticked rows (e.g. "Print selected") appear once a row is ticked:
|
||||||
|
// data-needs-selection names the form the row checkboxes belong to.
|
||||||
|
function showSelectionActions() {
|
||||||
|
document.querySelectorAll("[data-needs-selection]").forEach((el) => {
|
||||||
|
el.hidden = !document.querySelector(`input[form="${el.dataset.needsSelection}"]:checked`)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
document.addEventListener("turbo:load", showSelectionActions)
|
||||||
|
|
||||||
document.addEventListener("change", (event) => {
|
document.addEventListener("change", (event) => {
|
||||||
if (event.target.matches?.("[data-submit-on-change]")) event.target.form?.requestSubmit()
|
if (event.target.matches?.("[data-submit-on-change]")) event.target.form?.requestSubmit()
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
|
|
||||||
// Airport code field with suggestions from the airport database.
|
// Airport code field with suggestions from the airport database.
|
||||||
// <div data-controller="airport-autocomplete" data-airport-autocomplete-url-value="/airports/search?aircraft_id=1">
|
// <div data-controller="airport-autocomplete" data-airport-autocomplete-url-value="/airports/search?aircraft_id=1">
|
||||||
@@ -108,7 +109,7 @@ export default class extends Controller {
|
|||||||
const code = this.inputTarget.value.trim().toUpperCase()
|
const code = this.inputTarget.value.trim().toUpperCase()
|
||||||
const match = this.results.find((a) => a.code === code || (a.aka || []).includes(code))
|
const match = this.results.find((a) => a.code === code || (a.aka || []).includes(code))
|
||||||
if (match) this.setHint(this.describeAirport(match))
|
if (match) this.setHint(this.describeAirport(match))
|
||||||
else if (code.length >= 2 && code.length <= 4 && !code.includes(" ")) this.setHint("Not in the airport database", true)
|
else if (code.length >= 2 && code.length <= 4 && !code.includes(" ")) this.setHint(t("airports.not_found"), true)
|
||||||
else this.setHint("")
|
else this.setHint("")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
|
||||||
|
// After a release, offers to reload so this page picks up the new version.
|
||||||
|
export default class extends Controller {
|
||||||
|
static targets = [ "banner" ]
|
||||||
|
|
||||||
|
connect() {
|
||||||
|
this.show = () => this.bannerTarget.classList.remove("hidden")
|
||||||
|
document.addEventListener("app:updated", this.show)
|
||||||
|
}
|
||||||
|
|
||||||
|
disconnect() { document.removeEventListener("app:updated", this.show) }
|
||||||
|
|
||||||
|
reload() { location.reload() }
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
import { DirectUpload } from "@rails/activestorage"
|
import { DirectUpload } from "@rails/activestorage"
|
||||||
|
|
||||||
// Bulk document upload. Picked files (or a whole folder) are listed with an
|
// Bulk document upload. Picked files (or a whole folder) are listed with an
|
||||||
@@ -29,7 +30,7 @@ export default class extends Controller {
|
|||||||
add(event) {
|
add(event) {
|
||||||
for (const file of event.target.files) {
|
for (const file of event.target.files) {
|
||||||
const item = { file, path: file.webkitRelativePath || file.name, state: "pending", progress: 0 }
|
const item = { file, path: file.webkitRelativePath || file.name, state: "pending", progress: 0 }
|
||||||
if (file.size > this.maxBytesValue) Object.assign(item, { state: "error", error: `over the ${Math.round(this.maxBytesValue / 1048576)} MB limit` })
|
if (file.size > this.maxBytesValue) Object.assign(item, { state: "error", error: t("bulk_upload.over_limit", { mb: Math.round(this.maxBytesValue / 1048576) }) })
|
||||||
this.items.push(item)
|
this.items.push(item)
|
||||||
}
|
}
|
||||||
event.target.value = ""
|
event.target.value = ""
|
||||||
@@ -53,7 +54,7 @@ export default class extends Controller {
|
|||||||
defaultName(item) {
|
defaultName(item) {
|
||||||
const parts = item.path.split("/")
|
const parts = item.path.split("/")
|
||||||
if (this.groupTarget.checked && parts.length > 1) return parts[parts.length - 2]
|
if (this.groupTarget.checked && parts.length > 1) return parts[parts.length - 2]
|
||||||
return parts[parts.length - 1].replace(/\.[^.]+$/, "").replace(/_/g, " ").replace(/\s+/g, " ").trim() || "Untitled"
|
return parts[parts.length - 1].replace(/\.[^.]+$/, "").replace(/_/g, " ").replace(/\s+/g, " ").trim() || t("bulk_upload.untitled")
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
@@ -72,7 +73,7 @@ export default class extends Controller {
|
|||||||
name.type = "text"
|
name.type = "text"
|
||||||
name.className = "input"
|
name.className = "input"
|
||||||
name.value = item.name
|
name.value = item.name
|
||||||
name.setAttribute("aria-label", `Document name for ${item.path}`)
|
name.setAttribute("aria-label", t("bulk_upload.name_for", { path: item.path }))
|
||||||
name.disabled = this.uploading
|
name.disabled = this.uploading
|
||||||
name.addEventListener("input", () => { item.name = name.value; item.custom = true; this.updateSummary() })
|
name.addEventListener("input", () => { item.name = name.value; item.custom = true; this.updateSummary() })
|
||||||
|
|
||||||
@@ -90,7 +91,7 @@ export default class extends Controller {
|
|||||||
remove.type = "button"
|
remove.type = "button"
|
||||||
remove.className = "btn-secondary btn-sm"
|
remove.className = "btn-secondary btn-sm"
|
||||||
remove.textContent = "✕"
|
remove.textContent = "✕"
|
||||||
remove.setAttribute("aria-label", `Remove ${item.path}`)
|
remove.setAttribute("aria-label", t("bulk_upload.remove", { path: item.path }))
|
||||||
remove.disabled = this.uploading
|
remove.disabled = this.uploading
|
||||||
remove.addEventListener("click", () => { this.items.splice(index, 1); this.render() })
|
remove.addEventListener("click", () => { this.items.splice(index, 1); this.render() })
|
||||||
|
|
||||||
@@ -109,9 +110,9 @@ export default class extends Controller {
|
|||||||
|
|
||||||
updateSummary() {
|
updateSummary() {
|
||||||
const files = this.items.length
|
const files = this.items.length
|
||||||
const docs = new Set(this.items.map((item) => item.name.trim() || "Untitled")).size
|
const docs = new Set(this.items.map((item) => item.name.trim() || t("bulk_upload.untitled"))).size
|
||||||
this.summaryTarget.textContent = `${files} ${files === 1 ? "file" : "files"} → ${docs} ${docs === 1 ? "document" : "documents"}`
|
this.summaryTarget.textContent = `${files} ${files === 1 ? "file" : "files"} → ${docs} ${docs === 1 ? "document" : "documents"}`
|
||||||
this.submitTarget.textContent = files ? `Upload ${docs} ${docs === 1 ? "document" : "documents"}` : "Upload"
|
this.submitTarget.textContent = files ? t("bulk_upload.upload_count", { count: docs }) : t("bulk_upload.upload")
|
||||||
}
|
}
|
||||||
|
|
||||||
size(bytes) {
|
size(bytes) {
|
||||||
@@ -124,9 +125,9 @@ export default class extends Controller {
|
|||||||
if (this.ready) return
|
if (this.ready) return
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
if (this.uploading) return
|
if (this.uploading) return
|
||||||
if (this.items.length === 0) return this.say("Choose some files to upload.")
|
if (this.items.length === 0) return this.say(t("bulk_upload.choose_files"))
|
||||||
if (this.items.some((item) => item.file.size > this.maxBytesValue)) {
|
if (this.items.some((item) => item.file.size > this.maxBytesValue)) {
|
||||||
return this.say("Remove the files marked in red first.")
|
return this.say(t("bulk_upload.remove_red"))
|
||||||
}
|
}
|
||||||
|
|
||||||
this.items.forEach((item) => { if (item.state === "error") item.state = "pending" })
|
this.items.forEach((item) => { if (item.state === "error") item.state = "pending" })
|
||||||
@@ -134,11 +135,11 @@ export default class extends Controller {
|
|||||||
const queue = this.items.filter((item) => item.state === "pending")
|
const queue = this.items.filter((item) => item.state === "pending")
|
||||||
const total = queue.length
|
const total = queue.length
|
||||||
let finished = 0
|
let finished = 0
|
||||||
this.say(`Uploading 0 of ${total}…`)
|
this.say(t("bulk_upload.uploading", { done: 0, total }))
|
||||||
const worker = async () => {
|
const worker = async () => {
|
||||||
for (let item = queue.shift(); item; item = queue.shift()) {
|
for (let item = queue.shift(); item; item = queue.shift()) {
|
||||||
await this.upload(item)
|
await this.upload(item)
|
||||||
this.say(`Uploading ${++finished} of ${total}…`)
|
this.say(t("bulk_upload.uploading", { done: ++finished, total }))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
await Promise.all([ worker(), worker(), worker() ])
|
await Promise.all([ worker(), worker(), worker() ])
|
||||||
@@ -156,7 +157,7 @@ export default class extends Controller {
|
|||||||
}
|
}
|
||||||
this.uploading = false
|
this.uploading = false
|
||||||
this.ready = true
|
this.ready = true
|
||||||
this.say("Saving…")
|
this.say(t("bulk_upload.saving"))
|
||||||
// When nothing was left to upload this all ran inside the click's submit
|
// When nothing was left to upload this all ran inside the click's submit
|
||||||
// event, during which the browser ignores requestSubmit, so wait a tick.
|
// event, during which the browser ignores requestSubmit, so wait a tick.
|
||||||
setTimeout(() => this.element.requestSubmit())
|
setTimeout(() => this.element.requestSubmit())
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
|
|
||||||
// Interactive viewer for engine monitor charts. Clicking a chart opens it large
|
// Interactive viewer for engine monitor charts. Clicking a chart opens it large
|
||||||
// with higher-resolution data (fetched once, on first open): a crosshair shows
|
// with higher-resolution data (fetched once, on first open): a crosshair shows
|
||||||
@@ -35,7 +36,7 @@ export default class extends Controller {
|
|||||||
this.render()
|
this.render()
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.statusTarget.hidden = false
|
this.statusTarget.hidden = false
|
||||||
this.statusTarget.textContent = `Couldn't load the engine data (${error.message}).`
|
this.statusTarget.textContent = t("engine.load_failed", { message: error.message })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
|
|
||||||
// Fills a new logbook entry from a template: the wording, and when the
|
// Fills a new logbook entry from a template: the wording, and when the
|
||||||
// template sets them, the entry type, the logbook (which also picks the
|
// template sets them, the entry type, the logbook (which also picks the
|
||||||
@@ -9,7 +10,7 @@ export default class extends Controller {
|
|||||||
apply() {
|
apply() {
|
||||||
const option = this.templateTarget.selectedOptions[0]
|
const option = this.templateTarget.selectedOptions[0]
|
||||||
if (!option?.dataset.text) return
|
if (!option?.dataset.text) return
|
||||||
if (this.textTarget.value.trim() && !confirm("Replace the entry text with this template?")) return
|
if (this.textTarget.value.trim() && !confirm(t("entry_template.confirm"))) return
|
||||||
const { text, entryType, logType, certificate } = option.dataset
|
const { text, entryType, logType, certificate } = option.dataset
|
||||||
this.textTarget.value = text
|
this.textTarget.value = text
|
||||||
if (entryType && this.hasEntryTypeTarget) this.entryTypeTarget.value = entryType
|
if (entryType && this.hasEntryTypeTarget) this.entryTypeTarget.value = entryType
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
|
||||||
|
|
||||||
export default class extends Controller {
|
|
||||||
connect() {
|
|
||||||
this.element.textContent = "Hello World!"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
|
|
||||||
// Fills a textarea with suggested text (asks before replacing what's there).
|
// Fills a textarea with suggested text (asks before replacing what's there).
|
||||||
export default class extends Controller {
|
export default class extends Controller {
|
||||||
@@ -8,7 +9,7 @@ export default class extends Controller {
|
|||||||
insert(event) {
|
insert(event) {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
const field = this.fieldTarget
|
const field = this.fieldTarget
|
||||||
if (field.value.trim() && !confirm("Replace what's in the box with the suggested text?")) return
|
if (field.value.trim() && !confirm(t("insert_text.confirm"))) return
|
||||||
field.value = this.textValue
|
field.value = this.textValue
|
||||||
field.focus()
|
field.focus()
|
||||||
field.setSelectionRange(0, 0)
|
field.setSelectionRange(0, 0)
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
|
||||||
|
// Profile → This device: install the app. Chrome and Android offer a button;
|
||||||
|
// iPhone and iPad install from Safari's Share menu; elsewhere the browser's menu.
|
||||||
|
export default class extends Controller {
|
||||||
|
static targets = [ "button", "installed", "ios", "other" ]
|
||||||
|
|
||||||
|
connect() {
|
||||||
|
this.offer = () => this.render()
|
||||||
|
document.addEventListener("install:available", this.offer)
|
||||||
|
this.render()
|
||||||
|
}
|
||||||
|
|
||||||
|
disconnect() { document.removeEventListener("install:available", this.offer) }
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const installed = matchMedia("(display-mode: standalone)").matches || navigator.standalone === true
|
||||||
|
const ios = /iPad|iPhone|iPod/.test(navigator.userAgent) || (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1)
|
||||||
|
const prompt = !installed && !!window.samInstallPrompt
|
||||||
|
this.installedTarget.hidden = !installed
|
||||||
|
this.buttonTarget.hidden = !prompt
|
||||||
|
this.iosTarget.hidden = installed || prompt || !ios
|
||||||
|
this.otherTarget.hidden = installed || prompt || ios
|
||||||
|
}
|
||||||
|
|
||||||
|
async install() {
|
||||||
|
const offer = window.samInstallPrompt
|
||||||
|
if (!offer) return
|
||||||
|
offer.prompt()
|
||||||
|
await offer.userChoice
|
||||||
|
window.samInstallPrompt = null
|
||||||
|
this.render()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
|
|
||||||
// Write / Preview tabs for a Markdown textarea. The preview is rendered by the
|
// Write / Preview tabs for a Markdown textarea. The preview is rendered by the
|
||||||
// server, with the same Markdown rules and sanitizing as the saved note.
|
// server, with the same Markdown rules and sanitizing as the saved note.
|
||||||
@@ -17,7 +18,7 @@ export default class extends Controller {
|
|||||||
|
|
||||||
async preview() {
|
async preview() {
|
||||||
this.select(true)
|
this.select(true)
|
||||||
this.outputTarget.textContent = "Loading preview…"
|
this.outputTarget.textContent = t("markdown.loading")
|
||||||
const token = document.querySelector("meta[name=csrf-token]")?.content
|
const token = document.querySelector("meta[name=csrf-token]")?.content
|
||||||
try {
|
try {
|
||||||
const response = await fetch(this.urlValue, {
|
const response = await fetch(this.urlValue, {
|
||||||
@@ -29,7 +30,7 @@ export default class extends Controller {
|
|||||||
if (!response.ok) throw new Error(`HTTP ${response.status}`)
|
if (!response.ok) throw new Error(`HTTP ${response.status}`)
|
||||||
this.outputTarget.innerHTML = await response.text() // sanitized server-side
|
this.outputTarget.innerHTML = await response.text() // sanitized server-side
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.outputTarget.textContent = `Couldn't load the preview (${error.message}).`
|
this.outputTarget.textContent = t("markdown.load_failed", { message: error.message })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
import { nextDue, describeDue } from "next_due"
|
import { nextDue, describeDue } from "next_due"
|
||||||
|
|
||||||
// Live next-due preview (and prefill of an AD's next-due tach reading) from
|
// Live next-due preview (and prefill of an AD's next-due tach reading) from
|
||||||
@@ -40,12 +41,12 @@ export default class extends Controller {
|
|||||||
if (!this.hasPreviewTarget) return
|
if (!this.hasPreviewTarget) return
|
||||||
const rule = this.currentRule
|
const rule = this.currentRule
|
||||||
let text
|
let text
|
||||||
if (this.isPermanent) text = "Permanent compliance or not applicable: never due again."
|
if (this.isPermanent) text = t("next_due.permanent")
|
||||||
else if (!this.ruleTarget.value) text = ""
|
else if (!this.ruleTarget.value) text = ""
|
||||||
else if (!rule) text = "One-time: no recurring due date."
|
else if (!rule) text = t("next_due.one_time")
|
||||||
else {
|
else {
|
||||||
if (this.hasDueHoursTarget && this.manual) due = { ...due, hours: parseFloat(this.dueHoursTarget.value) }
|
if (this.hasDueHoursTarget && this.manual) due = { ...due, hours: parseFloat(this.dueHoursTarget.value) }
|
||||||
text = describeDue(due) ? `Next due: ${describeDue(due)}` : "Enter the date and hours to calculate the next due."
|
text = describeDue(due) ? t("next_due.next_due", { due: describeDue(due) }) : t("next_due.enter")
|
||||||
}
|
}
|
||||||
this.previewTarget.textContent = text
|
this.previewTarget.textContent = text
|
||||||
this.previewTarget.hidden = text === ""
|
this.previewTarget.hidden = text === ""
|
||||||
|
|||||||
+28
-21
@@ -1,25 +1,28 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
import { queue, formFields, newKey } from "controllers/offline_queue"
|
import { t } from "i18n"
|
||||||
|
import { queue, formFields, newKey, currentUser } from "controllers/offline_queue"
|
||||||
|
|
||||||
// The Log Flight form: with no connection, the flight is kept on this device
|
// Log Flight and Report Squawk: with no connection, the form is kept on this
|
||||||
// and sent later (see offline_sync_controller). The next leg starts where the
|
// device and sent later (see offline_sync_controller). For flights, the next
|
||||||
// last saved one ended.
|
// leg starts where the last saved one ended.
|
||||||
export default class extends Controller {
|
export default class extends Controller {
|
||||||
static targets = [ "key", "notice" ]
|
static targets = [ "key", "notice" ]
|
||||||
static values = { tail: String }
|
static values = { kind: { type: String, default: "flight" }, tail: String }
|
||||||
|
|
||||||
async connect() {
|
async connect() {
|
||||||
if (!this.keyTarget.value) this.keyTarget.value = newKey()
|
if (!this.keyTarget.value) this.keyTarget.value = newKey()
|
||||||
try {
|
try {
|
||||||
const mine = (await queue.all()).filter((i) => i.url === this.element.action)
|
const mine = (await queue.mine()).filter((i) => i.url === this.element.action)
|
||||||
if (mine.length) {
|
if (mine.length) {
|
||||||
this.prefillFrom(mine[mine.length - 1])
|
if (this.flight) this.prefillFrom(mine[mine.length - 1])
|
||||||
this.say(`${mine.length} flight${mine.length > 1 ? "s" : ""} logged offline on this device, waiting to send. This one starts where the last ended.`)
|
this.say(t(`offline.${this.kindValue}.queued_here`, { count: mine.length }))
|
||||||
}
|
}
|
||||||
} catch (_) { /* no IndexedDB: nothing queued */ }
|
} catch (_) { /* no IndexedDB: nothing queued */ }
|
||||||
this.rememberForm()
|
this.rememberForm()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get flight() { return this.kindValue === "flight" }
|
||||||
|
|
||||||
// No connection: keep it here instead of submitting.
|
// No connection: keep it here instead of submitting.
|
||||||
async submit(event) {
|
async submit(event) {
|
||||||
if (navigator.onLine) return
|
if (navigator.onLine) return
|
||||||
@@ -35,8 +38,8 @@ export default class extends Controller {
|
|||||||
if (this.pending) await this.save(this.pending)
|
if (this.pending) await this.save(this.pending)
|
||||||
}
|
}
|
||||||
|
|
||||||
// A proxy answered because the app is unreachable (502/503/504): keep the
|
// A proxy answered because the app is unreachable (502/503/504): keep it
|
||||||
// flight instead of showing the proxy's error page.
|
// instead of showing the proxy's error page.
|
||||||
async gatewayFailed(event) {
|
async gatewayFailed(event) {
|
||||||
if (![ 502, 503, 504 ].includes(event.detail.fetchResponse.statusCode) || !this.pending) return
|
if (![ 502, 503, 504 ].includes(event.detail.fetchResponse.statusCode) || !this.pending) return
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
@@ -44,19 +47,20 @@ export default class extends Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async save(fields) {
|
async save(fields) {
|
||||||
const item = { id: this.keyTarget.value, url: this.element.action, tail: this.tailValue, savedAt: new Date().toISOString(), fields }
|
const item = { id: this.keyTarget.value, kind: this.kindValue, url: this.element.action, tail: this.tailValue,
|
||||||
|
user: currentUser(), savedAt: new Date().toISOString(), fields }
|
||||||
try {
|
try {
|
||||||
await queue.add(item)
|
await queue.add(item)
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
this.say("No connection, and this browser can't store the flight. Write it down and log it when you're back online.")
|
this.say(t(`offline.${this.kindValue}.no_storage`))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.prefillFrom(item)
|
if (this.flight) this.prefillFrom(item)
|
||||||
this.clearLegFields()
|
this.clearFields()
|
||||||
this.keyTarget.value = newKey()
|
this.keyTarget.value = newKey()
|
||||||
this.pending = null
|
this.pending = null
|
||||||
window.scrollTo({ top: 0 })
|
window.scrollTo({ top: 0 })
|
||||||
this.say("No connection: flight saved on this device. It's sent automatically when you're back online. Log the next leg below, or close the app.")
|
this.say(t(`offline.${this.kindValue}.saved_on_device`))
|
||||||
document.dispatchEvent(new CustomEvent("offline-queue:changed"))
|
document.dispatchEvent(new CustomEvent("offline-queue:changed"))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,19 +72,22 @@ export default class extends Controller {
|
|||||||
set("departure_location", value("destination_location"))
|
set("departure_location", value("destination_location"))
|
||||||
}
|
}
|
||||||
|
|
||||||
clearLegFields() {
|
clearFields() {
|
||||||
for (const name of [ "tach_in", "tach_time", "hobbs_in", "hobbs_time", "destination_location", "route", "notes",
|
const names = this.flight
|
||||||
"oil_added", "oil_level_after", "fuel_added", "fuel_level_after", "track_log", "engine_data" ]) {
|
? [ "tach_in", "tach_time", "hobbs_in", "hobbs_time", "destination_location", "route", "notes",
|
||||||
const el = this.element.querySelector(`[name="flight_log[${name}]"]`)
|
"oil_added", "oil_level_after", "fuel_added", "fuel_level_after", "track_log", "engine_data" ].map((n) => `flight_log[${n}]`)
|
||||||
|
: [ "squawk[issue_reported]", "squawk[attachments][]" ]
|
||||||
|
for (const name of names) {
|
||||||
|
const el = this.element.querySelector(`[name="${name}"]`)
|
||||||
if (el) el.value = ""
|
if (el) el.value = ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Lets the offline page offer this form for this aircraft.
|
// Lets the offline page and the home-screen shortcuts offer this form.
|
||||||
rememberForm() {
|
rememberForm() {
|
||||||
try {
|
try {
|
||||||
const forms = JSON.parse(localStorage.getItem("sam-offline-forms") || "{}")
|
const forms = JSON.parse(localStorage.getItem("sam-offline-forms") || "{}")
|
||||||
forms[location.pathname] = this.tailValue
|
forms[location.pathname] = { tail: this.tailValue, kind: this.kindValue }
|
||||||
localStorage.setItem("sam-offline-forms", JSON.stringify(forms))
|
localStorage.setItem("sam-offline-forms", JSON.stringify(forms))
|
||||||
} catch (_) { /* storage off */ }
|
} catch (_) { /* storage off */ }
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { currentUser } from "controllers/offline_queue"
|
||||||
|
|
||||||
|
// Saves, ahead of time, what's needed to work without signal: the Fleet page
|
||||||
|
// and, for each of your aircraft, its Overview, W&B, Log Flight and Report
|
||||||
|
// Squawk pages (fetching them through the service worker keeps a copy, see
|
||||||
|
// service-worker.js) and its photo (kept in sam-images, shown when offline). Done in the background at most once an hour, or when
|
||||||
|
// your aircraft change. Signing out clears it.
|
||||||
|
const EVERY = 60 * 60 * 1000
|
||||||
|
|
||||||
|
export default class extends Controller {
|
||||||
|
static values = { aircraft: Array }
|
||||||
|
|
||||||
|
connect() {
|
||||||
|
if (!navigator.onLine || !("serviceWorker" in navigator)) return
|
||||||
|
navigator.serviceWorker.ready.then(() => this.prepare()).catch(() => {})
|
||||||
|
}
|
||||||
|
|
||||||
|
async prepare() {
|
||||||
|
const signature = `${currentUser()}:${JSON.stringify(this.aircraftValue)}`
|
||||||
|
let last = {}
|
||||||
|
try { last = JSON.parse(localStorage.getItem("sam-offline-prep") || "{}") } catch (_) { /* storage off */ }
|
||||||
|
if (last.signature === signature && Date.now() - last.at < EVERY) return
|
||||||
|
if (!navigator.serviceWorker.controller) return // first visit: the worker takes over on the next page
|
||||||
|
|
||||||
|
const forms = {}
|
||||||
|
const paths = [ "/" ]
|
||||||
|
for (const a of this.aircraftValue) {
|
||||||
|
paths.push(...a.pages, a.flight, a.squawk)
|
||||||
|
forms[a.flight] = { tail: a.tail, kind: "flight" }
|
||||||
|
forms[a.squawk] = { tail: a.tail, kind: "squawk" }
|
||||||
|
}
|
||||||
|
for (const path of paths) {
|
||||||
|
if (!navigator.onLine) return
|
||||||
|
// One at a time, after the page has settled, so it never competes with what you're doing.
|
||||||
|
await new Promise((resolve) => (window.requestIdleCallback || setTimeout)(resolve, { timeout: 2000 }))
|
||||||
|
try { await fetch(path, { credentials: "same-origin", headers: { Accept: "text/html" } }) } catch (_) { return }
|
||||||
|
}
|
||||||
|
await this.savePictures(this.aircraftValue.map((a) => a.picture).filter(Boolean))
|
||||||
|
try {
|
||||||
|
localStorage.setItem("sam-offline-forms", JSON.stringify({ ...JSON.parse(localStorage.getItem("sam-offline-forms") || "{}"), ...forms }))
|
||||||
|
localStorage.setItem("sam-offline-prep", JSON.stringify({ signature, at: Date.now() }))
|
||||||
|
} catch (_) { /* storage off */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
// The aircraft photos: refreshed, and those of aircraft you no longer have dropped.
|
||||||
|
async savePictures(urls) {
|
||||||
|
try {
|
||||||
|
const cache = await caches.open("sam-images")
|
||||||
|
const wanted = urls.map((url) => [ url, imageKey(url) ]).filter(([ , key ]) => key)
|
||||||
|
for (const request of await cache.keys()) if (!wanted.some(([ , key ]) => key === request.url)) await cache.delete(request)
|
||||||
|
for (const [ url, key ] of wanted) {
|
||||||
|
const response = await fetch(url, { credentials: "same-origin" }).catch(() => null)
|
||||||
|
if (response?.ok) await cache.put(key, response)
|
||||||
|
}
|
||||||
|
} catch (_) { /* no Cache API */ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Photo links carry an expiry, so they change with every page; the saved copy
|
||||||
|
// is filed under the upload's id instead (same rule in service-worker.js).
|
||||||
|
function imageKey(url) {
|
||||||
|
try {
|
||||||
|
const signed = new URL(url, location.origin).pathname.match(/\/blobs\/redirect\/([^/]+?)--/)[1]
|
||||||
|
return `${location.origin}/offline-image/${JSON.parse(atob(decodeURIComponent(signed)))._rails.data}`
|
||||||
|
} catch (_) { return null }
|
||||||
|
}
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
// Flights logged without a connection, kept in this browser (IndexedDB, so
|
// Flights and squawks saved without a connection, kept in this browser
|
||||||
// attached track and engine files are kept too) until they can be sent.
|
// (IndexedDB, so attached files are kept too) until they can be sent. Each
|
||||||
|
// is tagged with the user who saved it and only ever sent while they're
|
||||||
|
// signed in. The service worker reads the same store to send in the background.
|
||||||
const DB = "sam-offline"
|
const DB = "sam-offline"
|
||||||
const STORE = "flights"
|
const STORE = "flights" // holds every kind; the name predates squawks
|
||||||
|
|
||||||
function open() {
|
function open() {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
@@ -22,12 +24,23 @@ async function run(mode, fn) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// item: { id, url, tail, savedAt, fields: [[name, value]], error }
|
// The signed-in user (from the layout), or "" on a page without one.
|
||||||
|
export const currentUser = () => document.querySelector("meta[name=current-user]")?.content || ""
|
||||||
|
|
||||||
|
// item: { id, kind: "flight" | "squawk", url, tail, user, savedAt, fields: [[name, value]], error }
|
||||||
export const queue = {
|
export const queue = {
|
||||||
add: (item) => run("readwrite", (s) => s.put(item)),
|
add: async (item) => {
|
||||||
|
await run("readwrite", (s) => s.put(item))
|
||||||
|
// Ask the browser not to clear this site's storage under pressure, so
|
||||||
|
// unsent items aren't lost; and to send them even if the app is closed.
|
||||||
|
try { await navigator.storage?.persist?.() } catch (_) { /* not supported */ }
|
||||||
|
try { await (await navigator.serviceWorker?.ready)?.sync?.register("sam-queue") } catch (_) { /* not supported or turned off */ }
|
||||||
|
},
|
||||||
put: (item) => run("readwrite", (s) => s.put(item)),
|
put: (item) => run("readwrite", (s) => s.put(item)),
|
||||||
remove: (id) => run("readwrite", (s) => s.delete(id)),
|
remove: (id) => run("readwrite", (s) => s.delete(id)),
|
||||||
all: async () => ((await run("readonly", (s) => s.getAll())) || []).sort((a, b) => a.savedAt.localeCompare(b.savedAt)),
|
all: async () => ((await run("readonly", (s) => s.getAll())) || []).sort((a, b) => a.savedAt.localeCompare(b.savedAt)),
|
||||||
|
// Items this user saved (items from before tagging count as theirs).
|
||||||
|
mine: async () => (await queue.all()).filter((i) => !i.user || i.user === currentUser()),
|
||||||
}
|
}
|
||||||
|
|
||||||
export function formFields(form) {
|
export function formFields(form) {
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
import { queue } from "controllers/offline_queue"
|
import { queue } from "controllers/offline_queue"
|
||||||
|
|
||||||
// On every page: sends flights logged offline once there's a connection, and
|
// On every page: sends the flights and squawks this user saved offline once
|
||||||
// says what happened. A rejected flight stays until it's discarded.
|
// there's a connection, says what happened, and shows the count on the app
|
||||||
|
// icon. A rejected item stays until it's discarded.
|
||||||
export default class extends Controller {
|
export default class extends Controller {
|
||||||
static targets = [ "banner" ]
|
static targets = [ "banner" ]
|
||||||
|
|
||||||
@@ -20,21 +22,21 @@ export default class extends Controller {
|
|||||||
|
|
||||||
async sync() {
|
async sync() {
|
||||||
let items
|
let items
|
||||||
try { items = await queue.all() } catch (_) { return }
|
try { items = await queue.mine() } catch (_) { return }
|
||||||
if (!items.length) return this.show("")
|
if (!items.length) { this.badge(0); return this.show("") }
|
||||||
if (!navigator.onLine || this.running) return this.status(items)
|
if (!navigator.onLine || this.running) return this.status(items)
|
||||||
this.running = true
|
this.running = true
|
||||||
let sent = 0
|
const sent = []
|
||||||
try {
|
try {
|
||||||
for (const item of items.filter((i) => !i.error)) {
|
for (const item of items.filter((i) => !i.error)) {
|
||||||
const result = await this.send(item)
|
const result = await this.send(item)
|
||||||
if (result === "sent") { await queue.remove(item.id); sent++ }
|
if (result === "sent") { await queue.remove(item.id); sent.push(item) }
|
||||||
else if (result === "signin") { this.show("Sign in to send the flights logged offline."); return }
|
else if (result === "signin") { this.show(t("offline.sign_in")); return }
|
||||||
else if (result === "offline") break
|
else if (result === "offline") break
|
||||||
else { item.error = result; await queue.put(item) }
|
else { item.error = result; await queue.put(item) }
|
||||||
}
|
}
|
||||||
} finally { this.running = false }
|
} finally { this.running = false }
|
||||||
this.status(await queue.all(), sent)
|
this.status(await queue.mine(), sent)
|
||||||
}
|
}
|
||||||
|
|
||||||
async send(item) {
|
async send(item) {
|
||||||
@@ -52,16 +54,25 @@ export default class extends Controller {
|
|||||||
const html = await response.text()
|
const html = await response.text()
|
||||||
const doc = new DOMParser().parseFromString(html, "text/html")
|
const doc = new DOMParser().parseFromString(html, "text/html")
|
||||||
const message = [ ...doc.querySelectorAll("[role=alert], .field-error") ].map((e) => e.textContent.trim()).filter(Boolean).join(" ")
|
const message = [ ...doc.querySelectorAll("[role=alert], .field-error") ].map((e) => e.textContent.trim()).filter(Boolean).join(" ")
|
||||||
return message || `Not accepted (${response.status}).`
|
return message || t("offline.not_accepted", { status: response.status })
|
||||||
}
|
}
|
||||||
|
|
||||||
status(items, sent = 0) {
|
status(items, sent = []) {
|
||||||
const failed = items.filter((i) => i.error)
|
const failed = items.filter((i) => i.error)
|
||||||
const waiting = items.length - failed.length
|
const waiting = items.filter((i) => !i.error)
|
||||||
const parts = []
|
const parts = []
|
||||||
if (sent) parts.push(`Sent ${sent} flight${sent > 1 ? "s" : ""} logged offline.`)
|
for (const kind of [ "flight", "squawk" ]) {
|
||||||
if (waiting) parts.push(`${waiting} flight${waiting > 1 ? "s" : ""} logged offline waiting for a connection.`)
|
const count = (list) => list.filter((i) => (i.kind || "flight") === kind).length
|
||||||
|
if (count(sent)) parts.push(t(`offline.${kind}.sent`, { count: count(sent) }))
|
||||||
|
if (count(waiting)) parts.push(t(`offline.${kind}.waiting`, { count: count(waiting) }))
|
||||||
|
}
|
||||||
this.show(parts.join(" "), failed)
|
this.show(parts.join(" "), failed)
|
||||||
|
this.badge(items.length)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The number of unsent items on the installed app's icon.
|
||||||
|
badge(count) {
|
||||||
|
try { count ? navigator.setAppBadge?.(count) : navigator.clearAppBadge?.() } catch (_) { /* not supported */ }
|
||||||
}
|
}
|
||||||
|
|
||||||
show(text, failed = []) {
|
show(text, failed = []) {
|
||||||
@@ -71,8 +82,8 @@ export default class extends Controller {
|
|||||||
for (const item of failed) {
|
for (const item of failed) {
|
||||||
const date = (item.fields.find(([ n ]) => n === "flight_log[date]") || [])[1] || ""
|
const date = (item.fields.find(([ n ]) => n === "flight_log[date]") || [])[1] || ""
|
||||||
const row = document.createElement("p")
|
const row = document.createElement("p")
|
||||||
row.textContent = `${item.tail} flight ${date} logged offline wasn't accepted: ${item.error} `
|
row.textContent = `${t(`offline.${item.kind || "flight"}.rejected`, { tail: item.tail, date, error: item.error })} `
|
||||||
const discard = Object.assign(document.createElement("button"), { type: "button", textContent: "Discard", className: "btn-secondary btn-sm ml-1" })
|
const discard = Object.assign(document.createElement("button"), { type: "button", textContent: t("offline.discard"), className: "btn-secondary btn-sm ml-1" })
|
||||||
discard.addEventListener("click", async () => { await queue.remove(item.id); this.sync() })
|
discard.addEventListener("click", async () => { await queue.remove(item.id); this.sync() })
|
||||||
row.append(discard)
|
row.append(discard)
|
||||||
banner.append(row)
|
banner.append(row)
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t, locale } from "i18n"
|
||||||
|
|
||||||
|
// Pages the service worker kept for use without a connection (an aircraft's
|
||||||
|
// overview and weight and balance, and the Log Flight / Report Squawk forms)
|
||||||
|
// say when they were saved when they're shown from that copy.
|
||||||
|
const STALE_AFTER = 5 * 60 * 1000
|
||||||
|
|
||||||
|
export default class extends Controller {
|
||||||
|
static targets = [ "banner" ]
|
||||||
|
|
||||||
|
connect() {
|
||||||
|
const rendered = Date.parse(document.querySelector("meta[name=rendered-at]")?.content || "")
|
||||||
|
const stale = rendered && Date.now() - rendered > STALE_AFTER
|
||||||
|
if (stale) {
|
||||||
|
const when = new Date(rendered).toLocaleString(locale(), { dateStyle: "medium", timeStyle: "short" })
|
||||||
|
this.bannerTarget.textContent = t("offline.saved_copy", { time: when })
|
||||||
|
}
|
||||||
|
this.bannerTarget.classList.toggle("hidden", !stale)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
|
|
||||||
|
// Profile → This device: notifications on or off for this browser or app.
|
||||||
|
export default class extends Controller {
|
||||||
|
static targets = [ "status", "on", "off", "test" ]
|
||||||
|
static values = { key: String, url: String, testUrl: String }
|
||||||
|
|
||||||
|
async connect() {
|
||||||
|
if (!("serviceWorker" in navigator) || !("PushManager" in window) || !("Notification" in window)) {
|
||||||
|
const ios = /iPad|iPhone|iPod/.test(navigator.userAgent) || (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1)
|
||||||
|
return this.show(t(ios ? "push.ios_install_first" : "push.unsupported"), null)
|
||||||
|
}
|
||||||
|
this.registration = await navigator.serviceWorker.ready
|
||||||
|
const subscription = await this.registration.pushManager.getSubscription()
|
||||||
|
if (Notification.permission === "denied") return this.show(t("push.blocked"), null)
|
||||||
|
this.show(t(subscription ? "push.on" : "push.off"), !!subscription)
|
||||||
|
}
|
||||||
|
|
||||||
|
async turnOn() {
|
||||||
|
if (await Notification.requestPermission() !== "granted") return this.show(t("push.blocked"), null)
|
||||||
|
try {
|
||||||
|
const subscription = await this.registration.pushManager.subscribe({ userVisibleOnly: true, applicationServerKey: this.keyBytes() })
|
||||||
|
const response = await this.request("POST", this.urlValue, { subscription: subscription.toJSON() })
|
||||||
|
if (!response.ok) throw new Error(response.status)
|
||||||
|
this.show(t("push.on"), true)
|
||||||
|
} catch (_) {
|
||||||
|
this.show(t("push.failed"), false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async turnOff() {
|
||||||
|
const subscription = await this.registration.pushManager.getSubscription()
|
||||||
|
if (subscription) {
|
||||||
|
await this.request("DELETE", this.urlValue, { endpoint: subscription.endpoint })
|
||||||
|
await subscription.unsubscribe()
|
||||||
|
}
|
||||||
|
this.show(t("push.off"), false)
|
||||||
|
}
|
||||||
|
|
||||||
|
async sendTest() {
|
||||||
|
await this.request("POST", this.testUrlValue, {})
|
||||||
|
this.statusTarget.textContent = t("push.test_sent")
|
||||||
|
}
|
||||||
|
|
||||||
|
// on: true / false, or null when it can't be changed here.
|
||||||
|
show(text, on) {
|
||||||
|
this.statusTarget.textContent = text
|
||||||
|
this.onTarget.hidden = on !== false
|
||||||
|
this.offTarget.hidden = on !== true
|
||||||
|
this.testTarget.hidden = on !== true
|
||||||
|
}
|
||||||
|
|
||||||
|
request(method, url, body) {
|
||||||
|
return fetch(url, { method, credentials: "same-origin", body: JSON.stringify(body),
|
||||||
|
headers: { "Content-Type": "application/json", "X-CSRF-Token": document.querySelector("meta[name=csrf-token]")?.content || "" } })
|
||||||
|
}
|
||||||
|
|
||||||
|
keyBytes() {
|
||||||
|
const base64 = (this.keyValue + "=".repeat((4 - this.keyValue.length % 4) % 4)).replace(/-/g, "+").replace(/_/g, "/")
|
||||||
|
return Uint8Array.from(atob(base64), (c) => c.charCodeAt(0))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
|
import { queue } from "controllers/offline_queue"
|
||||||
|
|
||||||
|
// Signing out clears what this device kept for working offline (forms and
|
||||||
|
// page copies with aircraft details). Unsent flights and squawks stay, tagged
|
||||||
|
// with their user, and are sent the next time that person signs in here.
|
||||||
|
export default class extends Controller {
|
||||||
|
async clean(event) {
|
||||||
|
if (this.cleaned) return
|
||||||
|
event.preventDefault()
|
||||||
|
try {
|
||||||
|
const unsent = (await queue.mine()).length
|
||||||
|
if (unsent && !confirm(t("sign_out.unsent", { count: unsent }))) return
|
||||||
|
} catch (_) { /* no IndexedDB */ }
|
||||||
|
try { await Promise.all([ "sam-forms", "sam-pages", "sam-images", "sam-flight-forms" ].map((name) => caches.delete(name))) } catch (_) { /* no Cache API */ }
|
||||||
|
try { [ "sam-offline-forms", "sam-offline-prep" ].forEach((key) => localStorage.removeItem(key)) } catch (_) { /* storage off */ }
|
||||||
|
try { navigator.clearAppBadge?.() } catch (_) { /* not supported */ }
|
||||||
|
this.cleaned = true
|
||||||
|
this.element.requestSubmit()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,13 +1,11 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
|
|
||||||
const CHOICES = ["system", "light", "dark"]
|
const CHOICES = ["system", "light", "dark"]
|
||||||
const LABELS = { system: "System", light: "Light", dark: "Dark" }
|
|
||||||
|
|
||||||
// Light / dark / follow-the-OS theme toggle. The choice is kept in
|
// Light / dark / follow-the-OS theme toggle. The choice is kept in
|
||||||
// localStorage; the layout's inline script applies it before first paint.
|
// localStorage; the layout's inline script applies it before first paint.
|
||||||
export default class extends Controller {
|
export default class extends Controller {
|
||||||
static targets = ["button"]
|
|
||||||
|
|
||||||
connect() {
|
connect() {
|
||||||
this.media = window.matchMedia("(prefers-color-scheme: dark)")
|
this.media = window.matchMedia("(prefers-color-scheme: dark)")
|
||||||
this.onSystemChange = () => { if (this.choice === "system") this.apply() }
|
this.onSystemChange = () => { if (this.choice === "system") this.apply() }
|
||||||
@@ -42,7 +40,7 @@ export default class extends Controller {
|
|||||||
this.element.querySelectorAll("[data-theme-icon]").forEach((icon) => {
|
this.element.querySelectorAll("[data-theme-icon]").forEach((icon) => {
|
||||||
icon.classList.toggle("hidden", icon.dataset.themeIcon !== choice)
|
icon.classList.toggle("hidden", icon.dataset.themeIcon !== choice)
|
||||||
})
|
})
|
||||||
const label = `Theme: ${LABELS[choice]}${choice === "system" ? ` (${theme})` : ""}`
|
const label = choice === "system" ? t("theme.system", { theme: t(`theme.${theme}`) }) : t("theme.label", { choice: t(`theme.${choice}`) })
|
||||||
this.element.title = label
|
this.element.title = label
|
||||||
this.element.setAttribute("aria-label", label)
|
this.element.setAttribute("aria-label", label)
|
||||||
if (changed) window.dispatchEvent(new CustomEvent("theme:change", { detail: { theme } }))
|
if (changed) window.dispatchEvent(new CustomEvent("theme:change", { detail: { theme } }))
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
import { Controller } from "@hotwired/stimulus"
|
||||||
|
import { t } from "i18n"
|
||||||
|
|
||||||
// Loading calculator: takeoff and landing weight and CG from the empty
|
// Loading calculator: takeoff and landing weight and CG from the empty
|
||||||
// weight & moment plus each station's load, checked against max gross weight,
|
// weight & moment plus each station's load, checked against max gross weight,
|
||||||
@@ -23,7 +24,7 @@ export default class extends Controller {
|
|||||||
const fuel = input.dataset.fuel === "true"
|
const fuel = input.dataset.fuel === "true"
|
||||||
const max = parseFloat(input.dataset.max) || 0
|
const max = parseFloat(input.dataset.max) || 0
|
||||||
const label = input.closest("label").querySelector(".label").firstChild.textContent.trim()
|
const label = input.closest("label").querySelector(".label").firstChild.textContent.trim()
|
||||||
if (max && qty > max) messages.push([ "bad", `${label}: ${qty} is over its maximum of ${max} ${fuel ? "gal" : "lb"}.` ])
|
if (max && qty > max) messages.push([ "bad", t(fuel ? "wb.over_station_gal" : "wb.over_station_lb", { label, qty, max }) ])
|
||||||
const lbs = fuel ? qty * this.fuelDensityValue : qty
|
const lbs = fuel ? qty * this.fuelDensityValue : qty
|
||||||
weight += lbs
|
weight += lbs
|
||||||
moment += lbs * arm
|
moment += lbs * arm
|
||||||
@@ -42,19 +43,19 @@ export default class extends Controller {
|
|||||||
this.show("landing", landing)
|
this.show("landing", landing)
|
||||||
|
|
||||||
if (!loaded) {
|
if (!loaded) {
|
||||||
this.messagesTarget.replaceChildren(Object.assign(document.createElement("li"), { className: "text-slate-500", textContent: "Enter the loading to check weight and CG." }))
|
this.messagesTarget.replaceChildren(Object.assign(document.createElement("li"), { className: "text-slate-500", textContent: t("wb.enter_loading") }))
|
||||||
this.draw(takeoff, landing)
|
this.draw(takeoff, landing)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (this.maxGrossValue && takeoff.weight > this.maxGrossValue) {
|
if (this.maxGrossValue && takeoff.weight > this.maxGrossValue) {
|
||||||
messages.push([ "bad", `Takeoff weight is ${(takeoff.weight - this.maxGrossValue).toFixed(1)} lb over the maximum of ${this.maxGrossValue} lb.` ])
|
messages.push([ "bad", t("wb.over_gross", { over: (takeoff.weight - this.maxGrossValue).toFixed(1), max: this.maxGrossValue }) ])
|
||||||
}
|
}
|
||||||
if (this.envelopeValue.length >= 3) {
|
if (this.envelopeValue.length >= 3) {
|
||||||
for (const [ name, point ] of [ [ "Takeoff", takeoff ], [ "Landing", landing ] ]) {
|
for (const [ name, point ] of [ [ t("wb.takeoff"), takeoff ], [ t("wb.landing"), landing ] ]) {
|
||||||
if (!this.inside(point)) messages.push([ "bad", `${name} CG ${point.cg.toFixed(2)} in at ${point.weight.toFixed(0)} lb is outside the envelope.` ])
|
if (!this.inside(point)) messages.push([ "bad", t("wb.outside", { name, cg: point.cg.toFixed(2), weight: point.weight.toFixed(0) }) ])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!messages.length) messages.push([ "ok", "Within the limits entered here." ])
|
if (!messages.length) messages.push([ "ok", t("wb.within_limits") ])
|
||||||
this.messagesTarget.replaceChildren(...messages.map(([ kind, text ]) => {
|
this.messagesTarget.replaceChildren(...messages.map(([ kind, text ]) => {
|
||||||
const li = document.createElement("li")
|
const li = document.createElement("li")
|
||||||
li.className = kind === "ok" ? "text-emerald-700" : "text-red-700"
|
li.className = kind === "ok" ? "text-emerald-700" : "text-red-700"
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
// Strings for the page's scripts: the "js" keys of config/locales, which the
|
||||||
|
// layout puts in <script type="application/json" id="i18n">.
|
||||||
|
// t("bulk_upload.uploading", { done: 1, total: 4 })
|
||||||
|
// t("offline.sent", { count: 2 }) // one/other plurals pick by count
|
||||||
|
let strings
|
||||||
|
|
||||||
|
function load() {
|
||||||
|
if (!strings) {
|
||||||
|
try { strings = JSON.parse(document.getElementById("i18n")?.textContent || "{}") } catch { strings = {} }
|
||||||
|
}
|
||||||
|
return strings
|
||||||
|
}
|
||||||
|
|
||||||
|
export function t(key, vars = {}) {
|
||||||
|
let value = key.split(".").reduce((node, part) => node?.[part], load())
|
||||||
|
if (value && typeof value === "object") value = value[vars.count === 1 ? "one" : "other"]
|
||||||
|
if (typeof value !== "string") return key
|
||||||
|
return value.replace(/%\{(\w+)\}/g, (_, name) => vars[name] ?? "")
|
||||||
|
}
|
||||||
|
|
||||||
|
// The page's language, for number and date formatting.
|
||||||
|
export const locale = () => document.documentElement.lang || "en"
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { t, locale } from "i18n"
|
||||||
|
|
||||||
// Next-due math, mirroring Compliance.next_due in app/services/compliance.rb:
|
// Next-due math, mirroring Compliance.next_due in app/services/compliance.rb:
|
||||||
// months land on the END of the month, then days are added; hours are added
|
// months land on the END of the month, then days are added; hours are added
|
||||||
// to the hours at completion. Dates are "YYYY-MM-DD" strings (no timezones).
|
// to the hours at completion. Dates are "YYYY-MM-DD" strings (no timezones).
|
||||||
@@ -24,11 +26,11 @@ export function nextDue(rule, dateStr, hours) {
|
|||||||
|
|
||||||
export function describeDue(due) {
|
export function describeDue(due) {
|
||||||
const parts = []
|
const parts = []
|
||||||
if (due.hours != null) parts.push(`${due.hours.toLocaleString("en-US", { minimumFractionDigits: 1, maximumFractionDigits: 1 })} tach`)
|
if (due.hours != null) parts.push(t("next_due.tach", { hours: due.hours.toLocaleString(locale(), { minimumFractionDigits: 1, maximumFractionDigits: 1 }) }))
|
||||||
if (due.date) {
|
if (due.date) {
|
||||||
const [y, mo, d] = due.date.split("-").map(Number)
|
const [y, mo, d] = due.date.split("-").map(Number)
|
||||||
parts.push(new Date(y, mo - 1, d).toLocaleDateString("en-US", { month: "short", day: "numeric", year: "numeric" }))
|
parts.push(new Date(y, mo - 1, d).toLocaleDateString(locale(), { month: "short", day: "numeric", year: "numeric" }))
|
||||||
}
|
}
|
||||||
if (parts.length === 0) return ""
|
if (parts.length === 0) return ""
|
||||||
return parts.length > 1 ? `${parts.join(" or ")}, whichever comes first` : parts[0]
|
return parts.length > 1 ? t("next_due.either", { first: parts[0], second: parts[1] }) : parts[0]
|
||||||
}
|
}
|
||||||
@@ -33,11 +33,11 @@ class LogbookTranscriptionJob < ApplicationJob
|
|||||||
readable = pages.each_with_index.filter_map do |attachment, index|
|
readable = pages.each_with_index.filter_map do |attachment, index|
|
||||||
type = attachment.blob.content_type
|
type = attachment.blob.content_type
|
||||||
if type == "application/pdf"
|
if type == "application/pdf"
|
||||||
next warn("Page #{index + 1} (#{attachment.filename}) is over #{LogbookTranscriber::MAX_PDF_BYTES / 1.megabyte} MB, too large to transcribe.") if attachment.blob.byte_size > LogbookTranscriber::MAX_PDF_BYTES
|
next warn(I18n.t("jobs.logbook_transcription.pdf_too_large", page: index + 1, file: attachment.filename, mb: LogbookTranscriber::MAX_PDF_BYTES / 1.megabyte)) if attachment.blob.byte_size > LogbookTranscriber::MAX_PDF_BYTES
|
||||||
elsif !LogbookTranscriber::IMAGE_TYPES.include?(type)
|
elsif !LogbookTranscriber::IMAGE_TYPES.include?(type)
|
||||||
next warn("Page #{index + 1} (#{attachment.filename}) isn't a JPEG, PNG, GIF, WebP or PDF, so it wasn't transcribed.")
|
next warn(I18n.t("jobs.logbook_transcription.wrong_type", page: index + 1, file: attachment.filename))
|
||||||
elsif attachment.blob.byte_size > LogbookTranscriber::MAX_IMAGE_BYTES
|
elsif attachment.blob.byte_size > LogbookTranscriber::MAX_IMAGE_BYTES
|
||||||
next warn("Page #{index + 1} (#{attachment.filename}) is over 5 MB, too large to transcribe. Scan it at a lower resolution.")
|
next warn(I18n.t("jobs.logbook_transcription.image_too_large", page: index + 1, file: attachment.filename))
|
||||||
end
|
end
|
||||||
{ attachment: attachment, number: index + 1, pdf: type == "application/pdf" }
|
{ attachment: attachment, number: index + 1, pdf: type == "application/pdf" }
|
||||||
end
|
end
|
||||||
@@ -50,10 +50,10 @@ class LogbookTranscriptionJob < ApplicationJob
|
|||||||
|
|
||||||
def transcribe_pdf(page)
|
def transcribe_pdf(page)
|
||||||
result = @transcriber.transcribe([ payload(page) ])
|
result = @transcriber.transcribe([ payload(page) ])
|
||||||
note_skipped(result, ->(i) { "#{page[:attachment].filename} page #{i + 1}" })
|
note_skipped(result, ->(i) { I18n.t("jobs.logbook_transcription.file_page", file: page[:attachment].filename, page: i + 1) })
|
||||||
result.entries.sort_by { _1["page_start"].to_i }.each { save(_1, page[:number]) }
|
result.entries.sort_by { _1["page_start"].to_i }.each { save(_1, page[:number]) }
|
||||||
rescue LogbookTranscriber::Error => e
|
rescue LogbookTranscriber::Error => e
|
||||||
warn("#{page[:attachment].filename} wasn't transcribed: #{e.message}.")
|
warn(I18n.t("jobs.logbook_transcription.file_failed", file: page[:attachment].filename, message: e.message))
|
||||||
ensure
|
ensure
|
||||||
tick(1)
|
tick(1)
|
||||||
end
|
end
|
||||||
@@ -81,12 +81,12 @@ class LogbookTranscriptionJob < ApplicationJob
|
|||||||
rescue LogbookTranscriber::Error => e
|
rescue LogbookTranscriber::Error => e
|
||||||
held.each { save(_1[:entry], _1[:number]) } # keep what the previous batch read
|
held.each { save(_1[:entry], _1[:number]) } # keep what the previous batch read
|
||||||
held = []
|
held = []
|
||||||
pages = batch.size == 1 ? "Page #{batch.first[:number]} wasn't" : "Pages #{batch.first[:number]}–#{batch.last[:number]} weren't"
|
warn(batch.size == 1 ? I18n.t("jobs.logbook_transcription.page_failed", page: batch.first[:number], message: e.message)
|
||||||
warn("#{pages} transcribed: #{e.message}.")
|
: I18n.t("jobs.logbook_transcription.pages_failed", first: batch.first[:number], last: batch.last[:number], message: e.message))
|
||||||
tick(n.zero? ? batch.size : batch.size - 1)
|
tick(n.zero? ? batch.size : batch.size - 1)
|
||||||
next
|
next
|
||||||
end
|
end
|
||||||
note_skipped(result, ->(i) { "page #{batch[i]&.dig(:number) || '?'}" })
|
note_skipped(result, ->(i) { I18n.t("jobs.logbook_transcription.page", page: batch[i]&.dig(:number) || "?") })
|
||||||
|
|
||||||
entries = result.entries.sort_by { _1["page_start"].to_i }
|
entries = result.entries.sort_by { _1["page_start"].to_i }
|
||||||
held = []
|
held = []
|
||||||
@@ -109,10 +109,11 @@ class LogbookTranscriptionJob < ApplicationJob
|
|||||||
|
|
||||||
def save(entry, page_number)
|
def save(entry, page_number)
|
||||||
date = parse_date(entry["date"])
|
date = parse_date(entry["date"])
|
||||||
text = entry["text"].to_s.strip.presence || "[no text read]"
|
text = entry["text"].to_s.strip.presence || I18n.t("jobs.logbook_transcription.no_text")
|
||||||
unless date
|
unless date
|
||||||
text = "[date unreadable] #{text}"
|
text = "#{I18n.t('jobs.logbook_transcription.date_unreadable')} #{text}"
|
||||||
warn("An entry on page #{page_number} had no readable date#{@last_date ? "; it was given the previous entry's date (#{@last_date})" : ' and was dated today'}. Please check it.")
|
warn(@last_date ? I18n.t("jobs.logbook_transcription.no_date_previous", page: page_number, date: @last_date)
|
||||||
|
: I18n.t("jobs.logbook_transcription.no_date_today", page: page_number))
|
||||||
end
|
end
|
||||||
date ||= @last_date || Date.current
|
date ||= @last_date || Date.current
|
||||||
@last_date = date
|
@last_date = date
|
||||||
@@ -128,14 +129,14 @@ class LogbookTranscriptionJob < ApplicationJob
|
|||||||
verified: false, transcription_confidence: (entry["confidence"] if %w[high medium low].include?(entry["confidence"]))
|
verified: false, transcription_confidence: (entry["confidence"] if %w[high medium low].include?(entry["confidence"]))
|
||||||
)
|
)
|
||||||
@import.increment!(:entries_created)
|
@import.increment!(:entries_created)
|
||||||
warn("The #{date} entry on page #{page_number} was hard to read. Please check it against the scan.") if entry["confidence"] == "low"
|
warn(I18n.t("jobs.logbook_transcription.hard_to_read", date: date, page: page_number)) if entry["confidence"] == "low"
|
||||||
end
|
end
|
||||||
|
|
||||||
def note_skipped(result, label)
|
def note_skipped(result, label)
|
||||||
forms = result.non_logbook_pages.map { label.(_1) }
|
forms = result.non_logbook_pages.map { label.(_1) }
|
||||||
unreadable = result.unparseable_pages.map { label.(_1) }
|
unreadable = result.unparseable_pages.map { label.(_1) }
|
||||||
warn("Not logbook entries (forms, tags…), so nothing was transcribed from: #{forms.uniq.to_sentence}.") if forms.any?
|
warn(I18n.t("jobs.logbook_transcription.not_entries", pages: forms.uniq.to_sentence)) if forms.any?
|
||||||
warn("Too hard to read: #{unreadable.uniq.to_sentence}.") if unreadable.any?
|
warn(I18n.t("jobs.logbook_transcription.unreadable", pages: unreadable.uniq.to_sentence)) if unreadable.any?
|
||||||
end
|
end
|
||||||
|
|
||||||
def parse_date(value)
|
def parse_date(value)
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
# Daily: tells owners about items that have newly become overdue or limit
|
||||||
|
# the aircraft (grounded, VFR only…). Each is sent once; one that's fixed and
|
||||||
|
# becomes overdue again is sent again.
|
||||||
|
class OverdueNotificationJob < ApplicationJob
|
||||||
|
queue_as :default
|
||||||
|
|
||||||
|
def perform
|
||||||
|
Aircraft.includes(roles: :user).find_each do |aircraft|
|
||||||
|
issues = aircraft.airworthiness.issues.select { _1.severity.in?([ Airworthiness::RED, Airworthiness::LIMITED ]) }
|
||||||
|
keys = issues.map { |i| "#{i.category}:#{i.item.class.name}:#{i.item.id}" }
|
||||||
|
fresh = issues.reject.with_index { |_, n| aircraft.notified_issue_keys.include?(keys[n]) }
|
||||||
|
owners = aircraft.roles.select { _1.role == "owner" }.map(&:user).reject(&:disabled?)
|
||||||
|
if fresh.any?
|
||||||
|
PushNotifier.notify(owners, :overdue, path: Rails.application.routes.url_helpers.aircraft_path(aircraft), tag: "overdue-#{aircraft.id}",
|
||||||
|
tail: aircraft.tail_number, items: fresh.map(&:title).to_sentence, count: fresh.size)
|
||||||
|
end
|
||||||
|
aircraft.update_column(:notified_issue_keys, keys) if keys.sort != aircraft.notified_issue_keys.sort
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
Loaded 100 of 376 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user