forked from fixin.me/fixin.me
Compare commits
4 Commits
feature/qu
...
feature/me
| Author | SHA1 | Date | |
|---|---|---|---|
| 887d669f80 | |||
| 366662a948 | |||
| 1bc75f5d40 | |||
| bfd427c9b2 |
1
app/assets/images/pictograms/view-columns.svg
Normal file
1
app/assets/images/pictograms/view-columns.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M4,4H8V20H4V4M10,4H14V20H10V4M16,4H21V20H16V4Z"/></svg>
|
||||||
|
After Width: | Height: | Size: 135 B |
1
app/assets/images/pictograms/view-rows.svg
Normal file
1
app/assets/images/pictograms/view-rows.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M3,5H21V7H3V5M3,11H21V13H3V11M3,17H21V19H3V17Z"/></svg>
|
||||||
|
After Width: | Height: | Size: 135 B |
@@ -36,6 +36,7 @@
|
|||||||
--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;
|
||||||
|
|
||||||
@@ -231,6 +232,10 @@ 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);
|
||||||
@@ -252,6 +257,13 @@ textarea:invalid {
|
|||||||
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);
|
||||||
}
|
}
|
||||||
@@ -361,7 +373,7 @@ header {
|
|||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
}
|
}
|
||||||
.flash:before {
|
.flash:before {
|
||||||
filter: invert();
|
filter: invert(100%);
|
||||||
height: 1.4em;
|
height: 1.4em;
|
||||||
margin: 0 0.5em;
|
margin: 0 0.5em;
|
||||||
width: 1.4em;
|
width: 1.4em;
|
||||||
@@ -513,7 +525,7 @@ header {
|
|||||||
cursor: grab;
|
cursor: grab;
|
||||||
}
|
}
|
||||||
.items-table .form td {
|
.items-table .form td {
|
||||||
vertical-align: top;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
.items-table td:not(:first-child),
|
.items-table td:not(:first-child),
|
||||||
.grayed {
|
.grayed {
|
||||||
@@ -640,3 +652,42 @@ 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;
|
||||||
|
}
|
||||||
|
#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,7 +1,12 @@
|
|||||||
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
|
||||||
@measurements = []
|
load_measurements
|
||||||
#@measurements = current_user.units.ordered.includes(:base, :subunits)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@@ -9,8 +14,49 @@ 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
|
||||||
|
|||||||
@@ -9,6 +9,47 @@ function showPage(event) {
|
|||||||
}
|
}
|
||||||
document.addEventListener('turbo:load', showPage)
|
document.addEventListener('turbo:load', showPage)
|
||||||
|
|
||||||
|
function groupMeasurements() {
|
||||||
|
var tbody = document.getElementById('measurements');
|
||||||
|
if (!tbody) return;
|
||||||
|
var prevTakenAt = null;
|
||||||
|
Array.from(tbody.querySelectorAll('tr[data-taken-at]'))
|
||||||
|
.filter(function(row) { return row.style.display !== 'none' })
|
||||||
|
.forEach(function(row) {
|
||||||
|
var takenAt = row.dataset.takenAt;
|
||||||
|
row.classList.toggle('grouped', takenAt !== null && takenAt === prevTakenAt);
|
||||||
|
prevTakenAt = takenAt;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function getMeasurementsView() {
|
||||||
|
return localStorage.getItem('measurements-view') || 'compact';
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyMeasurementsView(view) {
|
||||||
|
document.body.dataset.measurementsView = view;
|
||||||
|
}
|
||||||
|
|
||||||
|
function setMeasurementsView(view) {
|
||||||
|
localStorage.setItem('measurements-view', view);
|
||||||
|
applyMeasurementsView(view);
|
||||||
|
}
|
||||||
|
window.setMeasurementsView = setMeasurementsView
|
||||||
|
|
||||||
|
document.addEventListener('turbo:load', function() {
|
||||||
|
var tbody = document.getElementById('measurements');
|
||||||
|
if (!tbody) return;
|
||||||
|
groupMeasurements();
|
||||||
|
applyMeasurementsView(getMeasurementsView());
|
||||||
|
new MutationObserver(function() {
|
||||||
|
groupMeasurements();
|
||||||
|
}).observe(tbody, {
|
||||||
|
childList: true, subtree: true,
|
||||||
|
attributes: true, attributeFilter: ['style']
|
||||||
|
});
|
||||||
|
})
|
||||||
|
|
||||||
function detailsChange(event) {
|
function detailsChange(event) {
|
||||||
var target = event.currentTarget
|
var target = event.currentTarget
|
||||||
var count = target.querySelectorAll('input:checked:not([disabled])').length
|
var count = target.querySelectorAll('input:checked:not([disabled])').length
|
||||||
@@ -37,6 +78,41 @@ window.detailsObserver = new MutationObserver((mutations) => {
|
|||||||
mutations[0].target.dispatchEvent(new Event('change', {bubbles: true}))
|
mutations[0].target.dispatchEvent(new Event('change', {bubbles: true}))
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
function readoutUnitChanged(select) {
|
||||||
|
var button = select.closest('tr').querySelector('.set-default-unit');
|
||||||
|
if (select.value && select.value !== select.dataset.defaultUnitId) {
|
||||||
|
Turbo.StreamElement.prototype.enableElement(button);
|
||||||
|
} else {
|
||||||
|
Turbo.StreamElement.prototype.disableElement(button);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
window.readoutUnitChanged = readoutUnitChanged
|
||||||
|
|
||||||
|
function setDefaultUnit(button) {
|
||||||
|
var select = button.closest('tr').querySelector('select[data-default-unit-id]');
|
||||||
|
var form = document.createElement('form');
|
||||||
|
form.action = button.dataset.path;
|
||||||
|
form.method = 'post';
|
||||||
|
form.dataset.turboStream = 'true';
|
||||||
|
var methodInput = document.createElement('input');
|
||||||
|
methodInput.type = 'hidden'; methodInput.name = '_method'; methodInput.value = 'patch';
|
||||||
|
var unitInput = document.createElement('input');
|
||||||
|
unitInput.type = 'hidden'; unitInput.name = 'quantity[default_unit_id]'; unitInput.value = select.value;
|
||||||
|
form.appendChild(methodInput);
|
||||||
|
form.appendChild(unitInput);
|
||||||
|
form.addEventListener('turbo:submit-end', function(event) {
|
||||||
|
if (event.detail.success) {
|
||||||
|
select.dataset.defaultUnitId = select.value;
|
||||||
|
readoutUnitChanged(select);
|
||||||
|
}
|
||||||
|
form.remove();
|
||||||
|
});
|
||||||
|
document.body.appendChild(form);
|
||||||
|
form.requestSubmit();
|
||||||
|
}
|
||||||
|
window.setDefaultUnit = setDefaultUnit
|
||||||
|
|
||||||
function formValidate(event) {
|
function formValidate(event) {
|
||||||
var id = event.submitter.getAttribute("data-validate")
|
var id = event.submitter.getAttribute("data-validate")
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
@@ -206,22 +282,17 @@ window.dragEnd = dragEnd
|
|||||||
|
|
||||||
function drop(event) {
|
function drop(event) {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
|
var idParam = event.currentTarget.getAttribute("data-drop-id-param")
|
||||||
var params = new URLSearchParams()
|
|
||||||
var id_param = event.currentTarget.getAttribute("data-drop-id-param")
|
|
||||||
var id = event.currentTarget.getAttribute("data-drop-id").split("_").pop()
|
var id = event.currentTarget.getAttribute("data-drop-id").split("_").pop()
|
||||||
params.append(id_param, id)
|
var form = document.createElement('form');
|
||||||
|
form.action = event.dataTransfer.getData("text/plain");
|
||||||
fetch(event.dataTransfer.getData("text/plain"), {
|
form.method = 'post';
|
||||||
body: params,
|
form.dataset.turboStream = 'true';
|
||||||
headers: {
|
var input = document.createElement('input');
|
||||||
"Accept": "text/vnd.turbo-stream.html",
|
input.type = 'hidden'; input.name = idParam; input.value = id;
|
||||||
"X-CSRF-Token": document.head.querySelector("meta[name=csrf-token]").content,
|
form.appendChild(input);
|
||||||
"X-Requested-With": "XMLHttpRequest"
|
form.addEventListener('turbo:submit-end', function() { form.remove(); });
|
||||||
},
|
document.body.appendChild(form);
|
||||||
method: "POST"
|
form.requestSubmit();
|
||||||
})
|
|
||||||
.then(response => response.text())
|
|
||||||
.then(html => Turbo.renderStreamMessage(html))
|
|
||||||
}
|
}
|
||||||
window.drop = drop
|
window.drop = drop
|
||||||
|
|||||||
24
app/views/measurements/_edit_form.html.erb
Normal file
24
app/views/measurements/_edit_form.html.erb
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<%= tabular_fields_for @readout, form: form_tag do |form| %>
|
||||||
|
<%- tag.tr id: row, class: "form", onkeydown: "formProcessKey(event)",
|
||||||
|
data: {form: form_tag, hidden_row: hidden_row, link: link} do %>
|
||||||
|
<td><%= @readout.quantity %></td>
|
||||||
|
<td class="ralign">
|
||||||
|
<%= form.number_field :value, required: true, autofocus: true %>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<%= form.collection_select :unit_id, @user_units, :id,
|
||||||
|
->(u){ sanitize(' ' * (u.base_id? ? 1 : 0) + u.symbol) },
|
||||||
|
{}, required: true %>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<%= form.datetime_field :taken_at %>
|
||||||
|
</td>
|
||||||
|
<td></td>
|
||||||
|
<td class="flex">
|
||||||
|
<%= form.button %>
|
||||||
|
<%= image_link_to t(:cancel), "close-outline", measurements_path,
|
||||||
|
class: 'dangerous', name: :cancel,
|
||||||
|
onclick: render_turbo_stream('edit_form_close', {row: row}) %>
|
||||||
|
</td>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
2
app/views/measurements/_edit_form_close.html.erb
Normal file
2
app/views/measurements/_edit_form_close.html.erb
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
<%= turbo_stream.close_form row %>
|
||||||
|
<%= turbo_stream.update :flashes %>
|
||||||
33
app/views/measurements/_edit_panel.html.erb
Normal file
33
app/views/measurements/_edit_panel.html.erb
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
<% form_tag = dom_id(@readout, :edit, :form) %>
|
||||||
|
<% row = dom_id(@readout, :edit) %>
|
||||||
|
<% hidden_row = dom_id(@readout) %>
|
||||||
|
|
||||||
|
<%= tabular_form_with model: @readout, url: measurement_path(@readout),
|
||||||
|
id: form_tag do |form| %>
|
||||||
|
<table class="items-table">
|
||||||
|
<tbody>
|
||||||
|
<%= tag.tr id: row, class: "form", onkeydown: "formProcessKey(event)",
|
||||||
|
data: {form: form_tag, hidden_row: hidden_row} do %>
|
||||||
|
<td><%= @readout.quantity %></td>
|
||||||
|
<td class="ralign">
|
||||||
|
<%= form.number_field :value, required: true, autofocus: true %>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<%= form.collection_select :unit_id, @user_units, :id,
|
||||||
|
->(u){ sanitize(' ' * (u.base_id? ? 1 : 0) + u.symbol) },
|
||||||
|
{}, required: true %>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<%= form.datetime_field :taken_at %>
|
||||||
|
</td>
|
||||||
|
<td></td>
|
||||||
|
<td class="flex">
|
||||||
|
<%= form.button %>
|
||||||
|
<%= image_link_to t(:cancel), "close-outline", measurements_path,
|
||||||
|
class: 'dangerous', name: :cancel,
|
||||||
|
onclick: render_turbo_stream('edit_form_close', {row: row}) %>
|
||||||
|
</td>
|
||||||
|
<% end %>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<% end %>
|
||||||
22
app/views/measurements/_readout.html.erb
Normal file
22
app/views/measurements/_readout.html.erb
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<%= 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 %>
|
||||||
41
app/views/measurements/_wide_table.html.erb
Normal file
41
app/views/measurements/_wide_table.html.erb
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
<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>
|
||||||
13
app/views/measurements/create.turbo_stream.erb
Normal file
13
app/views/measurements/create.turbo_stream.erb
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<% 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 %>
|
||||||
5
app/views/measurements/destroy.turbo_stream.erb
Normal file
5
app/views/measurements/destroy.turbo_stream.erb
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
<%= 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} %>
|
||||||
18
app/views/measurements/edit.turbo_stream.erb
Normal file
18
app/views/measurements/edit.turbo_stream.erb
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
<% ids = {row: dom_id(@readout, :edit),
|
||||||
|
hidden_row: dom_id(@readout),
|
||||||
|
link: nil,
|
||||||
|
form_tag: dom_id(@readout, :edit, :form)} %>
|
||||||
|
|
||||||
|
<% if params[:view] == 'wide' %>
|
||||||
|
<%= turbo_stream.update :measurement_edit_form, partial: 'edit_panel' %>
|
||||||
|
<%= turbo_stream.hide ids[:hidden_row] %>
|
||||||
|
<% else %>
|
||||||
|
<%= turbo_stream.append :measurement_edit_form do %>
|
||||||
|
<%- tabular_form_with model: @readout, url: measurement_path(@readout),
|
||||||
|
html: {id: ids[:form_tag]} do %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<%= turbo_stream.hide ids[:hidden_row] %>
|
||||||
|
<%= turbo_stream.remove ids[:row] %>
|
||||||
|
<%= turbo_stream.after @readout, partial: 'edit_form', locals: ids -%>
|
||||||
|
<% end %>
|
||||||
@@ -5,10 +5,36 @@
|
|||||||
id: :new_measurement_link, onclick: 'this.blur();',
|
id: :new_measurement_link, onclick: 'this.blur();',
|
||||||
data: {turbo_stream: true} %>
|
data: {turbo_stream: true} %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<%= image_button_tag '', 'view-rows', name: nil, type: 'button',
|
||||||
|
class: 'view-toggle', title: t('.view_compact'),
|
||||||
|
data: {view: 'compact'}, onclick: "setMeasurementsView('compact')" %>
|
||||||
|
<%= image_button_tag '', 'view-columns', name: nil, type: 'button',
|
||||||
|
class: 'view-toggle', title: t('.view_wide'),
|
||||||
|
data: {view: 'wide'}, onclick: "setMeasurementsView('wide')" %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<table class="main-area">
|
<div class="main-area measurements-section">
|
||||||
|
<%= tag.div id: :measurement_edit_form %>
|
||||||
|
<table class="items-table measurements-compact">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th><%= Quantity.model_name.human %></th>
|
||||||
|
<th><%= Readout.human_attribute_name(:value) %></th>
|
||||||
|
<th><%= Unit.model_name.human %></th>
|
||||||
|
<th data-column="taken-at"><%= Readout.human_attribute_name(:taken_at) %></th>
|
||||||
|
<th data-column="created-at"><%= Readout.human_attribute_name(:created_at) %></th>
|
||||||
|
<% if current_user.at_least(:active) %>
|
||||||
|
<th></th>
|
||||||
|
<% end %>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
<tbody id="measurements">
|
<tbody id="measurements">
|
||||||
<%= render(@measurements) || render_no_items %>
|
<%= render(partial: 'readout', collection: @measurements, as: :readout) || render_no_items %>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
<div id="measurements-wide" class="measurements-wide">
|
||||||
|
<%= render 'wide_table', wide_groups: @wide_groups, wide_quantities: @wide_quantities %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|||||||
4
app/views/measurements/update.turbo_stream.erb
Normal file
4
app/views/measurements/update.turbo_stream.erb
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
<%= 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} %>
|
||||||
@@ -97,13 +97,18 @@ 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
|
||||||
readout:
|
readout:
|
||||||
|
edit: Edit
|
||||||
destroy: Delete
|
destroy: Delete
|
||||||
create:
|
create:
|
||||||
success:
|
success:
|
||||||
one: Recorded 1 measurement.
|
one: Recorded 1 measurement.
|
||||||
other: Recorded %{count} measurements.
|
other: Recorded %{count} measurements.
|
||||||
no_readouts: No readouts selected.
|
no_readouts: No readouts selected.
|
||||||
|
update:
|
||||||
|
success: Measurement updated.
|
||||||
destroy:
|
destroy:
|
||||||
success: Measurement deleted.
|
success: Measurement deleted.
|
||||||
quantities:
|
quantities:
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
class AddTakenAtToReadouts < ActiveRecord::Migration[7.2]
|
class AddTakenAtToReadouts < ActiveRecord::Migration[7.2]
|
||||||
def change
|
def change
|
||||||
add_column :readouts, :taken_at, :datetime
|
add_column :readouts, :taken_at, :datetime
|
||||||
add_index :readouts, [:user_id, :taken_at]
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_03_000000) do
|
|||||||
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|
|
||||||
|
|||||||
@@ -1,8 +1,65 @@
|
|||||||
require "test_helper"
|
require "test_helper"
|
||||||
|
|
||||||
class MeasurementsControllerTest < ActionDispatch::IntegrationTest
|
class MeasurementsControllerTest < ActionDispatch::IntegrationTest
|
||||||
#test "should get index" do
|
setup do
|
||||||
# get measurements_index_url
|
host! '127.0.0.1'
|
||||||
# assert_response :success
|
@user = users(:alice)
|
||||||
#end
|
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 "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
|
||||||
|
|||||||
64
test/system/measurements_test.rb
Normal file
64
test/system/measurements_test.rb
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
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
|
||||||
Reference in New Issue
Block a user