Compare commits
33 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f04c8d85be | |||
| 9c51887024 | |||
| 2c845f3528 | |||
| f1578fad75 | |||
| 4d86652247 | |||
| eae0ee9d20 | |||
| eb2797bd90 | |||
| 5d051de666 | |||
| ef8214cfa7 | |||
| 30c80e6e2e | |||
| 159b4b340f | |||
| 774b1eb19b | |||
| d4be84875e | |||
| 65e5643b13 | |||
| b05523dcd6 | |||
| 1ab925f6fa | |||
| 83168092f1 | |||
| 852e6e7cea | |||
| 0481b0f6f1 | |||
| 76b95f7c30 | |||
| ca7edb99e1 | |||
| 98044fc04a | |||
| d3a34233b9 | |||
| 4a36ffc8bf | |||
| 78639b4c1e | |||
| c4def9cd86 | |||
| 3454d3052b | |||
| dedea0246f | |||
| 3ac3a6f13c | |||
| 97e7bfedf7 | |||
| a05767213c | |||
| d002ae0f2c | |||
| f87aa9fd3d |
@@ -15,6 +15,9 @@
|
|||||||
/config/master.key
|
/config/master.key
|
||||||
/config/puma.rb
|
/config/puma.rb
|
||||||
|
|
||||||
|
# Ignore test database.
|
||||||
|
/db/test.sqlite3
|
||||||
|
|
||||||
# Ignore all logfiles and tempfiles.
|
# Ignore all logfiles and tempfiles.
|
||||||
/log/*
|
/log/*
|
||||||
/tmp/*
|
/tmp/*
|
||||||
@@ -30,7 +33,7 @@
|
|||||||
|
|
||||||
/tmp/restart.txt
|
/tmp/restart.txt
|
||||||
|
|
||||||
# Ignore user files
|
# Ignore user files.
|
||||||
/.bash_history
|
/.bash_history
|
||||||
/.byebug_history
|
/.byebug_history
|
||||||
/.config
|
/.config
|
||||||
@@ -38,6 +41,7 @@
|
|||||||
/.lesshst
|
/.lesshst
|
||||||
/.local
|
/.local
|
||||||
/.mysql_history
|
/.mysql_history
|
||||||
|
/.sqlite_history
|
||||||
/.ssh
|
/.ssh
|
||||||
/.vim
|
/.vim
|
||||||
/.viminfo
|
/.viminfo
|
||||||
|
|||||||
@@ -1,106 +0,0 @@
|
|||||||
# CLAUDE.md
|
|
||||||
|
|
||||||
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
|
|
||||||
|
|
||||||
## Project Overview
|
|
||||||
|
|
||||||
Fixin.me is a "quantified self" Rails 7.2.3 application for personal data tracking. Users define hierarchical **quantities** (metrics to track), **units** (with optional conversion hierarchies), and **readouts** (individual measurements). There is also a non-persistent **measurement** model used as a form wrapper.
|
|
||||||
|
|
||||||
## Setup
|
|
||||||
|
|
||||||
Configuration files are distributed as `.dist` templates — copy and customize before use:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cp config/application.rb.dist config/application.rb
|
|
||||||
cp config/database.yml.dist config/database.yml
|
|
||||||
cp config/puma.rb.dist config/puma.rb
|
|
||||||
```
|
|
||||||
|
|
||||||
```bash
|
|
||||||
bundle config --local frozen true
|
|
||||||
bundle config --local path .gem
|
|
||||||
bundle config --local with mysql development test # or: pg, sqlite
|
|
||||||
bundle install
|
|
||||||
RAILS_ENV=development bundle exec rails db:create db:migrate db:seed
|
|
||||||
```
|
|
||||||
|
|
||||||
## Common Commands
|
|
||||||
|
|
||||||
```bash
|
|
||||||
bundle exec rails s # start server
|
|
||||||
bundle exec rails test # all unit/model/controller tests
|
|
||||||
bundle exec rails test:system # all system tests (Capybara + Selenium)
|
|
||||||
bundle exec rails test test/system/units_test.rb # single test file
|
|
||||||
bundle exec rails test --seed 64690 --name test_add_unit # single test by name
|
|
||||||
bundle exec rails db:seed:export # export default settings as seed file
|
|
||||||
```
|
|
||||||
|
|
||||||
## Architecture
|
|
||||||
|
|
||||||
### Data Model
|
|
||||||
|
|
||||||
- **Quantity** — hierarchical tree (self-referential `parent_id`). Cached `depth` and `pathname` fields are recomputed via recursive CTEs on write. Direct assignment to cached fields is blocked.
|
|
||||||
- **Unit** — optional hierarchy via `base_id` and `multiplier` for unit conversion. Multiplier precision/scale is validated by a custom validator.
|
|
||||||
- **Readout** — single measurement: `value` (IEEE 754 float), `quantity`, `unit`, `category`.
|
|
||||||
- **Measurement** — `ActiveModel::Model` form wrapper (not database-backed); bridges the readout creation form.
|
|
||||||
- **User** — Devise-managed with a status enum: `admin`, `active`, `restricted`, `locked`, `disabled`. Admins can disguise as other users.
|
|
||||||
|
|
||||||
### Hierarchical Queries
|
|
||||||
|
|
||||||
Both `Quantity` and `Unit` use recursive CTEs for tree traversal (ordered traversal, ancestors, progenies, common ancestors). `lib/core_ext/arel/` patches Arel to support CTE with `UPDATE`/`DELETE` statements, working around Rails issue #54658.
|
|
||||||
|
|
||||||
### Custom Extensions (`lib/core_ext/`)
|
|
||||||
|
|
||||||
- **arel/** — CTE support for UPDATE/DELETE
|
|
||||||
- **active_model/** — precision/scale validator used by `Unit#multiplier`
|
|
||||||
- **active_record/** — `attr_cached` mechanism (see `ApplicationRecord`)
|
|
||||||
- **action_view/** — record identifier suffixes
|
|
||||||
- Miscellaneous: `Array#delete_bang`, `BigDecimal` scientific notation
|
|
||||||
|
|
||||||
### Response Handling
|
|
||||||
|
|
||||||
Controllers respond to both HTML and Turbo Stream formats. Errors during Turbo Stream requests trigger a redirect with flash rather than rendering inline, handled in `ApplicationController`.
|
|
||||||
|
|
||||||
### Numeric Precision
|
|
||||||
|
|
||||||
Readout values are stored as IEEE 754 double-precision floats (not fixed-point decimals). Rationale in `DESIGN.md`: biological values span many orders of magnitude; 15-digit float precision is sufficient and avoids conversion overhead.
|
|
||||||
|
|
||||||
### Routes
|
|
||||||
|
|
||||||
```
|
|
||||||
measurements GET/POST /measurements
|
|
||||||
readouts GET/POST /readouts, DELETE /readouts/:id/discard
|
|
||||||
quantities CRUD + POST /quantities/:id/reparent
|
|
||||||
units CRUD + POST /units/:id/rebase
|
|
||||||
users CRUD + POST /users/:id/disguise, POST /users/revert
|
|
||||||
default/ namespace for default units import/export and admin panel
|
|
||||||
root → /units (authenticated), /sign_in (unauthenticated)
|
|
||||||
```
|
|
||||||
|
|
||||||
## JavaScript Conventions
|
|
||||||
|
|
||||||
### No manual fetch() — use Turbo
|
|
||||||
|
|
||||||
Never make AJAX requests with `fetch()` in JavaScript. Use Turbo's built-in mechanisms instead:
|
|
||||||
|
|
||||||
- **Links/buttons that trigger server actions**: use `data: {turbo_stream: true}` on the element (link or button_to form).
|
|
||||||
- **Dynamic form submissions from JS** (where HTML alone isn't enough): create a form element, append hidden inputs, and call `form.requestSubmit()`. Turbo intercepts it automatically — no manual CSRF handling, no `Turbo.renderStreamMessage()`.
|
|
||||||
```javascript
|
|
||||||
var form = document.createElement('form');
|
|
||||||
form.action = url; form.method = 'post'; form.dataset.turboStream = 'true';
|
|
||||||
// append hidden inputs...
|
|
||||||
form.addEventListener('turbo:submit-end', function() { form.remove(); });
|
|
||||||
document.body.appendChild(form);
|
|
||||||
form.requestSubmit();
|
|
||||||
```
|
|
||||||
- **Server-rendered HTML**: use ERB partials and Turbo Stream views (`*.turbo_stream.erb`), never build HTML in JavaScript.
|
|
||||||
|
|
||||||
### No HTML generation in JavaScript
|
|
||||||
|
|
||||||
Never use JavaScript to build and insert HTML (no `innerHTML =`, no `createElement` trees for content). Render HTML server-side in ERB partials; update the DOM via Turbo Stream actions (`replace`, `update`, `append`, etc.).
|
|
||||||
|
|
||||||
## Database Requirements
|
|
||||||
|
|
||||||
The database must support:
|
|
||||||
- Recursive CTEs with `UPDATE`/`DELETE` (MySQL ≥ 8.0, PostgreSQL, or SQLite3)
|
|
||||||
- Decimal precision of 30+ digits
|
|
||||||
@@ -22,13 +22,55 @@ whenever a change is considered, to avoid regressions.
|
|||||||
and scale approximately half of that - 9,
|
and scale approximately half of that - 9,
|
||||||
* double precision floating point guarantees 15 digits of precision, which
|
* double precision floating point guarantees 15 digits of precision, which
|
||||||
is more than enough for all expected use cases,
|
is more than enough for all expected use cases,
|
||||||
|
* if a decimal string with at most 15 significant digits is converted to
|
||||||
|
the IEEE 754 double-precision format, giving a normal number, and then
|
||||||
|
converted back to a decimal string with the same number of digits, the
|
||||||
|
final result should match the original string,
|
||||||
|
* if an IEEE 754 double-precision number is converted to a decimal
|
||||||
|
string with at least 17 significant digits, and then converted back to
|
||||||
|
double-precision representation, the final result must match the
|
||||||
|
original number,
|
||||||
* single precision floating point only guarntees 6 digits of precision,
|
* single precision floating point only guarntees 6 digits of precision,
|
||||||
which is estimated to be too low for some use cases (e.g. storing
|
which is estimated to be too low for some use cases (e.g. storing
|
||||||
latitude/longitude with a resolution grater than 100m)
|
latitude/longitude with a resolution grater than 100m),
|
||||||
* double precision floating point (IEEE 754) is a standard that ensures
|
* double precision floating point (IEEE 754) is a standard that ensures
|
||||||
compatibility with all database engines,
|
compatibility with majority of database engines,
|
||||||
* the same data format is used internally by Ruby as a `Float`; it
|
* the same data format is used internally by Ruby as a `Float`; it
|
||||||
guarantees no conversions between storage and computation,
|
guarantees no conversions between storage and computation,
|
||||||
* as a standard with hardware implementations ensures both: computing
|
* as a standard with hardware implementations ensures both: computing
|
||||||
efficiency and hardware/3rd party library compatibility as opposed to Ruby
|
efficiency and hardware/3rd party library compatibility as opposed to Ruby
|
||||||
custom `BigDecimal` type
|
custom `BigDecimal` type,
|
||||||
|
* at present, only normalized numbers are used and considered sufficient, in
|
||||||
|
order to avoid potential issues with the cross-platform compatibility of
|
||||||
|
subnormal (denormal) numbers,
|
||||||
|
* in the future, the IEEE 754 decimal64 data type may be considered once it is
|
||||||
|
supported by database engines.
|
||||||
|
|
||||||
|
### Database layer vs application layer data model constraints
|
||||||
|
|
||||||
|
* database constraints are the final guard against data integrity corruption,
|
||||||
|
* they should safeguard against data referential integrity loss under _all_
|
||||||
|
data (not schema) manipulation scenarios, including application level
|
||||||
|
logic errors and direct data manipulation (e.g. through `dbconsole`),
|
||||||
|
* application constraints can be as restrictive as database constraints or more,
|
||||||
|
but not less, as it doesn't serve any use case,
|
||||||
|
* proper application level constraints should prevent unhandled database
|
||||||
|
exception occurences, e.g `ActiveRecord::InvalidForeignKey` for operations
|
||||||
|
performed through Models (i.e. not `#delete_all` etc.)
|
||||||
|
|
||||||
|
### User interface
|
||||||
|
* values provided by user have to be exactly preserved, avoiding any precision
|
||||||
|
loss due to e.g. type casting
|
||||||
|
* when it's not possible to store value without information loss, feedback has to
|
||||||
|
be given at the time of entering value
|
||||||
|
* values can be received using either:
|
||||||
|
* `input[number]` - validates: number format, value against `[min]` and
|
||||||
|
`[max]` attributes; cannot validate precision (no `[pattern]` support);
|
||||||
|
or
|
||||||
|
* `input[text]` - can validate number format and precision with
|
||||||
|
`[pattern]`; cannot validate range (no `[min]`/`[max]` support),
|
||||||
|
* none of the above prevents misinterpretation of values between 0 and
|
||||||
|
Float::MIN as 0.0 - this has to be checked manually,
|
||||||
|
* assuming that user input with _precision > DIG_ is as rare as in
|
||||||
|
the range _(0, MIN)_, the decision is to choose input which requires
|
||||||
|
the least/simplest additional code.
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
source "https://rubygems.org"
|
source "https://rubygems.org"
|
||||||
|
|
||||||
# The requirement for the Ruby version comes from Rails
|
# The requirement for the Ruby version comes from Rails.
|
||||||
gem "rails", "~> 7.2.3"
|
gem "rails", "~> 8.1.4"
|
||||||
gem "sprockets-rails"
|
gem "sprockets-rails"
|
||||||
gem "puma", "~> 6.0"
|
gem "puma", "~> 6.0"
|
||||||
gem "sassc-rails"
|
gem "sassc-rails"
|
||||||
# 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[ mingw mswin x64_mingw jruby ]
|
gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
|
||||||
|
|
||||||
# TODO: select db gems automatically
|
# TODO: select db gems automatically?
|
||||||
# database_config = ERB.new(File.read("config/database.yml")).result
|
# database_config = ERB.new(File.read("config/database.yml")).result
|
||||||
# YAML.load(database_config, aliases: true).values.map { |env| env["adapter"] }.uniq
|
# YAML.load(database_config, aliases: true).values.map { |env| env["adapter"] }.uniq
|
||||||
group :mysql, optional: true do
|
group :mysql, optional: true do
|
||||||
@@ -21,7 +21,7 @@ group :sqlite, optional: true do
|
|||||||
gem "sqlite3", "~> 2.7"
|
gem "sqlite3", "~> 2.7"
|
||||||
end
|
end
|
||||||
|
|
||||||
gem "devise"
|
gem "devise", "~> 5.0.4"
|
||||||
|
|
||||||
gem "importmap-rails"
|
gem "importmap-rails"
|
||||||
gem "turbo-rails", "~> 2.0"
|
gem "turbo-rails", "~> 2.0"
|
||||||
@@ -42,11 +42,8 @@ group :test do
|
|||||||
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
|
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
|
||||||
gem "capybara"
|
gem "capybara"
|
||||||
gem "selenium-webdriver"
|
gem "selenium-webdriver"
|
||||||
|
|
||||||
# Remove minitest version restriction after error fixed:
|
|
||||||
# railties-7.2.3/lib/rails/test_unit/line_filtering.rb:7:in `run':
|
|
||||||
# wrong number of arguments (given 3, expected 1..2) (ArgumentError)
|
|
||||||
# from /var/www/.gem/ruby/3.3.0/gems/minitest-6.0.2/lib/minitest.rb:473:in
|
|
||||||
# `block (2 levels) in run_suite'
|
|
||||||
gem "minitest", "< 6"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# TODO: remove after upgrade to next version containing PR:
|
||||||
|
# https://github.com/ruby-i18n/i18n/pull/755
|
||||||
|
gem "i18n", git: "https://github.com/ruby-i18n/i18n", branch: "delegate-missing-interpolation-handler"
|
||||||
|
|||||||
@@ -1,85 +1,93 @@
|
|||||||
|
GIT
|
||||||
|
remote: https://github.com/ruby-i18n/i18n
|
||||||
|
revision: 8850d979a3a32453123ed744b943ead8751ba73b
|
||||||
|
branch: delegate-missing-interpolation-handler
|
||||||
|
specs:
|
||||||
|
i18n (1.15.2)
|
||||||
|
concurrent-ruby (~> 1.0)
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (7.2.3)
|
action_text-trix (2.1.19)
|
||||||
actionpack (= 7.2.3)
|
railties
|
||||||
activesupport (= 7.2.3)
|
actioncable (8.1.4)
|
||||||
|
actionpack (= 8.1.4)
|
||||||
|
activesupport (= 8.1.4)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
zeitwerk (~> 2.6)
|
zeitwerk (~> 2.6)
|
||||||
actionmailbox (7.2.3)
|
actionmailbox (8.1.4)
|
||||||
actionpack (= 7.2.3)
|
actionpack (= 8.1.4)
|
||||||
activejob (= 7.2.3)
|
activejob (= 8.1.4)
|
||||||
activerecord (= 7.2.3)
|
activerecord (= 8.1.4)
|
||||||
activestorage (= 7.2.3)
|
activestorage (= 8.1.4)
|
||||||
activesupport (= 7.2.3)
|
activesupport (= 8.1.4)
|
||||||
mail (>= 2.8.0)
|
mail (>= 2.8.0)
|
||||||
actionmailer (7.2.3)
|
actionmailer (8.1.4)
|
||||||
actionpack (= 7.2.3)
|
actionpack (= 8.1.4)
|
||||||
actionview (= 7.2.3)
|
actionview (= 8.1.4)
|
||||||
activejob (= 7.2.3)
|
activejob (= 8.1.4)
|
||||||
activesupport (= 7.2.3)
|
activesupport (= 8.1.4)
|
||||||
mail (>= 2.8.0)
|
mail (>= 2.8.0)
|
||||||
rails-dom-testing (~> 2.2)
|
rails-dom-testing (~> 2.2)
|
||||||
actionpack (7.2.3)
|
actionpack (8.1.4)
|
||||||
actionview (= 7.2.3)
|
actionview (= 8.1.4)
|
||||||
activesupport (= 7.2.3)
|
activesupport (= 8.1.4)
|
||||||
cgi
|
|
||||||
nokogiri (>= 1.8.5)
|
nokogiri (>= 1.8.5)
|
||||||
racc
|
rack (>= 2.2.4)
|
||||||
rack (>= 2.2.4, < 3.3)
|
|
||||||
rack-session (>= 1.0.1)
|
rack-session (>= 1.0.1)
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
rails-dom-testing (~> 2.2)
|
rails-dom-testing (~> 2.2)
|
||||||
rails-html-sanitizer (~> 1.6)
|
rails-html-sanitizer (~> 1.6)
|
||||||
useragent (~> 0.16)
|
useragent (~> 0.16)
|
||||||
actiontext (7.2.3)
|
actiontext (8.1.4)
|
||||||
actionpack (= 7.2.3)
|
action_text-trix (~> 2.1.15)
|
||||||
activerecord (= 7.2.3)
|
actionpack (= 8.1.4)
|
||||||
activestorage (= 7.2.3)
|
activerecord (= 8.1.4)
|
||||||
activesupport (= 7.2.3)
|
activestorage (= 8.1.4)
|
||||||
|
activesupport (= 8.1.4)
|
||||||
globalid (>= 0.6.0)
|
globalid (>= 0.6.0)
|
||||||
nokogiri (>= 1.8.5)
|
nokogiri (>= 1.8.5)
|
||||||
actionview (7.2.3)
|
actionview (8.1.4)
|
||||||
activesupport (= 7.2.3)
|
activesupport (= 8.1.4)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
cgi
|
|
||||||
erubi (~> 1.11)
|
erubi (~> 1.11)
|
||||||
rails-dom-testing (~> 2.2)
|
rails-dom-testing (~> 2.2)
|
||||||
rails-html-sanitizer (~> 1.6)
|
rails-html-sanitizer (~> 1.6)
|
||||||
activejob (7.2.3)
|
activejob (8.1.4)
|
||||||
activesupport (= 7.2.3)
|
activesupport (= 8.1.4)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (7.2.3)
|
activemodel (8.1.4)
|
||||||
activesupport (= 7.2.3)
|
activesupport (= 8.1.4)
|
||||||
activerecord (7.2.3)
|
activerecord (8.1.4)
|
||||||
activemodel (= 7.2.3)
|
activemodel (= 8.1.4)
|
||||||
activesupport (= 7.2.3)
|
activesupport (= 8.1.4)
|
||||||
timeout (>= 0.4.0)
|
timeout (>= 0.4.0)
|
||||||
activestorage (7.2.3)
|
activestorage (8.1.4)
|
||||||
actionpack (= 7.2.3)
|
actionpack (= 8.1.4)
|
||||||
activejob (= 7.2.3)
|
activejob (= 8.1.4)
|
||||||
activerecord (= 7.2.3)
|
activerecord (= 8.1.4)
|
||||||
activesupport (= 7.2.3)
|
activesupport (= 8.1.4)
|
||||||
marcel (~> 1.0)
|
marcel (~> 1.0)
|
||||||
activesupport (7.2.3)
|
activesupport (8.1.4)
|
||||||
base64
|
base64
|
||||||
benchmark (>= 0.3)
|
|
||||||
bigdecimal
|
bigdecimal
|
||||||
concurrent-ruby (~> 1.0, >= 1.3.1)
|
concurrent-ruby (~> 1.0, >= 1.3.1)
|
||||||
connection_pool (>= 2.2.5)
|
connection_pool (>= 2.2.5)
|
||||||
drb
|
drb
|
||||||
i18n (>= 1.6, < 2)
|
i18n (>= 1.6, < 2)
|
||||||
|
json
|
||||||
logger (>= 1.4.2)
|
logger (>= 1.4.2)
|
||||||
minitest (>= 5.1)
|
minitest (>= 5.1)
|
||||||
securerandom (>= 0.3)
|
securerandom (>= 0.3)
|
||||||
tzinfo (~> 2.0, >= 2.0.5)
|
tzinfo (~> 2.0, >= 2.0.5)
|
||||||
addressable (2.8.8)
|
uri (>= 0.13.1)
|
||||||
|
addressable (2.9.0)
|
||||||
public_suffix (>= 2.0.2, < 8.0)
|
public_suffix (>= 2.0.2, < 8.0)
|
||||||
base64 (0.3.0)
|
base64 (0.3.0)
|
||||||
bcrypt (3.1.21)
|
bcrypt (3.1.22)
|
||||||
benchmark (0.5.0)
|
bigdecimal (4.1.3)
|
||||||
bigdecimal (4.0.1)
|
|
||||||
bindex (0.8.1)
|
bindex (0.8.1)
|
||||||
builder (3.3.0)
|
builder (3.3.0)
|
||||||
byebug (13.0.0)
|
byebug (13.0.0)
|
||||||
@@ -93,155 +101,155 @@ GEM
|
|||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
regexp_parser (>= 1.5, < 3.0)
|
regexp_parser (>= 1.5, < 3.0)
|
||||||
xpath (~> 3.2)
|
xpath (~> 3.2)
|
||||||
cgi (0.5.1)
|
concurrent-ruby (1.3.8)
|
||||||
concurrent-ruby (1.3.6)
|
|
||||||
connection_pool (3.0.2)
|
connection_pool (3.0.2)
|
||||||
crass (1.0.6)
|
crass (1.0.7)
|
||||||
date (3.5.1)
|
date (3.5.1)
|
||||||
devise (5.0.2)
|
devise (5.0.4)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
railties (>= 7.0)
|
railties (>= 7.0)
|
||||||
responders
|
responders
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
drb (2.2.3)
|
drb (2.2.3)
|
||||||
erb (6.0.2)
|
erb (6.0.7)
|
||||||
erubi (1.13.1)
|
erubi (1.13.1)
|
||||||
ffi (1.17.3-aarch64-linux-gnu)
|
ffi (1.17.4-aarch64-linux-gnu)
|
||||||
ffi (1.17.3-aarch64-linux-musl)
|
ffi (1.17.4-aarch64-linux-musl)
|
||||||
ffi (1.17.3-arm-linux-gnu)
|
ffi (1.17.4-arm-linux-gnu)
|
||||||
ffi (1.17.3-arm-linux-musl)
|
ffi (1.17.4-arm-linux-musl)
|
||||||
ffi (1.17.3-arm64-darwin)
|
ffi (1.17.4-arm64-darwin)
|
||||||
ffi (1.17.3-x86_64-darwin)
|
ffi (1.17.4-x86_64-darwin)
|
||||||
ffi (1.17.3-x86_64-linux-gnu)
|
ffi (1.17.4-x86_64-linux-gnu)
|
||||||
ffi (1.17.3-x86_64-linux-musl)
|
ffi (1.17.4-x86_64-linux-musl)
|
||||||
globalid (1.3.0)
|
globalid (1.4.0)
|
||||||
activesupport (>= 6.1)
|
activesupport (>= 6.1)
|
||||||
i18n (1.14.8)
|
|
||||||
concurrent-ruby (~> 1.0)
|
|
||||||
importmap-rails (2.2.3)
|
importmap-rails (2.2.3)
|
||||||
actionpack (>= 6.0.0)
|
actionpack (>= 6.0.0)
|
||||||
activesupport (>= 6.0.0)
|
activesupport (>= 6.0.0)
|
||||||
railties (>= 6.0.0)
|
railties (>= 6.0.0)
|
||||||
io-console (0.8.2)
|
io-console (0.9.4)
|
||||||
irb (1.17.0)
|
irb (1.18.0)
|
||||||
pp (>= 0.6.0)
|
pp (>= 0.6.0)
|
||||||
prism (>= 1.3.0)
|
prism (>= 1.3.0)
|
||||||
rdoc (>= 4.0.0)
|
rdoc (>= 4.0.0)
|
||||||
reline (>= 0.4.2)
|
reline (>= 0.4.2)
|
||||||
|
json (3.0.2)
|
||||||
logger (1.7.0)
|
logger (1.7.0)
|
||||||
loofah (2.25.0)
|
loofah (2.25.2)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.12.0)
|
nokogiri (>= 1.12.0)
|
||||||
mail (2.9.0)
|
mail (2.9.1)
|
||||||
logger
|
logger
|
||||||
mini_mime (>= 0.1.1)
|
mini_mime (>= 0.1.1)
|
||||||
net-imap
|
net-imap
|
||||||
net-pop
|
net-pop
|
||||||
net-smtp
|
net-smtp
|
||||||
marcel (1.1.0)
|
marcel (1.2.1)
|
||||||
matrix (0.4.3)
|
matrix (0.4.3)
|
||||||
mini_mime (1.1.5)
|
mini_mime (1.1.5)
|
||||||
minitest (5.27.0)
|
minitest (6.0.6)
|
||||||
|
drb (~> 2.0)
|
||||||
|
prism (~> 1.5)
|
||||||
mysql2 (0.5.7)
|
mysql2 (0.5.7)
|
||||||
bigdecimal
|
bigdecimal
|
||||||
net-imap (0.6.3)
|
net-imap (0.6.7)
|
||||||
date
|
date
|
||||||
net-protocol
|
net-protocol
|
||||||
net-pop (0.1.2)
|
net-pop (0.1.2)
|
||||||
net-protocol
|
net-protocol
|
||||||
net-protocol (0.2.2)
|
net-protocol (0.4.0)
|
||||||
timeout
|
timeout
|
||||||
net-smtp (0.5.1)
|
net-smtp (0.5.2)
|
||||||
net-protocol
|
net-protocol
|
||||||
nio4r (2.7.5)
|
nio4r (2.7.5)
|
||||||
nokogiri (1.19.1-aarch64-linux-gnu)
|
nokogiri (1.19.4-aarch64-linux-gnu)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
nokogiri (1.19.1-aarch64-linux-musl)
|
nokogiri (1.19.4-aarch64-linux-musl)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
nokogiri (1.19.1-arm-linux-gnu)
|
nokogiri (1.19.4-arm-linux-gnu)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
nokogiri (1.19.1-arm-linux-musl)
|
nokogiri (1.19.4-arm-linux-musl)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
nokogiri (1.19.1-arm64-darwin)
|
nokogiri (1.19.4-arm64-darwin)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
nokogiri (1.19.1-x86_64-darwin)
|
nokogiri (1.19.4-x86_64-darwin)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
nokogiri (1.19.1-x86_64-linux-gnu)
|
nokogiri (1.19.4-x86_64-linux-gnu)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
nokogiri (1.19.1-x86_64-linux-musl)
|
nokogiri (1.19.4-x86_64-linux-musl)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
pg (1.6.3)
|
pg (1.7.0)
|
||||||
pg (1.6.3-aarch64-linux)
|
pg (1.7.0-aarch64-linux)
|
||||||
pg (1.6.3-aarch64-linux-musl)
|
pg (1.7.0-aarch64-linux-musl)
|
||||||
pg (1.6.3-arm64-darwin)
|
pg (1.7.0-arm64-darwin)
|
||||||
pg (1.6.3-x86_64-darwin)
|
pg (1.7.0-x86_64-darwin)
|
||||||
pg (1.6.3-x86_64-linux)
|
pg (1.7.0-x86_64-linux)
|
||||||
pg (1.6.3-x86_64-linux-musl)
|
pg (1.7.0-x86_64-linux-musl)
|
||||||
pp (0.6.3)
|
pp (0.6.4)
|
||||||
prettyprint
|
prettyprint
|
||||||
prettyprint (0.2.0)
|
prettyprint (0.2.0)
|
||||||
prism (1.9.0)
|
prism (1.9.0)
|
||||||
psych (5.3.1)
|
public_suffix (7.0.5)
|
||||||
date
|
|
||||||
stringio
|
|
||||||
public_suffix (7.0.2)
|
|
||||||
puma (6.6.1)
|
puma (6.6.1)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
racc (1.8.1)
|
racc (1.8.1)
|
||||||
rack (3.2.5)
|
rack (3.2.7)
|
||||||
rack-session (2.1.1)
|
rack-session (2.1.2)
|
||||||
base64 (>= 0.1.0)
|
base64 (>= 0.1.0)
|
||||||
rack (>= 3.0.0)
|
rack (>= 3.0.0)
|
||||||
rack-test (2.2.0)
|
rack-test (2.2.0)
|
||||||
rack (>= 1.3)
|
rack (>= 1.3)
|
||||||
rackup (2.3.1)
|
rackup (2.3.1)
|
||||||
rack (>= 3)
|
rack (>= 3)
|
||||||
rails (7.2.3)
|
rails (8.1.4)
|
||||||
actioncable (= 7.2.3)
|
actioncable (= 8.1.4)
|
||||||
actionmailbox (= 7.2.3)
|
actionmailbox (= 8.1.4)
|
||||||
actionmailer (= 7.2.3)
|
actionmailer (= 8.1.4)
|
||||||
actionpack (= 7.2.3)
|
actionpack (= 8.1.4)
|
||||||
actiontext (= 7.2.3)
|
actiontext (= 8.1.4)
|
||||||
actionview (= 7.2.3)
|
actionview (= 8.1.4)
|
||||||
activejob (= 7.2.3)
|
activejob (= 8.1.4)
|
||||||
activemodel (= 7.2.3)
|
activemodel (= 8.1.4)
|
||||||
activerecord (= 7.2.3)
|
activerecord (= 8.1.4)
|
||||||
activestorage (= 7.2.3)
|
activestorage (= 8.1.4)
|
||||||
activesupport (= 7.2.3)
|
activesupport (= 8.1.4)
|
||||||
bundler (>= 1.15.0)
|
bundler (>= 1.15.0)
|
||||||
railties (= 7.2.3)
|
railties (= 8.1.4)
|
||||||
rails-dom-testing (2.3.0)
|
rails-dom-testing (2.3.0)
|
||||||
activesupport (>= 5.0.0)
|
activesupport (>= 5.0.0)
|
||||||
minitest
|
minitest
|
||||||
nokogiri (>= 1.6)
|
nokogiri (>= 1.6)
|
||||||
rails-html-sanitizer (1.7.0)
|
rails-html-sanitizer (1.7.1)
|
||||||
loofah (~> 2.25)
|
loofah (~> 2.25, >= 2.25.2)
|
||||||
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
|
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
|
||||||
railties (7.2.3)
|
railties (8.1.4)
|
||||||
actionpack (= 7.2.3)
|
actionpack (= 8.1.4)
|
||||||
activesupport (= 7.2.3)
|
activesupport (= 8.1.4)
|
||||||
cgi
|
|
||||||
irb (~> 1.13)
|
irb (~> 1.13)
|
||||||
rackup (>= 1.0.0)
|
rackup (>= 1.0.0)
|
||||||
rake (>= 12.2)
|
rake (>= 12.2)
|
||||||
thor (~> 1.0, >= 1.2.2)
|
thor (~> 1.0, >= 1.2.2)
|
||||||
tsort (>= 0.2)
|
tsort (>= 0.2)
|
||||||
zeitwerk (~> 2.6)
|
zeitwerk (~> 2.6)
|
||||||
rake (13.3.1)
|
rake (13.4.2)
|
||||||
rdoc (7.2.0)
|
rbs (4.2.0)
|
||||||
erb
|
logger
|
||||||
psych (>= 4.0.0)
|
prism (>= 1.6.0)
|
||||||
tsort
|
tsort
|
||||||
regexp_parser (2.11.3)
|
rdoc (8.1.0)
|
||||||
reline (0.6.3)
|
erb
|
||||||
|
prism (>= 1.6.0)
|
||||||
|
rbs (>= 4.0.0)
|
||||||
|
tsort
|
||||||
|
regexp_parser (2.13.1)
|
||||||
|
reline (0.7.0)
|
||||||
io-console (~> 0.5)
|
io-console (~> 0.5)
|
||||||
responders (3.2.0)
|
responders (3.2.1)
|
||||||
actionpack (>= 7.0)
|
actionpack (>= 7.0)
|
||||||
railties (>= 7.0)
|
railties (>= 7.0)
|
||||||
rexml (3.4.4)
|
rubyzip (3.7.0)
|
||||||
rubyzip (3.2.2)
|
|
||||||
sassc (2.4.0)
|
sassc (2.4.0)
|
||||||
ffi (~> 1.9)
|
ffi (~> 1.9)
|
||||||
sassc-rails (2.1.2)
|
sassc-rails (2.1.2)
|
||||||
@@ -251,54 +259,52 @@ GEM
|
|||||||
sprockets-rails
|
sprockets-rails
|
||||||
tilt
|
tilt
|
||||||
securerandom (0.4.1)
|
securerandom (0.4.1)
|
||||||
selenium-webdriver (4.41.0)
|
selenium-webdriver (4.50.0)
|
||||||
base64 (~> 0.2)
|
base64 (~> 0.2)
|
||||||
logger (~> 1.4)
|
logger (~> 1.4)
|
||||||
rexml (~> 3.2, >= 3.2.5)
|
|
||||||
rubyzip (>= 1.2.2, < 4.0)
|
rubyzip (>= 1.2.2, < 4.0)
|
||||||
websocket (~> 1.0)
|
websocket (~> 1.0)
|
||||||
sprockets (4.2.2)
|
sprockets (4.4.1)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.1)
|
||||||
logger
|
logger
|
||||||
rack (>= 2.2.4, < 4)
|
rack (>= 2.2.4, < 4)
|
||||||
sprockets-rails (3.5.2)
|
sprockets-rails (3.5.2)
|
||||||
actionpack (>= 6.1)
|
actionpack (>= 6.1)
|
||||||
activesupport (>= 6.1)
|
activesupport (>= 6.1)
|
||||||
sprockets (>= 3.0.0)
|
sprockets (>= 3.0.0)
|
||||||
sqlite3 (2.9.0-aarch64-linux-gnu)
|
sqlite3 (2.9.6-aarch64-linux-gnu)
|
||||||
sqlite3 (2.9.0-aarch64-linux-musl)
|
sqlite3 (2.9.6-aarch64-linux-musl)
|
||||||
sqlite3 (2.9.0-arm-linux-gnu)
|
sqlite3 (2.9.6-arm-linux-gnu)
|
||||||
sqlite3 (2.9.0-arm-linux-musl)
|
sqlite3 (2.9.6-arm-linux-musl)
|
||||||
sqlite3 (2.9.0-arm64-darwin)
|
sqlite3 (2.9.6-arm64-darwin)
|
||||||
sqlite3 (2.9.0-x86_64-darwin)
|
sqlite3 (2.9.6-x86_64-darwin)
|
||||||
sqlite3 (2.9.0-x86_64-linux-gnu)
|
sqlite3 (2.9.6-x86_64-linux-gnu)
|
||||||
sqlite3 (2.9.0-x86_64-linux-musl)
|
sqlite3 (2.9.6-x86_64-linux-musl)
|
||||||
stringio (3.2.0)
|
|
||||||
thor (1.5.0)
|
thor (1.5.0)
|
||||||
tilt (2.7.0)
|
tilt (2.9.0)
|
||||||
timeout (0.6.0)
|
timeout (0.6.1)
|
||||||
tsort (0.2.0)
|
tsort (0.2.0)
|
||||||
turbo-rails (2.0.23)
|
turbo-rails (2.0.23)
|
||||||
actionpack (>= 7.1.0)
|
actionpack (>= 7.1.0)
|
||||||
railties (>= 7.1.0)
|
railties (>= 7.1.0)
|
||||||
tzinfo (2.0.6)
|
tzinfo (2.0.6)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
|
uri (1.1.1)
|
||||||
useragent (0.16.11)
|
useragent (0.16.11)
|
||||||
warden (1.2.9)
|
warden (1.2.9)
|
||||||
rack (>= 2.0.9)
|
rack (>= 2.0.9)
|
||||||
web-console (4.2.1)
|
web-console (4.3.0)
|
||||||
actionview (>= 6.0.0)
|
actionview (>= 8.0.0)
|
||||||
activemodel (>= 6.0.0)
|
|
||||||
bindex (>= 0.4.0)
|
bindex (>= 0.4.0)
|
||||||
railties (>= 6.0.0)
|
railties (>= 8.0.0)
|
||||||
websocket (1.2.11)
|
websocket (1.2.11)
|
||||||
websocket-driver (0.8.0)
|
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)
|
xpath (3.2.0)
|
||||||
nokogiri (~> 1.8)
|
nokogiri (~> 1.8)
|
||||||
zeitwerk (2.7.5)
|
zeitwerk (2.8.3)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
aarch64-linux-gnu
|
aarch64-linux-gnu
|
||||||
@@ -313,13 +319,13 @@ PLATFORMS
|
|||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
byebug
|
byebug
|
||||||
capybara
|
capybara
|
||||||
devise
|
devise (~> 5.0.4)
|
||||||
|
i18n!
|
||||||
importmap-rails
|
importmap-rails
|
||||||
minitest (< 6)
|
|
||||||
mysql2 (~> 0.5)
|
mysql2 (~> 0.5)
|
||||||
pg (~> 1.5)
|
pg (~> 1.5)
|
||||||
puma (~> 6.0)
|
puma (~> 6.0)
|
||||||
rails (~> 7.2.3)
|
rails (~> 8.1.4)
|
||||||
sassc-rails
|
sassc-rails
|
||||||
selenium-webdriver
|
selenium-webdriver
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
|
|||||||
@@ -16,14 +16,10 @@ environment, see the _Contributing_ section below.
|
|||||||
* Server side:
|
* Server side:
|
||||||
* Ruby interpreter, depending on the version of Rails used (see _Gemfile_),
|
* Ruby interpreter, depending on the version of Rails used (see _Gemfile_),
|
||||||
* https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#ruby-versions
|
* https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#ruby-versions
|
||||||
* database (e.g. MySQL >= 8.0) supporting:
|
* database (e.g. SQLite, MySQL >= 8.0) supporting:
|
||||||
* recursive Common Table Expressions (CTE) for SELECT/UPDATE/DELETE,
|
* recursive Common Table Expressions (CTE) for SELECT/UPDATE/DELETE,
|
||||||
* MariaDB does not support CTE for UPDATE/DELETE
|
* MariaDB does not support CTE for UPDATE/DELETE
|
||||||
(https://jira.mariadb.org/browse/MDEV-18511)
|
(https://jira.mariadb.org/browse/MDEV-18511)
|
||||||
* decimal datatype with precision of at least 30,
|
|
||||||
* SQLite3 _flexible typing_ decimal will work, but precision
|
|
||||||
will be limited to 16, making it practical mostly for testing
|
|
||||||
purposes
|
|
||||||
* for testing: browser as specified in _Client side_ requirements
|
* for testing: browser as specified in _Client side_ requirements
|
||||||
* Client side:
|
* Client side:
|
||||||
* browser (e.g. Firefox >= 121) supporting:
|
* browser (e.g. Firefox >= 121) supporting:
|
||||||
@@ -89,14 +85,10 @@ Running
|
|||||||
|
|
||||||
### Standalone Rails server + Apache proxy
|
### Standalone Rails server + Apache proxy
|
||||||
|
|
||||||
Customize Puma config template:
|
Copy and customize Puma config template if required:
|
||||||
|
|
||||||
cp -a config/puma.rb.dist config/puma.rb
|
cp -a config/puma.rb.dist config/puma.rb
|
||||||
|
|
||||||
and specify server IP/port, either with `port` or `bind`, e.g.:
|
|
||||||
|
|
||||||
bind 'tcp://0.0.0.0:3000'
|
|
||||||
|
|
||||||
#### (option 1) Start server manually
|
#### (option 1) Start server manually
|
||||||
|
|
||||||
bundle exec rails s -e production
|
bundle exec rails s -e production
|
||||||
@@ -123,9 +115,26 @@ Contributing
|
|||||||
|
|
||||||
### Gems
|
### Gems
|
||||||
|
|
||||||
Apart from database adapter, install development and testing gems:
|
Install development and testing gems, including at least MySQL and SQLite
|
||||||
|
database adapters:
|
||||||
|
|
||||||
bundle config --local with mysql development test
|
bundle config --local with development test mysql sqlite
|
||||||
|
|
||||||
|
#### Using gems from local git repos
|
||||||
|
|
||||||
|
When working on gem PRs, it may be useful to work with proposed changes locally
|
||||||
|
until PRs get accepted upstream. To add gem hosted in local git repository:
|
||||||
|
|
||||||
|
bundle config set local.capybara /var/www/tmp/capybara
|
||||||
|
|
||||||
|
Add gem to `Gemfile`:
|
||||||
|
|
||||||
|
gem "capybara", git: "https://github.com/teamcapybara/capybara", branch: "branch-name"
|
||||||
|
|
||||||
|
and install:
|
||||||
|
|
||||||
|
bundle install
|
||||||
|
bundle show capybara
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
|
||||||
@@ -138,20 +147,29 @@ assets.
|
|||||||
|
|
||||||
### Database
|
### Database
|
||||||
|
|
||||||
Grant database user privileges for development and test environments,
|
Grant database user privileges for development and test environments. Example
|
||||||
possibly with different Ruby versions:
|
below shows how to grant privileges to all databases which names start with
|
||||||
|
`fixinme-` on MySQL:
|
||||||
|
|
||||||
> mysql -p
|
> mysql -p
|
||||||
mysql> create user `fixinme-dev`@localhost identified by '<some password>';
|
mysql> create user `fixinme-dev`@localhost identified by '<some password>';
|
||||||
mysql> grant all privileges on `fixinme-%`.* to `fixinme-dev`@localhost;
|
mysql> grant all privileges on `fixinme-%`.* to `fixinme-dev`@localhost;
|
||||||
mysql> flush privileges;
|
mysql> flush privileges;
|
||||||
|
|
||||||
|
Dumping development data before database reset:
|
||||||
|
|
||||||
|
mysqldump -h <address> -u <user> -p --no-create-info --no-tablespaces --complete-insert <database> > tmp/data.sql
|
||||||
|
|
||||||
### Development environment
|
### Development environment
|
||||||
|
|
||||||
Starting application server in development environment:
|
Starting application server in development environment:
|
||||||
|
|
||||||
bundle exec rails s -e development
|
bundle exec rails s -e development
|
||||||
|
|
||||||
|
Accessing database console when more than one test db is present:
|
||||||
|
|
||||||
|
bundle exec rails dbconsole -e test --db sqlite3
|
||||||
|
|
||||||
For running rake tasks, prepend command with environment:
|
For running rake tasks, prepend command with environment:
|
||||||
|
|
||||||
RAILS_ENV=development bundle exec rails ...
|
RAILS_ENV=development bundle exec rails ...
|
||||||
@@ -164,14 +182,22 @@ Tests need to be run from within toplevel application directory:
|
|||||||
|
|
||||||
bundle exec rails test:system
|
bundle exec rails test:system
|
||||||
|
|
||||||
* system test(s) with seed/test name specified:
|
* system test(s) with seed or test name specified:
|
||||||
|
|
||||||
bundle exec rails test:system --seed 64690 --name test_add_unit
|
bundle exec rails test:system --include test_add_unit --seed 64690
|
||||||
|
|
||||||
* all tests from one file, with optional seed:
|
* all tests from one file, optionally with seed:
|
||||||
|
|
||||||
bundle exec rails test test/system/users_test.rb --seed 1234
|
bundle exec rails test test/system/users_test.rb --seed 1234
|
||||||
|
|
||||||
|
* system tests for selected database configuration (if multiple present):
|
||||||
|
|
||||||
|
bundle exec rails test:system --include /^test_sqlite3_/
|
||||||
|
|
||||||
|
* single system test for all database configurations (if multiple present):
|
||||||
|
|
||||||
|
bundle exec rails test:system --include /^test_\\w+_add_unit$/
|
||||||
|
|
||||||
### Icons
|
### Icons
|
||||||
|
|
||||||
Pictogrammers Material Design Icons: https://pictogrammers.com/library/mdi/
|
Pictogrammers Material Design Icons: https://pictogrammers.com/library/mdi/
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 432 B After Width: | Height: | Size: 432 B |
|
Before Width: | Height: | Size: 432 B After Width: | Height: | Size: 432 B |
|
Before Width: | Height: | Size: 524 B After Width: | Height: | Size: 524 B |
|
Before Width: | Height: | Size: 618 B After Width: | Height: | Size: 618 B |
|
Before Width: | Height: | Size: 152 B After Width: | Height: | Size: 152 B |
|
Before Width: | Height: | Size: 151 B After Width: | Height: | Size: 151 B |
|
Before Width: | Height: | Size: 236 B After Width: | Height: | Size: 236 B |
|
Before Width: | Height: | Size: 603 B After Width: | Height: | Size: 603 B |
|
Before Width: | Height: | Size: 278 B After Width: | Height: | Size: 278 B |
|
Before Width: | Height: | Size: 231 B After Width: | Height: | Size: 231 B |
|
Before Width: | Height: | Size: 148 B After Width: | Height: | Size: 148 B |
|
Before Width: | Height: | Size: 382 B After Width: | Height: | Size: 382 B |
|
Before Width: | Height: | Size: 330 B After Width: | Height: | Size: 330 B |
|
Before Width: | Height: | Size: 350 B After Width: | Height: | Size: 350 B |
|
Before Width: | Height: | Size: 189 B After Width: | Height: | Size: 189 B |
|
Before Width: | Height: | Size: 192 B After Width: | Height: | Size: 192 B |
|
Before Width: | Height: | Size: 174 B After Width: | Height: | Size: 174 B |
|
Before Width: | Height: | Size: 597 B After Width: | Height: | Size: 597 B |
|
Before Width: | Height: | Size: 216 B After Width: | Height: | Size: 216 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 771 B After Width: | Height: | Size: 771 B |
|
Before Width: | Height: | Size: 671 B After Width: | Height: | Size: 671 B |
|
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 220 B |
|
Before Width: | Height: | Size: 218 B After Width: | Height: | Size: 218 B |
|
Before Width: | Height: | Size: 316 B After Width: | Height: | Size: 316 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M4,4H8V20H4V4M10,4H14V20H10V4M16,4H21V20H16V4Z"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 135 B |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M3,5H21V7H3V5M3,11H21V13H3V11M3,17H21V19H3V17Z"/></svg>
|
|
||||||
|
Before Width: | Height: | Size: 135 B |
|
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B |
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 197 B |
|
Before Width: | Height: | Size: 165 B After Width: | Height: | Size: 165 B |
|
Before Width: | Height: | Size: 242 B After Width: | Height: | Size: 242 B |
|
Before Width: | Height: | Size: 423 B After Width: | Height: | Size: 423 B |
|
Before Width: | Height: | Size: 173 B After Width: | Height: | Size: 173 B |
|
Before Width: | Height: | Size: 475 B After Width: | Height: | Size: 475 B |
@@ -24,6 +24,7 @@
|
|||||||
*
|
*
|
||||||
* NOTE: style in a modular way, similar to how CSS @scope would be used,
|
* NOTE: style in a modular way, similar to how CSS @scope would be used,
|
||||||
* to make transition easier once @scope is widely available. */
|
* to make transition easier once @scope is widely available. */
|
||||||
|
/* TODO: change :root -> <html> ? */
|
||||||
:root {
|
:root {
|
||||||
--color-focus-gray: #f3f3f3;
|
--color-focus-gray: #f3f3f3;
|
||||||
--color-border-gray: #dddddd;
|
--color-border-gray: #dddddd;
|
||||||
@@ -36,7 +37,6 @@
|
|||||||
--color-blue: #009ade;
|
--color-blue: #009ade;
|
||||||
--color-dark-red: #b21237;
|
--color-dark-red: #b21237;
|
||||||
--color-red: #ff1f5b;
|
--color-red: #ff1f5b;
|
||||||
--color-purple: #8b2be2;
|
|
||||||
|
|
||||||
--depth: 0;
|
--depth: 0;
|
||||||
|
|
||||||
@@ -58,6 +58,11 @@
|
|||||||
}
|
}
|
||||||
/* NOTE: move to higher priority layer instead of using !important?; add CSS
|
/* NOTE: move to higher priority layer instead of using !important?; add CSS
|
||||||
* @layer requirements in README */
|
* @layer requirements in README */
|
||||||
|
/* Disable elements with:
|
||||||
|
* `[aria-disabled=true]` - non-form elements (e.g. links),
|
||||||
|
* `[disabled]` - form controls, that may be enabled conditionally,
|
||||||
|
* `[readonly]` - form controls, that stay disabled for form lifetime. */
|
||||||
|
[aria-disabled=true],
|
||||||
[disabled] {
|
[disabled] {
|
||||||
border-color: var(--color-border-gray) !important;
|
border-color: var(--color-border-gray) !important;
|
||||||
color: var(--color-border-gray) !important;
|
color: var(--color-border-gray) !important;
|
||||||
@@ -111,11 +116,6 @@ svg {
|
|||||||
svg:last-child {
|
svg:last-child {
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
}
|
}
|
||||||
.chart-panel svg {
|
|
||||||
height: auto;
|
|
||||||
margin: 0;
|
|
||||||
width: auto;
|
|
||||||
}
|
|
||||||
textarea {
|
textarea {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
@@ -172,6 +172,7 @@ table svg:not(:only-child) {
|
|||||||
width: 1.25em;
|
width: 1.25em;
|
||||||
}
|
}
|
||||||
input:focus-visible,
|
input:focus-visible,
|
||||||
|
/* TODO: select:focus-visible is redundant with -within? */
|
||||||
select:focus-visible,
|
select:focus-visible,
|
||||||
select:focus-within,
|
select:focus-within,
|
||||||
/* TODO: how to achieve `summary:focus-within` for `::details-content`? */
|
/* TODO: how to achieve `summary:focus-within` for `::details-content`? */
|
||||||
@@ -205,6 +206,10 @@ textarea:invalid {
|
|||||||
border-color: var(--color-red);
|
border-color: var(--color-red);
|
||||||
outline-color: var(--color-red);
|
outline-color: var(--color-red);
|
||||||
}
|
}
|
||||||
|
pre {
|
||||||
|
display: inline;
|
||||||
|
font: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
/* `.button`: button-styled <a>, <button>, <input type=submit>.
|
/* `.button`: button-styled <a>, <button>, <input type=submit>.
|
||||||
* `.link`: any other <a>.
|
* `.link`: any other <a>.
|
||||||
@@ -237,16 +242,17 @@ textarea:invalid {
|
|||||||
text-decoration: underline 1px var(--color-border-gray);
|
text-decoration: underline 1px var(--color-border-gray);
|
||||||
text-underline-offset: 0.25em;
|
text-underline-offset: 0.25em;
|
||||||
}
|
}
|
||||||
button.link {
|
|
||||||
border: none;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
[name=cancel],
|
|
||||||
.auxiliary {
|
.auxiliary {
|
||||||
border-color: var(--color-border-gray);
|
border-color: var(--color-nav-gray);
|
||||||
color: var(--color-nav-gray);
|
color: var(--color-nav-gray);
|
||||||
fill: var(--color-nav-gray);
|
fill: var(--color-nav-gray);
|
||||||
}
|
}
|
||||||
|
table .button {
|
||||||
|
border-color: var(--color-border-gray);
|
||||||
|
font-weight: normal;
|
||||||
|
height: 100%;
|
||||||
|
padding: 0.4em;
|
||||||
|
}
|
||||||
.button:focus-visible,
|
.button:focus-visible,
|
||||||
.tab:focus-visible,
|
.tab:focus-visible,
|
||||||
.tab:hover {
|
.tab:hover {
|
||||||
@@ -262,13 +268,6 @@ button.link {
|
|||||||
background-color: var(--color-red);
|
background-color: var(--color-red);
|
||||||
border-color: var(--color-red);
|
border-color: var(--color-red);
|
||||||
}
|
}
|
||||||
tr:has(select[data-changed]) button[name="button"],
|
|
||||||
.set-default-unit:not([disabled]) {
|
|
||||||
background-color: var(--color-purple);
|
|
||||||
border-color: var(--color-purple);
|
|
||||||
color: white;
|
|
||||||
fill: white;
|
|
||||||
}
|
|
||||||
.link:focus-visible {
|
.link:focus-visible {
|
||||||
text-decoration-color: var(--color-gray);
|
text-decoration-color: var(--color-gray);
|
||||||
}
|
}
|
||||||
@@ -276,13 +275,6 @@ tr:has(select[data-changed]) button[name="button"],
|
|||||||
color: var(--color-blue);
|
color: var(--color-blue);
|
||||||
text-decoration-color: var(--color-blue);
|
text-decoration-color: var(--color-blue);
|
||||||
}
|
}
|
||||||
table .button {
|
|
||||||
border-color: var(--color-border-gray);
|
|
||||||
color: var(--color-table-gray);
|
|
||||||
font-weight: normal;
|
|
||||||
height: 100%;
|
|
||||||
padding: 0.4em;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* NOTE: collapse gaps around empty rows (`topside`) once possible with
|
/* NOTE: collapse gaps around empty rows (`topside`) once possible with
|
||||||
@@ -311,6 +303,7 @@ header {
|
|||||||
grid-area: header;
|
grid-area: header;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* TODO: change .navigation -> <nav> ? */
|
||||||
.navigation {
|
.navigation {
|
||||||
display: flex;
|
display: flex;
|
||||||
grid-area: nav;
|
grid-area: nav;
|
||||||
@@ -377,21 +370,21 @@ header {
|
|||||||
line-height: 2.2em;
|
line-height: 2.2em;
|
||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
}
|
}
|
||||||
.flash:before {
|
.flash::before {
|
||||||
filter: invert(100%);
|
filter: invert(1);
|
||||||
height: 1.4em;
|
height: 1.4em;
|
||||||
margin: 0 0.5em;
|
margin: 0 0.5em;
|
||||||
width: 1.4em;
|
width: 1.4em;
|
||||||
}
|
}
|
||||||
.flash.alert:before {
|
.flash.alert::before {
|
||||||
content: url('pictograms/alert-outline.svg');
|
content: url('alert-outline.svg');
|
||||||
}
|
}
|
||||||
.flash.alert {
|
.flash.alert {
|
||||||
border-color: var(--color-red);
|
border-color: var(--color-red);
|
||||||
background-color: var(--color-red);
|
background-color: var(--color-red);
|
||||||
}
|
}
|
||||||
.flash.notice:before {
|
.flash.notice::before {
|
||||||
content: url('pictograms/check-circle-outline.svg');
|
content: url('check-circle-outline.svg');
|
||||||
}
|
}
|
||||||
.flash.notice {
|
.flash.notice {
|
||||||
border-color: var(--color-blue);
|
border-color: var(--color-blue);
|
||||||
@@ -454,15 +447,18 @@ header {
|
|||||||
|
|
||||||
.tabular-form table {
|
.tabular-form table {
|
||||||
border: none;
|
border: none;
|
||||||
border-spacing: 0.4em 0;
|
border-spacing: 0;
|
||||||
margin-inline: -0.4em;
|
|
||||||
}
|
}
|
||||||
.tabular-form table td {
|
.tabular-form table td {
|
||||||
border: none;
|
border: none;
|
||||||
|
padding-inline-start: 0.4em;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
.tabular-form table td {
|
.tabular-form table td:first-child {
|
||||||
padding-inline: 0;
|
padding-inline-start: 0;
|
||||||
|
}
|
||||||
|
.tabular-form table td:last-child {
|
||||||
|
padding-inline-end: 0;
|
||||||
}
|
}
|
||||||
.tabular-form table :is(form, input, select, textarea):only-child {
|
.tabular-form table :is(form, input, select, textarea):only-child {
|
||||||
margin-inline-start: 0;
|
margin-inline-start: 0;
|
||||||
@@ -470,20 +466,27 @@ header {
|
|||||||
|
|
||||||
|
|
||||||
.items-table {
|
.items-table {
|
||||||
border-spacing: 0;
|
border: none;
|
||||||
border: 1px solid var(--color-border-gray);
|
|
||||||
border-radius: 0.25em;
|
border-radius: 0.25em;
|
||||||
|
border-spacing: 0;
|
||||||
font-size: 0.85rem;
|
font-size: 0.85rem;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
.items-table thead {
|
.items-table:has(tbody > tr > td) {
|
||||||
font-size: 0.8rem;
|
border: 1px solid var(--color-border-gray);
|
||||||
}
|
}
|
||||||
.items-table thead,
|
.items-table:has(tbody > tr > td) caption {
|
||||||
.items-table tbody tr:hover {
|
display: none;
|
||||||
|
}
|
||||||
|
.items-table tbody:not(:has(tr > td)){
|
||||||
|
visibility: collapse;
|
||||||
|
}
|
||||||
|
.items-table th,
|
||||||
|
.items-table tr:where(:hover) {
|
||||||
background-color: var(--color-focus-gray);
|
background-color: var(--color-focus-gray);
|
||||||
}
|
}
|
||||||
.items-table th {
|
.items-table th {
|
||||||
|
font-size: 0.8rem;
|
||||||
padding: 0.75em 0 0.75em 1em;
|
padding: 0.75em 0 0.75em 1em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
@@ -530,7 +533,7 @@ header {
|
|||||||
cursor: grab;
|
cursor: grab;
|
||||||
}
|
}
|
||||||
.items-table .form td {
|
.items-table .form td {
|
||||||
vertical-align: middle;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
.items-table td:not(:first-child),
|
.items-table td:not(:first-child),
|
||||||
.grayed {
|
.grayed {
|
||||||
@@ -567,6 +570,20 @@ header {
|
|||||||
.hmin50 {
|
.hmin50 {
|
||||||
min-width: 50%;
|
min-width: 50%;
|
||||||
}
|
}
|
||||||
|
.hminnumber {
|
||||||
|
min-width: 5em;
|
||||||
|
}
|
||||||
|
.hmintext {
|
||||||
|
min-width: 6em;
|
||||||
|
}
|
||||||
|
.hstretch {
|
||||||
|
/* `width` conflicts with <input>/<textarea> size defined by [size]/[cols]
|
||||||
|
* attributes. It's best to not use these attributes (e.g. set them to 1) when
|
||||||
|
* setting width through stylesheet. */
|
||||||
|
/* NOTE: `field-sizing` can be considered after upgrade do FF >=152 */
|
||||||
|
width: -moz-available;
|
||||||
|
width: stretch;
|
||||||
|
}
|
||||||
.italic {
|
.italic {
|
||||||
color: var(--color-gray);
|
color: var(--color-gray);
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
@@ -595,7 +612,7 @@ summary::before {
|
|||||||
background-color: currentColor;
|
background-color: currentColor;
|
||||||
content: "";
|
content: "";
|
||||||
height: 1em;
|
height: 1em;
|
||||||
mask-image: url('pictograms/chevron-down.svg');
|
mask-image: url('chevron-down.svg');
|
||||||
mask-size: cover;
|
mask-size: cover;
|
||||||
width: 1em;
|
width: 1em;
|
||||||
}
|
}
|
||||||
@@ -657,45 +674,3 @@ li::marker {
|
|||||||
min-width: 66%;
|
min-width: 66%;
|
||||||
width: max-content;
|
width: max-content;
|
||||||
}
|
}
|
||||||
.measurements-section {
|
|
||||||
overflow-x: auto;
|
|
||||||
}
|
|
||||||
body[data-measurements-view=wide] .measurements-compact,
|
|
||||||
body[data-measurements-view=compact] .measurements-wide {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
body[data-measurements-view=compact] .view-toggle[data-view=compact],
|
|
||||||
body[data-measurements-view=wide] .view-toggle[data-view=wide] {
|
|
||||||
background-color: var(--color-blue);
|
|
||||||
border-color: var(--color-blue);
|
|
||||||
color: white;
|
|
||||||
fill: white;
|
|
||||||
}
|
|
||||||
.chart-panel {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
#measurements tr.grouped td {
|
|
||||||
border-top: none;
|
|
||||||
}
|
|
||||||
#measurements tr.grouped .taken-at,
|
|
||||||
#measurements tr.grouped .created-at {
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
|
||||||
.measurements-wide td {
|
|
||||||
vertical-align: middle;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
.wide-cell {
|
|
||||||
align-items: center;
|
|
||||||
display: inline-flex;
|
|
||||||
gap: 0.25em;
|
|
||||||
}
|
|
||||||
.wide-cell .button {
|
|
||||||
border: none;
|
|
||||||
font-size: inherit;
|
|
||||||
height: auto;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.wide-cell button.link::after {
|
|
||||||
content: none;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -55,9 +55,9 @@ class ApplicationController < ActionController::Base
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def render_no_content(record)
|
def render_errors(record)
|
||||||
helpers.render_errors(record)
|
target = record.new_record? ? [:new, record.parent || record.class] : [:edit, record]
|
||||||
render html: nil, layout: true
|
render 'errors', assigns: {record: record, target: target}
|
||||||
end
|
end
|
||||||
|
|
||||||
def rescue_turbo(exception)
|
def rescue_turbo(exception)
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
class ChartsController < ApplicationController
|
|
||||||
def index
|
|
||||||
readouts = current_user.readouts.includes(:quantity, :unit).order(:taken_at, :id)
|
|
||||||
@readouts_json = readouts.map { |r|
|
|
||||||
{ takenAt: r.taken_at&.iso8601,
|
|
||||||
quantityId: r.quantity_id,
|
|
||||||
quantityName: r.quantity.name,
|
|
||||||
value: r.value.to_f,
|
|
||||||
unit: r.unit.symbol }
|
|
||||||
}.to_json
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -17,7 +17,7 @@ class Default::UnitsController < ApplicationController
|
|||||||
|
|
||||||
def import
|
def import
|
||||||
@unit.port!(current_user)
|
@unit.port!(current_user)
|
||||||
flash.now[:notice] = t('.success', unit: @unit)
|
flash.now.notice = t('.success', unit: @unit)
|
||||||
ensure
|
ensure
|
||||||
run_and_render :index
|
run_and_render :index
|
||||||
end
|
end
|
||||||
@@ -30,14 +30,14 @@ class Default::UnitsController < ApplicationController
|
|||||||
|
|
||||||
def export
|
def export
|
||||||
@unit.port!(nil)
|
@unit.port!(nil)
|
||||||
flash.now[:notice] = t('.success', unit: @unit)
|
flash.now.notice = t('.success', unit: @unit)
|
||||||
ensure
|
ensure
|
||||||
run_and_render :index
|
run_and_render :index
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@unit.destroy!
|
@unit.destroy!
|
||||||
flash.now[:notice] = t('.success', unit: @unit)
|
flash.now.notice = t('.success', unit: @unit)
|
||||||
ensure
|
ensure
|
||||||
run_and_render :index
|
run_and_render :index
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,12 +1,7 @@
|
|||||||
class MeasurementsController < ApplicationController
|
class MeasurementsController < ApplicationController
|
||||||
before_action :find_readout, only: [:destroy, :edit, :update]
|
|
||||||
|
|
||||||
before_action except: :index do
|
|
||||||
raise AccessForbidden unless current_user.at_least(:active)
|
|
||||||
end
|
|
||||||
|
|
||||||
def index
|
def index
|
||||||
load_measurements
|
@measurements = []
|
||||||
|
#@measurements = current_user.units.ordered.includes(:base, :subunits)
|
||||||
end
|
end
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@@ -14,49 +9,8 @@ class MeasurementsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
taken_at = params.permit(:taken_at)[:taken_at]
|
|
||||||
readout_params = params.permit(readouts: Readout::ATTRIBUTES).fetch(:readouts, [])
|
|
||||||
@readouts = readout_params.map { |rp| current_user.readouts.build(rp.merge(taken_at: taken_at)) }
|
|
||||||
|
|
||||||
if @readouts.present? && @readouts.all?(&:valid?)
|
|
||||||
ActiveRecord::Base.transaction { @readouts.each(&:save!) }
|
|
||||||
load_measurements
|
|
||||||
flash.now[:notice] = t('.success', count: @readouts.size)
|
|
||||||
else
|
|
||||||
errors = @readouts.flat_map { |r| r.errors.full_messages }
|
|
||||||
flash.now[:alert] = errors.present? ? errors.first : t('.no_readouts')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def edit
|
|
||||||
@user_units = current_user.units.ordered
|
|
||||||
end
|
|
||||||
|
|
||||||
def update
|
|
||||||
if @readout.update(params.require(:readout).permit(:value, :unit_id, :taken_at))
|
|
||||||
load_measurements
|
|
||||||
flash.now[:notice] = t('.success')
|
|
||||||
else
|
|
||||||
@user_units = current_user.units.ordered
|
|
||||||
render :edit
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@readout.destroy!
|
|
||||||
load_measurements
|
|
||||||
flash.now[:notice] = t('.success')
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def find_readout
|
|
||||||
@readout = current_user.readouts.find(params[:id])
|
|
||||||
end
|
|
||||||
|
|
||||||
def load_measurements
|
|
||||||
@measurements = current_user.readouts.includes(:quantity, :unit).order(taken_at: :desc, id: :desc)
|
|
||||||
@wide_groups = @measurements.group_by(&:taken_at)
|
|
||||||
@wide_quantities = @measurements.map(&:quantity).uniq.sort_by(&:name)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -8,10 +8,6 @@ class QuantitiesController < ApplicationController
|
|||||||
raise AccessForbidden unless current_user.at_least(:active)
|
raise AccessForbidden unless current_user.at_least(:active)
|
||||||
end
|
end
|
||||||
|
|
||||||
before_action only: [:new, :edit, :create, :update] do
|
|
||||||
@user_units = current_user.units.ordered
|
|
||||||
end
|
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@quantities = current_user.quantities.ordered.includes(:parent, :subquantities)
|
@quantities = current_user.quantities.ordered.includes(:parent, :subquantities)
|
||||||
end
|
end
|
||||||
@@ -23,9 +19,9 @@ class QuantitiesController < ApplicationController
|
|||||||
def create
|
def create
|
||||||
@quantity = current_user.quantities.new(quantity_params)
|
@quantity = current_user.quantities.new(quantity_params)
|
||||||
if @quantity.save
|
if @quantity.save
|
||||||
@before = @quantity.successive
|
@before = @quantity.succeeding
|
||||||
@ancestors = @quantity.ancestors
|
@ancestors = @quantity.ancestors
|
||||||
flash.now[:notice] = t('.success', quantity: @quantity)
|
flash.now.notice = t('.success', quantity: @quantity)
|
||||||
else
|
else
|
||||||
render :new
|
render :new
|
||||||
end
|
end
|
||||||
@@ -37,7 +33,7 @@ class QuantitiesController < ApplicationController
|
|||||||
def update
|
def update
|
||||||
if @quantity.update(quantity_params.except(:parent_id))
|
if @quantity.update(quantity_params.except(:parent_id))
|
||||||
@ancestors = @quantity.ancestors
|
@ancestors = @quantity.ancestors
|
||||||
flash.now[:notice] = t('.success', quantity: @quantity)
|
flash.now.notice = t('.success', quantity: @quantity)
|
||||||
else
|
else
|
||||||
render :edit
|
render :edit
|
||||||
end
|
end
|
||||||
@@ -47,18 +43,22 @@ class QuantitiesController < ApplicationController
|
|||||||
permitted = params.require(:quantity).permit(:parent_id)
|
permitted = params.require(:quantity).permit(:parent_id)
|
||||||
@previous_ancestors = @quantity.ancestors
|
@previous_ancestors = @quantity.ancestors
|
||||||
|
|
||||||
# Until UI blocks all disallowed reparents, render error messages if present
|
if @quantity.update(permitted)
|
||||||
render_no_content(@quantity) unless @quantity.update(permitted)
|
|
||||||
|
|
||||||
@ancestors = @quantity.ancestors
|
@ancestors = @quantity.ancestors
|
||||||
@self_and_progenies = @quantity.with_progenies
|
# TODO: simplify into 1 query (see #succeeding comment)
|
||||||
@before = @self_and_progenies.last.successive
|
@quantities = @quantity.with_progenies
|
||||||
|
@before = @quantities.last.succeeding
|
||||||
|
else
|
||||||
|
# Until UI blocks all disallowed reparents, render error messages if present.
|
||||||
|
flash.now.alert = @quantity.errors.full_messages
|
||||||
|
render :nothing
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@quantity.destroy!
|
@quantity.destroy!
|
||||||
@ancestors = @quantity.ancestors
|
@ancestors = @quantity.ancestors
|
||||||
flash.now[:notice] = t('.success', quantity: @quantity)
|
flash.now.notice = t('.success', quantity: @quantity)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ class ReadoutsController < ApplicationController
|
|||||||
def new
|
def new
|
||||||
@quantities -= @prev_quantities
|
@quantities -= @prev_quantities
|
||||||
# TODO: raise ParameterInvalid if new_quantities.empty?
|
# TODO: raise ParameterInvalid if new_quantities.empty?
|
||||||
@readouts = current_user.readouts.build(@quantities.map { |q| {quantity: q} })
|
@readouts = @quantities.map { |q| q.readouts.build }
|
||||||
|
|
||||||
@user_units = current_user.units.ordered
|
@user_units = current_user.units.ordered
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
class UnitsController < ApplicationController
|
class UnitsController < ApplicationController
|
||||||
before_action only: :new do
|
before_action ->{ @unit = current_user.units.find_by!(id: params[:id]) },
|
||||||
find_unit if params[:id].present?
|
only: [:new, :edit, :update, :rebase, :destroy],
|
||||||
end
|
unless: ->{ action_name == "new" && params[:id].nil? }
|
||||||
before_action :find_unit, only: [:edit, :update, :rebase, :destroy]
|
|
||||||
|
|
||||||
before_action except: :index do
|
before_action except: [:index] do
|
||||||
raise AccessForbidden unless current_user.at_least(:active)
|
raise AccessForbidden unless current_user.at_least(:active)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -17,12 +16,12 @@ class UnitsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@unit = current_user.units.new(unit_params)
|
@unit = current_user.units.new(params.expect(Unit::ATTRIBUTES))
|
||||||
if @unit.save
|
if @unit.save
|
||||||
@before = @unit.successive
|
@before = @unit.succeeding
|
||||||
flash.now[:notice] = t('.success', unit: @unit)
|
flash.now.notice = t('.success', unit: @unit)
|
||||||
else
|
else
|
||||||
render :new
|
render_errors @unit
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -30,40 +29,32 @@ class UnitsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
if @unit.update(unit_params.except(:base_id))
|
if @unit.update(params.except(:base_id).expect(Unit::ATTRIBUTES))
|
||||||
flash.now[:notice] = t('.success', unit: @unit)
|
flash.now.notice = t('.success', unit: @unit)
|
||||||
else
|
else
|
||||||
render :edit
|
render_errors @unit
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# TODO: Avoid double table width change by first un-hiding table header,
|
# TODO: Avoid double table width change by first un-hiding table header,
|
||||||
# then displaying index, e.g. by re-displaying header in index
|
# then displaying index, e.g. by re-displaying header in index
|
||||||
def rebase
|
def rebase
|
||||||
permitted = params.require(:unit).permit(:base_id)
|
unit_params = params.expect(unit: :base_id)
|
||||||
permitted.merge!(multiplier: 1) if permitted[:base_id].blank? && @unit.multiplier != 1
|
unit_params.merge!(multiplier: 1.0) if unit_params[:base_id].blank?
|
||||||
|
|
||||||
@previous_base = @unit.base
|
@previous_base = @unit.base
|
||||||
@unit.update!(permitted)
|
@unit.update!(unit_params)
|
||||||
|
|
||||||
@before = @unit.successive
|
@before = @unit.succeeding
|
||||||
if @unit.multiplier_previously_changed?
|
if @unit.multiplier_previously_changed?
|
||||||
flash.now[:notice] = t(".multiplier_reset", unit: @unit)
|
flash.now.notice = t(".multiplier_reset", unit: @unit)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
@unit.destroy!
|
@unit.destroy!
|
||||||
flash.now[:notice] = t('.success', unit: @unit)
|
flash.now.notice = t('.success', unit: @unit)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def unit_params
|
|
||||||
params.require(:unit).permit(Unit::ATTRIBUTES)
|
|
||||||
end
|
|
||||||
|
|
||||||
def find_unit
|
|
||||||
@unit = current_user.units.find_by!(id: params[:id])
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ module ApplicationHelper
|
|||||||
# controller.action.* => helpers.label.model.* => activerecord.attributes.model.*
|
# controller.action.* => helpers.label.model.* => activerecord.attributes.model.*
|
||||||
# First 2 levels are translated recursively.
|
# First 2 levels are translated recursively.
|
||||||
label(method, class: classes) do |builder|
|
label(method, class: classes) do |builder|
|
||||||
translation = I18n.config.with(**handler) { deep_translate(method, **options) }
|
translation = I18n.with(**handler) { deep_translate(method, **options) }
|
||||||
translation.presence || "#{builder.translation}:"
|
translation.presence || "#{builder.translation}:"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -86,34 +86,30 @@ module ApplicationHelper
|
|||||||
def initialize(...)
|
def initialize(...)
|
||||||
super(...)
|
super(...)
|
||||||
@default_options.merge!(@options.slice(:form))
|
@default_options.merge!(@options.slice(:form))
|
||||||
@default_html_options.merge!(@options.slice(:form))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
[:text_field, :password_field, :text_area].each do |selector|
|
[:text_field, :password_field, :text_area].each do |selector|
|
||||||
class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
|
class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
|
||||||
def #{selector}(method, options = {})
|
def #{selector}(method, options = {})
|
||||||
options[:maxlength] ||= object.class.type_for_attribute(method).limit
|
options[:maxlength] ||= object.type_for_attribute(method).limit
|
||||||
if object.errors.include?(method)
|
# If [cols]/[size] is not set, minimum field width is controlled with
|
||||||
options[:pattern] = except_pattern(object.public_send(method), options[:pattern])
|
# stylesheet. To prevent browser estimating missing [cols]/[size]
|
||||||
end
|
# based on e.g. [maxlength], set it to 1.
|
||||||
|
options[:#{selector == :text_area ? :cols : :size}] ||= 1
|
||||||
super
|
super
|
||||||
end
|
end
|
||||||
RUBY_EVAL
|
RUBY_EVAL
|
||||||
end
|
end
|
||||||
|
|
||||||
def number_field(method, options = {})
|
def number_field(method, options = {})
|
||||||
attr_type = object.type_for_attribute(method)
|
case object.type_for_attribute(method).type
|
||||||
case attr_type.type
|
when :float, :double
|
||||||
when :decimal
|
options[:min] ||= Float::MIN_15.to_scientific
|
||||||
options[:value] = object.public_send(method)&.to_scientific
|
options[:max] ||= Float::MAX_15.to_scientific
|
||||||
options[:step] ||= BigDecimal(10).power(-attr_type.scale)
|
options[:oninput] = 'numberValidate(event)'
|
||||||
options[:max] ||= BigDecimal(10).power(attr_type.precision - attr_type.scale) -
|
options[:size] ||= options[:class]&.split&.include?('hstretch') ? 1 : 6
|
||||||
options[:step]
|
options[:step] ||= :any
|
||||||
options[:min] = options[:min] == :step ? options[:step] : options[:min]
|
options[:value] = object.public_send("#{method}_before_type_cast")
|
||||||
options[:min] ||= -options[:max]
|
|
||||||
options[:size] ||= attr_type.precision / 2
|
|
||||||
when :float
|
|
||||||
options[:size] ||= 6
|
|
||||||
end
|
end
|
||||||
super
|
super
|
||||||
end
|
end
|
||||||
@@ -132,11 +128,7 @@ module ApplicationHelper
|
|||||||
|
|
||||||
def submit_default_value
|
def submit_default_value
|
||||||
svg_name = object ? (object.persisted? ? 'update' : 'plus-circle-outline') : ''
|
svg_name = object ? (object.persisted? ? 'update' : 'plus-circle-outline') : ''
|
||||||
@template.svg_tag("pictograms/#{svg_name}", super)
|
@template.svg_tag(svg_name, super)
|
||||||
end
|
|
||||||
|
|
||||||
def except_pattern(value, pattern = nil)
|
|
||||||
"(?!^#{Regexp.escape(value)}$)" + (pattern || ".*")
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -147,8 +139,6 @@ module ApplicationHelper
|
|||||||
record_object, options = nil, record_object if record_object.is_a?(Hash)
|
record_object, options = nil, record_object if record_object.is_a?(Hash)
|
||||||
extra_options = {builder: TabularFormBuilder, skip_default_ids: true}
|
extra_options = {builder: TabularFormBuilder, skip_default_ids: true}
|
||||||
options = merge_attributes(options, extra_options)
|
options = merge_attributes(options, extra_options)
|
||||||
# TODO: set error message with setCustomValidity instead of rendering to flash?
|
|
||||||
render_errors(record_object || record_name)
|
|
||||||
fields_for(record_name, record_object, **options, &block)
|
fields_for(record_name, record_object, **options, &block)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -161,7 +151,7 @@ module ApplicationHelper
|
|||||||
def svg_tag(source, label = nil, options = {})
|
def svg_tag(source, label = nil, options = {})
|
||||||
label, options = nil, label if label.is_a? Hash
|
label, options = nil, label if label.is_a? Hash
|
||||||
svg_tag = tag.svg(**options) do
|
svg_tag = tag.svg(**options) do
|
||||||
tag.use(href: "#{image_path(source + ".svg")}#icon")
|
tag.use(href: image_path("#{source}.svg") + '#icon')
|
||||||
end
|
end
|
||||||
label.blank? ? svg_tag : svg_tag + tag.span(label)
|
label.blank? ? svg_tag : svg_tag + tag.span(label)
|
||||||
end
|
end
|
||||||
@@ -171,14 +161,13 @@ module ApplicationHelper
|
|||||||
['measurements', 'scale-bathroom', :restricted],
|
['measurements', 'scale-bathroom', :restricted],
|
||||||
['quantities', 'axis-arrow', :restricted, 'right'],
|
['quantities', 'axis-arrow', :restricted, 'right'],
|
||||||
['units', 'weight-gram', :restricted],
|
['units', 'weight-gram', :restricted],
|
||||||
['charts', 'chart-line', :restricted],
|
|
||||||
# TODO: display users tab only if >1 user present; sole_user?/sole_admin?
|
# TODO: display users tab only if >1 user present; sole_user?/sole_admin?
|
||||||
['users', 'account-multiple-outline', :admin],
|
['users', 'account-multiple-outline', :admin],
|
||||||
]
|
]
|
||||||
|
|
||||||
menu_tabs.map do |name, image, status, css_class|
|
menu_tabs.map do |name, image, status, css_class|
|
||||||
if current_user.at_least(status)
|
if current_user.at_least(status)
|
||||||
link_to svg_tag("pictograms/#{image}", t("#{name}.navigation")),
|
link_to svg_tag(image, t("#{name}.navigation")),
|
||||||
{controller: "/#{name}", action: "index"},
|
{controller: "/#{name}", action: "index"},
|
||||||
class: class_names('tab', css_class, active: name == current_tab)
|
class: class_names('tab', css_class, active: name == current_tab)
|
||||||
end
|
end
|
||||||
@@ -210,28 +199,19 @@ module ApplicationHelper
|
|||||||
|
|
||||||
def image_link_to_unless_current(name, image = nil, options = nil, html_options = {})
|
def image_link_to_unless_current(name, image = nil, options = nil, html_options = {})
|
||||||
name, html_options = link_or_button_options(:link, name, image, html_options)
|
name, html_options = link_or_button_options(:link, name, image, html_options)
|
||||||
# NOTE: Starting from Rails 8.1.0, below condition can be replaced with:
|
if current_page?(options, method: [:get, :post])
|
||||||
# current_page?(options, method: [:get, :post])
|
|
||||||
if request.path == url_for(options)
|
|
||||||
html_options = html_options.deep_merge DISABLED_ATTRIBUTES
|
html_options = html_options.deep_merge DISABLED_ATTRIBUTES
|
||||||
end
|
end
|
||||||
link_to name, options, html_options
|
link_to name, options, html_options
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_errors(records)
|
def render_flash
|
||||||
# Conversion of flash to Array only required because of Devise
|
|
||||||
# TODO: override Devise message setting to Array()?
|
|
||||||
flash[:alert] = Array(flash[:alert])
|
|
||||||
Array(records).each { |record| flash[:alert] += record.errors.full_messages }
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_flash_messages
|
|
||||||
flash.map do |entry, messages|
|
flash.map do |entry, messages|
|
||||||
# Conversion of flash to Array only required because of Devise
|
# Conversion of flash to Array only required because of Devise.
|
||||||
Array(messages).map do |message|
|
Array(messages).map do |message|
|
||||||
tag.div class: "flash #{entry}" do
|
tag.div class: "flash #{entry}" do
|
||||||
tag.span(sanitize(message)) +
|
tag.span(sanitize(message)) +
|
||||||
svg_tag('pictograms/close-outline', {onclick: "this.parentElement.remove()"})
|
svg_tag('close-outline', {onclick: "this.parentElement.remove()"})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end.join.html_safe
|
end.join.html_safe
|
||||||
@@ -263,7 +243,7 @@ module ApplicationHelper
|
|||||||
link_is_local = html_options[:onclick] || html_options.dig(:data, :turbo_stream)
|
link_is_local = html_options[:onclick] || html_options.dig(:data, :turbo_stream)
|
||||||
name = name.to_s
|
name = name.to_s
|
||||||
name += '...' if type == :link && !link_is_local
|
name += '...' if type == :link && !link_is_local
|
||||||
name = svg_tag("pictograms/#{image}", name) if image
|
name = svg_tag(image, name) if image
|
||||||
|
|
||||||
[name, html_options]
|
[name, html_options]
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,107 +1,19 @@
|
|||||||
// Configure your import map in config/importmap.rb. Read more:
|
// Configure your import map in config/importmap.rb. Read more:
|
||||||
// https://github.com/rails/importmap-rails
|
// https://github.com/rails/importmap-rails
|
||||||
import "@hotwired/turbo-rails"
|
import "@hotwired/turbo-rails"
|
||||||
|
import "./turbo_actions.js"
|
||||||
|
// TODO: access `data-` attributes through
|
||||||
|
// `keyname in`/`dataset.keyname`/`delete dataset.keyname`
|
||||||
|
|
||||||
|
|
||||||
/* Hide page before loaded for testing purposes */
|
// Show page if hidden for testing purposes.
|
||||||
function showPage(event) {
|
function showPage(event) {
|
||||||
document.documentElement.style.visibility="visible"
|
document.documentElement.style.visibility="visible"
|
||||||
}
|
}
|
||||||
document.addEventListener('turbo:load', showPage)
|
document.addEventListener('turbo:load', showPage)
|
||||||
|
|
||||||
function groupMeasurements() {
|
|
||||||
var tbody = document.getElementById('measurements');
|
|
||||||
if (!tbody) return;
|
|
||||||
var prevTakenAt = null;
|
|
||||||
Array.from(tbody.querySelectorAll('tr[data-taken-at]'))
|
|
||||||
.filter(function(row) { return row.style.display !== 'none' })
|
|
||||||
.forEach(function(row) {
|
|
||||||
var takenAt = row.dataset.takenAt;
|
|
||||||
row.classList.toggle('grouped', takenAt !== null && takenAt === prevTakenAt);
|
|
||||||
prevTakenAt = takenAt;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
function buildCharts() {
|
|
||||||
var container = document.getElementById('measurements-charts');
|
|
||||||
var dataEl = document.getElementById('charts-data');
|
|
||||||
if (!container || !dataEl) return;
|
|
||||||
|
|
||||||
var readouts = JSON.parse(dataEl.textContent);
|
|
||||||
container.innerHTML = '';
|
|
||||||
if (readouts.length === 0) return;
|
|
||||||
|
|
||||||
// Data arrives sorted by taken_at from the server; group into per-quantity traces
|
|
||||||
var quantities = new Map();
|
|
||||||
readouts.forEach(function(r) {
|
|
||||||
if (!r.takenAt) return;
|
|
||||||
if (!quantities.has(r.quantityId)) {
|
|
||||||
quantities.set(r.quantityId, { name: r.quantityName, unit: r.unit, x: [], y: [] });
|
|
||||||
}
|
|
||||||
var q = quantities.get(r.quantityId);
|
|
||||||
q.x.push(r.takenAt);
|
|
||||||
q.y.push(r.value);
|
|
||||||
});
|
|
||||||
|
|
||||||
var traces = [];
|
|
||||||
quantities.forEach(function(q) {
|
|
||||||
traces.push({
|
|
||||||
x: q.x,
|
|
||||||
y: q.y,
|
|
||||||
mode: 'lines+markers',
|
|
||||||
type: 'scatter',
|
|
||||||
name: q.name + ' (' + q.unit + ')',
|
|
||||||
marker: { size: 5 }
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
var div = document.createElement('div');
|
|
||||||
div.className = 'chart-panel';
|
|
||||||
container.appendChild(div);
|
|
||||||
|
|
||||||
Plotly.newPlot(div, traces, {
|
|
||||||
xaxis: { type: 'date', tickformat: '%Y-%m-%d %H:%M' },
|
|
||||||
yaxis: {},
|
|
||||||
margin: { t: 20, r: 20, b: 80, l: 60 },
|
|
||||||
paper_bgcolor: 'transparent',
|
|
||||||
plot_bgcolor: 'transparent',
|
|
||||||
font: { family: 'system-ui' },
|
|
||||||
legend: { orientation: 'h', y: -0.25 }
|
|
||||||
}, { responsive: true, displayModeBar: false });
|
|
||||||
}
|
|
||||||
|
|
||||||
function getMeasurementsView() {
|
|
||||||
return localStorage.getItem('measurements-view') || 'compact';
|
|
||||||
}
|
|
||||||
|
|
||||||
function applyMeasurementsView(view) {
|
|
||||||
document.body.dataset.measurementsView = view;
|
|
||||||
}
|
|
||||||
|
|
||||||
function setMeasurementsView(view) {
|
|
||||||
localStorage.setItem('measurements-view', view);
|
|
||||||
applyMeasurementsView(view);
|
|
||||||
}
|
|
||||||
window.setMeasurementsView = setMeasurementsView
|
|
||||||
|
|
||||||
document.addEventListener('turbo:load', function() {
|
|
||||||
if (document.getElementById('charts-data')) {
|
|
||||||
buildCharts();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var tbody = document.getElementById('measurements');
|
|
||||||
if (!tbody) return;
|
|
||||||
groupMeasurements();
|
|
||||||
applyMeasurementsView(getMeasurementsView());
|
|
||||||
new MutationObserver(function() {
|
|
||||||
groupMeasurements();
|
|
||||||
}).observe(tbody, {
|
|
||||||
childList: true, subtree: true,
|
|
||||||
attributes: true, attributeFilter: ['style']
|
|
||||||
});
|
|
||||||
})
|
|
||||||
|
|
||||||
|
// <details> event handlers.
|
||||||
function detailsChange(event) {
|
function detailsChange(event) {
|
||||||
var target = event.currentTarget
|
var target = event.currentTarget
|
||||||
var count = target.querySelectorAll('input:checked:not([disabled])').length
|
var count = target.querySelectorAll('input:checked:not([disabled])').length
|
||||||
@@ -117,7 +29,7 @@ function detailsChange(event) {
|
|||||||
}
|
}
|
||||||
window.detailsChange = detailsChange
|
window.detailsChange = detailsChange
|
||||||
|
|
||||||
/* Close open <details> when focus lost */
|
// Close open <details> when focus lost.
|
||||||
function detailsClose(event) {
|
function detailsClose(event) {
|
||||||
if (!event.relatedTarget ||
|
if (!event.relatedTarget ||
|
||||||
event.relatedTarget.closest("details") != event.currentTarget) {
|
event.relatedTarget.closest("details") != event.currentTarget) {
|
||||||
@@ -131,44 +43,7 @@ window.detailsObserver = new MutationObserver((mutations) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
function readoutUnitChanged(select) {
|
// Validation of multiple-submit forms with different field requirements.
|
||||||
var button = select.closest('tr').querySelector('.set-default-unit');
|
|
||||||
if (select.value && select.value !== select.dataset.defaultUnitId) {
|
|
||||||
button.removeAttribute('disabled');
|
|
||||||
button.removeAttribute('aria-disabled');
|
|
||||||
button.removeAttribute('tabindex');
|
|
||||||
} else {
|
|
||||||
button.setAttribute('disabled', 'disabled');
|
|
||||||
button.setAttribute('aria-disabled', 'true');
|
|
||||||
button.setAttribute('tabindex', '-1');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
window.readoutUnitChanged = readoutUnitChanged
|
|
||||||
|
|
||||||
function setDefaultUnit(button) {
|
|
||||||
var select = button.closest('tr').querySelector('select[data-default-unit-id]');
|
|
||||||
var form = document.createElement('form');
|
|
||||||
form.action = button.dataset.path;
|
|
||||||
form.method = 'post';
|
|
||||||
form.dataset.turboStream = 'true';
|
|
||||||
var methodInput = document.createElement('input');
|
|
||||||
methodInput.type = 'hidden'; methodInput.name = '_method'; methodInput.value = 'patch';
|
|
||||||
var unitInput = document.createElement('input');
|
|
||||||
unitInput.type = 'hidden'; unitInput.name = 'quantity[default_unit_id]'; unitInput.value = select.value;
|
|
||||||
form.appendChild(methodInput);
|
|
||||||
form.appendChild(unitInput);
|
|
||||||
form.addEventListener('turbo:submit-end', function(event) {
|
|
||||||
if (event.detail.success) {
|
|
||||||
select.dataset.defaultUnitId = select.value;
|
|
||||||
readoutUnitChanged(select);
|
|
||||||
}
|
|
||||||
form.remove();
|
|
||||||
});
|
|
||||||
document.body.appendChild(form);
|
|
||||||
form.requestSubmit();
|
|
||||||
}
|
|
||||||
window.setDefaultUnit = setDefaultUnit
|
|
||||||
|
|
||||||
function formValidate(event) {
|
function formValidate(event) {
|
||||||
var id = event.submitter.getAttribute("data-validate")
|
var id = event.submitter.getAttribute("data-validate")
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
@@ -181,74 +56,35 @@ function formValidate(event) {
|
|||||||
}
|
}
|
||||||
window.formValidate = formValidate
|
window.formValidate = formValidate
|
||||||
|
|
||||||
|
// Pattern for number precision verification. Should accept all number formats
|
||||||
|
// accepted by Kernel#Float. Lookahead checks the number of significant digits
|
||||||
|
// in mantissa, following expression makes sure there is only one dot.
|
||||||
|
const numberRegExp = /^\-?(?=(?:\.?0)*(?:\.?\d){1,15}?(?:\.?0)*\.?(?:[eE]|$))(?<mantissa>\d*\.?\d+|\d+\.)(?:[eE]\-?\d{1,3})?$/
|
||||||
|
|
||||||
/* Turbo stream actions */
|
// Validation of input[type=number] value precision.
|
||||||
Turbo.StreamElement.prototype.disableElement = function(element) {
|
function numberValidate(event) {
|
||||||
element.setAttribute("disabled", "disabled")
|
var input = event.target
|
||||||
element.setAttribute("aria-disabled", "true")
|
|
||||||
element.setAttribute("tabindex", "-1")
|
|
||||||
}
|
|
||||||
Turbo.StreamActions.disable = function() {
|
|
||||||
this.targetElements.forEach((e) => { this.disableElement(e) })
|
|
||||||
}
|
|
||||||
|
|
||||||
Turbo.StreamElement.prototype.enableElement = function(element) {
|
input.setCustomValidity("")
|
||||||
element.removeAttribute("disabled")
|
if (!input.validity.valid) return
|
||||||
element.removeAttribute("aria-disabled")
|
|
||||||
// Assume 'tabindex' is not used explicitly, so removing it is safe
|
|
||||||
element.removeAttribute("tabindex")
|
|
||||||
}
|
|
||||||
Turbo.StreamActions.enable = function() {
|
|
||||||
this.targetElements.forEach((e) => { this.enableElement(e) })
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TODO: change to visibility = collapse to avoid width change? */
|
var match = numberRegExp.exec(input.value)
|
||||||
Turbo.StreamActions.hide = function() {
|
if (!match ||
|
||||||
this.targetElements.forEach((e) => { e.style.display = "none" })
|
(parseFloat(input.value) == 0.0 && match.groups['mantissa'].match(/[1-9]/))) {
|
||||||
}
|
// TODO: move message to locales
|
||||||
|
input.setCustomValidity("Please select a value within range of double precision floating-point format.")
|
||||||
Turbo.StreamActions.show = function() {
|
|
||||||
this.targetElements.forEach((e) => { e.style.removeProperty("display") })
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
Turbo.StreamActions.collapse = function() {
|
|
||||||
this.targetElements.forEach((e) => { e.style.visibility = "collapse" })
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
Turbo.StreamActions.close_form = function() {
|
|
||||||
this.targetElements.forEach((e) => {
|
|
||||||
/* Move focus if there's no focus or focus inside form being closed */
|
|
||||||
const focused = document.activeElement
|
|
||||||
if (!focused || (focused == document.body) || e.contains(focused)) {
|
|
||||||
let nextForm = e.parentElement.querySelector(`#${e.id} ~ tr:has([autofocus])`)
|
|
||||||
nextForm ??= e.parentElement.querySelector("tr:has([autofocus])")
|
|
||||||
nextForm?.querySelector("[autofocus]").focus()
|
|
||||||
}
|
}
|
||||||
document.getElementById(e.getAttribute("data-form")).remove()
|
|
||||||
if (e.hasAttribute("data-link")) {
|
|
||||||
this.enableElement(document.getElementById(e.getAttribute("data-link")))
|
|
||||||
}
|
|
||||||
if (e.hasAttribute("data-hidden-row")) {
|
|
||||||
document.getElementById(e.getAttribute("data-hidden-row")).removeAttribute("style")
|
|
||||||
}
|
|
||||||
e.remove()
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
window.numberValidate = numberValidate
|
||||||
|
|
||||||
Turbo.StreamActions.unselect = function() {
|
|
||||||
this.targetElements.forEach((e) => {
|
|
||||||
e.checked = false
|
|
||||||
this.enableElement(e)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// Keyboard event processing handlers.
|
||||||
function formProcessKey(event) {
|
function formProcessKey(event) {
|
||||||
switch (event.key) {
|
switch (event.key) {
|
||||||
case "Escape":
|
case "Escape":
|
||||||
event.currentTarget.querySelector("a[name=cancel]").click()
|
event.currentTarget.querySelector("a[name=cancel]").click()
|
||||||
break
|
break
|
||||||
|
// TODO: allow new line inside <textarea> (submit with ctrl-enter?)
|
||||||
case "Enter":
|
case "Enter":
|
||||||
event.currentTarget.querySelector("button[name=button]").click()
|
event.currentTarget.querySelector("button[name=button]").click()
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
@@ -270,7 +106,7 @@ function detailsProcessKey(event) {
|
|||||||
var button = event.currentTarget.querySelector("button:not([disabled])")
|
var button = event.currentTarget.querySelector("button:not([disabled])")
|
||||||
if (button) {
|
if (button) {
|
||||||
button.click()
|
button.click()
|
||||||
// Autofocus won't be respected unless target is blurred
|
// Autofocus won't be respected unless target is blurred.
|
||||||
event.target.blur()
|
event.target.blur()
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
event.stopPropagation()
|
event.stopPropagation()
|
||||||
@@ -280,7 +116,8 @@ function detailsProcessKey(event) {
|
|||||||
}
|
}
|
||||||
window.detailsProcessKey = detailsProcessKey;
|
window.detailsProcessKey = detailsProcessKey;
|
||||||
|
|
||||||
/* Items table drag and drop support */
|
|
||||||
|
// Items table drag and drop support.
|
||||||
var lastEnterTime
|
var lastEnterTime
|
||||||
function dragStart(event) {
|
function dragStart(event) {
|
||||||
lastEnterTime = event.timeStamp
|
lastEnterTime = event.timeStamp
|
||||||
@@ -290,7 +127,8 @@ function dragStart(event) {
|
|||||||
})
|
})
|
||||||
event.dataTransfer.setData("text/plain", row.getAttribute("data-drag-path"))
|
event.dataTransfer.setData("text/plain", row.getAttribute("data-drag-path"))
|
||||||
var rowRectangle = row.getBoundingClientRect()
|
var rowRectangle = row.getBoundingClientRect()
|
||||||
event.dataTransfer.setDragImage(row, event.x - rowRectangle.left, event.y - rowRectangle.top)
|
event.dataTransfer.setDragImage(row, event.x - rowRectangle.left,
|
||||||
|
event.y - rowRectangle.top)
|
||||||
event.dataTransfer.dropEffect = "move"
|
event.dataTransfer.dropEffect = "move"
|
||||||
}
|
}
|
||||||
window.dragStart = dragStart
|
window.dragStart = dragStart
|
||||||
@@ -300,9 +138,11 @@ window.dragStart = dragStart
|
|||||||
* * Enter/Leave events at the same timeStamp may not be logically ordered
|
* * Enter/Leave events at the same timeStamp may not be logically ordered
|
||||||
* (e.g. E -> E -> L, not E -> L -> E),
|
* (e.g. E -> E -> L, not E -> L -> E),
|
||||||
* * not every Enter event has corresponding Leave event, especially during
|
* * not every Enter event has corresponding Leave event, especially during
|
||||||
* rapid pointer moves
|
* rapid pointer moves.
|
||||||
* NOTE: sometimes Leave is not emitted when pointer goes fast over table
|
* NOTE: sometimes Leave is not emitted when pointer goes fast over table
|
||||||
* and outside. This should probably be fixed in browser, than patched here.
|
* and outside. This should probably be fixed in browser, than patched here.
|
||||||
|
* TODO: replace Leave table with Enter document?
|
||||||
|
* https://www.quirksmode.org/js/events_order.html#link4
|
||||||
*/
|
*/
|
||||||
function dragEnter(event) {
|
function dragEnter(event) {
|
||||||
//console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id)
|
//console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id)
|
||||||
@@ -320,7 +160,7 @@ window.dragOver = dragOver
|
|||||||
|
|
||||||
function dragLeave(event) {
|
function dragLeave(event) {
|
||||||
//console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id)
|
//console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id)
|
||||||
// Leave has been accounted for by Enter at the same timestamp, processed earlier
|
// Leave has been accounted for by Enter at the same timestamp, processed earlier.
|
||||||
if (event.timeStamp <= lastEnterTime) return
|
if (event.timeStamp <= lastEnterTime) return
|
||||||
event.currentTarget.closest("table").querySelectorAll(".dropzone").forEach((tr) => {
|
event.currentTarget.closest("table").querySelectorAll(".dropzone").forEach((tr) => {
|
||||||
tr.classList.remove("dropzone")
|
tr.classList.remove("dropzone")
|
||||||
@@ -338,17 +178,22 @@ window.dragEnd = dragEnd
|
|||||||
|
|
||||||
function drop(event) {
|
function drop(event) {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
var idParam = event.currentTarget.getAttribute("data-drop-id-param")
|
|
||||||
|
var params = new URLSearchParams()
|
||||||
|
var id_param = event.currentTarget.getAttribute("data-drop-id-param")
|
||||||
var id = event.currentTarget.getAttribute("data-drop-id").split("_").pop()
|
var id = event.currentTarget.getAttribute("data-drop-id").split("_").pop()
|
||||||
var form = document.createElement('form');
|
params.append(id_param, id)
|
||||||
form.action = event.dataTransfer.getData("text/plain");
|
|
||||||
form.method = 'post';
|
fetch(event.dataTransfer.getData("text/plain"), {
|
||||||
form.dataset.turboStream = 'true';
|
body: params,
|
||||||
var input = document.createElement('input');
|
headers: {
|
||||||
input.type = 'hidden'; input.name = idParam; input.value = id;
|
"Accept": "text/vnd.turbo-stream.html",
|
||||||
form.appendChild(input);
|
"X-CSRF-Token": document.head.querySelector("meta[name=csrf-token]").content,
|
||||||
form.addEventListener('turbo:submit-end', function() { form.remove(); });
|
"X-Requested-With": "XMLHttpRequest"
|
||||||
document.body.appendChild(form);
|
},
|
||||||
form.requestSubmit();
|
method: "POST"
|
||||||
|
})
|
||||||
|
.then(response => response.text())
|
||||||
|
.then(html => Turbo.renderStreamMessage(html))
|
||||||
}
|
}
|
||||||
window.drop = drop
|
window.drop = drop
|
||||||
|
|||||||
@@ -0,0 +1,97 @@
|
|||||||
|
// Turbo Streams actions.
|
||||||
|
|
||||||
|
const FORM_CONTROLS = ["BUTTON", "FIELDSET", "INPUT", "OPTGROUP", "OPTION", "SELECT",
|
||||||
|
"TEXTAREA"]
|
||||||
|
|
||||||
|
Object.assign(Turbo.StreamElement.prototype, {
|
||||||
|
disableElement(element) {
|
||||||
|
if (FORM_CONTROLS.includes(element.tagName)) {
|
||||||
|
element.setAttribute("disabled", "disabled")
|
||||||
|
} else {
|
||||||
|
element.setAttribute("aria-disabled", "true")
|
||||||
|
// NOTE: tabindex should not be disabled?
|
||||||
|
element.setAttribute("tabindex", "-1")
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
enableElement(element) {
|
||||||
|
if (FORM_CONTROLS.includes(element.tagName)) {
|
||||||
|
element.removeAttribute("disabled")
|
||||||
|
} else {
|
||||||
|
element.removeAttribute("aria-disabled")
|
||||||
|
// Assume 'tabindex' is not used explicitly, so removing it is safe.
|
||||||
|
element.removeAttribute("tabindex")
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
showElement(element) { element.style.visibility = "visible" }
|
||||||
|
})
|
||||||
|
|
||||||
|
Object.assign(Turbo.StreamActions, {
|
||||||
|
disable() {
|
||||||
|
this.targetElements.forEach((e) => { this.disableElement(e) })
|
||||||
|
},
|
||||||
|
|
||||||
|
enable() {
|
||||||
|
this.targetElements.forEach((e) => { this.enableElement(e) })
|
||||||
|
},
|
||||||
|
|
||||||
|
hide() {
|
||||||
|
this.targetElements.forEach((e) => { e.style.visibility = "collapse" })
|
||||||
|
},
|
||||||
|
|
||||||
|
show() {
|
||||||
|
this.targetElements.forEach((e) => { this.showElement(e) })
|
||||||
|
},
|
||||||
|
|
||||||
|
unselect() {
|
||||||
|
this.targetElements.forEach((e) => { e.checked = false; this.enableElement(e) })
|
||||||
|
},
|
||||||
|
|
||||||
|
validate_form() {
|
||||||
|
this.targetElements.forEach((form) => {
|
||||||
|
this.templateContent.querySelectorAll("span").forEach((span) => {
|
||||||
|
var control = document.querySelector(
|
||||||
|
`[form="${form.id}"][name="${span.dataset.name}"]`
|
||||||
|
)
|
||||||
|
control.setCustomValidity(span.textContent)
|
||||||
|
// Add event listener in capture phase to clear custom validity before
|
||||||
|
// `[oninput]` or any other bubble phase handler is invoked.
|
||||||
|
// https://www.quirksmode.org/js/events_order.html
|
||||||
|
// TODO: keep invalidating current value whenever user re-enters it. Store
|
||||||
|
// invalid value and validation message in `[data-invalid-message/value]`
|
||||||
|
// and check input value on "input" event (below) (using `[pattern]` may not
|
||||||
|
// be suitable due to inability to customize validtion message; also
|
||||||
|
// pattern may be used for other, conflicting purposes).
|
||||||
|
// After user executes any other action (while form is open), remove `[data-]`
|
||||||
|
// attributes and custom validation, as value may no longer be invalid.
|
||||||
|
control.addEventListener(
|
||||||
|
"input",
|
||||||
|
function(event) { event.target.setCustomValidity("") },
|
||||||
|
{capture: true, once: true}
|
||||||
|
)
|
||||||
|
})
|
||||||
|
form.reportValidity()
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
close_form() {
|
||||||
|
this.targetElements.forEach((e) => {
|
||||||
|
// Move focus if there's no focus or focus inside form being closed.
|
||||||
|
const focused = document.activeElement
|
||||||
|
if (!focused || (focused == document.body) || e.contains(focused)) {
|
||||||
|
let nextForm = e.parentElement.querySelector(`#${e.id} ~ tr:has([autofocus])`)
|
||||||
|
nextForm ??= e.parentElement.querySelector("tr:has([autofocus])")
|
||||||
|
nextForm?.querySelector("[autofocus]").focus()
|
||||||
|
}
|
||||||
|
document.getElementById(e.dataset.form).remove()
|
||||||
|
if ('link' in e.dataset) {
|
||||||
|
this.enableElement(document.getElementById(e.dataset.link))
|
||||||
|
}
|
||||||
|
if ('hiddenRow' in e.dataset) {
|
||||||
|
this.showElement(document.getElementById(e.dataset.hiddenRow))
|
||||||
|
}
|
||||||
|
e.remove()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
@@ -1,4 +1,6 @@
|
|||||||
class ApplicationRecord < ActiveRecord::Base
|
class ApplicationRecord < ActiveRecord::Base
|
||||||
|
include ActionView::Helpers::TagHelper
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
# Cached attribute has non-user assignable value calculated from other
|
# Cached attribute has non-user assignable value calculated from other
|
||||||
# attributes' values on create/update. This simplifies and speeds up
|
# attributes' values on create/update. This simplifies and speeds up
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
class Note < ApplicationRecord
|
||||||
|
ATTRIBUTES = [:text]
|
||||||
|
end
|
||||||
@@ -1,22 +1,26 @@
|
|||||||
class Quantity < ApplicationRecord
|
class Quantity < ApplicationRecord
|
||||||
ATTRIBUTES = [:name, :description, :parent_id, :default_unit_id]
|
ATTRIBUTES = [:name, :description, :parent_id]
|
||||||
attr_cached :depth, :pathname
|
attr_cached :depth, :pathname
|
||||||
|
|
||||||
belongs_to :user, optional: true
|
belongs_to :user, optional: true
|
||||||
belongs_to :parent, optional: true, class_name: "Quantity"
|
belongs_to :parent, optional: true, class_name: "Quantity"
|
||||||
belongs_to :default_unit, optional: true, class_name: "Unit"
|
|
||||||
has_many :subquantities, ->{ order(:name) }, class_name: "Quantity",
|
has_many :subquantities, ->{ order(:name) }, class_name: "Quantity",
|
||||||
inverse_of: :parent, dependent: :restrict_with_error
|
inverse_of: :parent, dependent: :restrict_with_error
|
||||||
|
has_many :readouts, dependent: :restrict_with_error
|
||||||
|
|
||||||
validate if: ->{ parent.present? } do
|
validate if: ->{ parent.present? } do
|
||||||
errors.add(:parent, :user_mismatch) unless user_id == parent.user_id
|
errors.add(:parent, :user_mismatch) unless user_id == parent.user_id
|
||||||
errors.add(:parent, :self_reference) if id == parent_id
|
errors.add(:parent, :self_reference) if id == parent_id
|
||||||
end
|
end
|
||||||
validate if: ->{ parent.present? }, on: :update do
|
validate if: ->{ parent.present? }, on: :update do
|
||||||
|
# TODO: should not report error for (parent == self)
|
||||||
errors.add(:parent, :descendant_reference) if ancestor_of?(parent)
|
errors.add(:parent, :descendant_reference) if ancestor_of?(parent)
|
||||||
end
|
end
|
||||||
validates :name, presence: true, uniqueness: {scope: [:user_id, :parent_id]},
|
validates :name, presence: true, uniqueness: {scope: [:user_id, :parent_id]},
|
||||||
length: {maximum: type_for_attribute(:name).limit}
|
length: {maximum: type_for_attribute(:name).limit}
|
||||||
|
# FIXME: length validation for :text type column is probably wrong; reported
|
||||||
|
# limit is in bytes (at least for MySQL) and check is for #length (i.e.
|
||||||
|
# characters); this doesn't seem to apply to :string (implemented as varchar)
|
||||||
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
||||||
|
|
||||||
# Update :depths of progenies after parent change
|
# Update :depths of progenies after parent change
|
||||||
@@ -61,26 +65,42 @@ class Quantity < ApplicationRecord
|
|||||||
scope :defaults, ->{ where(user: nil) }
|
scope :defaults, ->{ where(user: nil) }
|
||||||
|
|
||||||
# Return: ordered [sub]hierarchy
|
# Return: ordered [sub]hierarchy
|
||||||
scope :ordered, ->(root: nil, include_root: true) {
|
scope :ordered, ->(**kwargs) {
|
||||||
numbered = Arel::Table.new('numbered')
|
with_path(**kwargs).order(arel_table[:path])
|
||||||
|
}
|
||||||
|
|
||||||
self.model.with(numbered: numbered(:parent_id, :name)).with_recursive(arel_table.name => [
|
# TODO: sort recursive CTE using ORDER BY; it's supported by SQLite, so
|
||||||
numbered.project(
|
# drop MySQL until it is available (?)
|
||||||
numbered[Arel.star],
|
# Only ORDER BY allows proper i.e. not placing limits on user data and
|
||||||
numbered.cast(numbered[:child_number], 'BINARY').as('path')
|
# efficient with regard to paging (LIMIT/OFFSET) depth-first search.
|
||||||
).where(numbered[root && include_root ? :id : :parent_id].eq(root)),
|
# Sorting based on numbering is less elegant/efficient (MySQL: ROW_NUMBER cannot
|
||||||
numbered.project(
|
# be used inside recursive CTE and needs separate SELECT,
|
||||||
numbered[Arel.star],
|
# https://bugs.mysql.com/bug.php?id=96538).
|
||||||
arel_table[:path].concat(numbered[:child_number])
|
# Sorting based on pathname requires I) padding to maximum column length or
|
||||||
).join(arel_table).on(numbered[:parent_id].eq(arel_table[:id]))
|
# II) delimiter which a) cannot be used in sorted column and b) sorts before
|
||||||
]).order(arel_table[:path])
|
# anything else (this adds complexity; NULL cannot be used when sorting).
|
||||||
|
# Sorting based on ARRAY is only available on PostgreSQL.
|
||||||
|
scope :with_path, ->(root: nil, include_root: true) {
|
||||||
|
with_number = Arel::Table.new('with_number')
|
||||||
|
|
||||||
|
self.model.with(with_number: with_number(:parent_id, :name))
|
||||||
|
.with_recursive(arel_table.name => [
|
||||||
|
with_number.project(
|
||||||
|
with_number[Arel.star],
|
||||||
|
with_number.cast(with_number[:number], 'BINARY').as('path')
|
||||||
|
).where(with_number[root && include_root ? :id : :parent_id].eq(root)),
|
||||||
|
with_number.project(
|
||||||
|
with_number[Arel.star],
|
||||||
|
arel_table[:path].concat(with_number[:number])
|
||||||
|
).join(arel_table).on(with_number[:parent_id].eq(arel_table[:id]))
|
||||||
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
# TODO: extract named functions to custom Arel extension
|
# TODO: extract named functions to custom Arel extension
|
||||||
# NOTE: once recursive queries allow use of window functions, this scope can
|
# NOTE: once recursive queries allow use of window functions, this scope can
|
||||||
# be merged with :ordered
|
# be merged with :ordered
|
||||||
# https://gist.github.com/ProGM/c6df08da14708dcc28b5ca325df37ceb#extending-arel
|
# https://gist.github.com/ProGM/c6df08da14708dcc28b5ca325df37ceb#extending-arel
|
||||||
scope :numbered, ->(parent_column, order_column) {
|
scope :with_number, ->(parent_column, order_column) {
|
||||||
select(
|
select(
|
||||||
arel_table[Arel.star],
|
arel_table[Arel.star],
|
||||||
Arel::Nodes::NamedFunction.new(
|
Arel::Nodes::NamedFunction.new(
|
||||||
@@ -93,12 +113,12 @@ class Quantity < ApplicationRecord
|
|||||||
).from(arel_table),
|
).from(arel_table),
|
||||||
Arel::Nodes.build_quoted('0')
|
Arel::Nodes.build_quoted('0')
|
||||||
],
|
],
|
||||||
).as('child_number')
|
).as('number')
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
def to_s
|
def to_s
|
||||||
name
|
tag.pre name
|
||||||
end
|
end
|
||||||
|
|
||||||
def to_s_with_depth
|
def to_s_with_depth
|
||||||
@@ -131,15 +151,17 @@ class Quantity < ApplicationRecord
|
|||||||
.order(arel_table[:depth].desc)
|
.order(arel_table[:depth].desc)
|
||||||
}
|
}
|
||||||
|
|
||||||
# Return: successive record in order of appearance; used for partial view reload
|
# Return: succeeding record in order of appearance, used for partial view reload.
|
||||||
def successive
|
# TODO: add scope returning succeeding element for multiple records
|
||||||
|
def succeeding
|
||||||
quantities = Quantity.arel_table
|
quantities = Quantity.arel_table
|
||||||
Quantity.with(
|
Quantity.with(lagging_quantities: user.quantities.with_path.select(
|
||||||
quantities: user.quantities.ordered.select(
|
|
||||||
quantities[Arel.star],
|
quantities[Arel.star],
|
||||||
Arel::Nodes::NamedFunction.new('LAG', [quantities[:id]]).over.as('lag_id')
|
# For SQLite 'OVER () ORDER BY x' is not equivalent to 'OVER (ORDER BY x)'.
|
||||||
)
|
Arel::Nodes::NamedFunction.new('LAG', [quantities[:id]])
|
||||||
).where(quantities[:lag_id].eq(id)).first
|
.over(Arel::Nodes::Window.new.order(Quantity.ordered.order_values)).as('lag_id')
|
||||||
|
)).from(Arel::Table.new(:lagging_quantities).as(:quantities))
|
||||||
|
.where(quantities[:lag_id].eq(id)).take
|
||||||
end
|
end
|
||||||
|
|
||||||
def with_progenies
|
def with_progenies
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
class Readout < ApplicationRecord
|
class Readout < ApplicationRecord
|
||||||
ATTRIBUTES = [:quantity_id, :value, :unit_id, :taken_at]
|
ATTRIBUTES = [:quantity_id, :value, :unit_id]
|
||||||
|
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
belongs_to :quantity
|
belongs_to :quantity
|
||||||
belongs_to :unit
|
belongs_to :unit
|
||||||
|
|
||||||
|
# TODO: validate quantity.user_id == unit.user_id != NULL
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
class Unit < ApplicationRecord
|
class Unit < ApplicationRecord
|
||||||
ATTRIBUTES = [:symbol, :description, :multiplier, :base_id]
|
ATTRIBUTES = {unit: [:symbol, :description, :multiplier, :base_id]}
|
||||||
|
|
||||||
belongs_to :user, optional: true
|
belongs_to :user, optional: true
|
||||||
belongs_to :base, optional: true, class_name: "Unit"
|
belongs_to :base, optional: true, class_name: "Unit"
|
||||||
|
# TODO: use #alias_attribute after Rails upgrade?
|
||||||
|
alias_method :parent, :base
|
||||||
has_many :subunits, class_name: "Unit", inverse_of: :base,
|
has_many :subunits, class_name: "Unit", inverse_of: :base,
|
||||||
dependent: :restrict_with_error
|
dependent: :restrict_with_error
|
||||||
|
|
||||||
@@ -14,8 +16,8 @@ class Unit < ApplicationRecord
|
|||||||
validates :symbol, presence: true, uniqueness: {scope: :user_id},
|
validates :symbol, presence: true, uniqueness: {scope: :user_id},
|
||||||
length: {maximum: type_for_attribute(:symbol).limit}
|
length: {maximum: type_for_attribute(:symbol).limit}
|
||||||
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
||||||
validates :multiplier, numericality: {equal_to: 1}, unless: :base
|
validates :multiplier, numericality: {equal_to: 1.0}, unless: :base
|
||||||
validates :multiplier, numericality: {greater_than: 0, precision: true, scale: true}, if: :base
|
validates :multiplier, numericality: {greater_than: 0.0}, if: :base
|
||||||
|
|
||||||
scope :defaults, ->{ where(user: nil) }
|
scope :defaults, ->{ where(user: nil) }
|
||||||
scope :defaults_diff, ->{
|
scope :defaults_diff, ->{
|
||||||
@@ -77,15 +79,13 @@ class Unit < ApplicationRecord
|
|||||||
.from(units).group(:base_id, :symbol)
|
.from(units).group(:base_id, :symbol)
|
||||||
}
|
}
|
||||||
scope :ordered, ->{
|
scope :ordered, ->{
|
||||||
left_outer_joins(:base).order(ordering)
|
left_outer_joins(:base).order([
|
||||||
}
|
arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
|
||||||
|
|
||||||
def self.ordering
|
|
||||||
[arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
|
|
||||||
arel_table[:base_id].not_eq(nil),
|
arel_table[:base_id].not_eq(nil),
|
||||||
:multiplier,
|
arel_table[:multiplier],
|
||||||
:symbol]
|
arel_table[:symbol]
|
||||||
end
|
])
|
||||||
|
}
|
||||||
|
|
||||||
before_destroy do
|
before_destroy do
|
||||||
# TODO: disallow destruction if any object depends on this unit
|
# TODO: disallow destruction if any object depends on this unit
|
||||||
@@ -93,7 +93,7 @@ class Unit < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
def to_s
|
def to_s
|
||||||
symbol
|
tag.pre symbol
|
||||||
end
|
end
|
||||||
|
|
||||||
def movable?
|
def movable?
|
||||||
@@ -104,21 +104,21 @@ class Unit < ApplicationRecord
|
|||||||
user_id.nil?
|
user_id.nil?
|
||||||
end
|
end
|
||||||
|
|
||||||
# Should only by invoked on Units returned from #defaults_diff which are #portable
|
# Should only by invoked on Units returned from #defaults_diff which are #portable.
|
||||||
def port!(recipient)
|
def port!(recipient)
|
||||||
recipient_base = base && Unit.find_by!(symbol: base.symbol, user: recipient)
|
recipient_base = base && Unit.find_by!(symbol: base.symbol, user: recipient)
|
||||||
params = slice(ATTRIBUTES - [:symbol, :base_id])
|
params = slice(ATTRIBUTES[:unit] - [:symbol, :base_id])
|
||||||
Unit.find_or_initialize_by(user: recipient, symbol: symbol)
|
Unit.find_or_initialize_by(user: recipient, symbol: symbol)
|
||||||
.update!(base: recipient_base, **params)
|
.update!(base: recipient_base, **params)
|
||||||
end
|
end
|
||||||
|
|
||||||
def successive
|
def succeeding
|
||||||
units = Unit.arel_table
|
units = Unit.arel_table
|
||||||
lead = Arel::Nodes::NamedFunction.new('LAG', [units[:id]])
|
Unit.with(lagging_units: user.units.left_outer_joins(:base).select(
|
||||||
window = Arel::Nodes::Window.new.order(*Unit.ordering)
|
units[Arel.star],
|
||||||
lag_id = lead.over(window).as('lag_id')
|
Arel::Nodes::NamedFunction.new('LAG', [units[:id]])
|
||||||
Unit.with(
|
.over(Arel::Nodes::Window.new.order(Unit.ordered.order_values)).as('lag_id')
|
||||||
units: user.units.left_outer_joins(:base).select(units[Arel.star], lag_id)
|
)).from(Arel::Table.new(:lagging_units).as(:units))
|
||||||
).where(units[:lag_id].eq(id)).first
|
.where(units[:lag_id].eq(id)).take
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
<%= turbo_stream.validate_form dom_target(*@target, :form) do %>
|
||||||
|
<% @record.errors.attribute_names.map do |attr| %>
|
||||||
|
<%= tag.span data: {name: field_name(dom_class(@record), attr)} do %>
|
||||||
|
<%- @record.errors.full_messages_for(attr).map { |m| m + '.' }.join(' ') %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
<div class="main-area" id="measurements-charts"></div>
|
|
||||||
<script id="charts-data" type="application/json"><%= raw @readouts_json %></script>
|
|
||||||
@@ -14,7 +14,6 @@
|
|||||||
<%= csp_meta_tag %>
|
<%= csp_meta_tag %>
|
||||||
|
|
||||||
<%= stylesheet_link_tag "spreadsheet" %>
|
<%= stylesheet_link_tag "spreadsheet" %>
|
||||||
<script src="https://cdn.plot.ly/plotly-basic-2.35.2.min.js"></script>
|
|
||||||
<%= javascript_importmap_tags %>
|
<%= javascript_importmap_tags %>
|
||||||
|
|
||||||
<%#= turbo_page_requires_reload_tag %>
|
<%#= turbo_page_requires_reload_tag %>
|
||||||
@@ -45,7 +44,7 @@
|
|||||||
</header>
|
</header>
|
||||||
|
|
||||||
<div id="flashes">
|
<div id="flashes">
|
||||||
<%= render_flash_messages %>
|
<%= render_flash %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%# Allows overwriting/clearing navigation menu for some views %>
|
<%# Allows overwriting/clearing navigation menu for some views %>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<%= yield %>
|
<%# Render unconditionally, to clear previous flash messages. %>
|
||||||
|
|
||||||
<%# Some views may convert ActiveRecord errors to flashes, render at the end. %>
|
|
||||||
<%= turbo_stream.update :flashes do %>
|
<%= turbo_stream.update :flashes do %>
|
||||||
<%= render_flash_messages %>
|
<%= render_flash %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
<%= yield %>
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
<%= tabular_fields_for @readout, form: form_tag do |form| %>
|
|
||||||
<%- tag.tr id: row, class: "form", onkeydown: "formProcessKey(event)",
|
|
||||||
data: {form: form_tag, hidden_row: hidden_row, link: link} do %>
|
|
||||||
<td><%= @readout.quantity %></td>
|
|
||||||
<td class="ralign">
|
|
||||||
<%= form.number_field :value, required: true, autofocus: true %>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<%= form.collection_select :unit_id, @user_units, :id,
|
|
||||||
->(u){ sanitize(' ' * (u.base_id? ? 1 : 0) + u.symbol) },
|
|
||||||
{}, required: true %>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<%= form.datetime_field :taken_at %>
|
|
||||||
</td>
|
|
||||||
<td></td>
|
|
||||||
<td class="flex">
|
|
||||||
<%= form.button %>
|
|
||||||
<%= image_link_to t(:cancel), "close-outline", measurements_path,
|
|
||||||
class: 'dangerous', name: :cancel,
|
|
||||||
onclick: render_turbo_stream('edit_form_close', {row: row}) %>
|
|
||||||
</td>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
<%= turbo_stream.close_form row %>
|
|
||||||
<%= turbo_stream.update :flashes %>
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
<% form_tag = dom_id(@readout, :edit, :form) %>
|
|
||||||
<% row = dom_id(@readout, :edit) %>
|
|
||||||
<% hidden_row = dom_id(@readout) %>
|
|
||||||
|
|
||||||
<%= tabular_form_with model: @readout, url: measurement_path(@readout),
|
|
||||||
id: form_tag do |form| %>
|
|
||||||
<table class="items-table">
|
|
||||||
<tbody>
|
|
||||||
<%= tag.tr id: row, class: "form", onkeydown: "formProcessKey(event)",
|
|
||||||
data: {form: form_tag, hidden_row: hidden_row} do %>
|
|
||||||
<td><%= @readout.quantity %></td>
|
|
||||||
<td class="ralign">
|
|
||||||
<%= form.number_field :value, required: true, autofocus: true %>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<%= form.collection_select :unit_id, @user_units, :id,
|
|
||||||
->(u){ sanitize(' ' * (u.base_id? ? 1 : 0) + u.symbol) },
|
|
||||||
{}, required: true %>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<%= form.datetime_field :taken_at %>
|
|
||||||
</td>
|
|
||||||
<td></td>
|
|
||||||
<td class="flex">
|
|
||||||
<%= form.button %>
|
|
||||||
<%= image_link_to t(:cancel), "close-outline", measurements_path,
|
|
||||||
class: 'dangerous', name: :cancel,
|
|
||||||
onclick: render_turbo_stream('edit_form_close', {row: row}) %>
|
|
||||||
</td>
|
|
||||||
<% end %>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
<% end %>
|
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
<tr class="italic">
|
<tr class="italic">
|
||||||
<td class="hexpand hmin50"><%= t '.taken_at_html' %></td>
|
<td class="hexpand hmin50"><%= t '.taken_at_html' %></td>
|
||||||
<td colspan="3" class="ralign">
|
<td colspan="3" class="ralign">
|
||||||
<%= form.datetime_field :taken_at, required: true, value: Time.current.strftime('%Y-%m-%dT%H:%M') %>
|
<%= form.datetime_field :taken_at, required: true %>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
@@ -19,7 +19,8 @@
|
|||||||
<details id="quantity_select" class="center hexpand" open
|
<details id="quantity_select" class="center hexpand" open
|
||||||
onkeydown="detailsProcessKey(event)">
|
onkeydown="detailsProcessKey(event)">
|
||||||
<summary autofocus>
|
<summary autofocus>
|
||||||
<!-- TODO: Set content with CSS when span empty to avoid duplication -->
|
<%# TODO: Set content with CSS when span empty to avoid duplication; or
|
||||||
|
change to disabled input with prompt %>
|
||||||
<span data-prompt="<%= t('.select_quantity') %>">
|
<span data-prompt="<%= t('.select_quantity') %>">
|
||||||
<%= t('.select_quantity') %>
|
<%= t('.select_quantity') %>
|
||||||
</span>
|
</span>
|
||||||
@@ -33,7 +34,7 @@
|
|||||||
<div class="flex reverse">
|
<div class="flex reverse">
|
||||||
<%= form.button id: :create_measurement_button, disabled: true -%>
|
<%= form.button id: :create_measurement_button, disabled: true -%>
|
||||||
<%= image_link_to t(:cancel), "close-outline", measurements_path, name: :cancel,
|
<%= image_link_to t(:cancel), "close-outline", measurements_path, name: :cancel,
|
||||||
class: 'dangerous', onclick: render_turbo_stream('form_close') %>
|
class: 'auxiliary dangerous', onclick: render_turbo_stream('form_close') %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
<%= tag.tr id: dom_id(readout), data: {taken_at: readout.taken_at&.iso8601,
|
|
||||||
quantity_id: readout.quantity_id, quantity_name: readout.quantity.name,
|
|
||||||
value: format("%.10g", readout.value), unit: readout.unit.symbol} do %>
|
|
||||||
<td>
|
|
||||||
<% if current_user.at_least(:active) %>
|
|
||||||
<%= link_to readout.quantity, edit_measurement_path(readout),
|
|
||||||
class: 'link', onclick: 'this.blur();', data: {turbo_stream: true} %>
|
|
||||||
<% else %>
|
|
||||||
<%= readout.quantity %>
|
|
||||||
<% end %>
|
|
||||||
</td>
|
|
||||||
<td class="ralign"><%= format("%.10g", readout.value) %></td>
|
|
||||||
<td><%= readout.unit %></td>
|
|
||||||
<td class="taken-at"><%= l(readout.taken_at) if readout.taken_at %></td>
|
|
||||||
<td class="created-at"><%= l(readout.created_at) %></td>
|
|
||||||
<% if current_user.at_least(:active) %>
|
|
||||||
<td class="flex">
|
|
||||||
<%= image_button_to t('.destroy'), 'delete-outline', measurement_path(readout),
|
|
||||||
method: :delete, data: {turbo_stream: true} %>
|
|
||||||
</td>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
<table class="items-table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th><%= Readout.human_attribute_name(:taken_at) %></th>
|
|
||||||
<% wide_quantities.each do |q| %>
|
|
||||||
<th><%= q.name %></th>
|
|
||||||
<% end %>
|
|
||||||
<th><%= Readout.human_attribute_name(:created_at) %></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<% wide_groups.each do |taken_at, readouts| %>
|
|
||||||
<tr>
|
|
||||||
<td><%= l(taken_at) if taken_at %></td>
|
|
||||||
<% wide_quantities.each do |q| %>
|
|
||||||
<% readout = readouts.find { |r| r.quantity_id == q.id } %>
|
|
||||||
<td class="ralign">
|
|
||||||
<% if readout %>
|
|
||||||
<span class="wide-cell">
|
|
||||||
<% if current_user.at_least(:active) %>
|
|
||||||
<%= link_to format("%.10g", readout.value),
|
|
||||||
edit_measurement_path(readout, view: :wide),
|
|
||||||
class: 'link', onclick: 'this.blur();',
|
|
||||||
data: {turbo_stream: true} %>
|
|
||||||
<% else %>
|
|
||||||
<%= format("%.10g", readout.value) %>
|
|
||||||
<% end %>
|
|
||||||
<%= readout.unit.symbol %>
|
|
||||||
<% if current_user.at_least(:active) %>
|
|
||||||
<%= image_button_to '', 'delete-outline', measurement_path(readout),
|
|
||||||
method: :delete, data: {turbo_stream: true} %>
|
|
||||||
<% end %>
|
|
||||||
</span>
|
|
||||||
<% end %>
|
|
||||||
</td>
|
|
||||||
<% end %>
|
|
||||||
<td><%= l(readouts.first.created_at) %></td>
|
|
||||||
</tr>
|
|
||||||
<% end %>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
<% if @readouts.present? && @readouts.all?(&:persisted?) %>
|
|
||||||
<%= turbo_stream.update :flashes %>
|
|
||||||
<%= turbo_stream.remove :measurement_form %>
|
|
||||||
<%= turbo_stream.enable :new_measurement_link %>
|
|
||||||
<%= turbo_stream.remove :no_items %>
|
|
||||||
<% @readouts.each do |readout| %>
|
|
||||||
<%= turbo_stream.prepend :measurements, partial: 'readout', locals: {readout: readout} %>
|
|
||||||
<% end %>
|
|
||||||
<%= turbo_stream.update 'measurements-wide', partial: 'wide_table',
|
|
||||||
locals: {wide_groups: @wide_groups, wide_quantities: @wide_quantities} %>
|
|
||||||
<% else %>
|
|
||||||
<%= turbo_stream.update :flashes %>
|
|
||||||
<% end %>
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
<%= turbo_stream.update :flashes %>
|
|
||||||
<%= turbo_stream.remove @readout %>
|
|
||||||
<%= turbo_stream.append(:measurements, render_no_items) if current_user.readouts.empty? %>
|
|
||||||
<%= turbo_stream.update 'measurements-wide', partial: 'wide_table',
|
|
||||||
locals: {wide_groups: @wide_groups, wide_quantities: @wide_quantities} %>
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<% ids = {row: dom_id(@readout, :edit),
|
|
||||||
hidden_row: dom_id(@readout),
|
|
||||||
link: nil,
|
|
||||||
form_tag: dom_id(@readout, :edit, :form)} %>
|
|
||||||
|
|
||||||
<% if params[:view] == 'wide' %>
|
|
||||||
<%= turbo_stream.update :measurement_edit_form, partial: 'edit_panel' %>
|
|
||||||
<%= turbo_stream.hide ids[:hidden_row] %>
|
|
||||||
<% else %>
|
|
||||||
<%= turbo_stream.append :measurement_edit_form do %>
|
|
||||||
<%- tabular_form_with model: @readout, url: measurement_path(@readout),
|
|
||||||
html: {id: ids[:form_tag]} do %>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
<%= turbo_stream.hide ids[:hidden_row] %>
|
|
||||||
<%= turbo_stream.remove ids[:row] %>
|
|
||||||
<%= turbo_stream.after @readout, partial: 'edit_form', locals: ids -%>
|
|
||||||
<% end %>
|
|
||||||
@@ -5,37 +5,10 @@
|
|||||||
id: :new_measurement_link, onclick: 'this.blur();',
|
id: :new_measurement_link, onclick: 'this.blur();',
|
||||||
data: {turbo_stream: true} %>
|
data: {turbo_stream: true} %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= image_button_tag '', 'view-rows', name: nil, type: 'button',
|
|
||||||
class: 'view-toggle', title: t('.view_compact'),
|
|
||||||
data: {view: 'compact'}, onclick: "setMeasurementsView('compact')" %>
|
|
||||||
<%= image_button_tag '', 'view-columns', name: nil, type: 'button',
|
|
||||||
class: 'view-toggle', title: t('.view_wide'),
|
|
||||||
data: {view: 'wide'}, onclick: "setMeasurementsView('wide')" %>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="main-area measurements-section">
|
<table class="main-area">
|
||||||
<%= tag.div id: :measurement_edit_form %>
|
|
||||||
<table class="items-table measurements-compact">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th><%= Quantity.model_name.human %></th>
|
|
||||||
<th><%= Readout.human_attribute_name(:value) %></th>
|
|
||||||
<th><%= Unit.model_name.human %></th>
|
|
||||||
<th data-column="taken-at"><%= Readout.human_attribute_name(:taken_at) %></th>
|
|
||||||
<th data-column="created-at"><%= Readout.human_attribute_name(:created_at) %></th>
|
|
||||||
<% if current_user.at_least(:active) %>
|
|
||||||
<th></th>
|
|
||||||
<% end %>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody id="measurements">
|
<tbody id="measurements">
|
||||||
<%= render(partial: 'readout', collection: @measurements, as: :readout) || render_no_items %>
|
<%= render(@measurements) || render_no_items %>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<div id="measurements-wide" class="measurements-wide">
|
|
||||||
<%= render 'wide_table', wide_groups: @wide_groups, wide_quantities: @wide_quantities %>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
<%= turbo_stream.close_form dom_id(@readout, :edit) %>
|
|
||||||
<%= turbo_stream.replace @readout, partial: 'measurements/readout', locals: {readout: @readout} %>
|
|
||||||
<%= turbo_stream.update 'measurements-wide', partial: 'wide_table',
|
|
||||||
locals: {wide_groups: @wide_groups, wide_quantities: @wide_quantities} %>
|
|
||||||
@@ -3,22 +3,14 @@
|
|||||||
data: {link: link, form: form_tag, hidden_row: hidden_row} do %>
|
data: {link: link, form: form_tag, hidden_row: hidden_row} do %>
|
||||||
|
|
||||||
<td style="--depth:<%= @quantity.depth %>">
|
<td style="--depth:<%= @quantity.depth %>">
|
||||||
<%= form.text_field :name, required: true, autofocus: true, size: 20 %>
|
<%= form.text_field :name, autofocus: true, class: 'hstretch', required: true %>
|
||||||
</td>
|
<td><%= form.text_area :description, class: 'hstretch', escape: false, rows: 1 %>
|
||||||
<td>
|
|
||||||
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<%= form.collection_select :default_unit_id, @user_units, :id,
|
|
||||||
->(u){ sanitize(' ' * (u.base_id? ? 1 : 0) + u.symbol) },
|
|
||||||
{include_blank: true}, onchange: "this.dataset.changed = ''" %>
|
|
||||||
</td>
|
|
||||||
|
|
||||||
<td class="flex">
|
<td class="flex">
|
||||||
<%= form.button %>
|
<%= form.button %>
|
||||||
<%= image_link_to t(:cancel), "close-outline", quantities_path, class: 'dangerous',
|
<%= image_link_to t(:cancel), "close-outline", quantities_path,
|
||||||
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
class: 'dangerous', name: :cancel,
|
||||||
</td>
|
onclick: render_turbo_stream('form_close', {row: row}) %>
|
||||||
<td></td>
|
<td>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -1,25 +1,24 @@
|
|||||||
<%= tag.tr id: dom_id(quantity),
|
<tr id="<%= dom_target(quantity) %>"
|
||||||
ondragstart: "dragStart(event)", ondragend: "dragEnd(event)",
|
ondragstart="dragStart(event)" ondragend="dragEnd(event)"
|
||||||
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
ondragover="dragOver(event)" ondrop="drop(event)"
|
||||||
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
ondragenter="dragEnter(event)" ondragleave="dragLeave(event)"
|
||||||
data: {drag_path: reparent_quantity_path(quantity), drop_id: dom_id(quantity),
|
data-drag-path="<%= reparent_quantity_path(quantity) %>"
|
||||||
drop_id_param: "quantity[parent_id]"} do %>
|
data-drop-id="<%= dom_target(quantity) %>"
|
||||||
|
data-drop-id-param="<%= field_name(:quantity, :parent_id) %>">
|
||||||
|
|
||||||
<td style="--depth:<%= quantity.depth %>">
|
<td style="--depth:<%= quantity.depth %>">
|
||||||
<%= link_to quantity, edit_quantity_path(quantity), class: 'link',
|
<%= link_to quantity, edit_quantity_path(quantity), class: 'link',
|
||||||
onclick: 'this.blur();', data: {turbo_stream: true} %>
|
onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||||
</td>
|
<td><%= quantity.description %>
|
||||||
<td><%= quantity.description %></td>
|
|
||||||
<td><%= quantity.default_unit&.symbol %></td>
|
|
||||||
|
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<td class="flex">
|
<td class="flex">
|
||||||
<%= image_link_to t('.new_subquantity'), 'plus-outline', new_quantity_path(quantity),
|
<%= image_link_to t('.new_subquantity'), 'plus-outline',
|
||||||
id: dom_id(quantity, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
new_quantity_path(quantity), id: dom_target(:new, quantity, :link),
|
||||||
|
onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||||
|
|
||||||
<%= image_button_to_if quantity.destroyable?, t('.destroy'), 'delete-outline',
|
<%= image_button_to_if quantity.destroyable?, t('.destroy'), 'delete-outline',
|
||||||
quantity_path(quantity), method: :delete %>
|
quantity_path(quantity), method: :delete %>
|
||||||
</td>
|
|
||||||
<td class="handle" draggable="true">⠿</td>
|
<td class="handle" draggable="true">⠿
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
<%= turbo_stream.close_form dom_id(@quantity.parent || Quantity, :new) %>
|
<%= turbo_stream.close_form dom_target(:new, @quantity.parent || :quantity) %>
|
||||||
<%= turbo_stream.remove :no_items %>
|
|
||||||
<% @ancestors.each do |ancestor| %>
|
<% @ancestors.each do |ancestor| %>
|
||||||
<%= turbo_stream.replace ancestor %>
|
<%= turbo_stream.replace ancestor %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= @before ? turbo_stream.before(@before, @quantity) :
|
<%= turbo_stream.before @before || :endmark, @quantity %>
|
||||||
turbo_stream.append(:quantities, @quantity) %>
|
|
||||||
|
|||||||
@@ -2,4 +2,3 @@
|
|||||||
<%= turbo_stream.replace ancestor %>
|
<%= turbo_stream.replace ancestor %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= turbo_stream.remove @quantity %>
|
<%= turbo_stream.remove @quantity %>
|
||||||
<%= turbo_stream.append(:quantities, render_no_items) if current_user.quantities.empty? %>
|
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
<% ids = {row: dom_id(@quantity, :edit),
|
<% ids = {row: dom_target(:edit, @quantity),
|
||||||
hidden_row: dom_id(@quantity),
|
hidden_row: dom_target(@quantity),
|
||||||
link: nil,
|
link: nil,
|
||||||
form_tag: dom_id(@quantity, :edit, :form)} %>
|
form_tag: dom_target(:edit, @quantity, :form)} %>
|
||||||
|
|
||||||
<%= turbo_stream.append :quantity_form do %>
|
<%= turbo_stream.append_all 'body' do %>
|
||||||
<%- tabular_form_with model: @quantity, html: {id: ids[:form_tag]} do %>
|
<%- tabular_form_with model: @quantity, html: {id: ids[:form_tag]} do %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= turbo_stream.hide ids[:hidden_row] %>
|
<%= turbo_stream.hide ids[:hidden_row] %>
|
||||||
<%= turbo_stream.remove ids[:row] %>
|
|
||||||
<%= turbo_stream.after @quantity, partial: 'form', locals: ids -%>
|
<%= turbo_stream.after @quantity, partial: 'form', locals: ids -%>
|
||||||
|
|||||||
@@ -1,35 +1,31 @@
|
|||||||
<div class="rightside-area buttongrid">
|
<div class="rightside-area buttongrid">
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<%= image_link_to t('.new_quantity'), 'plus-outline', new_quantity_path,
|
<%= image_link_to t('.new_quantity'), 'plus-outline', new_quantity_path,
|
||||||
id: dom_id(Quantity, :new, :link), onclick: 'this.blur();',
|
id: :new_quantity_link, onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||||
data: {turbo_stream: true} %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
<%#= image_link_to t('.import_quantities'), 'download-outline', default_quantities_path,
|
<%#= image_link_to t('.import_quantities'), 'download-outline',
|
||||||
class: 'tools-area' %>
|
default_quantities_path, class: 'tools-area' %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%# TODO: remove? form can be inserted directly, e.g. at the end of index %>
|
|
||||||
<%= tag.div class: 'main-area', id: :quantity_form %>
|
|
||||||
|
|
||||||
<table class="main-area items-table">
|
<table class="main-area items-table">
|
||||||
<thead>
|
<caption class="hint"><%= t '.no_items' %></caption>
|
||||||
|
|
||||||
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= Quantity.human_attribute_name(:name) %></th>
|
<th class="hmintext"><%= Quantity.human_attribute_name(:name) %>
|
||||||
<th class="hexpand"><%= Quantity.human_attribute_name(:description) %></th>
|
<th class="hexpand"><%= Quantity.human_attribute_name(:description) %>
|
||||||
<th><%= Quantity.human_attribute_name(:default_unit) %></th>
|
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<th><%= t :actions %></th>
|
<th><%= t :actions %>
|
||||||
<th></th>
|
<th>
|
||||||
|
|
||||||
|
<tr id="quantity_" hidden
|
||||||
|
ondragover="dragOver(event)" ondrop="drop(event)"
|
||||||
|
ondragenter="dragEnter(event)" ondragleave="dragLeave(event)"
|
||||||
|
data-drop-id="quantity_"
|
||||||
|
data-drop-id-param="<%= field_name(:quantity, :parent_id) %>">
|
||||||
|
<th colspan="4"><%= t '.top_level_drop' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</tr>
|
|
||||||
<%= tag.tr id: "quantity_", hidden: true,
|
<%= render @quantities %>
|
||||||
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
<tr id="endmark" hidden>
|
||||||
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
|
||||||
data: {drop_id: "quantity_", drop_id_param: "quantity[parent_id]"} do %>
|
|
||||||
<th colspan="5"><%= t '.top_level_drop' %></th>
|
|
||||||
<% end %>
|
|
||||||
</thead>
|
|
||||||
<tbody id="quantities">
|
|
||||||
<%= render(@quantities) || render_no_items %>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -1,20 +1,15 @@
|
|||||||
<% dom_obj = @quantity.parent || @quantity %>
|
<% target_id = dom_target(:new, @quantity.parent || :quantity) %>
|
||||||
<% ids = {row: dom_id(dom_obj, :new),
|
<% ids = {row: target_id,
|
||||||
hidden_row: nil,
|
hidden_row: nil,
|
||||||
link: dom_id(dom_obj, :new, :link),
|
link: dom_target(target_id, :link),
|
||||||
form_tag: dom_id(dom_obj, :new, :form)} %>
|
form_tag: dom_target(target_id, :form)} %>
|
||||||
|
|
||||||
<%= turbo_stream.disable ids[:link] -%>
|
<%= turbo_stream.disable ids[:link] -%>
|
||||||
|
|
||||||
<%= turbo_stream.append :quantity_form do %>
|
<%= turbo_stream.append_all 'body' do %>
|
||||||
<%- tabular_form_with model: @quantity, html: {id: ids[:form_tag]} do |form| %>
|
<%- tabular_form_with model: @quantity, html: {id: ids[:form_tag]} do |form| %>
|
||||||
<%= form.hidden_field :parent_id if @quantity.parent_id? %>
|
<%= form.hidden_field :parent_id if @quantity.parent_id? %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if @quantity.parent_id? %>
|
<%= turbo_stream.after @quantity.parent || :quantity_, partial: 'form', locals: ids %>
|
||||||
<%= turbo_stream.remove ids[:row] %>
|
|
||||||
<%= turbo_stream.after @quantity.parent, partial: 'form', locals: ids %>
|
|
||||||
<% else %>
|
|
||||||
<%= turbo_stream.prepend :quantities, partial: 'form', locals: ids %>
|
|
||||||
<% end %>
|
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
<% @self_and_progenies.each do |q| %>
|
|
||||||
<%= turbo_stream.remove q %>
|
|
||||||
<% end %>
|
|
||||||
<% @previous_ancestors.union(@ancestors).each do |ancestor| %>
|
<% @previous_ancestors.union(@ancestors).each do |ancestor| %>
|
||||||
<%= turbo_stream.replace ancestor %>
|
<%= turbo_stream.replace ancestor %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% @self_and_progenies.each do |q| %>
|
<% @quantities.each do |quantity| %>
|
||||||
<%= @before ? turbo_stream.before(@before, q) : turbo_stream.append(:quantities, q) %>
|
<%= turbo_stream.remove quantity %>
|
||||||
|
<%= turbo_stream.before @before || :endmark, quantity %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<%= turbo_stream.close_form dom_id(@quantity, :edit) %>
|
<%= turbo_stream.close_form dom_target(:edit, @quantity) %>
|
||||||
<% @ancestors.push(@quantity).each do |ancestor| %>
|
<% @ancestors.push(@quantity).each do |ancestor| %>
|
||||||
<%= turbo_stream.replace ancestor %>
|
<%= turbo_stream.replace ancestor %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<%# TODO: add readout reordering by dragging %>
|
<%# TODO: add readout reordering by dragging %>
|
||||||
<%= tabular_fields_for 'readouts[]', readout do |form| %>
|
<%= tabular_fields_for 'readouts[]', readout do |form| %>
|
||||||
<%- tag.tr id: dom_id(readout.quantity, :new, :readout) do %>
|
<%- tag.tr id: dom_target(:new, readout.quantity, :readout) do %>
|
||||||
<td>
|
<td>
|
||||||
<%# TODO: add grayed readout index (in separate column?) %>
|
<%# TODO: add grayed readout index (in separate column?) %>
|
||||||
<%= readout.quantity.relative_pathname(@superquantity) %>
|
<%= readout.quantity.relative_pathname(@superquantity) %>
|
||||||
@@ -12,17 +12,10 @@
|
|||||||
<td>
|
<td>
|
||||||
<%= form.collection_select :unit_id, @user_units, :id,
|
<%= form.collection_select :unit_id, @user_units, :id,
|
||||||
->(u){ sanitize(' ' * (u.base_id ? 1 : 0) + u.symbol) },
|
->(u){ sanitize(' ' * (u.base_id ? 1 : 0) + u.symbol) },
|
||||||
{prompt: '', disabled: '', selected: readout.quantity.default_unit_id || ''}, required: true,
|
{prompt: '', disabled: '', selected: ''}, required: true %>
|
||||||
data: {default_unit_id: readout.quantity.default_unit_id || ''},
|
|
||||||
onchange: "readoutUnitChanged(this)" %>
|
|
||||||
</td>
|
</td>
|
||||||
<td class="flex">
|
<td class="flex">
|
||||||
<%# TODO: change to _link_ after giving up displaying relative paths %>
|
<%# TODO: change to _link_ after giving up displaying relative paths %>
|
||||||
<%= image_button_tag '', 'check-circle-outline',
|
|
||||||
class: 'set-default-unit', name: nil, type: 'button', disabled: true,
|
|
||||||
title: t('readouts.form.set_default_unit'),
|
|
||||||
data: {path: quantity_path(readout.quantity)},
|
|
||||||
onclick: 'setDefaultUnit(this)' %>
|
|
||||||
<%= image_button_tag '', 'delete-outline', class: 'dangerous', name: nil,
|
<%= image_button_tag '', 'delete-outline', class: 'dangerous', name: nil,
|
||||||
formaction: discard_readouts_path(readout.quantity),
|
formaction: discard_readouts_path(readout.quantity),
|
||||||
formmethod: :get, formnovalidate: true, data: {turbo_stream: true} %>
|
formmethod: :get, formnovalidate: true, data: {turbo_stream: true} %>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<%= turbo_stream.update(:measurement_form_legend) { @superquantity&.pathname } %>
|
<%= turbo_stream.update(:measurement_form_legend) { @superquantity&.pathname } %>
|
||||||
|
|
||||||
<% @prev_quantities.each do |pq| %>
|
<% @prev_quantities.each do |pq| %>
|
||||||
<%= turbo_stream.update dom_id(pq, nil, :pathname) do %>
|
<%= turbo_stream.update dom_target(pq, :pathname) do %>
|
||||||
<%= pq.relative_pathname(@superquantity) %>
|
<%= pq.relative_pathname(@superquantity) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<%= turbo_stream.disable :create_measurement_button if @prev_quantities.one? %>
|
<%= turbo_stream.disable :create_measurement_button if @prev_quantities.one? %>
|
||||||
<%= turbo_stream.remove dom_id(@quantity, :new, :readout) %>
|
<%= turbo_stream.remove dom_target(:new, @quantity, :readout) %>
|
||||||
<%= render partial: 'form_repath' %>
|
<%= render partial: 'form_repath' %>
|
||||||
<%= turbo_stream.unselect dom_id(@quantity) %>
|
<%= turbo_stream.unselect dom_target(@quantity) %>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<% @readouts.each do |r| %>
|
<% @readouts.each do |r| %>
|
||||||
<%= turbo_stream.disable dom_id(r.quantity) %>
|
<%= turbo_stream.disable dom_target(r.quantity) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= render partial: 'form_repath' %>
|
<%= render partial: 'form_repath' %>
|
||||||
<%= turbo_stream.append :readouts do %>
|
<%= turbo_stream.append :readouts do %>
|
||||||
|
|||||||
@@ -3,20 +3,17 @@
|
|||||||
data: {link: link, form: form_tag, hidden_row: hidden_row} do %>
|
data: {link: link, form: form_tag, hidden_row: hidden_row} do %>
|
||||||
|
|
||||||
<td style="--depth:<%= @unit.base_id? ? 1 : 0 %>">
|
<td style="--depth:<%= @unit.base_id? ? 1 : 0 %>">
|
||||||
<%= form.text_field :symbol, required: true, autofocus: true, size: 12 %>
|
<%= form.text_field :symbol, autofocus: true, class: 'hstretch', required: true %>
|
||||||
</td>
|
|
||||||
<td>
|
<td>
|
||||||
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
<% if @unit.base_id? %>
|
||||||
</td>
|
<%= form.number_field :multiplier, class: 'hstretch', required: true %>
|
||||||
<td>
|
<% end %>
|
||||||
<%= form.number_field :multiplier, required: true, size: 10, min: :step if @unit.base_id? %>
|
<td><%= form.text_area :description, class: 'hstretch', escape: false, rows: 1 %>
|
||||||
</td>
|
|
||||||
|
|
||||||
<td class="flex">
|
<td class="flex">
|
||||||
<%= form.button %>
|
<%= form.button %>
|
||||||
<%= image_link_to t(:cancel), "close-outline", units_path, class: 'dangerous',
|
<%= image_link_to t(:cancel), "close-outline", units_path, class: 'dangerous',
|
||||||
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
||||||
</td>
|
<td>
|
||||||
<td></td>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -1,32 +1,32 @@
|
|||||||
<%= tag.tr id: dom_id(unit),
|
<tr id="<%= dom_target(unit) %>"
|
||||||
ondragstart: "dragStart(event)", ondragend: "dragEnd(event)",
|
ondragstart="dragStart(event)" ondragend="dragEnd(event)"
|
||||||
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
ondragover="dragOver(event)" ondrop="drop(event)"
|
||||||
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
ondragenter="dragEnter(event)" ondragleave="dragLeave(event)"
|
||||||
data: {drag_path: rebase_unit_path(unit),
|
data-drag-path="<%= rebase_unit_path(unit) %>"
|
||||||
drop_id: dom_id(unit.base || unit),
|
data-drop-id="<%= dom_target(unit.base || unit) %>"
|
||||||
drop_id_param: "unit[base_id]"} do %>
|
data-drop-id-param="<%= field_name(:unit, :base_id) %>">
|
||||||
|
|
||||||
<td style="--depth:<%= unit.base_id? ? 1 : 0 %>">
|
<td style="--depth:<%= unit.base_id? ? 1 : 0 %>">
|
||||||
<%= link_to unit, edit_unit_path(unit), class: 'link', onclick: 'this.blur();',
|
<%= link_to unit, edit_unit_path(unit), class: 'link', onclick: 'this.blur();',
|
||||||
data: {turbo_stream: true} %>
|
data: {turbo_stream: true} %>
|
||||||
</td>
|
<%# Closing <td> tag required to avoid whitespace inclusion for testing. %>
|
||||||
<td><%= unit.description %></td>
|
<td class="ralign"><%= unit.multiplier.to_html if unit.base_id? %></td>
|
||||||
<td class="ralign"><%= unit.multiplier.to_html %></td>
|
<td><%= unit.description %>
|
||||||
|
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<td class="flex">
|
<td class="flex">
|
||||||
<% unless unit.base_id? %>
|
<% unless unit.base_id? %>
|
||||||
<%= image_link_to t('.new_subunit'), 'plus-outline', new_unit_path(unit),
|
<%= image_link_to t('.new_subunit'), 'plus-outline', new_unit_path(unit),
|
||||||
id: dom_id(unit, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
id: dom_target(:new, unit, :link), onclick: 'this.blur();',
|
||||||
|
data: {turbo_stream: true} %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= image_button_to_if unit.movable?, t('.destroy'), 'delete-outline', unit_path(unit),
|
<%= image_button_to_if unit.movable?, t('.destroy'), 'delete-outline',
|
||||||
method: :delete %>
|
unit_path(unit), method: :delete %>
|
||||||
</td>
|
|
||||||
<% if unit.movable? %>
|
<% if unit.movable? %>
|
||||||
<td class="handle" draggable="true">⠿</td>
|
<td class="handle" draggable="true">⠿
|
||||||
<% else %>
|
<% else %>
|
||||||
<td></td>
|
<td>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
<%= turbo_stream.close_form dom_id(@unit.base || Unit, :new) %>
|
<%= turbo_stream.close_form dom_target(:new, @unit.base || :unit) %>
|
||||||
<%= turbo_stream.remove :no_items %>
|
|
||||||
<%= turbo_stream.replace @unit.base if @unit.base_id? %>
|
<%= turbo_stream.replace @unit.base if @unit.base_id? %>
|
||||||
<%= @before ? turbo_stream.before(@before, @unit) : turbo_stream.append(:units, @unit) %>
|
<%= turbo_stream.before @before || :endmark, @unit %>
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
<%= turbo_stream.replace @unit.base if @unit.base_id? %>
|
<%= turbo_stream.replace @unit.base if @unit.base_id? %>
|
||||||
<%= turbo_stream.remove @unit %>
|
<%= turbo_stream.remove @unit %>
|
||||||
<%= turbo_stream.append(:units, render_no_items) if current_user.units.empty? %>
|
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
<% ids = {row: dom_id(@unit, :edit),
|
<% ids = {row: dom_target(:edit, @unit),
|
||||||
hidden_row: dom_id(@unit),
|
hidden_row: dom_target(@unit),
|
||||||
link: nil,
|
link: nil,
|
||||||
form_tag: dom_id(@unit, :edit, :form)} %>
|
form_tag: dom_target(:edit, @unit, :form)} %>
|
||||||
|
|
||||||
<%= turbo_stream.append :unit_form do %>
|
<%= turbo_stream.append_all 'body' do %>
|
||||||
<%- tabular_form_with model: @unit, html: {id: ids[:form_tag]} do %>
|
<%- tabular_form_with model: @unit, html: {id: ids[:form_tag]} do %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= turbo_stream.hide ids[:hidden_row] %>
|
<%= turbo_stream.hide ids[:hidden_row] %>
|
||||||
<%= turbo_stream.remove ids[:row] %>
|
|
||||||
<%= turbo_stream.after @unit, partial: 'form', locals: ids -%>
|
<%= turbo_stream.after @unit, partial: 'form', locals: ids -%>
|
||||||
|
|||||||
@@ -1,34 +1,33 @@
|
|||||||
<div class="rightside-area buttongrid">
|
<div class="rightside-area buttongrid">
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<%= image_link_to t('.new_unit'), 'plus-outline', new_unit_path,
|
<%= image_link_to t('.new_unit'), 'plus-outline', new_unit_path,
|
||||||
id: dom_id(Unit, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
id: :new_unit_link, onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= image_link_to t('.import_units'), 'download-outline', default_units_path,
|
<%= image_link_to t('.import_units'), 'download-outline', default_units_path,
|
||||||
class: 'tools-area' %>
|
class: 'tools-area' %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%# TODO: remove? form can be inserted directly, e.g. at the end of index %>
|
|
||||||
<%= tag.div id: :unit_form %>
|
|
||||||
|
|
||||||
<table class="main-area items-table">
|
<table class="main-area items-table">
|
||||||
<thead>
|
<caption class="hint"><%= t '.no_items' %></caption>
|
||||||
|
|
||||||
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= Unit.human_attribute_name(:symbol) %></th>
|
<th class="hmintext"><%= Unit.human_attribute_name(:symbol) %>
|
||||||
<th class="hexpand"><%= Unit.human_attribute_name(:description) %></th>
|
<th class="hminnumber"><%= Unit.human_attribute_name(:multiplier) %>
|
||||||
<th><%= Unit.human_attribute_name(:multiplier) %></th>
|
<th class="hexpand"><%= Unit.human_attribute_name(:description) %>
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<th><%= t :actions %></th>
|
<th><%= t :actions %>
|
||||||
<th></th>
|
<th>
|
||||||
|
|
||||||
|
<tr id="unit_" hidden
|
||||||
|
ondragover="dragOver(event)" ondrop="drop(event)"
|
||||||
|
ondragenter="dragEnter(event)" ondragleave="dragLeave(event)"
|
||||||
|
data-drop-id="unit_" data-drop-id-param="<%= field_name(:unit, :base_id) %>">
|
||||||
|
<th colspan="5"><%= t '.top_level_drop' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</tr>
|
|
||||||
<%= tag.tr id: "unit_", hidden: true,
|
<%= render @units %>
|
||||||
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
<%# Hidden rows with IDs allow simplier row insertion by using only
|
||||||
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
turbo_stream #after/#before instead of #after + #prepend/#before + #append. %>
|
||||||
data: {drop_id: "unit_", drop_id_param: "unit[base_id]"} do %>
|
<tr id="endmark" hidden>
|
||||||
<th colspan="5"><%= t '.top_level_drop' %></th>
|
|
||||||
<% end %>
|
|
||||||
</thead>
|
|
||||||
<tbody id="units">
|
|
||||||
<%= render(@units) || render_no_items %>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -1,20 +1,15 @@
|
|||||||
<% dom_obj = @unit.base || @unit %>
|
<% target_id = dom_target(:new, @unit.base || :unit) %>
|
||||||
<% ids = {row: dom_id(dom_obj, :new),
|
<% ids = {row: target_id,
|
||||||
hidden_row: nil,
|
hidden_row: nil,
|
||||||
link: dom_id(dom_obj, :new, :link),
|
link: dom_target(target_id, :link),
|
||||||
form_tag: dom_id(dom_obj, :new, :form)} %>
|
form_tag: dom_target(target_id, :form)} %>
|
||||||
|
|
||||||
<%= turbo_stream.disable ids[:link] -%>
|
<%= turbo_stream.disable ids[:link] -%>
|
||||||
|
|
||||||
<%= turbo_stream.append :unit_form do %>
|
<%= turbo_stream.append_all 'body' do %>
|
||||||
<%- tabular_form_with model: @unit, html: {id: ids[:form_tag]} do |form| %>
|
<%- tabular_form_with model: @unit, html: {id: ids[:form_tag]} do |form| %>
|
||||||
<%= form.hidden_field :base_id if @unit.base_id? %>
|
<%= form.hidden_field :base_id if @unit.base_id? %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if @unit.base_id? %>
|
<%= turbo_stream.after @unit.base || :unit_, partial: 'form', locals: ids %>
|
||||||
<%= turbo_stream.remove ids[:row] %>
|
|
||||||
<%= turbo_stream.after @unit.base, partial: 'form', locals: ids %>
|
|
||||||
<% else %>
|
|
||||||
<%= turbo_stream.prepend :units, partial: 'form', locals: ids %>
|
|
||||||
<% end %>
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
|
<% [@previous_base, @unit.base].uniq.compact.each do |unit| %>
|
||||||
|
<%= turbo_stream.replace unit %>
|
||||||
|
<% end %>
|
||||||
<%= turbo_stream.remove @unit %>
|
<%= turbo_stream.remove @unit %>
|
||||||
<%= turbo_stream.replace @previous_base if @previous_base %>
|
<%= turbo_stream.before @before || :endmark, @unit %>
|
||||||
<%= turbo_stream.replace @unit.base if @unit.base_id? && (@previous_base.id != @unit.base_id) %>
|
|
||||||
<%= @before ? turbo_stream.before(@before, @unit) : turbo_stream.append(:units, @unit) %>
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
<%= turbo_stream.close_form dom_id(@unit, :edit) %>
|
<%= turbo_stream.close_form dom_target(:edit, @unit) %>
|
||||||
<%= turbo_stream.replace @unit.base if @unit.base_id? %>
|
<%= turbo_stream.replace @unit.base if @unit.base_id? %>
|
||||||
<%= turbo_stream.replace @unit %>
|
<%= turbo_stream.replace @unit %>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<th><%= User.human_attribute_name(:email) %></th>
|
<th><%= User.human_attribute_name(:email) %></th>
|
||||||
<th><%= User.human_attribute_name(:status) %></th>
|
<th><%= User.human_attribute_name(:status) %></th>
|
||||||
<th><%= User.human_attribute_name(:confirmed_at) %></th>
|
<th><%= User.human_attribute_name(:confirmed_at) %></th>
|
||||||
<th><%= User.human_attribute_name(:created_at) %> <sup>(UTC)</sup></th>
|
<th><pre><%= User.human_attribute_name(:created_at) %> <sup>(UTC)</sup></pre></th>
|
||||||
<th><%= t :actions %></th>
|
<th><%= t :actions %></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@@ -22,10 +22,8 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td><%= svg_tag 'checkbox-marked-outline' if user.confirmed_at.present? %></td>
|
||||||
<%= svg_tag 'pictograms/checkbox-marked-outline' if user.confirmed_at.present? %>
|
<td><pre><%= l user.created_at, format: :without_tz %></pre></td>
|
||||||
</td>
|
|
||||||
<td><%= l user.created_at, format: :without_tz %></td>
|
|
||||||
<td class="flex">
|
<td class="flex">
|
||||||
<% if allow_disguise?(user) %>
|
<% if allow_disguise?(user) %>
|
||||||
<%= image_link_to t('.disguise'), 'incognito', disguise_user_path(user) %>
|
<%= image_link_to t('.disguise'), 'incognito', disguise_user_path(user) %>
|
||||||
|
|||||||
@@ -1,2 +1 @@
|
|||||||
<%# For some reason flash messages are duplicated in bot flash and flash.now %>
|
|
||||||
<% flash.discard %>
|
<% flash.discard %>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<% content_for :navigation, flush: true do %>
|
<% content_for :navigation, flush: true do %>
|
||||||
<%= link_to svg_tag('pictograms/arrow-left-bold-outline', t(:back)),
|
<%= link_to svg_tag('arrow-left-bold-outline', t(:back)),
|
||||||
request.referer.present? ? :back : root_path, class: 'tab' %>
|
request.referer.present? ? :back : root_path, class: 'tab' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<% content_for :navigation, flush: true do %>
|
<% content_for :navigation, flush: true do %>
|
||||||
<%= link_to svg_tag('pictograms/arrow-left-bold-outline', t(:back)), users_path,
|
<%= link_to svg_tag('arrow-left-bold-outline', t(:back)), users_path, class: 'tab' %>
|
||||||
class: 'tab' %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= labeled_form_for @user, html: {class: 'main-area'} do |f| %>
|
<%= labeled_form_for @user, html: {class: 'main-area'} do |f| %>
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
#!/usr/bin/env ruby
|
||||||
|
require_relative "../config/boot"
|
||||||
|
require "active_support/continuous_integration"
|
||||||
|
|
||||||
|
CI = ActiveSupport::ContinuousIntegration
|
||||||
|
require_relative "../config/ci.rb"
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
#!/usr/bin/env ruby
|
||||||
|
exec "./bin/rails", "server", *ARGV
|
||||||