forked from fixin.me/fixin.me
Compare commits
1 Commits
fix/form-c
...
feature/ex
| Author | SHA1 | Date | |
|---|---|---|---|
| 3e0f27b357 |
122
CLAUDE.md
122
CLAUDE.md
@@ -1,122 +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
|
|
||||||
|
|
||||||
### Use Stimulus for all JS behavior
|
|
||||||
|
|
||||||
This app uses **Hotwire = Turbo + Stimulus**. All JavaScript behavior must be in Stimulus controllers under `app/javascript/controllers/`. Never use:
|
|
||||||
- Inline HTML event handlers: `onclick="..."`, `onkeydown="..."`, `ondragstart="..."` etc.
|
|
||||||
- Global `window.*` function exports
|
|
||||||
- Bare `<script>` blocks in templates
|
|
||||||
- `turbo:load` listeners for behavior that belongs in a controller's `connect()` lifecycle
|
|
||||||
|
|
||||||
**Instead:**
|
|
||||||
- Put behavior in a Stimulus controller method
|
|
||||||
- Wire it with `data-action="event->controller#method"` in the template
|
|
||||||
- Use `data-controller="name"` on the root element, `data-[name]-target="targetName"` for targets, `data-[name]-[valueName]-value="..."` for values
|
|
||||||
- Use `connect()` / `disconnect()` for setup/teardown (MutationObservers, event listeners, etc.)
|
|
||||||
|
|
||||||
Controller filename `foo_bar_controller.js` → identifier `foo-bar` → `data-controller="foo-bar"`.
|
|
||||||
|
|
||||||
### 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
|
|
||||||
1
Gemfile
1
Gemfile
@@ -25,7 +25,6 @@ gem "devise"
|
|||||||
|
|
||||||
gem "importmap-rails"
|
gem "importmap-rails"
|
||||||
gem "turbo-rails", "~> 2.0"
|
gem "turbo-rails", "~> 2.0"
|
||||||
gem "stimulus-rails"
|
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
gem "byebug"
|
gem "byebug"
|
||||||
|
|||||||
@@ -273,8 +273,6 @@ GEM
|
|||||||
sqlite3 (2.9.0-x86_64-darwin)
|
sqlite3 (2.9.0-x86_64-darwin)
|
||||||
sqlite3 (2.9.0-x86_64-linux-gnu)
|
sqlite3 (2.9.0-x86_64-linux-gnu)
|
||||||
sqlite3 (2.9.0-x86_64-linux-musl)
|
sqlite3 (2.9.0-x86_64-linux-musl)
|
||||||
stimulus-rails (1.3.4)
|
|
||||||
railties (>= 6.0.0)
|
|
||||||
stringio (3.2.0)
|
stringio (3.2.0)
|
||||||
thor (1.5.0)
|
thor (1.5.0)
|
||||||
tilt (2.7.0)
|
tilt (2.7.0)
|
||||||
@@ -326,7 +324,6 @@ DEPENDENCIES
|
|||||||
selenium-webdriver
|
selenium-webdriver
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
sqlite3 (~> 2.7)
|
sqlite3 (~> 2.7)
|
||||||
stimulus-rails
|
|
||||||
turbo-rails (~> 2.0)
|
turbo-rails (~> 2.0)
|
||||||
tzinfo-data
|
tzinfo-data
|
||||||
web-console
|
web-console
|
||||||
|
|||||||
@@ -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 |
@@ -36,7 +36,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;
|
||||||
|
|
||||||
@@ -111,11 +110,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;
|
||||||
}
|
}
|
||||||
@@ -237,10 +231,6 @@ 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],
|
[name=cancel],
|
||||||
.auxiliary {
|
.auxiliary {
|
||||||
border-color: var(--color-border-gray);
|
border-color: var(--color-border-gray);
|
||||||
@@ -262,13 +252,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);
|
||||||
}
|
}
|
||||||
@@ -378,7 +361,7 @@ header {
|
|||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
}
|
}
|
||||||
.flash:before {
|
.flash:before {
|
||||||
filter: invert(100%);
|
filter: invert();
|
||||||
height: 1.4em;
|
height: 1.4em;
|
||||||
margin: 0 0.5em;
|
margin: 0 0.5em;
|
||||||
width: 1.4em;
|
width: 1.4em;
|
||||||
@@ -530,7 +513,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 {
|
||||||
@@ -657,45 +640,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;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -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
|
||||||
|
|||||||
@@ -86,7 +86,6 @@ 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|
|
||||||
@@ -171,7 +170,6 @@ 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],
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,15 +1,54 @@
|
|||||||
// 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 "controllers"
|
|
||||||
|
|
||||||
|
|
||||||
/* Hide page before loaded for testing purposes */
|
/* Hide page before loaded for testing purposes */
|
||||||
function showPage() {
|
function showPage(event) {
|
||||||
document.documentElement.style.visibility = "visible"
|
document.documentElement.style.visibility="visible"
|
||||||
}
|
}
|
||||||
document.addEventListener('turbo:load', showPage)
|
document.addEventListener('turbo:load', showPage)
|
||||||
|
|
||||||
|
function detailsChange(event) {
|
||||||
|
var target = event.currentTarget
|
||||||
|
var count = target.querySelectorAll('input:checked:not([disabled])').length
|
||||||
|
var span = target.querySelector('summary > span')
|
||||||
|
var button = target.querySelector('button')
|
||||||
|
if (count > 0) {
|
||||||
|
span.textContent = count + ' selected';
|
||||||
|
Turbo.StreamElement.prototype.enableElement(button)
|
||||||
|
} else {
|
||||||
|
span.textContent = span.getAttribute('data-prompt')
|
||||||
|
Turbo.StreamElement.prototype.disableElement(button)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
window.detailsChange = detailsChange
|
||||||
|
|
||||||
|
/* Close open <details> when focus lost */
|
||||||
|
function detailsClose(event) {
|
||||||
|
if (!event.relatedTarget ||
|
||||||
|
event.relatedTarget.closest("details") != event.currentTarget) {
|
||||||
|
event.currentTarget.removeAttribute("open")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
window.detailsClose = detailsClose
|
||||||
|
|
||||||
|
window.detailsObserver = new MutationObserver((mutations) => {
|
||||||
|
mutations[0].target.dispatchEvent(new Event('change', {bubbles: true}))
|
||||||
|
});
|
||||||
|
|
||||||
|
function formValidate(event) {
|
||||||
|
var id = event.submitter.getAttribute("data-validate")
|
||||||
|
if (!id) return;
|
||||||
|
|
||||||
|
var input = document.getElementById(id)
|
||||||
|
if (!input.checkValidity()) {
|
||||||
|
input.reportValidity()
|
||||||
|
event.preventDefault()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
window.formValidate = formValidate
|
||||||
|
|
||||||
|
|
||||||
/* Turbo stream actions */
|
/* Turbo stream actions */
|
||||||
Turbo.StreamElement.prototype.disableElement = function(element) {
|
Turbo.StreamElement.prototype.disableElement = function(element) {
|
||||||
@@ -72,3 +111,117 @@ Turbo.StreamActions.unselect = function() {
|
|||||||
this.enableElement(e)
|
this.enableElement(e)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formProcessKey(event) {
|
||||||
|
switch (event.key) {
|
||||||
|
case "Escape":
|
||||||
|
event.currentTarget.querySelector("a[name=cancel]").click()
|
||||||
|
break
|
||||||
|
case "Enter":
|
||||||
|
event.currentTarget.querySelector("button[name=button]").click()
|
||||||
|
event.preventDefault()
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
window.formProcessKey = formProcessKey
|
||||||
|
|
||||||
|
function detailsProcessKey(event) {
|
||||||
|
// TODO: up/down arrows to move focus to prev/next line
|
||||||
|
switch (event.key) {
|
||||||
|
case "Escape":
|
||||||
|
if (event.currentTarget.hasAttribute("open")) {
|
||||||
|
event.currentTarget.removeAttribute("open")
|
||||||
|
event.stopPropagation()
|
||||||
|
}
|
||||||
|
break
|
||||||
|
case "Enter":
|
||||||
|
var button = event.currentTarget.querySelector("button:not([disabled])")
|
||||||
|
if (button) {
|
||||||
|
button.click()
|
||||||
|
// Autofocus won't be respected unless target is blurred
|
||||||
|
event.target.blur()
|
||||||
|
event.preventDefault()
|
||||||
|
event.stopPropagation()
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
window.detailsProcessKey = detailsProcessKey;
|
||||||
|
|
||||||
|
/* Items table drag and drop support */
|
||||||
|
var lastEnterTime
|
||||||
|
function dragStart(event) {
|
||||||
|
lastEnterTime = event.timeStamp
|
||||||
|
var row = event.currentTarget
|
||||||
|
row.closest("table").querySelectorAll("thead tr").forEach((tr) => {
|
||||||
|
tr.toggleAttribute("hidden")
|
||||||
|
})
|
||||||
|
event.dataTransfer.setData("text/plain", row.getAttribute("data-drag-path"))
|
||||||
|
var rowRectangle = row.getBoundingClientRect()
|
||||||
|
event.dataTransfer.setDragImage(row, event.x - rowRectangle.left, event.y - rowRectangle.top)
|
||||||
|
event.dataTransfer.dropEffect = "move"
|
||||||
|
}
|
||||||
|
window.dragStart = dragStart
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Drag tracking assumptions (based on FF 122.0 experience):
|
||||||
|
* * Enter/Leave events at the same timeStamp may not be logically ordered
|
||||||
|
* (e.g. E -> E -> L, not E -> L -> E),
|
||||||
|
* * not every Enter event has corresponding Leave event, especially during
|
||||||
|
* rapid pointer moves
|
||||||
|
* NOTE: sometimes Leave is not emitted when pointer goes fast over table
|
||||||
|
* and outside. This should probably be fixed in browser, than patched here.
|
||||||
|
*/
|
||||||
|
function dragEnter(event) {
|
||||||
|
//console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id)
|
||||||
|
dragLeave(event)
|
||||||
|
lastEnterTime = event.timeStamp
|
||||||
|
const id = event.currentTarget.getAttribute("data-drop-id")
|
||||||
|
document.getElementById(id).classList.add("dropzone")
|
||||||
|
}
|
||||||
|
window.dragEnter = dragEnter
|
||||||
|
|
||||||
|
function dragOver(event) {
|
||||||
|
event.preventDefault()
|
||||||
|
}
|
||||||
|
window.dragOver = dragOver
|
||||||
|
|
||||||
|
function dragLeave(event) {
|
||||||
|
//console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id)
|
||||||
|
// Leave has been accounted for by Enter at the same timestamp, processed earlier
|
||||||
|
if (event.timeStamp <= lastEnterTime) return
|
||||||
|
event.currentTarget.closest("table").querySelectorAll(".dropzone").forEach((tr) => {
|
||||||
|
tr.classList.remove("dropzone")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
window.dragLeave = dragLeave
|
||||||
|
|
||||||
|
function dragEnd(event) {
|
||||||
|
dragLeave(event)
|
||||||
|
event.currentTarget.closest("table").querySelectorAll("thead tr").forEach((tr) => {
|
||||||
|
tr.toggleAttribute("hidden")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
window.dragEnd = dragEnd
|
||||||
|
|
||||||
|
function drop(event) {
|
||||||
|
event.preventDefault()
|
||||||
|
|
||||||
|
var params = new URLSearchParams()
|
||||||
|
var id_param = event.currentTarget.getAttribute("data-drop-id-param")
|
||||||
|
var id = event.currentTarget.getAttribute("data-drop-id").split("_").pop()
|
||||||
|
params.append(id_param, id)
|
||||||
|
|
||||||
|
fetch(event.dataTransfer.getData("text/plain"), {
|
||||||
|
body: params,
|
||||||
|
headers: {
|
||||||
|
"Accept": "text/vnd.turbo-stream.html",
|
||||||
|
"X-CSRF-Token": document.head.querySelector("meta[name=csrf-token]").content,
|
||||||
|
"X-Requested-With": "XMLHttpRequest"
|
||||||
|
},
|
||||||
|
method: "POST"
|
||||||
|
})
|
||||||
|
.then(response => response.text())
|
||||||
|
.then(html => Turbo.renderStreamMessage(html))
|
||||||
|
}
|
||||||
|
window.drop = drop
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
import { Application } from "@hotwired/stimulus"
|
|
||||||
|
|
||||||
const application = Application.start()
|
|
||||||
application.debug = false
|
|
||||||
window.Stimulus = application
|
|
||||||
|
|
||||||
export { application }
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
|
||||||
|
|
||||||
export default class extends Controller {
|
|
||||||
static targets = ["container", "data"]
|
|
||||||
|
|
||||||
connect() {
|
|
||||||
const readouts = JSON.parse(this.dataTarget.textContent)
|
|
||||||
if (readouts.length === 0) return
|
|
||||||
|
|
||||||
const quantities = new Map()
|
|
||||||
readouts.forEach(r => {
|
|
||||||
if (!r.takenAt) return
|
|
||||||
if (!quantities.has(r.quantityId)) {
|
|
||||||
quantities.set(r.quantityId, { name: r.quantityName, unit: r.unit, x: [], y: [] })
|
|
||||||
}
|
|
||||||
const q = quantities.get(r.quantityId)
|
|
||||||
q.x.push(r.takenAt)
|
|
||||||
q.y.push(r.value)
|
|
||||||
})
|
|
||||||
|
|
||||||
const traces = []
|
|
||||||
quantities.forEach(q => {
|
|
||||||
traces.push({
|
|
||||||
x: q.x, y: q.y,
|
|
||||||
mode: 'lines+markers', type: 'scatter',
|
|
||||||
name: q.name + ' (' + q.unit + ')',
|
|
||||||
marker: { size: 5 }
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
const div = document.createElement('div')
|
|
||||||
div.className = 'chart-panel'
|
|
||||||
this.containerTarget.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 })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
|
||||||
|
|
||||||
export default class extends Controller {
|
|
||||||
static targets = ["countLabel", "submitButton", "list"]
|
|
||||||
|
|
||||||
connect() {
|
|
||||||
this._observer = new MutationObserver(() => {
|
|
||||||
this.element.dispatchEvent(new Event('change', { bubbles: true }))
|
|
||||||
})
|
|
||||||
this._observer.observe(this.listTarget, { subtree: true, attributeFilter: ['disabled'] })
|
|
||||||
}
|
|
||||||
|
|
||||||
disconnect() {
|
|
||||||
this._observer?.disconnect()
|
|
||||||
}
|
|
||||||
|
|
||||||
change() {
|
|
||||||
const count = this.element.querySelectorAll('input:checked:not([disabled])').length
|
|
||||||
if (count > 0) {
|
|
||||||
this.countLabelTarget.textContent = count + ' selected'
|
|
||||||
Turbo.StreamElement.prototype.enableElement(this.submitButtonTarget)
|
|
||||||
} else {
|
|
||||||
this.countLabelTarget.textContent = this.countLabelTarget.dataset.prompt
|
|
||||||
Turbo.StreamElement.prototype.disableElement(this.submitButtonTarget)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
close(event) {
|
|
||||||
if (!event.relatedTarget ||
|
|
||||||
event.relatedTarget.closest("details") != this.element) {
|
|
||||||
this.element.removeAttribute("open")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
processKey(event) {
|
|
||||||
switch (event.key) {
|
|
||||||
case "Escape":
|
|
||||||
if (this.element.hasAttribute("open")) {
|
|
||||||
this.element.removeAttribute("open")
|
|
||||||
event.stopPropagation()
|
|
||||||
}
|
|
||||||
break
|
|
||||||
case "Enter": {
|
|
||||||
const button = this.element.querySelector("button:not([disabled])")
|
|
||||||
if (button) {
|
|
||||||
button.click()
|
|
||||||
event.target.blur()
|
|
||||||
event.preventDefault()
|
|
||||||
event.stopPropagation()
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
|
||||||
|
|
||||||
// Shared across all instances — drag spans multiple elements
|
|
||||||
let lastEnterTime
|
|
||||||
|
|
||||||
export default class extends Controller {
|
|
||||||
static values = {
|
|
||||||
dragPath: String,
|
|
||||||
dropId: String,
|
|
||||||
dropIdParam: String
|
|
||||||
}
|
|
||||||
|
|
||||||
start(event) {
|
|
||||||
lastEnterTime = event.timeStamp
|
|
||||||
this.element.closest("table").querySelectorAll("thead tr").forEach(tr => {
|
|
||||||
tr.toggleAttribute("hidden")
|
|
||||||
})
|
|
||||||
event.dataTransfer.setData("text/plain", this.dragPathValue)
|
|
||||||
const rect = this.element.getBoundingClientRect()
|
|
||||||
event.dataTransfer.setDragImage(this.element, event.x - rect.left, event.y - rect.top)
|
|
||||||
event.dataTransfer.dropEffect = "move"
|
|
||||||
}
|
|
||||||
|
|
||||||
end(event) {
|
|
||||||
this.leave(event)
|
|
||||||
this.element.closest("table").querySelectorAll("thead tr").forEach(tr => {
|
|
||||||
tr.toggleAttribute("hidden")
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
enter(event) {
|
|
||||||
this.leave(event)
|
|
||||||
lastEnterTime = event.timeStamp
|
|
||||||
document.getElementById(this.dropIdValue)?.classList.add("dropzone")
|
|
||||||
}
|
|
||||||
|
|
||||||
over(event) {
|
|
||||||
event.preventDefault()
|
|
||||||
}
|
|
||||||
|
|
||||||
leave(event) {
|
|
||||||
if (event.timeStamp <= lastEnterTime) return
|
|
||||||
this.element.closest("table").querySelectorAll(".dropzone").forEach(tr => {
|
|
||||||
tr.classList.remove("dropzone")
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
drop(event) {
|
|
||||||
event.preventDefault()
|
|
||||||
const id = this.dropIdValue.split("_").pop()
|
|
||||||
const form = document.createElement('form')
|
|
||||||
form.action = event.dataTransfer.getData("text/plain")
|
|
||||||
form.method = 'post'
|
|
||||||
form.dataset.turboStream = 'true'
|
|
||||||
const input = document.createElement('input')
|
|
||||||
input.type = 'hidden'; input.name = this.dropIdParamValue; input.value = id
|
|
||||||
form.appendChild(input)
|
|
||||||
form.addEventListener('turbo:submit-end', () => form.remove())
|
|
||||||
document.body.appendChild(form)
|
|
||||||
form.requestSubmit()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
|
||||||
|
|
||||||
export default class extends Controller {
|
|
||||||
processKey(event) {
|
|
||||||
switch (event.key) {
|
|
||||||
case "Escape":
|
|
||||||
this.element.querySelector("a[name=cancel]").click()
|
|
||||||
break
|
|
||||||
case "Enter":
|
|
||||||
this.element.querySelector("button[name=button]").click()
|
|
||||||
event.preventDefault()
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
validate(event) {
|
|
||||||
const id = event.submitter?.getAttribute("data-validate")
|
|
||||||
if (!id) return
|
|
||||||
const input = document.getElementById(id)
|
|
||||||
if (!input.checkValidity()) {
|
|
||||||
input.reportValidity()
|
|
||||||
event.preventDefault()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cancel(event) {
|
|
||||||
event.preventDefault()
|
|
||||||
const el = this.element
|
|
||||||
|
|
||||||
// Move focus to next open form if this one had focus
|
|
||||||
const focused = document.activeElement
|
|
||||||
if (!focused || focused === document.body || el.contains(focused)) {
|
|
||||||
const next = el.parentElement?.querySelector(`#${el.id} ~ tr:has([autofocus])`)
|
|
||||||
?? el.parentElement?.querySelector("tr:has([autofocus])")
|
|
||||||
next?.querySelector("[autofocus]")?.focus()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove associated inner form element (tabular: <tr> wraps a separate <form>)
|
|
||||||
document.getElementById(el.dataset.form)?.remove()
|
|
||||||
|
|
||||||
// Re-enable trigger link
|
|
||||||
const enableId = el.dataset.link ?? el.dataset.cancelEnable
|
|
||||||
if (enableId) Turbo.StreamElement.prototype.enableElement(document.getElementById(enableId))
|
|
||||||
|
|
||||||
// Show hidden row (tabular forms) or no-items placeholder (create form)
|
|
||||||
document.getElementById(el.dataset.hiddenRow)?.removeAttribute("style")
|
|
||||||
document.getElementById(el.dataset.cancelShow)?.style.removeProperty("display")
|
|
||||||
|
|
||||||
el.remove()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
import { application } from "controllers/application"
|
|
||||||
import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading"
|
|
||||||
eagerLoadControllersFrom("controllers", application)
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
|
||||||
|
|
||||||
export default class extends Controller {
|
|
||||||
static targets = ["tbody"]
|
|
||||||
|
|
||||||
connect() {
|
|
||||||
this.#group()
|
|
||||||
this._observer = new MutationObserver(() => this.#group())
|
|
||||||
this._observer.observe(this.tbodyTarget, {
|
|
||||||
childList: true, subtree: true,
|
|
||||||
attributes: true, attributeFilter: ['style']
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
disconnect() {
|
|
||||||
this._observer?.disconnect()
|
|
||||||
}
|
|
||||||
|
|
||||||
#group() {
|
|
||||||
let prevTakenAt = null
|
|
||||||
Array.from(this.tbodyTarget.querySelectorAll('tr[data-taken-at]'))
|
|
||||||
.filter(row => row.style.display !== 'none')
|
|
||||||
.forEach(row => {
|
|
||||||
const takenAt = row.dataset.takenAt
|
|
||||||
row.classList.toggle('grouped', takenAt !== null && takenAt === prevTakenAt)
|
|
||||||
prevTakenAt = takenAt
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
|
||||||
|
|
||||||
export default class extends Controller {
|
|
||||||
connect() {
|
|
||||||
document.body.dataset.measurementsView = this.#get()
|
|
||||||
}
|
|
||||||
|
|
||||||
set(event) {
|
|
||||||
const view = event.params.name
|
|
||||||
localStorage.setItem('measurements-view', view)
|
|
||||||
document.body.dataset.measurementsView = view
|
|
||||||
}
|
|
||||||
|
|
||||||
#get() {
|
|
||||||
return localStorage.getItem('measurements-view') || 'compact'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
import { Controller } from "@hotwired/stimulus"
|
|
||||||
|
|
||||||
export default class extends Controller {
|
|
||||||
static targets = ["select", "button"]
|
|
||||||
|
|
||||||
unitChanged() {
|
|
||||||
if (this.selectTarget.value && this.selectTarget.value !== this.selectTarget.dataset.defaultUnitId) {
|
|
||||||
Turbo.StreamElement.prototype.enableElement(this.buttonTarget)
|
|
||||||
} else {
|
|
||||||
Turbo.StreamElement.prototype.disableElement(this.buttonTarget)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
setDefault() {
|
|
||||||
const select = this.selectTarget
|
|
||||||
const form = document.createElement('form')
|
|
||||||
form.action = this.buttonTarget.dataset.path
|
|
||||||
form.method = 'post'
|
|
||||||
form.dataset.turboStream = 'true'
|
|
||||||
const methodInput = document.createElement('input')
|
|
||||||
methodInput.type = 'hidden'; methodInput.name = '_method'; methodInput.value = 'patch'
|
|
||||||
const 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', event => {
|
|
||||||
if (event.detail.success) {
|
|
||||||
select.dataset.defaultUnitId = select.value
|
|
||||||
this.unitChanged()
|
|
||||||
}
|
|
||||||
form.remove()
|
|
||||||
})
|
|
||||||
document.body.appendChild(form)
|
|
||||||
form.requestSubmit()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +1,9 @@
|
|||||||
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
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
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
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
<div data-controller="charts">
|
|
||||||
<div class="main-area" id="measurements-charts" data-charts-target="container"></div>
|
|
||||||
<script id="charts-data" type="application/json" data-charts-target="data"><%= raw @readouts_json %></script>
|
|
||||||
</div>
|
|
||||||
@@ -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 %>
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
<%= tabular_fields_for @readout, form: form_tag do |form| %>
|
|
||||||
<%- tag.tr id: row, class: "form",
|
|
||||||
data: {controller: 'form', action: 'keydown->form#processKey',
|
|
||||||
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,
|
|
||||||
data: {action: 'click->form#cancel'} %>
|
|
||||||
</td>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
@@ -1,34 +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",
|
|
||||||
data: {controller: 'form', action: 'keydown->form#processKey',
|
|
||||||
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,
|
|
||||||
data: {action: 'click->form#cancel'} %>
|
|
||||||
</td>
|
|
||||||
<% end %>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
<% end %>
|
|
||||||
@@ -1,8 +1,6 @@
|
|||||||
<%= tabular_form_with model: Measurement.new, id: :measurement_form,
|
<%= tabular_form_with model: Measurement.new, id: :measurement_form,
|
||||||
class: 'topside-area flex vertical center',
|
class: 'topside-area flex vertical center',
|
||||||
html: {data: {controller: 'form', action: 'keydown->form#processKey',
|
html: {onkeydown: 'formProcessKey(event)'} do |form| %>
|
||||||
cancel_enable: 'new_measurement_link',
|
|
||||||
cancel_show: 'no_items'}} do |form| %>
|
|
||||||
|
|
||||||
<table class="items-table center">
|
<table class="items-table center">
|
||||||
<tbody id="readouts">
|
<tbody id="readouts">
|
||||||
@@ -10,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,23 +17,29 @@
|
|||||||
|
|
||||||
<%# TODO: right-click selection; unnecessary with hierarchical tags? %>
|
<%# TODO: right-click selection; unnecessary with hierarchical tags? %>
|
||||||
<details id="quantity_select" class="center hexpand" open
|
<details id="quantity_select" class="center hexpand" open
|
||||||
data-controller="details"
|
onkeydown="detailsProcessKey(event)">
|
||||||
data-action="focusout->details#close change->details#change keydown->details#processKey">
|
|
||||||
<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 -->
|
||||||
<span data-prompt="<%= t('.select_quantity') %>" data-details-target="countLabel">
|
<span data-prompt="<%= t('.select_quantity') %>">
|
||||||
<%= t('.select_quantity') %>
|
<%= t('.select_quantity') %>
|
||||||
</span>
|
</span>
|
||||||
<%= image_button_tag t(:apply), "update", name: nil, disabled: true,
|
<%= image_button_tag t(:apply), "update", name: nil, disabled: true,
|
||||||
formaction: new_readout_path, formmethod: :get, formnovalidate: true,
|
formaction: new_readout_path, formmethod: :get, formnovalidate: true,
|
||||||
data: {turbo_stream: true, details_target: 'submitButton'} %>
|
data: {turbo_stream: true} %>
|
||||||
</summary>
|
</summary>
|
||||||
<ul data-details-target="list"><%= quantities_check_boxes(@quantities) %></ul>
|
<ul><%= quantities_check_boxes(@quantities) %></ul>
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<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', data: {action: 'click->form#cancel'} %>
|
class: 'dangerous', onclick: render_turbo_stream('form_close') %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
quantity_select.addEventListener('focusout', detailsClose)
|
||||||
|
quantity_select.addEventListener('change', detailsChange)
|
||||||
|
detailsObserver.observe(quantity_select.querySelector('ul'),
|
||||||
|
{subtree: true, attributeFilter: ['disabled']})
|
||||||
|
</script>
|
||||||
|
|||||||
4
app/views/measurements/_form_close.html.erb
Normal file
4
app/views/measurements/_form_close.html.erb
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
<%= turbo_stream.update :flashes %>
|
||||||
|
<%= turbo_stream.remove :measurement_form %>
|
||||||
|
<%= turbo_stream.show :no_items -%>
|
||||||
|
<%= turbo_stream.enable :new_measurement_link -%>
|
||||||
@@ -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 %>
|
|
||||||
@@ -1,41 +1,14 @@
|
|||||||
<%# TODO: show hint when no quantities/units defined %>
|
<%# TODO: show hint when no quantities/units defined %>
|
||||||
<div class="rightside-area buttongrid" data-controller="measurements-view">
|
<div class="rightside-area buttongrid">
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<%= image_link_to t('.new_measurement'), 'plus-outline', new_measurement_path,
|
<%= image_link_to t('.new_measurement'), 'plus-outline', new_measurement_path,
|
||||||
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', action: 'click->measurements-view#set',
|
|
||||||
'measurements-view-name-param': 'compact'} %>
|
|
||||||
<%= image_button_tag '', 'view-columns', name: nil, type: 'button',
|
|
||||||
class: 'view-toggle', title: t('.view_wide'),
|
|
||||||
data: {view: 'wide', action: 'click->measurements-view#set',
|
|
||||||
'measurements-view-name-param': 'wide'} %>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="main-area measurements-section">
|
<table class="main-area">
|
||||||
<%= tag.div id: :measurement_edit_form %>
|
<tbody id="measurements">
|
||||||
<table class="items-table measurements-compact" data-controller="measurements">
|
<%= render(@measurements) || render_no_items %>
|
||||||
<thead>
|
</tbody>
|
||||||
<tr>
|
</table>
|
||||||
<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" data-measurements-target="tbody">
|
|
||||||
<%= render(partial: 'readout', collection: @measurements, as: :readout) || render_no_items %>
|
|
||||||
</tbody>
|
|
||||||
</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} %>
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
<%= tabular_fields_for @quantity, form: form_tag do |form| %>
|
<%= tabular_fields_for @quantity, form: form_tag do |form| %>
|
||||||
<%- tag.tr id: row, class: "form",
|
<%- tag.tr id: row, class: "form", onkeydown: "formProcessKey(event)",
|
||||||
data: {controller: 'form', action: 'keydown->form#processKey',
|
data: {link: link, form: form_tag, hidden_row: hidden_row} do %>
|
||||||
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, required: true, autofocus: true, size: 20 %>
|
||||||
@@ -9,16 +8,11 @@
|
|||||||
<td>
|
<td>
|
||||||
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
||||||
</td>
|
</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, class: 'dangerous',
|
||||||
name: :cancel, data: {action: 'click->form#cancel'} %>
|
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
||||||
</td>
|
</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
2
app/views/quantities/_form_close.html.erb
Normal file
2
app/views/quantities/_form_close.html.erb
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
<%= turbo_stream.close_form row %>
|
||||||
|
<%= turbo_stream.update :flashes %>
|
||||||
@@ -1,17 +1,15 @@
|
|||||||
<%= tag.tr id: dom_id(quantity),
|
<%= tag.tr id: dom_id(quantity),
|
||||||
draggable: true,
|
ondragstart: "dragStart(event)", ondragend: "dragEnd(event)",
|
||||||
data: {controller: 'drag',
|
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
||||||
action: 'dragstart->drag#start dragend->drag#end dragover->drag#over drop->drag#drop dragenter->drag#enter dragleave->drag#leave',
|
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
||||||
drag_drag_path_value: reparent_quantity_path(quantity),
|
data: {drag_path: reparent_quantity_path(quantity), drop_id: dom_id(quantity),
|
||||||
drag_drop_id_value: dom_id(quantity),
|
drop_id_param: "quantity[parent_id]"} do %>
|
||||||
drag_drop_id_param_value: 'quantity[parent_id]'} do %>
|
|
||||||
|
|
||||||
<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>
|
||||||
<td><%= quantity.description %></td>
|
<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">
|
||||||
|
|||||||
@@ -16,18 +16,16 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th><%= Quantity.human_attribute_name(:name) %></th>
|
<th><%= Quantity.human_attribute_name(:name) %></th>
|
||||||
<th class="hexpand"><%= Quantity.human_attribute_name(:description) %></th>
|
<th class="hexpand"><%= Quantity.human_attribute_name(:description) %></th>
|
||||||
<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>
|
<th></th>
|
||||||
<% end %>
|
<% end %>
|
||||||
</tr>
|
</tr>
|
||||||
<%= tag.tr id: "quantity_", hidden: true,
|
<%= tag.tr id: "quantity_", hidden: true,
|
||||||
data: {controller: 'drag',
|
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
||||||
action: 'dragover->drag#over drop->drag#drop dragenter->drag#enter dragleave->drag#leave',
|
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
||||||
drag_drop_id_value: 'quantity_',
|
data: {drop_id: "quantity_", drop_id_param: "quantity[parent_id]"} do %>
|
||||||
drag_drop_id_param_value: 'quantity[parent_id]'} do %>
|
<th colspan="4"><%= t '.top_level_drop' %></th>
|
||||||
<th colspan="5"><%= t '.top_level_drop' %></th>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="quantities">
|
<tbody id="quantities">
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
<%# 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),
|
<%- tag.tr id: dom_id(readout.quantity, :new, :readout) do %>
|
||||||
data: {controller: 'readout-unit'} 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,19 +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 || '',
|
|
||||||
readout_unit_target: 'select',
|
|
||||||
action: 'change->readout-unit#unitChanged'} %>
|
|
||||||
</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),
|
|
||||||
readout_unit_target: 'button',
|
|
||||||
action: 'click->readout-unit#setDefault'} %>
|
|
||||||
<%= 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,6 @@
|
|||||||
<%= tabular_fields_for @unit, form: form_tag do |form| %>
|
<%= tabular_fields_for @unit, form: form_tag do |form| %>
|
||||||
<%- tag.tr id: row, class: "form",
|
<%- tag.tr id: row, class: "form", onkeydown: "formProcessKey(event)",
|
||||||
data: {controller: 'form', action: 'keydown->form#processKey',
|
data: {link: link, form: form_tag, hidden_row: hidden_row} do %>
|
||||||
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, required: true, autofocus: true, size: 12 %>
|
||||||
@@ -16,7 +15,7 @@
|
|||||||
<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, data: {action: 'click->form#cancel'} %>
|
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
||||||
</td>
|
</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
2
app/views/units/_form_close.html.erb
Normal file
2
app/views/units/_form_close.html.erb
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
<%= turbo_stream.close_form row %>
|
||||||
|
<%= turbo_stream.update :flashes %>
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
<%= tag.tr id: dom_id(unit),
|
<%= tag.tr id: dom_id(unit),
|
||||||
draggable: true,
|
ondragstart: "dragStart(event)", ondragend: "dragEnd(event)",
|
||||||
data: {controller: 'drag',
|
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
||||||
action: 'dragstart->drag#start dragend->drag#end dragover->drag#over drop->drag#drop dragenter->drag#enter dragleave->drag#leave',
|
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
||||||
drag_drag_path_value: rebase_unit_path(unit),
|
data: {drag_path: rebase_unit_path(unit),
|
||||||
drag_drop_id_value: dom_id(unit.base || unit),
|
drop_id: dom_id(unit.base || unit),
|
||||||
drag_drop_id_param_value: 'unit[base_id]'} do %>
|
drop_id_param: "unit[base_id]"} do %>
|
||||||
|
|
||||||
<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();',
|
||||||
|
|||||||
@@ -22,10 +22,9 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
</tr>
|
</tr>
|
||||||
<%= tag.tr id: "unit_", hidden: true,
|
<%= tag.tr id: "unit_", hidden: true,
|
||||||
data: {controller: 'drag',
|
ondragover: "dragOver(event)", ondrop: "drop(event)",
|
||||||
action: 'dragover->drag#over drop->drag#drop dragenter->drag#enter dragleave->drag#leave',
|
ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
|
||||||
drag_drop_id_value: 'unit_',
|
data: {drop_id: "unit_", drop_id_param: "unit[base_id]"} do %>
|
||||||
drag_drop_id_param_value: 'unit[base_id]'} do %>
|
|
||||||
<th colspan="5"><%= t '.top_level_drop' %></th>
|
<th colspan="5"><%= t '.top_level_drop' %></th>
|
||||||
<% end %>
|
<% end %>
|
||||||
</thead>
|
</thead>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<%= labeled_form_for resource, url: user_registration_path,
|
<%= labeled_form_for resource, url: user_registration_path,
|
||||||
html: {class: 'main-area', data: {controller: 'form', action: 'submit->form#validate'}} do |f| %>
|
html: {class: 'main-area', onsubmit: 'formValidate(event)'} do |f| %>
|
||||||
|
|
||||||
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
||||||
autocomplete: 'email' %>
|
autocomplete: 'email' %>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<%= labeled_form_for resource, url: user_session_path,
|
<%= labeled_form_for resource, url: user_session_path,
|
||||||
html: {class: 'main-area', data: {controller: 'form', action: 'submit->form#validate'}} do |f| %>
|
html: {class: 'main-area', onsubmit: 'formValidate(event)'} do |f| %>
|
||||||
|
|
||||||
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
<%= f.email_field :email, required: true, size: 30, autofocus: true,
|
||||||
autocomplete: 'email' %>
|
autocomplete: 'email' %>
|
||||||
|
|||||||
@@ -20,6 +20,10 @@ Bundler.require(*Rails.groups)
|
|||||||
|
|
||||||
module FixinMe
|
module FixinMe
|
||||||
class Application < Rails::Application
|
class Application < Rails::Application
|
||||||
|
# Allow RAILS_DATABASE_YML to override the database config file path.
|
||||||
|
# Used by the multi-database test runner (lib/tasks/test_databases.rake).
|
||||||
|
config.paths['config/database'] = [ENV['RAILS_DATABASE_YML']] if ENV['RAILS_DATABASE_YML']
|
||||||
|
|
||||||
# Initialize configuration defaults for originally generated Rails version.
|
# Initialize configuration defaults for originally generated Rails version.
|
||||||
config.load_defaults 7.0
|
config.load_defaults 7.0
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
yQ/e5AEwReoZ6yiIqCZjBbl2Tp41JNcuwfWF3FeSSk2K0XBtE+VQXHlAHMBPRwbBdkutB8jls+YKou3JX58j88BEH3Ft/8h7GIepYF+nOhdb79y05lqEhARA4IZYnHe1Do72MdmseE0ectfDpfk6Q1qnfiTFe3X1KyfLR0hiSEM5+1ZYfk2loUBWSIfgYuqtK7bEOZiL6imU46n4+58g3VZd0cK7getT7rwNlVt1s6ME9PTwT/RqE736fLEIyDeaEg8hBxTrPVeYyii2o4IWM02/0HsuRPxXLLQAgXyzHhlT9wo18X5FaaecgGloBie0UMrPS3j6oBlVn61WQbkuEe/yQKnzyiw0v5HSmzME4PiDTaSW2em/BtGiMAhJpyukipQa4/leR3OTJxv3TAMha1bnk/OC--QU+gjSEvBsZpr3XT--osCoTfqZ4ENeas+nFdXefA==
|
3nm9KZNtyLhPgZBVzOOkN2FXHD0uEMuzgb5Sl1MrAMmi6+iEFSzyTHfZFW2mz18VyNz5DDYvTODZqBDQKK+FQh70uEQkmGqaY5XsTOzUFzk56quaPNtZvFEGux1nX2avSbYQBs3HeyYyWyTAFhez5j8tVb6sZD2xZ8twa9KAB42j86NIHT9w/ZMFqZbGbdBoR1Mrqoy9/IWv2QgxMTpGR6JBpTUwauXm6wS/bTt8SCXF57JSVgvdw/BxFzoA3Xj6N5E89LbMfh54W2ruMhybka5E7zXN9z0v4oXt8GiYZFIODEYZwqzEVaUK1WXS5qb5OrDJFAzs29Uf/gDrIDx71Lot+jejCS+xFfI9454EnHcVH66wKuwF6ylKupJDffM0hQHplcEfVSq5UiDfbPXm46Vr0g1A--2RrmuzCBuHvYpPNA--ugbuRe7ivfDqeUCt6ahciA==
|
||||||
@@ -48,3 +48,24 @@ production:
|
|||||||
#test:
|
#test:
|
||||||
# <<: *default
|
# <<: *default
|
||||||
# database: fixinme_test
|
# database: fixinme_test
|
||||||
|
|
||||||
|
# Multi-database testing
|
||||||
|
# ----------------------
|
||||||
|
# Any key starting with "test" is treated as a test database.
|
||||||
|
# When more than one is present, EVERY test task (rails test, rails test:models,
|
||||||
|
# rails test:system, …) automatically runs against all of them.
|
||||||
|
#
|
||||||
|
# The adapter gem must be available:
|
||||||
|
# bundle config --local with "mysql sqlite" # mysql + sqlite
|
||||||
|
# bundle config --local with "mysql pg" # mysql + postgresql
|
||||||
|
#
|
||||||
|
#test_sqlite:
|
||||||
|
# adapter: sqlite3
|
||||||
|
# database: db/fixinme_test.sqlite3
|
||||||
|
#
|
||||||
|
#test_pg:
|
||||||
|
# adapter: postgresql
|
||||||
|
# database: fixinme_test
|
||||||
|
# username: fixinme
|
||||||
|
# password: Some-password1%
|
||||||
|
# host: localhost
|
||||||
|
|||||||
@@ -58,7 +58,4 @@ Rails.application.configure do
|
|||||||
# config.action_view.annotate_rendered_view_with_filenames = true
|
# config.action_view.annotate_rendered_view_with_filenames = true
|
||||||
|
|
||||||
config.log_level = :info
|
config.log_level = :info
|
||||||
|
|
||||||
# Allow Capybara's dynamic test server host (127.0.0.1:<random_port>)
|
|
||||||
config.hosts << '127.0.0.1'
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -2,6 +2,3 @@
|
|||||||
|
|
||||||
pin "application", preload: true
|
pin "application", preload: true
|
||||||
pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
|
pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
|
||||||
pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
|
|
||||||
pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
|
|
||||||
pin_all_from "app/javascript/controllers", under: "controllers"
|
|
||||||
|
|||||||
@@ -11,13 +11,8 @@ en:
|
|||||||
activerecord:
|
activerecord:
|
||||||
attributes:
|
attributes:
|
||||||
quantity:
|
quantity:
|
||||||
default_unit: Default unit
|
|
||||||
description: Description
|
description: Description
|
||||||
name: Name
|
name: Name
|
||||||
readout:
|
|
||||||
created_at: Recorded at
|
|
||||||
taken_at: Taken at
|
|
||||||
value: Value
|
|
||||||
unit:
|
unit:
|
||||||
base: Base unit
|
base: Base unit
|
||||||
description: Description
|
description: Description
|
||||||
@@ -86,11 +81,6 @@ en:
|
|||||||
revert: Revert
|
revert: Revert
|
||||||
sign_out: Sign out
|
sign_out: Sign out
|
||||||
source_code: Get code
|
source_code: Get code
|
||||||
readouts:
|
|
||||||
form:
|
|
||||||
set_default_unit: Set as default unit
|
|
||||||
charts:
|
|
||||||
navigation: Charts
|
|
||||||
measurements:
|
measurements:
|
||||||
navigation: Measurements
|
navigation: Measurements
|
||||||
no_items: There are no measurements taken. You can Add some now.
|
no_items: There are no measurements taken. You can Add some now.
|
||||||
@@ -99,21 +89,6 @@ en:
|
|||||||
taken_at_html: Measurement taken at 
|
taken_at_html: Measurement taken at 
|
||||||
index:
|
index:
|
||||||
new_measurement: Add measurement
|
new_measurement: Add measurement
|
||||||
view_compact: Compact view
|
|
||||||
view_wide: Wide view
|
|
||||||
view_charts: Charts
|
|
||||||
readout:
|
|
||||||
edit: Edit
|
|
||||||
destroy: Delete
|
|
||||||
create:
|
|
||||||
success:
|
|
||||||
one: Recorded 1 measurement.
|
|
||||||
other: Recorded %{count} measurements.
|
|
||||||
no_readouts: No readouts selected.
|
|
||||||
update:
|
|
||||||
success: Measurement updated.
|
|
||||||
destroy:
|
|
||||||
success: Measurement deleted.
|
|
||||||
quantities:
|
quantities:
|
||||||
navigation: Quantities
|
navigation: Quantities
|
||||||
no_items: There are no configured quantities. You can Add some or Import from defaults.
|
no_items: There are no configured quantities. You can Add some or Import from defaults.
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
Rails.application.routes.draw do
|
Rails.application.routes.draw do
|
||||||
resources :measurements
|
resources :measurements
|
||||||
resources :charts, only: [:index]
|
|
||||||
|
|
||||||
resources :readouts, only: [:new] do
|
resources :readouts, only: [:new] do
|
||||||
collection {get 'new/:id/discard', action: :discard, as: :discard}
|
collection {get 'new/:id/discard', action: :discard, as: :discard}
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
class AddTakenAtToReadouts < ActiveRecord::Migration[7.2]
|
|
||||||
def change
|
|
||||||
add_column :readouts, :taken_at, :datetime
|
|
||||||
add_index :readouts, [:user_id, :taken_at]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
class AddDefaultUnitToQuantities < ActiveRecord::Migration[7.2]
|
|
||||||
def change
|
|
||||||
add_reference :quantities, :default_unit, foreign_key: {to_table: :units}, null: true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema[7.2].define(version: 2026_04_03_000000) do
|
ActiveRecord::Schema[7.2].define(version: 2025_01_21_230456) do
|
||||||
create_table "quantities", charset: "utf8mb4", collation: "utf8mb4_0900_as_ci", force: :cascade do |t|
|
create_table "quantities", charset: "utf8mb4", collation: "utf8mb4_0900_as_ci", force: :cascade do |t|
|
||||||
t.bigint "user_id"
|
t.bigint "user_id"
|
||||||
t.string "name", limit: 31, null: false
|
t.string "name", limit: 31, null: false
|
||||||
@@ -20,8 +20,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_03_000000) do
|
|||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.integer "depth", default: 0, null: false
|
t.integer "depth", default: 0, null: false
|
||||||
t.string "pathname", limit: 511, null: false
|
t.string "pathname", limit: 511, null: false
|
||||||
t.bigint "default_unit_id"
|
|
||||||
t.index ["default_unit_id"], name: "index_quantities_on_default_unit_id"
|
|
||||||
t.index ["parent_id"], name: "index_quantities_on_parent_id"
|
t.index ["parent_id"], name: "index_quantities_on_parent_id"
|
||||||
t.index ["user_id", "parent_id", "name"], name: "index_quantities_on_user_id_and_parent_id_and_name", unique: true
|
t.index ["user_id", "parent_id", "name"], name: "index_quantities_on_user_id_and_parent_id_and_name", unique: true
|
||||||
t.index ["user_id"], name: "index_quantities_on_user_id"
|
t.index ["user_id"], name: "index_quantities_on_user_id"
|
||||||
@@ -34,12 +32,10 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_03_000000) do
|
|||||||
t.decimal "value", precision: 30, scale: 15, null: false
|
t.decimal "value", precision: 30, scale: 15, null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.datetime "taken_at"
|
|
||||||
t.index ["quantity_id", "created_at"], name: "index_readouts_on_quantity_id_and_created_at", unique: true
|
t.index ["quantity_id", "created_at"], name: "index_readouts_on_quantity_id_and_created_at", unique: true
|
||||||
t.index ["quantity_id"], name: "index_readouts_on_quantity_id"
|
t.index ["quantity_id"], name: "index_readouts_on_quantity_id"
|
||||||
t.index ["unit_id"], name: "index_readouts_on_unit_id"
|
t.index ["unit_id"], name: "index_readouts_on_unit_id"
|
||||||
t.index ["user_id"], name: "index_readouts_on_user_id"
|
t.index ["user_id"], name: "index_readouts_on_user_id"
|
||||||
t.index ["user_id", "taken_at"], name: "index_readouts_on_user_id_and_taken_at"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "units", charset: "utf8mb4", collation: "utf8mb4_0900_as_ci", force: :cascade do |t|
|
create_table "units", charset: "utf8mb4", collation: "utf8mb4_0900_as_ci", force: :cascade do |t|
|
||||||
@@ -74,7 +70,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_03_000000) do
|
|||||||
end
|
end
|
||||||
|
|
||||||
add_foreign_key "quantities", "quantities", column: "parent_id", on_delete: :cascade
|
add_foreign_key "quantities", "quantities", column: "parent_id", on_delete: :cascade
|
||||||
add_foreign_key "quantities", "units", column: "default_unit_id"
|
|
||||||
add_foreign_key "quantities", "users"
|
add_foreign_key "quantities", "users"
|
||||||
add_foreign_key "readouts", "quantities"
|
add_foreign_key "readouts", "quantities"
|
||||||
add_foreign_key "readouts", "units"
|
add_foreign_key "readouts", "units"
|
||||||
|
|||||||
@@ -21,4 +21,3 @@ end
|
|||||||
#[Source, Quantity, Unit].each { |model| model.defaults.delete_all }
|
#[Source, Quantity, Unit].each { |model| model.defaults.delete_all }
|
||||||
|
|
||||||
require_relative 'seeds/units.rb'
|
require_relative 'seeds/units.rb'
|
||||||
require_relative 'seeds/demo.rb'
|
|
||||||
|
|||||||
@@ -1,87 +0,0 @@
|
|||||||
demo_email = 'demo@localhost'
|
|
||||||
|
|
||||||
User.transaction do
|
|
||||||
break if User.find_by(email: demo_email)
|
|
||||||
|
|
||||||
demo = User.create! email: demo_email, password: 'demo123', status: :active do |user|
|
|
||||||
user.skip_confirmation!
|
|
||||||
print "Creating demo account '#{user.email}' with password '#{user.password}'..."
|
|
||||||
end
|
|
||||||
puts "done."
|
|
||||||
|
|
||||||
# --- Units ---
|
|
||||||
u = {}
|
|
||||||
u[:kg] = demo.units.create! symbol: 'kg', description: 'kilogram'
|
|
||||||
u[:g] = demo.units.create! symbol: 'g', description: 'gram', base: u[:kg], multiplier: 1e-3
|
|
||||||
u[:cm] = demo.units.create! symbol: 'cm', description: 'centimetre'
|
|
||||||
u[:bpm] = demo.units.create! symbol: 'bpm', description: 'beats per minute'
|
|
||||||
u[:pct] = demo.units.create! symbol: '%', description: 'percent'
|
|
||||||
u[:h] = demo.units.create! symbol: 'h', description: 'hour'
|
|
||||||
u[:min] = demo.units.create! symbol: 'min', description: 'minute', base: u[:h], multiplier: (1.0/60).round(10)
|
|
||||||
u[:kcal]= demo.units.create! symbol: 'kcal',description: 'kilocalorie'
|
|
||||||
u[:mg] = demo.units.create! symbol: 'mg', description: 'milligram', base: u[:kg], multiplier: 1e-6
|
|
||||||
u[:mmhg]= demo.units.create! symbol: 'mmHg',description: 'millimetre of mercury'
|
|
||||||
|
|
||||||
# --- Quantities ---
|
|
||||||
body = demo.quantities.create! name: 'Body'
|
|
||||||
weight = demo.quantities.create! name: 'Weight', parent: body
|
|
||||||
height = demo.quantities.create! name: 'Height', parent: body
|
|
||||||
fat = demo.quantities.create! name: 'Body fat', parent: body
|
|
||||||
|
|
||||||
cardio = demo.quantities.create! name: 'Cardiovascular'
|
|
||||||
hr_rest = demo.quantities.create! name: 'Resting HR', parent: cardio
|
|
||||||
hr_peak = demo.quantities.create! name: 'Peak HR', parent: cardio
|
|
||||||
bp_sys = demo.quantities.create! name: 'BP systolic', parent: cardio
|
|
||||||
bp_dia = demo.quantities.create! name: 'BP diastolic', parent: cardio
|
|
||||||
|
|
||||||
activity = demo.quantities.create! name: 'Activity'
|
|
||||||
sleep_dur = demo.quantities.create! name: 'Sleep', parent: activity
|
|
||||||
calories = demo.quantities.create! name: 'Calories out', parent: activity
|
|
||||||
|
|
||||||
nutrition = demo.quantities.create! name: 'Nutrition'
|
|
||||||
cal_in = demo.quantities.create! name: 'Calories in', parent: nutrition
|
|
||||||
caffeine = demo.quantities.create! name: 'Caffeine', parent: nutrition
|
|
||||||
|
|
||||||
# --- Readouts (60 days of daily-ish data) ---
|
|
||||||
base_time = 60.days.ago.beginning_of_day
|
|
||||||
rng = Random.new(42)
|
|
||||||
|
|
||||||
weight_val = 82.4
|
|
||||||
fat_val = 21.5
|
|
||||||
hr_rest_val = 62.0
|
|
||||||
|
|
||||||
60.times do |i|
|
|
||||||
t = base_time + i.days + rng.rand(3600 * 2)
|
|
||||||
|
|
||||||
weight_val += rng.rand(-0.3..0.3)
|
|
||||||
fat_val += rng.rand(-0.15..0.15)
|
|
||||||
hr_rest_val += rng.rand(-1.5..1.5)
|
|
||||||
hr_rest_val = hr_rest_val.clamp(52, 72)
|
|
||||||
|
|
||||||
demo.readouts.create! quantity: weight, unit: u[:kg], value: weight_val.round(1), created_at: t
|
|
||||||
demo.readouts.create! quantity: fat, unit: u[:pct], value: fat_val.round(1), created_at: t
|
|
||||||
demo.readouts.create! quantity: hr_rest, unit: u[:bpm], value: hr_rest_val.round, created_at: t
|
|
||||||
|
|
||||||
if i % 2 == 0
|
|
||||||
demo.readouts.create! quantity: bp_sys, unit: u[:mmhg], value: (115 + rng.rand(-8..8)).round, created_at: t
|
|
||||||
demo.readouts.create! quantity: bp_dia, unit: u[:mmhg], value: (75 + rng.rand(-5..5)).round, created_at: t
|
|
||||||
end
|
|
||||||
|
|
||||||
if i % 3 == 0
|
|
||||||
demo.readouts.create! quantity: hr_peak, unit: u[:bpm], value: (155 + rng.rand(-10..10)).round, created_at: t
|
|
||||||
end
|
|
||||||
|
|
||||||
demo.readouts.create! quantity: sleep_dur, unit: u[:h], value: (6.5 + rng.rand(-1.5..1.5)).round(1), created_at: t
|
|
||||||
demo.readouts.create! quantity: calories, unit: u[:kcal],value: (2100 + rng.rand(-300..300)).round, created_at: t
|
|
||||||
demo.readouts.create! quantity: cal_in, unit: u[:kcal],value: (1900 + rng.rand(-400..400)).round, created_at: t
|
|
||||||
|
|
||||||
if i % 4 == 0
|
|
||||||
demo.readouts.create! quantity: caffeine, unit: u[:mg], value: (200 + rng.rand(-80..80)).round, created_at: t
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
# height is stable — record once
|
|
||||||
demo.readouts.create! quantity: height, unit: u[:cm], value: 178.0, created_at: base_time
|
|
||||||
|
|
||||||
puts " Created #{demo.units.count} units, #{demo.quantities.count} quantities, #{demo.readouts.count} readouts."
|
|
||||||
end
|
|
||||||
158
lib/tasks/test_databases.rake
Normal file
158
lib/tasks/test_databases.rake
Normal file
@@ -0,0 +1,158 @@
|
|||||||
|
require 'yaml'
|
||||||
|
require 'erb'
|
||||||
|
require 'tmpdir'
|
||||||
|
|
||||||
|
# Multi-database test runner
|
||||||
|
# ==========================
|
||||||
|
# When database.yml contains more than one `test*` configuration, every
|
||||||
|
# standard test task (test, test:models, test:system, …) is automatically
|
||||||
|
# rewritten to run the full suite against EACH configured database in turn.
|
||||||
|
#
|
||||||
|
# Convention — any top-level key that starts with "test" and holds a Hash:
|
||||||
|
#
|
||||||
|
# test: ← required primary database
|
||||||
|
# adapter: mysql2
|
||||||
|
# database: fixinme_test
|
||||||
|
# ...
|
||||||
|
#
|
||||||
|
# test_sqlite: ← optional additional databases
|
||||||
|
# adapter: sqlite3
|
||||||
|
# database: db/fixinme_test.sqlite3
|
||||||
|
#
|
||||||
|
# test_pg:
|
||||||
|
# adapter: postgresql
|
||||||
|
# ...
|
||||||
|
#
|
||||||
|
# A single-database setup is unchanged: every task behaves exactly as before.
|
||||||
|
#
|
||||||
|
# The mechanism uses RAILS_DATABASE_YML — an env var read by
|
||||||
|
# config/application.rb(.dist) to override Rails' database config path before
|
||||||
|
# initialisation, giving each subprocess a clean, isolated database config.
|
||||||
|
|
||||||
|
module MultiDbTests
|
||||||
|
ADAPTER_GEMS = {
|
||||||
|
'mysql2' => 'mysql2',
|
||||||
|
'sqlite3' => 'sqlite3',
|
||||||
|
'postgresql' => 'pg',
|
||||||
|
'pg' => 'pg',
|
||||||
|
}.freeze
|
||||||
|
|
||||||
|
ADAPTER_BUNDLE_GROUPS = {
|
||||||
|
'mysql2' => 'mysql',
|
||||||
|
'sqlite3' => 'sqlite',
|
||||||
|
'postgresql' => 'postgresql',
|
||||||
|
'pg' => 'postgresql',
|
||||||
|
}.freeze
|
||||||
|
|
||||||
|
# Rake task names generated by railties/lib/rails/test_unit/testing.rake
|
||||||
|
# that use run_from_rake — these are the ones we rewrite.
|
||||||
|
WRAPPED_TASKS = (
|
||||||
|
['test'] +
|
||||||
|
Rails::TestUnit::Runner::TEST_FOLDERS.map { |f| "test:#{f}" } +
|
||||||
|
%w[test:all test:system test:generators test:units test:functionals]
|
||||||
|
).freeze
|
||||||
|
|
||||||
|
class << self
|
||||||
|
# Returns {name => config_hash} for every key starting with "test".
|
||||||
|
def test_configs
|
||||||
|
@test_configs ||= begin
|
||||||
|
db_file = Rails.root.join('config', 'database.yml')
|
||||||
|
all = YAML.safe_load(ERB.new(db_file.read).result, aliases: true) || {}
|
||||||
|
all.select { |k, v| k.to_s.start_with?('test') && v.is_a?(Hash) }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def non_test_configs
|
||||||
|
@non_test_configs ||= begin
|
||||||
|
db_file = Rails.root.join('config', 'database.yml')
|
||||||
|
all = YAML.safe_load(ERB.new(db_file.read).result, aliases: true) || {}
|
||||||
|
all.reject { |k, _| k.to_s.start_with?('test') }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Run rails +task_name+ for every configured test database.
|
||||||
|
# Called from the rewritten rake task actions.
|
||||||
|
def run(task_name)
|
||||||
|
cfgs = test_configs
|
||||||
|
results = {}
|
||||||
|
|
||||||
|
cfgs.each do |db_name, config|
|
||||||
|
adapter = config['adapter'].to_s
|
||||||
|
puts "\n#{'─' * 64}"
|
||||||
|
puts " #{task_name} · #{db_name} (#{adapter})"
|
||||||
|
puts '─' * 64
|
||||||
|
|
||||||
|
unless adapter_available?(adapter)
|
||||||
|
warn " SKIPPED — '#{adapter}' gem not in bundle.\n" \
|
||||||
|
" Run: bundle config --local with \"#{current_with} #{adapter_group(adapter)}\""
|
||||||
|
results[db_name] = :skipped
|
||||||
|
next
|
||||||
|
end
|
||||||
|
|
||||||
|
Dir.mktmpdir('rails_test_') do |tmpdir|
|
||||||
|
tmp_yml = File.join(tmpdir, 'database.yml')
|
||||||
|
File.write(tmp_yml, non_test_configs.merge('test' => config).to_yaml)
|
||||||
|
env = { 'RAILS_DATABASE_YML' => tmp_yml }
|
||||||
|
|
||||||
|
if system(env, 'bundle exec rails db:test:prepare')
|
||||||
|
results[db_name] = system(env, 'rails', task_name) ? :pass : :fail
|
||||||
|
else
|
||||||
|
results[db_name] = :prepare_failed
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
print_summary(cfgs, results)
|
||||||
|
|
||||||
|
failed = results.count { |_, s| [:fail, :prepare_failed].include?(s) }
|
||||||
|
exit(false) if failed > 0
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def adapter_available?(adapter)
|
||||||
|
require ADAPTER_GEMS.fetch(adapter, adapter)
|
||||||
|
true
|
||||||
|
rescue LoadError
|
||||||
|
false
|
||||||
|
end
|
||||||
|
|
||||||
|
def adapter_group(adapter)
|
||||||
|
ADAPTER_BUNDLE_GROUPS.fetch(adapter, adapter)
|
||||||
|
end
|
||||||
|
|
||||||
|
def current_with
|
||||||
|
(Bundler.settings[:with] || '').split(':').join(' ')
|
||||||
|
end
|
||||||
|
|
||||||
|
def print_summary(cfgs, results)
|
||||||
|
return if results.size <= 1 # no summary for single-DB runs
|
||||||
|
|
||||||
|
puts "\n#{'═' * 64}"
|
||||||
|
puts ' SUMMARY'
|
||||||
|
puts '═' * 64
|
||||||
|
results.each do |db_name, status|
|
||||||
|
adapter = cfgs.dig(db_name, 'adapter') || '?'
|
||||||
|
icon = status == :pass ? '✓' : (status == :skipped ? '–' : '✗')
|
||||||
|
label = { pass: 'PASS', fail: 'FAIL',
|
||||||
|
prepare_failed: 'PREPARE FAILED', skipped: 'SKIPPED' }[status]
|
||||||
|
puts " #{icon} #{db_name.ljust(26)} (#{adapter.ljust(12)}) #{label}"
|
||||||
|
end
|
||||||
|
puts '═' * 64
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Rewrite every standard test task to run against all configured databases.
|
||||||
|
# This file loads after railties/testing.rake, so all tasks already exist.
|
||||||
|
# Single-database setups are completely unaffected.
|
||||||
|
if MultiDbTests.test_configs.size > 1
|
||||||
|
MultiDbTests::WRAPPED_TASKS.each do |task_name|
|
||||||
|
next unless Rake::Task.task_defined?(task_name)
|
||||||
|
|
||||||
|
Rake::Task[task_name].clear_actions
|
||||||
|
Rake::Task[task_name].enhance do
|
||||||
|
MultiDbTests.run(task_name)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
require "test_helper"
|
|
||||||
|
|
||||||
class ChartsControllerTest < ActionDispatch::IntegrationTest
|
|
||||||
setup do
|
|
||||||
host! '127.0.0.1'
|
|
||||||
@user = users(:alice)
|
|
||||||
post new_user_session_path, params: { user: { email: @user.email, password: 'alice' } }
|
|
||||||
@quantity = @user.quantities.create!(name: 'Weight')
|
|
||||||
@unit = @user.units.create!(symbol: 'kg')
|
|
||||||
end
|
|
||||||
|
|
||||||
test "requires authentication" do
|
|
||||||
delete destroy_user_session_path
|
|
||||||
get charts_path
|
|
||||||
assert_response :redirect
|
|
||||||
end
|
|
||||||
|
|
||||||
test "index returns ok" do
|
|
||||||
get charts_path
|
|
||||||
assert_response :success
|
|
||||||
end
|
|
||||||
|
|
||||||
test "embeds readout data as JSON in script tag" do
|
|
||||||
users(:alice).readouts.create!(quantity: @quantity, unit: @unit, value: 82.5, taken_at: 1.day.ago)
|
|
||||||
|
|
||||||
get charts_path
|
|
||||||
|
|
||||||
assert_select 'script#charts-data[type="application/json"]' do |elements|
|
|
||||||
data = JSON.parse(elements.first.children.first.to_s)
|
|
||||||
assert_equal 1, data.size
|
|
||||||
assert_equal 'Weight', data.first['quantityName']
|
|
||||||
assert_in_delta 82.5, data.first['value']
|
|
||||||
assert_equal 'kg', data.first['unit']
|
|
||||||
assert_not_nil data.first['takenAt']
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
test "orders readouts by taken_at ascending" do
|
|
||||||
older = users(:alice).readouts.create!(quantity: @quantity, unit: @unit, value: 80.0, taken_at: 2.days.ago)
|
|
||||||
newer = users(:alice).readouts.create!(quantity: @quantity, unit: @unit, value: 82.5, taken_at: 1.day.ago)
|
|
||||||
|
|
||||||
get charts_path
|
|
||||||
|
|
||||||
assert_select 'script#charts-data[type="application/json"]' do |elements|
|
|
||||||
data = JSON.parse(elements.first.children.first.to_s)
|
|
||||||
assert_equal older.taken_at.iso8601, data.first['takenAt']
|
|
||||||
assert_equal newer.taken_at.iso8601, data.last['takenAt']
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
test "does not expose other users readouts" do
|
|
||||||
bob_quantity = users(:bob).quantities.create!(name: 'Steps')
|
|
||||||
bob_unit = users(:bob).units.create!(symbol: 'steps')
|
|
||||||
users(:bob).readouts.create!(quantity: bob_quantity, unit: bob_unit, value: 5000, taken_at: 1.day.ago)
|
|
||||||
|
|
||||||
get charts_path
|
|
||||||
|
|
||||||
assert_select 'script#charts-data[type="application/json"]' do |elements|
|
|
||||||
data = JSON.parse(elements.first.children.first.to_s)
|
|
||||||
assert data.none? { |r| r['quantityName'] == 'Steps' }, "Bob's data must not appear"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,65 +1,8 @@
|
|||||||
require "test_helper"
|
require "test_helper"
|
||||||
|
|
||||||
class MeasurementsControllerTest < ActionDispatch::IntegrationTest
|
class MeasurementsControllerTest < ActionDispatch::IntegrationTest
|
||||||
setup do
|
#test "should get index" do
|
||||||
host! '127.0.0.1'
|
# get measurements_index_url
|
||||||
@user = users(:alice)
|
# assert_response :success
|
||||||
post new_user_session_path, params: { user: { email: @user.email, password: 'alice' } }
|
#end
|
||||||
@quantity = @user.quantities.create!(name: 'Weight')
|
|
||||||
@unit = @user.units.create!(symbol: 'kg')
|
|
||||||
end
|
|
||||||
|
|
||||||
test "index returns ok" do
|
|
||||||
get measurements_path
|
|
||||||
assert_response :success
|
|
||||||
end
|
|
||||||
|
|
||||||
test "index requires authentication" do
|
|
||||||
delete destroy_user_session_path
|
|
||||||
get measurements_path
|
|
||||||
assert_response :redirect
|
|
||||||
end
|
|
||||||
|
|
||||||
test "create records readout with taken_at" do
|
|
||||||
taken_at = 1.day.ago.change(usec: 0)
|
|
||||||
assert_difference -> { @user.readouts.count } do
|
|
||||||
post measurements_path, params: {
|
|
||||||
taken_at: taken_at.iso8601,
|
|
||||||
readouts: [{ quantity_id: @quantity.id, value: '82.5', unit_id: @unit.id }]
|
|
||||||
}, as: :turbo_stream
|
|
||||||
end
|
|
||||||
assert_response :success
|
|
||||||
assert_equal taken_at, @user.readouts.last.taken_at
|
|
||||||
end
|
|
||||||
|
|
||||||
test "create with no readouts selected shows alert" do
|
|
||||||
post measurements_path, params: { taken_at: Time.now.iso8601 }, as: :turbo_stream
|
|
||||||
assert_response :success
|
|
||||||
end
|
|
||||||
|
|
||||||
test "destroy removes readout" do
|
|
||||||
readout = @user.readouts.create!(quantity: @quantity, unit: @unit, value: 82.5, taken_at: 1.day.ago)
|
|
||||||
assert_difference -> { @user.readouts.count }, -1 do
|
|
||||||
delete measurement_path(readout), as: :turbo_stream
|
|
||||||
end
|
|
||||||
assert_response :success
|
|
||||||
end
|
|
||||||
|
|
||||||
test "destroy cannot remove another user's readout" do
|
|
||||||
other_quantity = users(:bob).quantities.create!(name: 'Weight')
|
|
||||||
other_unit = users(:bob).units.create!(symbol: 'kg')
|
|
||||||
readout = users(:bob).readouts.create!(quantity: other_quantity, unit: other_unit, value: 70.0, taken_at: 1.day.ago)
|
|
||||||
assert_no_difference -> { users(:bob).readouts.count } do
|
|
||||||
delete measurement_path(readout), as: :turbo_stream
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
test "update changes readout value" do
|
|
||||||
readout = @user.readouts.create!(quantity: @quantity, unit: @unit, value: 82.5, taken_at: 1.day.ago)
|
|
||||||
patch measurement_path(readout), params: {
|
|
||||||
readout: { value: '83.0', unit_id: @unit.id, taken_at: readout.taken_at.iso8601 }
|
|
||||||
}, as: :turbo_stream
|
|
||||||
assert_response :success
|
|
||||||
assert_in_delta 83.0, readout.reload.value
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
require "application_system_test_case"
|
|
||||||
|
|
||||||
class ChartsTest < ApplicationSystemTestCase
|
|
||||||
setup do
|
|
||||||
@user = sign_in(user: users(:alice))
|
|
||||||
@quantity = @user.quantities.create!(name: 'Weight')
|
|
||||||
@unit = @user.units.create!(symbol: 'kg')
|
|
||||||
@user.readouts.create!(quantity: @quantity, unit: @unit, value: 82.5, taken_at: 1.day.ago)
|
|
||||||
@user.readouts.create!(quantity: @quantity, unit: @unit, value: 83.1, taken_at: Time.now)
|
|
||||||
visit charts_path
|
|
||||||
end
|
|
||||||
|
|
||||||
test "charts page is reachable from navigation" do
|
|
||||||
visit root_path
|
|
||||||
click_on t('charts.navigation')
|
|
||||||
assert_current_path charts_path
|
|
||||||
end
|
|
||||||
|
|
||||||
test "renders Plotly chart panel" do
|
|
||||||
assert_selector '#measurements-charts .chart-panel', wait: 5
|
|
||||||
end
|
|
||||||
|
|
||||||
test "chart legend shows quantity name with unit" do
|
|
||||||
assert_text 'Weight (kg)', wait: 5
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
require "application_system_test_case"
|
|
||||||
|
|
||||||
class MeasurementsTest < ApplicationSystemTestCase
|
|
||||||
setup do
|
|
||||||
@user = sign_in(user: users(:alice))
|
|
||||||
|
|
||||||
@quantity = @user.quantities.create!(name: 'Weight')
|
|
||||||
@unit = @user.units.create!(symbol: 'kg')
|
|
||||||
@readout = @user.readouts.create!(quantity: @quantity, unit: @unit, value: 82.5)
|
|
||||||
|
|
||||||
visit measurements_path
|
|
||||||
end
|
|
||||||
|
|
||||||
test "index shows quantity name as edit link for active user" do
|
|
||||||
within 'tbody' do
|
|
||||||
assert_selector :link, exact_text: @quantity.name
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
test "edit opens inline form on quantity link click" do
|
|
||||||
within 'tbody' do
|
|
||||||
click_on @quantity.name
|
|
||||||
assert_selector ':focus'
|
|
||||||
assert_selector 'input[name="readout[value]"]'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
test "edit and update measurement value" do
|
|
||||||
within 'tbody' do
|
|
||||||
click_on @quantity.name
|
|
||||||
fill_in 'readout[value]', with: '83.1'
|
|
||||||
assert_difference ->{ @readout.reload.value }, 83.1 - @readout.value do
|
|
||||||
click_on t('helpers.submit.update')
|
|
||||||
end
|
|
||||||
assert_no_selector :fillable_field
|
|
||||||
assert_selector :link, exact_text: @quantity.name
|
|
||||||
end
|
|
||||||
assert_selector '.flash.notice', text: t('measurements.update.success')
|
|
||||||
end
|
|
||||||
|
|
||||||
test "cancel edit restores original row" do
|
|
||||||
within 'tbody' do
|
|
||||||
click_on @quantity.name
|
|
||||||
assert_selector 'input[name="readout[value]"]'
|
|
||||||
click_on t(:cancel)
|
|
||||||
assert_no_selector :fillable_field
|
|
||||||
assert_selector :link, exact_text: @quantity.name
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
test "wide view edit opens panel form" do
|
|
||||||
@readout.update!(taken_at: Time.now)
|
|
||||||
visit measurements_path
|
|
||||||
execute_script("localStorage.removeItem('measurements-view')")
|
|
||||||
visit measurements_path
|
|
||||||
|
|
||||||
find('button[data-view="wide"]').click
|
|
||||||
within '#measurements-wide' do
|
|
||||||
assert_text format("%.10g", 82.5), wait: 3
|
|
||||||
find('button.link').click
|
|
||||||
end
|
|
||||||
assert_selector '#measurement_edit_form input[name="readout[value]"]', wait: 5
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
require "application_system_test_case"
|
|
||||||
|
|
||||||
class QuantitiesTest < ApplicationSystemTestCase
|
|
||||||
setup do
|
|
||||||
@user = sign_in(user: users(:alice))
|
|
||||||
@unit = @user.units.create!(symbol: 'kg')
|
|
||||||
@quantity = @user.quantities.create!(name: 'Weight')
|
|
||||||
visit quantities_path
|
|
||||||
end
|
|
||||||
|
|
||||||
test "update button turns red when default unit changes" do
|
|
||||||
click_on 'Weight'
|
|
||||||
|
|
||||||
button = find('button[name=button]')
|
|
||||||
initial_color = evaluate_script("getComputedStyle(arguments[0]).backgroundColor", button)
|
|
||||||
|
|
||||||
select 'kg', from: 'quantity[default_unit_id]'
|
|
||||||
|
|
||||||
changed_color = evaluate_script("getComputedStyle(arguments[0]).backgroundColor", button)
|
|
||||||
refute_equal initial_color, changed_color, "Button color should change when default unit is altered"
|
|
||||||
end
|
|
||||||
|
|
||||||
test "saving default unit pre-selects it in measurements form" do
|
|
||||||
click_on 'Weight'
|
|
||||||
select 'kg', from: 'quantity[default_unit_id]'
|
|
||||||
click_on t('helpers.submit.update')
|
|
||||||
assert_selector '.flash.notice'
|
|
||||||
|
|
||||||
@quantity.reload
|
|
||||||
assert_equal @unit.id, @quantity.default_unit_id
|
|
||||||
|
|
||||||
visit measurements_path
|
|
||||||
find(:link_or_button, t('measurements.index.new_measurement')).click
|
|
||||||
assert_selector '#measurement_form'
|
|
||||||
|
|
||||||
within '#quantity_select' do
|
|
||||||
check 'Weight'
|
|
||||||
end
|
|
||||||
find('button[formaction]').click
|
|
||||||
|
|
||||||
within 'tbody#readouts' do
|
|
||||||
assert_selector "option[value='#{@unit.id}'][selected]"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -229,7 +229,7 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
user = User.find_by_email!(first(:link).text)
|
user = User.find_by_email!(first(:link).text)
|
||||||
inject_button_to first('td:not(.link)'), "update status", user_path(user), method: :patch,
|
inject_button_to first('td:not(.link)'), "update status", user_path(user), method: :patch,
|
||||||
params: {user: {status: User.statuses.keys.sample}}, data: {turbo: false}
|
params: {user: {status: User.statuses.keys.sample}}, data: {turbo: false}
|
||||||
execute_script("arguments[0].click()", find_button("update status"))
|
click_on "update status"
|
||||||
end
|
end
|
||||||
assert_title 'The change you wanted was rejected (422)'
|
assert_title 'The change you wanted was rejected (422)'
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user