forked from fixin.me/fixin.me
Compare commits
19 Commits
feature/ex
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 492507aea7 | |||
| f52f4c83dd | |||
| d54467f259 | |||
| 2c9320010b | |||
| 179fe58421 | |||
| 68695bced9 | |||
| 6717b1d4c1 | |||
| d7fd8f1c45 | |||
| c367009347 | |||
| 1efb1ad86e | |||
| 238e8eb846 | |||
| 37199f85df | |||
| 7e1eacbc33 | |||
| f3cb8db1f4 | |||
| 7904ff3ef9 | |||
| 9ad922e3a1 | |||
| 1acb179851 | |||
| 207699584b | |||
| 46dd480b4e |
74
.gitea/workflows/test.yml
Normal file
74
.gitea/workflows/test.yml
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
name: Tests
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ master ]
|
||||||
|
pull_request:
|
||||||
|
branches: [ master ]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test-sqlite:
|
||||||
|
name: Tests (SQLite)
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- uses: ruby/setup-ruby@v1
|
||||||
|
with:
|
||||||
|
ruby-version: '3.3'
|
||||||
|
bundler-cache: true
|
||||||
|
env:
|
||||||
|
BUNDLE_WITH: "sqlite:development:test"
|
||||||
|
|
||||||
|
- name: Set up test database
|
||||||
|
run: bin/rails db:create db:schema:load
|
||||||
|
env:
|
||||||
|
RAILS_ENV: test
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: bin/rails test
|
||||||
|
env:
|
||||||
|
RAILS_ENV: test
|
||||||
|
CI: "true"
|
||||||
|
|
||||||
|
test-mysql:
|
||||||
|
name: Tests (MySQL)
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
services:
|
||||||
|
mysql:
|
||||||
|
image: mysql:8.0
|
||||||
|
env:
|
||||||
|
MYSQL_ROOT_PASSWORD: ""
|
||||||
|
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
|
||||||
|
MYSQL_DATABASE: fixin_test
|
||||||
|
ports:
|
||||||
|
- 3306:3306
|
||||||
|
options: >-
|
||||||
|
--health-cmd="mysqladmin ping"
|
||||||
|
--health-interval=10s
|
||||||
|
--health-timeout=5s
|
||||||
|
--health-retries=3
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- uses: ruby/setup-ruby@v1
|
||||||
|
with:
|
||||||
|
ruby-version: '3.3'
|
||||||
|
bundler-cache: true
|
||||||
|
env:
|
||||||
|
BUNDLE_WITH: "mysql:development:test"
|
||||||
|
|
||||||
|
- name: Set up test database
|
||||||
|
run: bin/rails db:schema:load
|
||||||
|
env:
|
||||||
|
RAILS_ENV: test
|
||||||
|
DB_ADAPTER: mysql
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: bin/rails test
|
||||||
|
env:
|
||||||
|
RAILS_ENV: test
|
||||||
|
CI: "true"
|
||||||
|
DB_ADAPTER: mysql
|
||||||
34
DESIGN.md
34
DESIGN.md
@@ -1,34 +0,0 @@
|
|||||||
DESIGN
|
|
||||||
======
|
|
||||||
|
|
||||||
Below is a list of design decisions. The justification is to be consulted
|
|
||||||
whenever a change is considered, to avoid regressions.
|
|
||||||
|
|
||||||
### Data type for DB storage of numeric values (`decimal` vs `float`)
|
|
||||||
|
|
||||||
* among database engines supported (by Rails), SQLite offers storage of
|
|
||||||
`decimal` data type with the lowest precision, equal to the precision of
|
|
||||||
`REAL` type (double precision float value, IEEE 754), but in a floating point
|
|
||||||
format,
|
|
||||||
* decimal types in other database engines offer greater precision, but store
|
|
||||||
data in a fixed point format,
|
|
||||||
* biology-related values differ by several orders of magnitude; storing them in
|
|
||||||
fixed point format would only make sense if required precision would be
|
|
||||||
greater than that offered by floating point format,
|
|
||||||
* even then, fixed point would mean either bigger memory requirements or
|
|
||||||
worse precision for numbers close to scale limit,
|
|
||||||
* for a fixed point format to use the same 8 bytes of storage as IEEE
|
|
||||||
754, precision would need to be limited to 18 digits (4 bytes/9 digits)
|
|
||||||
and scale approximately half of that - 9,
|
|
||||||
* double precision floating point guarantees 15 digits of precision, which
|
|
||||||
is more than enough for all expected use cases,
|
|
||||||
* single precision floating point only guarntees 6 digits of precision,
|
|
||||||
which is estimated to be too low for some use cases (e.g. storing
|
|
||||||
latitude/longitude with a resolution grater than 100m)
|
|
||||||
* double precision floating point (IEEE 754) is a standard that ensures
|
|
||||||
compatibility with all database engines,
|
|
||||||
* the same data format is used internally by Ruby as a `Float`; it
|
|
||||||
guarantees no conversions between storage and computation,
|
|
||||||
* as a standard with hardware implementations ensures both: computing
|
|
||||||
efficiency and hardware/3rd party library compatibility as opposed to Ruby
|
|
||||||
custom `BigDecimal` type
|
|
||||||
@@ -18,12 +18,14 @@
|
|||||||
/* Strive for simplicity:
|
/* Strive for simplicity:
|
||||||
* * style elements/tags only - if possible,
|
* * style elements/tags only - if possible,
|
||||||
* * replace element/tag name with class name - if element has to be styled
|
* * replace element/tag name with class name - if element has to be styled
|
||||||
* differently depending on context (e.g. <form>, <table>, <a> as link/button),
|
* differently depending on context (e.g. <form>; <a> as link/button),
|
||||||
* * styles with multiple selectors should have all selectors with same
|
* * styles with multiple selectors should have all selectors with same
|
||||||
* specificity, to allow proper rule specificity vs order management.
|
* specificity, to allow proper rule specificity vs order management.
|
||||||
*
|
*
|
||||||
* NOTE: style in a modular way, similar to how CSS @scope would be used,
|
* NOTE: style in a modular way, similar to how CSS @scope would be used,
|
||||||
* to make transition easier once @scope is widely available. */
|
* to make transition easier once @scope is widely available. */
|
||||||
|
/* TODO: review styles with multiple selectors and try to convert them to the same
|
||||||
|
* specificity. */
|
||||||
:root {
|
:root {
|
||||||
--color-focus-gray: #f3f3f3;
|
--color-focus-gray: #f3f3f3;
|
||||||
--color-border-gray: #dddddd;
|
--color-border-gray: #dddddd;
|
||||||
@@ -55,19 +57,8 @@
|
|||||||
:focus-visible {
|
:focus-visible {
|
||||||
outline: none;
|
outline: none;
|
||||||
}
|
}
|
||||||
/* NOTE: move to higher priority layer instead of using !important?; add CSS
|
|
||||||
* @layer requirements in README */
|
/* [hidden] submit elements cannot have `display` set as it makes them visible. */
|
||||||
[disabled] {
|
|
||||||
border-color: var(--color-border-gray) !important;
|
|
||||||
color: var(--color-border-gray) !important;
|
|
||||||
/* NOTE: cannot set cursor when `pointer-events: none`; can be fixed by setting
|
|
||||||
* `cursor` on wrapping element.
|
|
||||||
cursor: not-allowed; */
|
|
||||||
fill: var(--color-border-gray) !important;
|
|
||||||
pointer-events: none !important;
|
|
||||||
}
|
|
||||||
/* Styles set `display` without distinguishing between [hidden] elements, making
|
|
||||||
* them visible. */
|
|
||||||
[hidden] {
|
[hidden] {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
@@ -78,13 +69,10 @@
|
|||||||
* gray - target for interaction with keyboard,
|
* gray - target for interaction with keyboard,
|
||||||
* red - destructive, non-undoable action.
|
* red - destructive, non-undoable action.
|
||||||
*/
|
*/
|
||||||
/* TODO: merge selectors using :is() */
|
|
||||||
a,
|
|
||||||
button,
|
button,
|
||||||
details,
|
details,
|
||||||
input,
|
input,
|
||||||
select,
|
select,
|
||||||
summary,
|
|
||||||
textarea {
|
textarea {
|
||||||
background-color: inherit;
|
background-color: inherit;
|
||||||
font: inherit;
|
font: inherit;
|
||||||
@@ -102,14 +90,14 @@ textarea {
|
|||||||
border-radius: 0.25em;
|
border-radius: 0.25em;
|
||||||
padding: 0.2em 0.4em;
|
padding: 0.2em 0.4em;
|
||||||
}
|
}
|
||||||
svg {
|
[name=cancel],
|
||||||
height: 1.4em;
|
.auxiliary {
|
||||||
margin: 0 0.2em 0 0;
|
border-color: var(--color-border-gray);
|
||||||
width: 1.4em;
|
color: var(--color-nav-gray);
|
||||||
}
|
fill: var(--color-nav-gray);
|
||||||
svg:last-child {
|
|
||||||
margin-right: 0;
|
|
||||||
}
|
}
|
||||||
|
input[type=checkbox],
|
||||||
|
svg,
|
||||||
textarea {
|
textarea {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
@@ -127,12 +115,11 @@ input[type=checkbox]:checked {
|
|||||||
appearance: checkbox;
|
appearance: checkbox;
|
||||||
-webkit-appearance: checkbox;
|
-webkit-appearance: checkbox;
|
||||||
}
|
}
|
||||||
/* Hide spin buttons of <input type=number>. */
|
/* Hide spin buttons in input number fields */
|
||||||
/* TODO: add spin buttons inside <input type=number>: before (-) and after (+) input. */
|
/* TODO: add spin buttons inside input[number]: before (-) and after (+) input */
|
||||||
input[type=number] {
|
input[type=number] {
|
||||||
appearance: textfield;
|
appearance: textfield;
|
||||||
-moz-appearance: textfield;
|
-moz-appearance: textfield;
|
||||||
text-align: end;
|
|
||||||
}
|
}
|
||||||
input::-webkit-inner-spin-button {
|
input::-webkit-inner-spin-button {
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
@@ -141,30 +128,6 @@ input::-webkit-outer-spin-button {
|
|||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
/* Text color of table form controls:
|
|
||||||
* - black for row/table forms,
|
|
||||||
* - inherited for internal (column specific) buttons/forms. */
|
|
||||||
table input,
|
|
||||||
table select,
|
|
||||||
table summary,
|
|
||||||
table textarea {
|
|
||||||
border-color: var(--color-border-gray);
|
|
||||||
}
|
|
||||||
table input,
|
|
||||||
table select,
|
|
||||||
table textarea {
|
|
||||||
padding-block: 0.375em;
|
|
||||||
}
|
|
||||||
table form input,
|
|
||||||
table form select,
|
|
||||||
table form summary,
|
|
||||||
table form textarea {
|
|
||||||
color: inherit;
|
|
||||||
}
|
|
||||||
table svg:not(:only-child) {
|
|
||||||
height: 1.25em;
|
|
||||||
width: 1.25em;
|
|
||||||
}
|
|
||||||
input:focus-visible,
|
input:focus-visible,
|
||||||
select:focus-visible,
|
select:focus-visible,
|
||||||
select:focus-within,
|
select:focus-within,
|
||||||
@@ -173,7 +136,6 @@ summary:focus-visible,
|
|||||||
textarea:focus-visible {
|
textarea:focus-visible {
|
||||||
accent-color: var(--color-dark-blue);
|
accent-color: var(--color-dark-blue);
|
||||||
background-color: var(--color-focus-gray);
|
background-color: var(--color-focus-gray);
|
||||||
color: black;
|
|
||||||
}
|
}
|
||||||
input:hover,
|
input:hover,
|
||||||
select:hover,
|
select:hover,
|
||||||
@@ -184,15 +146,8 @@ textarea:hover {
|
|||||||
}
|
}
|
||||||
select:hover,
|
select:hover,
|
||||||
summary:hover {
|
summary:hover {
|
||||||
color: black;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
/* TODO: style <details>/<summary> focus to match <select> as much as possible.
|
|
||||||
summary:focus-visible::before,
|
|
||||||
summary:hover::before {
|
|
||||||
background-color: black;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
input:invalid,
|
input:invalid,
|
||||||
select:invalid,
|
select:invalid,
|
||||||
textarea:invalid {
|
textarea:invalid {
|
||||||
@@ -226,17 +181,21 @@ textarea:invalid {
|
|||||||
padding: 0.6em 0.5em;
|
padding: 0.6em 0.5em;
|
||||||
width: fit-content;
|
width: fit-content;
|
||||||
}
|
}
|
||||||
.link {
|
|
||||||
color: inherit;
|
|
||||||
text-decoration: underline 1px var(--color-border-gray);
|
|
||||||
text-underline-offset: 0.25em;
|
|
||||||
}
|
|
||||||
[name=cancel],
|
[name=cancel],
|
||||||
.auxiliary {
|
.auxiliary {
|
||||||
border-color: var(--color-border-gray);
|
border-color: var(--color-border-gray);
|
||||||
color: var(--color-nav-gray);
|
color: var(--color-nav-gray);
|
||||||
fill: var(--color-nav-gray);
|
fill: var(--color-nav-gray);
|
||||||
}
|
}
|
||||||
|
.button > svg,
|
||||||
|
.tab > svg {
|
||||||
|
height: 1.4em;
|
||||||
|
width: 1.4em;
|
||||||
|
}
|
||||||
|
.button > svg:not(:last-child),
|
||||||
|
.tab > svg:not(:last-child) {
|
||||||
|
margin-right: 0.2em;
|
||||||
|
}
|
||||||
.button:focus-visible,
|
.button:focus-visible,
|
||||||
.tab:focus-visible,
|
.tab:focus-visible,
|
||||||
.tab:hover {
|
.tab:hover {
|
||||||
@@ -252,19 +211,13 @@ textarea:invalid {
|
|||||||
background-color: var(--color-red);
|
background-color: var(--color-red);
|
||||||
border-color: var(--color-red);
|
border-color: var(--color-red);
|
||||||
}
|
}
|
||||||
.link:focus-visible {
|
/* TODO: move normal, non-button links (<a>:hover/:focus) styling here (i.e.
|
||||||
text-decoration-color: var(--color-gray);
|
* page-wide, top-level) and remove from `table.items` - as the style should be
|
||||||
}
|
* same everywhere. */
|
||||||
.link:hover {
|
input[type=text]:read-only,
|
||||||
color: var(--color-blue);
|
textarea:read-only {
|
||||||
text-decoration-color: var(--color-blue);
|
border: none;
|
||||||
}
|
padding-inline: 0;
|
||||||
table .button {
|
|
||||||
border-color: var(--color-border-gray);
|
|
||||||
color: var(--color-table-gray);
|
|
||||||
font-weight: normal;
|
|
||||||
height: 100%;
|
|
||||||
padding: 0.4em;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -277,16 +230,16 @@ body {
|
|||||||
grid-template-areas:
|
grid-template-areas:
|
||||||
"header header header"
|
"header header header"
|
||||||
"nav nav nav"
|
"nav nav nav"
|
||||||
|
"leftside topside rightside"
|
||||||
"leftside main rightside";
|
"leftside main rightside";
|
||||||
grid-template-columns: 1fr minmax(max-content, 2fr) 1fr;
|
grid-template-columns: 1fr minmax(max-content, 2fr) 1fr;
|
||||||
font-family: system-ui;
|
font-family: system-ui;
|
||||||
margin: 0.4em;
|
margin: 0.4em;
|
||||||
}
|
}
|
||||||
body:has(> .topside-area) {
|
body:not(:has(.topside-area)) {
|
||||||
grid-template-areas:
|
grid-template-areas:
|
||||||
"header header header"
|
"header header header"
|
||||||
"nav nav nav"
|
"nav nav nav"
|
||||||
"leftside topside rightside"
|
|
||||||
"leftside main rightside";
|
"leftside main rightside";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -393,6 +346,7 @@ header {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* TODO: Hover over invalid should work like in measurements (thin vs thick border) */
|
||||||
.labeled-form {
|
.labeled-form {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
display: grid;
|
display: grid;
|
||||||
@@ -429,79 +383,85 @@ header {
|
|||||||
.labeled-form .auxiliary {
|
.labeled-form .auxiliary {
|
||||||
grid-column: 3;
|
grid-column: 3;
|
||||||
/* If more buttons are needed, `grid-row` can be replaced with
|
/* If more buttons are needed, `grid-row` can be replaced with
|
||||||
* `reading-flow: grid-columns` to ensure proper [tabindex] order. */
|
* `reading-flow: grid-columns` to ensure proper tabindex order */
|
||||||
grid-row: 1;
|
grid-row: 1;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
padding-block: 0;
|
padding-block: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tabular-form table {
|
|
||||||
border: none;
|
|
||||||
border-spacing: 0.4em 0;
|
|
||||||
margin-inline: -0.4em;
|
|
||||||
}
|
|
||||||
.tabular-form table td {
|
|
||||||
border: none;
|
|
||||||
vertical-align: middle;
|
|
||||||
}
|
|
||||||
.tabular-form table td {
|
|
||||||
padding-inline: 0;
|
|
||||||
}
|
|
||||||
.tabular-form table :is(form, input, select, textarea):only-child {
|
|
||||||
margin-inline-start: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
/* TODO: remove `.items` class (?) and make `form table` work properly. */
|
||||||
.items-table {
|
table.items {
|
||||||
border-spacing: 0;
|
border-spacing: 0;
|
||||||
border: 1px solid var(--color-border-gray);
|
border: 1px solid var(--color-border-gray);
|
||||||
border-radius: 0.25em;
|
border-radius: 0.25em;
|
||||||
font-size: 0.85rem;
|
font-size: 0.85rem;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
.items-table thead {
|
table:not(:has(tr)) {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
table.items thead {
|
||||||
font-size: 0.8rem;
|
font-size: 0.8rem;
|
||||||
}
|
}
|
||||||
.items-table thead,
|
table.items thead,
|
||||||
.items-table tbody tr:hover {
|
table.items tbody tr:hover {
|
||||||
background-color: var(--color-focus-gray);
|
background-color: var(--color-focus-gray);
|
||||||
}
|
}
|
||||||
.items-table th {
|
table.items th {
|
||||||
padding: 0.75em 0 0.75em 1em;
|
padding-block: 0.75em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
.items-table th:last-child {
|
table.items th,
|
||||||
padding-inline-end: 0.4em;
|
table.items td {
|
||||||
|
padding-inline: 1em 0;
|
||||||
}
|
}
|
||||||
.items-table td {
|
/* For <a> to fill <td> completely, we use an `::after` pseudoelement. */
|
||||||
border-top: 1px solid var(--color-border-gray);
|
table.items td.link {
|
||||||
height: 2.4em;
|
padding: 0;
|
||||||
padding: 0.1em 0 0.1em calc(1em + var(--depth) * 0.8em);
|
|
||||||
}
|
|
||||||
.items-table td:last-child {
|
|
||||||
padding-inline-end: 0.1em;
|
|
||||||
}
|
|
||||||
.items-table :is(form, input, select, textarea):only-child {
|
|
||||||
margin-inline-start: calc(-0.4em - 0.9px);
|
|
||||||
}
|
|
||||||
/* For <a> to fill table cell completely, we use an `::after` pseudoelement. */
|
|
||||||
/* TODO: expand to whole row? will require adjusting z-index on inputs/buttons */
|
|
||||||
.items-table td:has(> .link) {
|
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
.items-table .link::after {
|
table.items td.link a {
|
||||||
|
color: inherit;
|
||||||
|
font: inherit;
|
||||||
|
}
|
||||||
|
table.items td.link a::after {
|
||||||
content: '';
|
content: '';
|
||||||
inset: -1px 0 0 0;
|
inset: 0;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
}
|
}
|
||||||
.items-table .flex {
|
table.items td:first-child {
|
||||||
|
padding-inline-start: calc(1em + var(--depth) * 0.8em);
|
||||||
|
}
|
||||||
|
table.items td:has(input, select, textarea) {
|
||||||
|
padding-inline-start: calc(0.6em - 0.9px);
|
||||||
|
}
|
||||||
|
table.items td:first-child:has(input, select, textarea) {
|
||||||
|
padding-inline-start: calc(0.6em + var(--depth) * 0.8em - 0.9px);
|
||||||
|
}
|
||||||
|
table.items th:last-child {
|
||||||
|
padding-inline-end: 0.4em;
|
||||||
|
}
|
||||||
|
table.items td:last-child {
|
||||||
|
padding-inline-end: 0.1em;
|
||||||
|
}
|
||||||
|
table.items td {
|
||||||
|
border-top: 1px solid var(--color-border-gray);
|
||||||
|
height: 2.4em;
|
||||||
|
padding-block: 0.1em;
|
||||||
|
}
|
||||||
|
table.items .actions {
|
||||||
|
display: flex;
|
||||||
gap: 0.4em;
|
gap: 0.4em;
|
||||||
justify-content: end;
|
justify-content: end;
|
||||||
}
|
}
|
||||||
.items-table .dropzone {
|
table.items .actions.centered {
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
table.items tr.dropzone {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
.items-table .dropzone::after {
|
table.items tr.dropzone::after {
|
||||||
content: '';
|
content: '';
|
||||||
inset: 1px 0 0 0;
|
inset: 1px 0 0 0;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
@@ -509,57 +469,123 @@ header {
|
|||||||
outline-offset: -1px;
|
outline-offset: -1px;
|
||||||
z-index: var(--z-index-table-row-outline);
|
z-index: var(--z-index-table-row-outline);
|
||||||
}
|
}
|
||||||
.items-table .handle {
|
table.items td.handle {
|
||||||
cursor: grab;
|
cursor: move;
|
||||||
}
|
}
|
||||||
.items-table .form td {
|
table.items tr.form td {
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
.items-table td:not(:first-child),
|
|
||||||
|
/* TODO: replace `:hover:focus-visible` combos with proper LOVE style order. */
|
||||||
|
/* TODO: update table styling: simplify selectors, deduplicate, remove non-font rem. */
|
||||||
|
table.items td.link a:hover,
|
||||||
|
table.items td.link a:focus-visible,
|
||||||
|
table.items td.link a:hover:focus-visible {
|
||||||
|
text-decoration: underline;
|
||||||
|
text-decoration-thickness: 0.05rem;
|
||||||
|
text-underline-offset: 0.2rem;
|
||||||
|
}
|
||||||
|
table.items td.link a:hover {
|
||||||
|
color: var(--color-blue);
|
||||||
|
}
|
||||||
|
table.items td.link a:focus-visible {
|
||||||
|
text-decoration-color: var(--color-gray);
|
||||||
|
}
|
||||||
|
table.items td.link a:hover:focus-visible {
|
||||||
|
color: var(--color-dark-blue);
|
||||||
|
}
|
||||||
|
|
||||||
|
table.items td:not(:first-child),
|
||||||
.grayed {
|
.grayed {
|
||||||
color: var(--color-table-gray);
|
color: var(--color-table-gray);
|
||||||
fill: var(--color-gray);
|
fill: var(--color-table-gray);
|
||||||
}
|
}
|
||||||
.items-table td:has(> svg:only-child) {
|
table.items svg {
|
||||||
|
height: 1rem;
|
||||||
|
vertical-align: middle;
|
||||||
|
width: 1rem;
|
||||||
|
}
|
||||||
|
table.items svg:last-child {
|
||||||
|
height: 1.2rem;
|
||||||
|
width: 1.2rem;
|
||||||
|
}
|
||||||
|
table.items td.svg {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
table.items td.number {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
table.items .button {
|
||||||
|
font-weight: normal;
|
||||||
|
height: 100%;
|
||||||
|
padding: 0.4em;
|
||||||
|
}
|
||||||
|
table.items input:not([type=submit]):not([type=checkbox]),
|
||||||
|
table.items select,
|
||||||
|
table.items textarea {
|
||||||
|
padding-block: 0.375em;
|
||||||
|
}
|
||||||
|
|
||||||
|
table input,
|
||||||
|
table select,
|
||||||
|
table summary,
|
||||||
|
table textarea {
|
||||||
|
border-color: var(--color-border-gray);
|
||||||
|
}
|
||||||
|
table select {
|
||||||
|
color: var(--color-table-gray);
|
||||||
|
}
|
||||||
|
table select:hover,
|
||||||
|
table select:focus-within,
|
||||||
|
table select:focus-visible {
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
table .button {
|
||||||
|
border-color: var(--color-border-gray);
|
||||||
|
color: var(--color-table-gray);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.center {
|
form table.items {
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
form table.items td {
|
||||||
|
border: none;
|
||||||
|
text-align: left;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
form table.items td:first-child {
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
|
form table select {
|
||||||
|
color: black;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.centered {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
.extendedright {
|
||||||
|
margin-right: auto;
|
||||||
|
}
|
||||||
.hexpand {
|
.hexpand {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
.flex {
|
.hflex {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 0.8em;
|
gap: 0.8em;
|
||||||
}
|
}
|
||||||
.flex.reverse {
|
.hflex.centered {
|
||||||
flex-direction: row-reverse;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
.flex.vertical {
|
.vexpand {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
.vflex {
|
||||||
|
display: flex;
|
||||||
|
gap: 0.8em;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
.hint {
|
|
||||||
color: var(--color-table-gray);
|
|
||||||
font-style: italic;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
.hmin50 {
|
|
||||||
min-width: 50%;
|
|
||||||
}
|
|
||||||
.italic {
|
|
||||||
color: var(--color-gray);
|
|
||||||
font-style: italic;
|
|
||||||
}
|
|
||||||
.ralign {
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
.rextend {
|
|
||||||
margin-right: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
details {
|
details {
|
||||||
@@ -570,12 +596,12 @@ summary {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
color: var(--color-gray);
|
color: var(--color-gray);
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 0.4em;
|
gap: 0.2em;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
summary::before {
|
summary::before {
|
||||||
background-color: currentColor;
|
background-color: #000;
|
||||||
content: "";
|
content: "";
|
||||||
height: 1em;
|
height: 1em;
|
||||||
mask-image: url('pictograms/chevron-down.svg');
|
mask-image: url('pictograms/chevron-down.svg');
|
||||||
@@ -598,14 +624,14 @@ summary span {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
details[open] summary::before {
|
details[open] summary::before {
|
||||||
transform: scaleY(-1);
|
transform: rotate(180deg);
|
||||||
}
|
}
|
||||||
summary::marker {
|
summary::marker {
|
||||||
padding-left: 0.25em;
|
padding-left: 0.25em;
|
||||||
}
|
}
|
||||||
/* NOTE: use `details[open]::details-content` once widely available. */
|
/* NOTE: use `details[open]::details-content` once widely available. */
|
||||||
details[open] ul {
|
details[open] ul {
|
||||||
background-color: white;
|
background: white;
|
||||||
border: 1px solid var(--color-border-gray);
|
border: 1px solid var(--color-border-gray);
|
||||||
border-radius: 0.25em;
|
border-radius: 0.25em;
|
||||||
box-shadow: 1px 1px 3px var(--color-border-gray);
|
box-shadow: 1px 1px 3px var(--color-border-gray);
|
||||||
@@ -635,8 +661,3 @@ li::marker {
|
|||||||
* * focused label styling (currently only checkbox has focus),
|
* * focused label styling (currently only checkbox has focus),
|
||||||
* * disabled checkbox blue square focus removal.
|
* * disabled checkbox blue square focus removal.
|
||||||
* */
|
* */
|
||||||
|
|
||||||
#measurement_form {
|
|
||||||
min-width: 66%;
|
|
||||||
width: max-content;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
|
|||||||
helper_method :current_user_disguised?
|
helper_method :current_user_disguised?
|
||||||
helper_method :current_tab
|
helper_method :current_tab
|
||||||
|
|
||||||
|
before_action :redirect_to_setup_if_needed
|
||||||
before_action :authenticate_user!
|
before_action :authenticate_user!
|
||||||
|
|
||||||
class AccessForbidden < StandardError; end
|
class AccessForbidden < StandardError; end
|
||||||
@@ -55,6 +56,16 @@ class ApplicationController < ActionController::Base
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
# Redirect to the web setup wizard when the application has not yet been
|
||||||
|
# initialised (i.e. no admin account exists in the database).
|
||||||
|
def redirect_to_setup_if_needed
|
||||||
|
return if User.exists?(status: :admin)
|
||||||
|
redirect_to new_setup_path
|
||||||
|
rescue ActiveRecord::StatementInvalid
|
||||||
|
# Tables may not exist yet (migrations not run). Fall through and let the
|
||||||
|
# normal request handling surface a meaningful error.
|
||||||
|
end
|
||||||
|
|
||||||
def render_no_content(record)
|
def render_no_content(record)
|
||||||
helpers.render_errors(record)
|
helpers.render_errors(record)
|
||||||
render html: nil, layout: true
|
render html: nil, layout: true
|
||||||
|
|||||||
@@ -1,7 +1,13 @@
|
|||||||
class MeasurementsController < ApplicationController
|
class MeasurementsController < ApplicationController
|
||||||
|
before_action except: :index do
|
||||||
|
raise AccessForbidden unless current_user.at_least(:active)
|
||||||
|
end
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@measurements = []
|
readouts = current_user.readouts.includes(:quantity, :unit).order(created_at: :desc)
|
||||||
#@measurements = current_user.units.ordered.includes(:base, :subunits)
|
@measurements = readouts.group_by(&:created_at).map do |created_at, grouped|
|
||||||
|
Measurement.new(created_at: created_at, readouts: grouped)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@@ -9,8 +15,33 @@ class MeasurementsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
|
timestamp = Time.current
|
||||||
|
@readouts = readout_params.map do |rp|
|
||||||
|
r = current_user.readouts.new(rp)
|
||||||
|
r.created_at = timestamp
|
||||||
|
r
|
||||||
|
end
|
||||||
|
|
||||||
|
if @readouts.all?(&:valid?)
|
||||||
|
Readout.transaction { @readouts.each(&:save!) }
|
||||||
|
@measurement = Measurement.new(readouts: @readouts, created_at: timestamp)
|
||||||
|
flash.now[:notice] = t('.success')
|
||||||
|
else
|
||||||
|
render :new, status: :unprocessable_entity
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
|
@measurement = Measurement.new(id: params[:id].to_i,
|
||||||
|
created_at: Time.at(params[:id].to_i))
|
||||||
|
current_user.readouts.where(created_at: @measurement.created_at).delete_all
|
||||||
|
@measurements_empty = current_user.readouts.empty?
|
||||||
|
flash.now[:notice] = t('.success')
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def readout_params
|
||||||
|
params.require(:readouts).map { |r| r.permit(:quantity_id, :value, :unit_id) }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,16 +1,23 @@
|
|||||||
class ReadoutsController < ApplicationController
|
class ReadoutsController < ApplicationController
|
||||||
before_action :find_quantities, only: [:new]
|
before_action :find_quantity, only: [:new, :discard]
|
||||||
before_action :find_quantity, only: [:discard]
|
|
||||||
before_action :find_prev_quantities, only: [:new, :discard]
|
before_action :find_prev_quantities, only: [:new, :discard]
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@quantities -= @prev_quantities
|
new_quantities =
|
||||||
# TODO: raise ParameterInvalid if new_quantities.empty?
|
case params[:button]
|
||||||
@readouts = current_user.readouts.build(@quantities.map { |q| {quantity: q} })
|
when 'children'
|
||||||
|
@quantity.subquantities
|
||||||
|
when 'subtree'
|
||||||
|
@quantity.progenies
|
||||||
|
else
|
||||||
|
[@quantity]
|
||||||
|
end
|
||||||
|
new_quantities -= @prev_quantities
|
||||||
|
@readouts = current_user.readouts.build(new_quantities.map { |q| {quantity: q} })
|
||||||
|
|
||||||
@user_units = current_user.units.ordered
|
@user_units = current_user.units.ordered
|
||||||
|
|
||||||
quantities = @prev_quantities + @quantities
|
quantities = @prev_quantities + new_quantities
|
||||||
@superquantity = current_user.quantities
|
@superquantity = current_user.quantities
|
||||||
.common_ancestors(quantities.map(&:parent_id)).first
|
.common_ancestors(quantities.map(&:parent_id)).first
|
||||||
end
|
end
|
||||||
@@ -24,9 +31,6 @@ class ReadoutsController < ApplicationController
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def find_quantities
|
|
||||||
@quantities = current_user.quantities.find(params[:quantity])
|
|
||||||
end
|
|
||||||
|
|
||||||
def find_quantity
|
def find_quantity
|
||||||
@quantity = current_user.quantities.find_by!(id: params[:id])
|
@quantity = current_user.quantities.find_by!(id: params[:id])
|
||||||
|
|||||||
59
app/controllers/setup_controller.rb
Normal file
59
app/controllers/setup_controller.rb
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
# Handles the one-time web-based installation wizard.
|
||||||
|
#
|
||||||
|
# The wizard is only accessible when no admin account exists yet. Once an
|
||||||
|
# admin has been created the controller redirects every request to the root
|
||||||
|
# path, so it can never be used to overwrite an existing installation.
|
||||||
|
class SetupController < ActionController::Base
|
||||||
|
# Use the full application layout (header, flash, etc.) so the page looks
|
||||||
|
# consistent with the rest of the site.
|
||||||
|
layout "application"
|
||||||
|
|
||||||
|
before_action :redirect_if_installed
|
||||||
|
|
||||||
|
def new
|
||||||
|
end
|
||||||
|
|
||||||
|
def create
|
||||||
|
email = params[:admin_email].to_s.strip
|
||||||
|
password = params[:admin_password].to_s
|
||||||
|
confirm = params[:admin_password_confirmation].to_s
|
||||||
|
|
||||||
|
errors = []
|
||||||
|
errors << t(".email_blank") if email.blank?
|
||||||
|
errors << t(".password_blank") if password.blank?
|
||||||
|
errors << t(".password_mismatch") if password != confirm
|
||||||
|
|
||||||
|
if errors.any?
|
||||||
|
flash.now[:alert] = errors.join(" ")
|
||||||
|
return render :new, status: :unprocessable_entity
|
||||||
|
end
|
||||||
|
|
||||||
|
user = User.new(email: email, password: password, status: :admin)
|
||||||
|
user.skip_confirmation!
|
||||||
|
|
||||||
|
unless user.save
|
||||||
|
flash.now[:alert] = user.errors.full_messages.join(" ")
|
||||||
|
return render :new, status: :unprocessable_entity
|
||||||
|
end
|
||||||
|
|
||||||
|
# Persist runtime settings chosen during setup.
|
||||||
|
Setting.set("skip_email_confirmation",
|
||||||
|
params[:skip_email_confirmation] == "1")
|
||||||
|
|
||||||
|
# Optionally seed the built-in default units.
|
||||||
|
if params[:seed_units] == "1"
|
||||||
|
load Rails.root.join("db/seeds/units.rb")
|
||||||
|
end
|
||||||
|
|
||||||
|
redirect_to new_user_session_path, notice: t(".success")
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def redirect_if_installed
|
||||||
|
redirect_to root_path if User.exists?(status: :admin)
|
||||||
|
rescue ActiveRecord::StatementInvalid
|
||||||
|
# Tables are not yet migrated — stay on the setup page so the user sees a
|
||||||
|
# meaningful error rather than a crash.
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -1,11 +1,24 @@
|
|||||||
class User::ProfilesController < Devise::RegistrationsController
|
class User::ProfilesController < Devise::RegistrationsController
|
||||||
def destroy
|
def destroy
|
||||||
# TODO: Disallow/disable deletion for last admin account; update :edit view
|
if current_user.sole_admin?
|
||||||
|
redirect_back fallback_location: edit_user_registration_path,
|
||||||
|
alert: t(".sole_admin")
|
||||||
|
return
|
||||||
|
end
|
||||||
super
|
super
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
|
def build_resource(hash = {})
|
||||||
|
super
|
||||||
|
# Skip the email confirmation step when the admin has enabled this option
|
||||||
|
# via the web setup wizard (stored as the "skip_email_confirmation" Setting).
|
||||||
|
# The account becomes active immediately so the user can sign in right after
|
||||||
|
# registering.
|
||||||
|
resource.skip_confirmation! if Setting.get("skip_email_confirmation") == "true"
|
||||||
|
end
|
||||||
|
|
||||||
def update_resource(resource, params)
|
def update_resource(resource, params)
|
||||||
# Based on update_with_password()
|
# Based on update_with_password()
|
||||||
if params[:password].blank?
|
if params[:password].blank?
|
||||||
|
|||||||
@@ -102,17 +102,13 @@ module ApplicationHelper
|
|||||||
|
|
||||||
def number_field(method, options = {})
|
def number_field(method, options = {})
|
||||||
attr_type = object.type_for_attribute(method)
|
attr_type = object.type_for_attribute(method)
|
||||||
case attr_type.type
|
if attr_type.type == :decimal
|
||||||
when :decimal
|
|
||||||
options[:value] = object.public_send(method)&.to_scientific
|
options[:value] = object.public_send(method)&.to_scientific
|
||||||
options[:step] ||= BigDecimal(10).power(-attr_type.scale)
|
options[:step] ||= BigDecimal(10).power(-attr_type.scale)
|
||||||
options[:max] ||= BigDecimal(10).power(attr_type.precision - attr_type.scale) -
|
options[:max] ||= BigDecimal(10).power(attr_type.precision - attr_type.scale) -
|
||||||
options[:step]
|
options[:step]
|
||||||
options[:min] = options[:min] == :step ? options[:step] : options[:min]
|
options[:min] = options[:min] == :step ? options[:step] : options[:min]
|
||||||
options[:min] ||= -options[:max]
|
options[:min] ||= -options[:max]
|
||||||
options[:size] ||= attr_type.precision / 2
|
|
||||||
when :float
|
|
||||||
options[:size] ||= 6
|
|
||||||
end
|
end
|
||||||
super
|
super
|
||||||
end
|
end
|
||||||
@@ -152,8 +148,7 @@ module ApplicationHelper
|
|||||||
end
|
end
|
||||||
|
|
||||||
def tabular_form_with(**options, &block)
|
def tabular_form_with(**options, &block)
|
||||||
extra_options = {builder: TabularFormBuilder, class: 'tabular-form',
|
extra_options = {builder: TabularFormBuilder, html: {autocomplete: 'off'}}
|
||||||
html: {autocomplete: 'off'}}
|
|
||||||
form_with(**merge_attributes(options, extra_options), &block)
|
form_with(**merge_attributes(options, extra_options), &block)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
module QuantitiesHelper
|
module QuantitiesHelper
|
||||||
def quantities_check_boxes(quantities)
|
def quantities_check_boxes
|
||||||
# Closing <details> on focusout event depends on relatedTarget for internal
|
# Closing <details> on focusout event depends on relatedTarget for internal
|
||||||
# actions being non-null. To ensure this, all top-layer elements of
|
# actions being non-null. To ensure this, all top-layer elements of
|
||||||
# ::details-content must accept focus, e.g. <label> needs tabindex="-1" */
|
# ::details-content must accept focus, e.g. <label> needs tabindex="-1" */
|
||||||
collection_check_boxes(nil, :quantity, quantities, :id, :to_s_with_depth,
|
collection_check_boxes(nil, :quantity, @quantities, :id, :to_s_with_depth,
|
||||||
include_hidden: false) do |b|
|
include_hidden: false) do |b|
|
||||||
content_tag :li, b.label(tabindex: -1) { b.check_box + b.text }
|
content_tag :li, b.label(tabindex: -1) { b.check_box + b.text }
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,3 +1,17 @@
|
|||||||
class Measurement
|
class Measurement
|
||||||
include ActiveModel::Model
|
include ActiveModel::Model
|
||||||
|
|
||||||
|
attr_accessor :readouts, :created_at
|
||||||
|
|
||||||
|
def id
|
||||||
|
created_at.to_i
|
||||||
|
end
|
||||||
|
|
||||||
|
def to_param
|
||||||
|
id.to_s
|
||||||
|
end
|
||||||
|
|
||||||
|
def persisted?
|
||||||
|
true
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ class Quantity < ApplicationRecord
|
|||||||
errors.add(:parent, :descendant_reference) if ancestor_of?(parent)
|
errors.add(:parent, :descendant_reference) if ancestor_of?(parent)
|
||||||
end
|
end
|
||||||
validates :name, presence: true, uniqueness: {scope: [:user_id, :parent_id]},
|
validates :name, presence: true, uniqueness: {scope: [:user_id, :parent_id]},
|
||||||
length: {maximum: type_for_attribute(:name).limit}
|
length: {maximum: type_for_attribute(:name).limit || Float::INFINITY}
|
||||||
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
validates :description, length: {maximum: type_for_attribute(:description).limit || Float::INFINITY}
|
||||||
|
|
||||||
# Update :depths of progenies after parent change
|
# Update :depths of progenies after parent change
|
||||||
before_save if: :parent_changed? do
|
before_save if: :parent_changed? do
|
||||||
@@ -61,18 +61,26 @@ class Quantity < ApplicationRecord
|
|||||||
|
|
||||||
# Return: ordered [sub]hierarchy
|
# Return: ordered [sub]hierarchy
|
||||||
scope :ordered, ->(root: nil, include_root: true) {
|
scope :ordered, ->(root: nil, include_root: true) {
|
||||||
numbered = Arel::Table.new('numbered')
|
if connection.adapter_name =~ /mysql/i
|
||||||
|
numbered = Arel::Table.new('numbered')
|
||||||
self.model.with(numbered: numbered(:parent_id, :name)).with_recursive(arel_table.name => [
|
self.model.with(numbered: numbered(:parent_id, :name)).with_recursive(arel_table.name => [
|
||||||
numbered.project(
|
numbered.project(
|
||||||
numbered[Arel.star],
|
numbered[Arel.star],
|
||||||
numbered.cast(numbered[:child_number], 'BINARY').as('path')
|
numbered.cast(numbered[:child_number], 'BINARY').as('path')
|
||||||
).where(numbered[root && include_root ? :id : :parent_id].eq(root)),
|
).where(numbered[root && include_root ? :id : :parent_id].eq(root)),
|
||||||
numbered.project(
|
numbered.project(
|
||||||
numbered[Arel.star],
|
numbered[Arel.star],
|
||||||
arel_table[:path].concat(numbered[:child_number])
|
arel_table[:path].concat(numbered[:child_number])
|
||||||
).join(arel_table).on(numbered[:parent_id].eq(arel_table[:id]))
|
).join(arel_table).on(numbered[:parent_id].eq(arel_table[:id]))
|
||||||
]).order(arel_table[:path])
|
]).order(arel_table[:path])
|
||||||
|
elsif root.nil?
|
||||||
|
# SQLite: pathname column already stores the full hierarchical path
|
||||||
|
order(:pathname)
|
||||||
|
else
|
||||||
|
root_pathname = unscoped.where(id: root).pick(:pathname)
|
||||||
|
scope = order(:pathname).where("pathname LIKE ?", "#{root_pathname}#{PATHNAME_DELIMITER}%")
|
||||||
|
include_root ? scope.or(where(id: root)) : scope
|
||||||
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
# TODO: extract named functions to custom Arel extension
|
# TODO: extract named functions to custom Arel extension
|
||||||
|
|||||||
20
app/models/setting.rb
Normal file
20
app/models/setting.rb
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
# Key-value store for runtime application settings that are configured through
|
||||||
|
# the web setup wizard (or updated by an administrator) rather than hard-coded
|
||||||
|
# in application.rb.
|
||||||
|
#
|
||||||
|
# Known keys:
|
||||||
|
# skip_email_confirmation – "true"/"false", mirrors the homonymous option
|
||||||
|
# that was previously in application.rb.
|
||||||
|
class Setting < ApplicationRecord
|
||||||
|
validates :key, presence: true, uniqueness: true
|
||||||
|
|
||||||
|
# Return the string value stored for +key+, or +default+ when absent.
|
||||||
|
def self.get(key, default: nil)
|
||||||
|
find_by(key: key)&.value || default
|
||||||
|
end
|
||||||
|
|
||||||
|
# Persist +value+ for +key+, creating the record if it does not yet exist.
|
||||||
|
def self.set(key, value)
|
||||||
|
find_or_initialize_by(key: key).update!(value: value.to_s)
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -12,8 +12,8 @@ class Unit < ApplicationRecord
|
|||||||
errors.add(:base, :multilevel_nesting) if base.base_id?
|
errors.add(:base, :multilevel_nesting) if base.base_id?
|
||||||
end
|
end
|
||||||
validates :symbol, presence: true, uniqueness: {scope: :user_id},
|
validates :symbol, presence: true, uniqueness: {scope: :user_id},
|
||||||
length: {maximum: type_for_attribute(:symbol).limit}
|
length: {maximum: type_for_attribute(:symbol).limit || Float::INFINITY}
|
||||||
validates :description, length: {maximum: type_for_attribute(:description).limit}
|
validates :description, length: {maximum: type_for_attribute(:description).limit || Float::INFINITY}
|
||||||
validates :multiplier, numericality: {equal_to: 1}, unless: :base
|
validates :multiplier, numericality: {equal_to: 1}, unless: :base
|
||||||
validates :multiplier, numericality: {greater_than: 0, precision: true, scale: true}, if: :base
|
validates :multiplier, numericality: {greater_than: 0, precision: true, scale: true}, if: :base
|
||||||
|
|
||||||
@@ -26,10 +26,8 @@ class Unit < ApplicationRecord
|
|||||||
other_bases_units = arel_table.alias('other_bases_units')
|
other_bases_units = arel_table.alias('other_bases_units')
|
||||||
sub_units = arel_table.alias('sub_units')
|
sub_units = arel_table.alias('sub_units')
|
||||||
|
|
||||||
# TODO: move inner 'with' CTE to outer 'with recursive' - it can have multiple
|
|
||||||
# CTEs, even non recursive ones.
|
|
||||||
Unit.with_recursive(actionable_units: [
|
Unit.with_recursive(actionable_units: [
|
||||||
Unit.with(units: self.or(Unit.defaults)).left_joins(:base)
|
self.or(Unit.defaults).left_joins(:base)
|
||||||
.where.not(
|
.where.not(
|
||||||
# Exclude Units that are/have default counterpart
|
# Exclude Units that are/have default counterpart
|
||||||
Arel::SelectManager.new.project(1).from(other_units)
|
Arel::SelectManager.new.project(1).from(other_units)
|
||||||
@@ -65,8 +63,14 @@ class Unit < ApplicationRecord
|
|||||||
),
|
),
|
||||||
# Fill base Units to display proper hierarchy. Duplicates will be removed
|
# Fill base Units to display proper hierarchy. Duplicates will be removed
|
||||||
# by final group() - can't be deduplicated with UNION due to 'portable' field.
|
# by final group() - can't be deduplicated with UNION due to 'portable' field.
|
||||||
arel_table.join(actionable_units).on(actionable_units[:base_id].eq(arel_table[:id]))
|
# Use ActiveRecord::Relation (not a raw SelectManager) so the SQLite Arel
|
||||||
.project(arel_table[Arel.star], Arel::Nodes.build_quoted(nil).as('portable'))
|
# visitor does not wrap it in parentheses inside the UNION ALL CTE body.
|
||||||
|
Unit.joins(
|
||||||
|
arel_table.create_join(
|
||||||
|
actionable_units,
|
||||||
|
arel_table.create_on(actionable_units[:base_id].eq(arel_table[:id]))
|
||||||
|
)
|
||||||
|
).select(arel_table[Arel.star], Arel::Nodes.build_quoted(nil).as('portable'))
|
||||||
]).select(units: [:base_id, :symbol])
|
]).select(units: [:base_id, :symbol])
|
||||||
.select(
|
.select(
|
||||||
units[:id].minimum.as('id'), # can be ANY_VALUE()
|
units[:id].minimum.as('id'), # can be ANY_VALUE()
|
||||||
@@ -74,7 +78,7 @@ class Unit < ApplicationRecord
|
|||||||
Arel::Nodes.build_quoted(1).as('multiplier'), # disregard multiplier when sorting
|
Arel::Nodes.build_quoted(1).as('multiplier'), # disregard multiplier when sorting
|
||||||
units[:portable].minimum.as('portable')
|
units[:portable].minimum.as('portable')
|
||||||
)
|
)
|
||||||
.from(units).group(:base_id, :symbol)
|
.from(units).group(units[:base_id], units[:symbol])
|
||||||
}
|
}
|
||||||
scope :ordered, ->{
|
scope :ordered, ->{
|
||||||
left_outer_joins(:base).order(ordering)
|
left_outer_joins(:base).order(ordering)
|
||||||
@@ -83,8 +87,8 @@ class Unit < ApplicationRecord
|
|||||||
def self.ordering
|
def self.ordering
|
||||||
[arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
|
[arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
|
||||||
arel_table[:base_id].not_eq(nil),
|
arel_table[:base_id].not_eq(nil),
|
||||||
:multiplier,
|
arel_table[:multiplier],
|
||||||
:symbol]
|
arel_table[:symbol]]
|
||||||
end
|
end
|
||||||
|
|
||||||
before_destroy do
|
before_destroy do
|
||||||
|
|||||||
@@ -29,4 +29,11 @@ class User < ApplicationRecord
|
|||||||
def at_least(status)
|
def at_least(status)
|
||||||
User.statuses[self.status] >= User.statuses[status]
|
User.statuses[self.status] >= User.statuses[status]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Returns true when this user is the only admin account in the system.
|
||||||
|
# Used to block actions that would leave the application without an admin
|
||||||
|
# (account deletion, status demotion).
|
||||||
|
def sole_admin?
|
||||||
|
admin? && !User.admin.where.not(id: id).exists?
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
</td>
|
</td>
|
||||||
|
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<td class="flex">
|
<td class="actions">
|
||||||
<% unless unit.portable.nil? %>
|
<% unless unit.portable.nil? %>
|
||||||
<% if unit.default? %>
|
<% if unit.default? %>
|
||||||
<%= image_button_to_if unit.portable?, t('.import'), 'download-outline',
|
<%= image_button_to_if unit.portable?, t('.import'), 'download-outline',
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
class: 'tools-area' %>
|
class: 'tools-area' %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<table class="main-area items-table">
|
<table class="main-area items">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= Unit.human_attribute_name(:symbol) %></th>
|
<th><%= Unit.human_attribute_name(:symbol) %></th>
|
||||||
|
|||||||
@@ -23,10 +23,10 @@
|
|||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<header class="flex">
|
<header class="hflex">
|
||||||
<%= image_link_to t(".source_code"), "code-braces", source_code_url %>
|
<%= image_link_to t(".source_code"), "code-braces", source_code_url %>
|
||||||
<%= image_link_to t(".issue_tracker"), "bug-outline", issue_tracker_url,
|
<%= image_link_to t(".issue_tracker"), "bug-outline", issue_tracker_url,
|
||||||
class: "rextend" %>
|
class: "extendedright" %>
|
||||||
<% if user_signed_in? %>
|
<% if user_signed_in? %>
|
||||||
<%= image_link_to_unless_current(current_user, "account-wrench-outline",
|
<%= image_link_to_unless_current(current_user, "account-wrench-outline",
|
||||||
edit_user_registration_path) %>
|
edit_user_registration_path) %>
|
||||||
|
|||||||
@@ -1,37 +1,23 @@
|
|||||||
<%= tabular_form_with model: Measurement.new, id: :measurement_form,
|
<%= tabular_form_with model: Measurement.new do |form| %>
|
||||||
class: 'topside-area flex vertical center',
|
<fieldset>
|
||||||
html: {onkeydown: 'formProcessKey(event)'} do |form| %>
|
<table class="items centered">
|
||||||
|
<tbody id="readouts">
|
||||||
<table class="items-table center">
|
<tr id="readouts_form">
|
||||||
<tbody id="readouts">
|
<td colspan="4">
|
||||||
<%= tabular_fields_for @measurement do |form| %>
|
<%= collection_select :quantity, :id, @quantities, :id, :to_s_with_depth,
|
||||||
<tr class="italic">
|
{prompt: t('.select_quantity'), disabled: '', selected: ''},
|
||||||
<td class="hexpand hmin50"><%= t '.taken_at_html' %></td>
|
{name: :id, class: 'quantity vexpand',
|
||||||
<td colspan="3" class="ralign">
|
onchange: "this.form.requestSubmit(new_readout_submit);"} %>
|
||||||
<%= form.datetime_field :taken_at, required: true %>
|
<%= form.submit id: :new_readout_submit, name: nil, value: nil,
|
||||||
|
formaction: new_readout_path, formmethod: :get, formnovalidate: true,
|
||||||
|
hidden: true, data: {turbo_stream: true} %>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
</tbody>
|
||||||
</tbody>
|
</table>
|
||||||
</table>
|
</fieldset>
|
||||||
|
<div class="hflex centered">
|
||||||
<%# TODO: right-click selection; unnecessary with hierarchical tags? %>
|
<%= form.button -%>
|
||||||
<details id="quantity_select" class="center hexpand" open
|
|
||||||
onkeydown="detailsProcessKey(event)">
|
|
||||||
<summary autofocus>
|
|
||||||
<!-- TODO: Set content with CSS when span empty to avoid duplication -->
|
|
||||||
<span data-prompt="<%= t('.select_quantity') %>">
|
|
||||||
<%= t('.select_quantity') %>
|
|
||||||
</span>
|
|
||||||
<%= image_button_tag t(:apply), "update", name: nil, disabled: true,
|
|
||||||
formaction: new_readout_path, formmethod: :get, formnovalidate: true,
|
|
||||||
data: {turbo_stream: true} %>
|
|
||||||
</summary>
|
|
||||||
<ul><%= quantities_check_boxes(@quantities) %></ul>
|
|
||||||
</details>
|
|
||||||
|
|
||||||
<div class="flex reverse">
|
|
||||||
<%= form.button id: :create_measurement_button, disabled: true -%>
|
|
||||||
<%= image_link_to t(:cancel), "close-outline", measurements_path, name: :cancel,
|
<%= image_link_to t(:cancel), "close-outline", measurements_path, name: :cancel,
|
||||||
class: 'dangerous', onclick: render_turbo_stream('form_close') %>
|
class: 'dangerous', onclick: render_turbo_stream('form_close') %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
<%= turbo_stream.update :measurement_form %>
|
||||||
<%= turbo_stream.update :flashes %>
|
<%= turbo_stream.update :flashes %>
|
||||||
<%= turbo_stream.remove :measurement_form %>
|
<%= turbo_stream.remove :measurement_form %>
|
||||||
<%= turbo_stream.show :no_items -%>
|
<%= turbo_stream.show :no_items -%>
|
||||||
|
|||||||
14
app/views/measurements/_measurement.html.erb
Normal file
14
app/views/measurements/_measurement.html.erb
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<%= tag.tr id: dom_id(measurement) do %>
|
||||||
|
<td><%= l measurement.created_at, format: :short %></td>
|
||||||
|
<td>
|
||||||
|
<% measurement.readouts.each do |readout| %>
|
||||||
|
<span><%= readout.quantity.name %>: <%= readout.value %> <%= readout.unit %></span>
|
||||||
|
<% end %>
|
||||||
|
</td>
|
||||||
|
<% if current_user.at_least(:active) %>
|
||||||
|
<td class="actions">
|
||||||
|
<%= image_button_to t('.destroy'), 'delete-outline', measurement_path(measurement),
|
||||||
|
method: :delete %>
|
||||||
|
</td>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
5
app/views/measurements/create.turbo_stream.erb
Normal file
5
app/views/measurements/create.turbo_stream.erb
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
<%= turbo_stream.update :flashes %>
|
||||||
|
<%= turbo_stream.remove :measurement_form %>
|
||||||
|
<%= turbo_stream.remove :no_items %>
|
||||||
|
<%= turbo_stream.enable :new_measurement_link %>
|
||||||
|
<%= turbo_stream.prepend :measurements, @measurement %>
|
||||||
3
app/views/measurements/destroy.turbo_stream.erb
Normal file
3
app/views/measurements/destroy.turbo_stream.erb
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
<%= turbo_stream.update :flashes %>
|
||||||
|
<%= turbo_stream.remove @measurement %>
|
||||||
|
<%= turbo_stream.append(:measurements, render_no_items) if @measurements_empty %>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<%# TODO: show hint when no quantities/units defined %>
|
<%# TODO: show hint when no quantities/units defined %>
|
||||||
<div class="rightside-area buttongrid">
|
<div class="rightside 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();',
|
||||||
@@ -7,7 +7,9 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<table class="main-area">
|
<%= tag.div class: 'topside', id: :measurement_form %>
|
||||||
|
|
||||||
|
<table class="main">
|
||||||
<tbody id="measurements">
|
<tbody id="measurements">
|
||||||
<%= render(@measurements) || render_no_items %>
|
<%= render(@measurements) || render_no_items %>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<%= turbo_stream.disable :new_measurement_link -%>
|
<%= turbo_stream.disable :new_measurement_link -%>
|
||||||
<%= turbo_stream.hide :no_items -%>
|
<%= turbo_stream.update :measurement_form do %>
|
||||||
<%= turbo_stream.append_all 'body' do %>
|
|
||||||
<%= render partial: 'form' %>
|
<%= render partial: 'form' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
<%= form.text_area :description, cols: 30, rows: 1, escape: false %>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class="flex">
|
<td class="actions">
|
||||||
<%= 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, onclick: render_turbo_stream('form_close', {row: row}) %>
|
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
||||||
|
|||||||
@@ -5,14 +5,14 @@
|
|||||||
data: {drag_path: reparent_quantity_path(quantity), drop_id: dom_id(quantity),
|
data: {drag_path: reparent_quantity_path(quantity), drop_id: dom_id(quantity),
|
||||||
drop_id_param: "quantity[parent_id]"} do %>
|
drop_id_param: "quantity[parent_id]"} do %>
|
||||||
|
|
||||||
<td style="--depth:<%= quantity.depth %>">
|
<td class="link" style="--depth:<%= quantity.depth %>">
|
||||||
<%= link_to quantity, edit_quantity_path(quantity), class: 'link',
|
<%= link_to quantity, edit_quantity_path(quantity), onclick: 'this.blur();',
|
||||||
onclick: 'this.blur();', data: {turbo_stream: true} %>
|
data: {turbo_stream: true} %>
|
||||||
</td>
|
</td>
|
||||||
<td><%= quantity.description %></td>
|
<td><%= quantity.description %></td>
|
||||||
|
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<td class="flex">
|
<td class="actions">
|
||||||
<%= image_link_to t('.new_subquantity'), 'plus-outline', new_quantity_path(quantity),
|
<%= image_link_to t('.new_subquantity'), 'plus-outline', new_quantity_path(quantity),
|
||||||
id: dom_id(quantity, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
id: dom_id(quantity, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||||
|
|
||||||
|
|||||||
@@ -8,14 +8,13 @@
|
|||||||
class: 'tools-area' %>
|
class: 'tools-area' %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%# TODO: remove? form can be inserted directly, e.g. at the end of index %>
|
|
||||||
<%= tag.div class: 'main-area', id: :quantity_form %>
|
<%= tag.div class: 'main-area', id: :quantity_form %>
|
||||||
|
|
||||||
<table class="main-area items-table">
|
<table class="main-area items">
|
||||||
<thead>
|
<thead>
|
||||||
<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><%= Quantity.human_attribute_name(:description) %></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>
|
||||||
|
|||||||
@@ -1,22 +1,20 @@
|
|||||||
<%# TODO: add readout reordering by dragging %>
|
<%# TODO: add readout reordering by dragging %>
|
||||||
<%= tabular_fields_for 'readouts[]', readout do |form| %>
|
<%= tabular_fields_for 'readouts[]', readout do |form| %>
|
||||||
<%- tag.tr id: dom_id(readout.quantity, :new, :readout) do %>
|
<%- tag.tr id: dom_id(readout.quantity, :new, :readout),
|
||||||
|
onkeydown: 'processKey(event)' do %>
|
||||||
<td>
|
<td>
|
||||||
<%# TODO: add grayed readout index (in separate column?) %>
|
|
||||||
<%= readout.quantity.relative_pathname(@superquantity) %>
|
<%= readout.quantity.relative_pathname(@superquantity) %>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<%= form.number_field :value, required: true, autofocus: true, size: 10 %>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
<%= form.hidden_field :quantity_id %>
|
<%= form.hidden_field :quantity_id %>
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<%= form.number_field :value, required: true, autofocus: readout_counter == 0 %>
|
|
||||||
</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: ''}, required: true %>
|
|
||||||
</td>
|
</td>
|
||||||
<td class="flex">
|
<td class="actions">
|
||||||
<%# TODO: change to _link_ after giving up displaying relative paths %>
|
<%= image_button_tag '', 'delete-outline', class: 'dangerous', name: :discard,
|
||||||
<%= 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} %>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<%= turbo_stream.disable :create_measurement_button if @prev_quantities.one? %>
|
|
||||||
<%= turbo_stream.remove dom_id(@quantity, :new, :readout) %>
|
<%= turbo_stream.remove dom_id(@quantity, :new, :readout) %>
|
||||||
|
<%= turbo_stream.disable_all 'button[name="discard"]' if @prev_quantities.one? %>
|
||||||
|
<%= turbo_stream.enable_all "select.quantity option[value='#{@quantity.id}']" %>
|
||||||
<%= render partial: 'form_repath' %>
|
<%= render partial: 'form_repath' %>
|
||||||
<%= turbo_stream.unselect dom_id(@quantity) %>
|
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
<% @readouts.each do |r| %>
|
|
||||||
<%= turbo_stream.disable dom_id(r.quantity) %>
|
|
||||||
<% end %>
|
|
||||||
<%= render partial: 'form_repath' %>
|
<%= render partial: 'form_repath' %>
|
||||||
<%= turbo_stream.append :readouts do %>
|
<%# is .one? proper condition? can @readouts be empty? %>
|
||||||
|
<%= turbo_stream.enable_all 'button[name="discard"]' if @prev_quantities.one? %>
|
||||||
|
<% @readouts.each do |r| %>
|
||||||
|
<%= turbo_stream.disable_all "select.quantity option[value='#{r.quantity_id}']" %>
|
||||||
|
<% end %>
|
||||||
|
<%= turbo_stream.before :readouts_form do %>
|
||||||
<%= render partial: 'form', collection: @readouts, as: :readout %>
|
<%= render partial: 'form', collection: @readouts, as: :readout %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= turbo_stream.enable :create_measurement_button if @prev_quantities.empty? %>
|
|
||||||
|
|||||||
39
app/views/setup/new.html.erb
Normal file
39
app/views/setup/new.html.erb
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
<%= form_with url: setup_path, method: :post, class: "labeled-form main-area" do %>
|
||||||
|
|
||||||
|
<h3 style="grid-column: 1 / -1; text-align: left; margin: 0;">
|
||||||
|
<%= t(".admin_account") %>
|
||||||
|
</h3>
|
||||||
|
|
||||||
|
<label for="admin_email"><%= t(".admin_email") %></label>
|
||||||
|
<%= email_field_tag :admin_email, params[:admin_email],
|
||||||
|
id: "admin_email", required: true, size: 30, autofocus: true,
|
||||||
|
autocomplete: "email" %>
|
||||||
|
|
||||||
|
<label for="admin_password"><%= t(".admin_password") %></label>
|
||||||
|
<%= password_field_tag :admin_password, nil,
|
||||||
|
id: "admin_password", required: true, size: 30,
|
||||||
|
autocomplete: "new-password" %>
|
||||||
|
|
||||||
|
<label for="admin_password_confirmation"><%= t(".admin_password_confirmation") %></label>
|
||||||
|
<%= password_field_tag :admin_password_confirmation, nil,
|
||||||
|
id: "admin_password_confirmation", required: true, size: 30,
|
||||||
|
autocomplete: "off" %>
|
||||||
|
|
||||||
|
<h3 style="grid-column: 1 / -1; text-align: left; margin: 0.5em 0 0 0;">
|
||||||
|
<%= t(".options") %>
|
||||||
|
</h3>
|
||||||
|
|
||||||
|
<label for="skip_email_confirmation" style="grid-column: 1 / 3; text-align: left;">
|
||||||
|
<%= check_box_tag :skip_email_confirmation, "1",
|
||||||
|
params[:skip_email_confirmation] == "1",
|
||||||
|
id: "skip_email_confirmation" %>
|
||||||
|
<%= t(".skip_email_confirmation") %>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label for="seed_units" style="grid-column: 1 / 3; text-align: left;">
|
||||||
|
<%= check_box_tag :seed_units, "1", true, id: "seed_units" %>
|
||||||
|
<%= t(".seed_units") %>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<%= submit_tag t(".submit") %>
|
||||||
|
<% end %>
|
||||||
@@ -8,11 +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>
|
<td class="number">
|
||||||
<%= form.number_field :multiplier, required: true, size: 10, min: :step if @unit.base_id? %>
|
<%= form.number_field :multiplier, required: true, size: 10, min: :step if @unit.base_id? %>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class="flex">
|
<td class="actions">
|
||||||
<%= form.button %>
|
<%= form.button %>
|
||||||
<%= image_link_to t(:cancel), "close-outline", units_path, class: 'dangerous',
|
<%= image_link_to t(:cancel), "close-outline", units_path, class: 'dangerous',
|
||||||
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
name: :cancel, onclick: render_turbo_stream('form_close', {row: row}) %>
|
||||||
|
|||||||
@@ -6,15 +6,14 @@
|
|||||||
drop_id: dom_id(unit.base || unit),
|
drop_id: dom_id(unit.base || unit),
|
||||||
drop_id_param: "unit[base_id]"} do %>
|
drop_id_param: "unit[base_id]"} do %>
|
||||||
|
|
||||||
<td style="--depth:<%= unit.base_id? ? 1 : 0 %>">
|
<td class="link" 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), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||||
data: {turbo_stream: true} %>
|
|
||||||
</td>
|
</td>
|
||||||
<td><%= unit.description %></td>
|
<td><%= unit.description %></td>
|
||||||
<td class="ralign"><%= unit.multiplier.to_html %></td>
|
<td class="number"><%= unit.multiplier.to_html %></td>
|
||||||
|
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<td class="flex">
|
<td class="actions">
|
||||||
<% unless unit.base_id? %>
|
<% unless unit.base_id? %>
|
||||||
<%= image_link_to t('.new_subunit'), 'plus-outline', new_unit_path(unit),
|
<%= image_link_to t('.new_subunit'), 'plus-outline', new_unit_path(unit),
|
||||||
id: dom_id(unit, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
id: dom_id(unit, :new, :link), onclick: 'this.blur();', data: {turbo_stream: true} %>
|
||||||
|
|||||||
@@ -7,14 +7,13 @@
|
|||||||
class: 'tools-area' %>
|
class: 'tools-area' %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%# TODO: remove? form can be inserted directly, e.g. at the end of index %>
|
|
||||||
<%= tag.div id: :unit_form %>
|
<%= tag.div id: :unit_form %>
|
||||||
|
|
||||||
<table class="main-area items-table">
|
<table class="main-area items">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= Unit.human_attribute_name(:symbol) %></th>
|
<th><%= Unit.human_attribute_name(:symbol) %></th>
|
||||||
<th class="hexpand"><%= Unit.human_attribute_name(:description) %></th>
|
<th><%= Unit.human_attribute_name(:description) %></th>
|
||||||
<th><%= Unit.human_attribute_name(:multiplier) %></th>
|
<th><%= Unit.human_attribute_name(:multiplier) %></th>
|
||||||
<% if current_user.at_least(:active) %>
|
<% if current_user.at_least(:active) %>
|
||||||
<th><%= t :actions %></th>
|
<th><%= t :actions %></th>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<table class="main-area items-table" id="users">
|
<table class="main-area items" id="users">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= User.human_attribute_name(:email) %></th>
|
<th><%= User.human_attribute_name(:email) %></th>
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
<% @users.each do |user| %>
|
<% @users.each do |user| %>
|
||||||
<tr>
|
<tr>
|
||||||
<td><%= link_to user, user_path(user), class: 'link' %></td>
|
<td class="link"><%= link_to user, user_path(user) %></td>
|
||||||
<td>
|
<td>
|
||||||
<% if user == current_user %>
|
<% if user == current_user %>
|
||||||
<%= user.status %>
|
<%= user.status %>
|
||||||
@@ -22,11 +22,11 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td class="svg">
|
||||||
<%= svg_tag 'pictograms/checkbox-marked-outline' if user.confirmed_at.present? %>
|
<%= svg_tag 'pictograms/checkbox-marked-outline' if user.confirmed_at.present? %>
|
||||||
</td>
|
</td>
|
||||||
<td><%= l user.created_at, format: :without_tz %></td>
|
<td><%= l user.created_at, format: :without_tz %></td>
|
||||||
<td class="flex">
|
<td class="actions">
|
||||||
<% if allow_disguise?(user) %>
|
<% if allow_disguise?(user) %>
|
||||||
<%= image_link_to t('.disguise'), 'incognito', disguise_user_path(user) %>
|
<%= image_link_to t('.disguise'), 'incognito', disguise_user_path(user) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -4,9 +4,8 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<div class="rightside-area buttongrid">
|
<div class="rightside-area buttongrid">
|
||||||
<%#= TODO: Disallow/disable deletion for last admin account, image_button_to_if %>
|
<%= image_button_to_if !current_user.sole_admin?, t('.delete'), 'account-remove-outline',
|
||||||
<%= image_button_to t('.delete'), 'account-remove-outline', user_registration_path,
|
user_registration_path, form_class: 'tools-area', method: :delete, data: {turbo: false},
|
||||||
form_class: 'tools-area', method: :delete, data: {turbo: false},
|
|
||||||
onclick: {confirm: t('.confirm_delete')} %>
|
onclick: {confirm: t('.confirm_delete')} %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
<%= f.submit t(:register), data: {turbo: false} %>
|
<%= f.submit t(:register), data: {turbo: false} %>
|
||||||
|
|
||||||
|
<%# TODO: fix button text color after change link -> button %>
|
||||||
<%= image_button_tag t(:resend_confirmation), 'email-sync-outline',
|
<%= image_button_tag t(:resend_confirmation), 'email-sync-outline',
|
||||||
class: 'auxiliary', formaction: user_confirmation_path, formnovalidate: true,
|
class: 'auxiliary', formaction: user_confirmation_path, formnovalidate: true,
|
||||||
data: {validate: f.field_id(:email)} %>
|
data: {validate: f.field_id(:email)} %>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<%= f.email_field :email, autofocus: true, autocomplete: "email" %>
|
<%= f.email_field :email, autofocus: true, autocomplete: "email" %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex">
|
<div class="actions">
|
||||||
<%= f.submit "Resend unlock instructions" %>
|
<%= f.submit "Resend unlock instructions" %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -20,10 +20,6 @@ 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
|
||||||
|
|
||||||
@@ -58,5 +54,9 @@ module FixinMe
|
|||||||
|
|
||||||
# Sender address of account registration-related messages
|
# Sender address of account registration-related messages
|
||||||
Devise.mailer_sender = 'noreply@localhost'
|
Devise.mailer_sender = 'noreply@localhost'
|
||||||
|
|
||||||
|
# Whether to skip e-mail confirmation for new registrations is configured
|
||||||
|
# through the web setup wizard and stored in the database (Setting model),
|
||||||
|
# so it does not need to be set here.
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
3nm9KZNtyLhPgZBVzOOkN2FXHD0uEMuzgb5Sl1MrAMmi6+iEFSzyTHfZFW2mz18VyNz5DDYvTODZqBDQKK+FQh70uEQkmGqaY5XsTOzUFzk56quaPNtZvFEGux1nX2avSbYQBs3HeyYyWyTAFhez5j8tVb6sZD2xZ8twa9KAB42j86NIHT9w/ZMFqZbGbdBoR1Mrqoy9/IWv2QgxMTpGR6JBpTUwauXm6wS/bTt8SCXF57JSVgvdw/BxFzoA3Xj6N5E89LbMfh54W2ruMhybka5E7zXN9z0v4oXt8GiYZFIODEYZwqzEVaUK1WXS5qb5OrDJFAzs29Uf/gDrIDx71Lot+jejCS+xFfI9454EnHcVH66wKuwF6ylKupJDffM0hQHplcEfVSq5UiDfbPXm46Vr0g1A--2RrmuzCBuHvYpPNA--ugbuRe7ivfDqeUCt6ahciA==
|
OOGMGhfQuV67kqlMecZLcNfgrGS81KPAGmY27GnohtcGSPtiaqL8OZYsVf5IIOaI1K14ZEflln+E2deaIJ5apaq98f+1gJawGbAJeEfLCskJV/03nT8ICpRk+bxT/lzqeCIaUJOLk4708ufC9EpdpJD/jgVSAuI/iNMzzwMbNFvqNmx0Kmgp0mRpHSDGLZZkaP3GW7wdsJEVsNpSPIrkkGL1BvD+nHbmHjuGkn4MMsmm1Yz0M31jkJiDksT0SVeOcxWvOApclxm6VZOAws2l6YKEs/XoE7ye3ssjxdjdwjMzRXV7dwYclNBQGRoERVTozdYiFR4eAGMdlG0RsnUAp+edILH5nvHCIPb3la/dUTOzAQMNY0TqMMVUHGqGuVS/EMCX/w7zrmYN5C+2W8SfugrvTpAL--dUdvsDfbUdVrbmmo--fUwsWUp+DQGPtEF+Zq4ZTw==
|
||||||
@@ -48,24 +48,3 @@ 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,4 +58,7 @@ 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 the default integration test host.
|
||||||
|
config.hosts << "www.example.com"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -85,10 +85,19 @@ en:
|
|||||||
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.
|
||||||
form:
|
form:
|
||||||
select_quantity: select quantities...
|
select_quantity: select the measured quantity...
|
||||||
taken_at_html: Measurement taken at 
|
|
||||||
index:
|
index:
|
||||||
new_measurement: Add measurement
|
new_measurement: Add measurement
|
||||||
|
create:
|
||||||
|
success: Measurement saved.
|
||||||
|
destroy:
|
||||||
|
success: Measurement deleted.
|
||||||
|
measurement:
|
||||||
|
destroy: Delete
|
||||||
|
readouts:
|
||||||
|
form:
|
||||||
|
select_unit: ...
|
||||||
|
new_children: Children
|
||||||
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.
|
||||||
@@ -160,7 +169,27 @@ en:
|
|||||||
New password:
|
New password:
|
||||||
<br><em>leave blank to keep unchanged</em>
|
<br><em>leave blank to keep unchanged</em>
|
||||||
%{password_length_hint_html}
|
%{password_length_hint_html}
|
||||||
|
registrations:
|
||||||
|
destroy:
|
||||||
|
sole_admin: You cannot delete the only admin account.
|
||||||
actions: Actions
|
actions: Actions
|
||||||
|
setup:
|
||||||
|
new:
|
||||||
|
admin_account: Admin account
|
||||||
|
admin_email: 'E-mail:'
|
||||||
|
admin_password: 'Password:'
|
||||||
|
admin_password_confirmation: 'Retype password:'
|
||||||
|
options: Options
|
||||||
|
skip_email_confirmation: Skip e-mail confirmation for new registrations
|
||||||
|
seed_units: Seed built-in default units
|
||||||
|
submit: Set up
|
||||||
|
create:
|
||||||
|
email_blank: E-mail cannot be blank.
|
||||||
|
password_blank: Password cannot be blank.
|
||||||
|
password_mismatch: Passwords do not match.
|
||||||
|
success: >
|
||||||
|
Installation complete. You can now sign in with the admin account you
|
||||||
|
just created.
|
||||||
add: Add
|
add: Add
|
||||||
apply: Apply
|
apply: Apply
|
||||||
back: Back
|
back: Back
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
Rails.application.routes.draw do
|
Rails.application.routes.draw do
|
||||||
|
# Web-based installation wizard — only reachable when no admin exists yet.
|
||||||
|
resource :setup, only: [:new, :create], controller: :setup
|
||||||
|
|
||||||
resources :measurements
|
resources :measurements
|
||||||
|
|
||||||
|
|
||||||
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}
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
class CreateReadouts < ActiveRecord::Migration[7.2]
|
class CreateReadouts < ActiveRecord::Migration[7.2]
|
||||||
def change
|
def change
|
||||||
create_table :readouts do |t|
|
create_table :readouts do |t|
|
||||||
# Reference :user through :quantity (:measurement may be NULL).
|
t.references :user, null: false, foreign_key: true
|
||||||
t.references :measurement, foreign_key: true
|
|
||||||
t.references :quantity, null: false, foreign_key: true
|
t.references :quantity, null: false, foreign_key: true
|
||||||
# :category + :value + :unit as a separate table? (NumericValue, TextValue)
|
|
||||||
t.integer :category, null: false, default: 0
|
|
||||||
t.float :value, null: false, limit: Float::MANT_DIG
|
|
||||||
t.references :unit, foreign_key: true
|
t.references :unit, foreign_key: true
|
||||||
# Move to Measurement?
|
t.decimal :value, null: false, precision: 30, scale: 15
|
||||||
#t.references :collector, foreign_key: true
|
#t.references :collector, foreign_key: true
|
||||||
#t.references :device, foreign_key: true
|
#t.references :device, foreign_key: true
|
||||||
|
|
||||||
|
|||||||
12
db/migrate/20260228171524_create_settings.rb
Normal file
12
db/migrate/20260228171524_create_settings.rb
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
class CreateSettings < ActiveRecord::Migration[7.2]
|
||||||
|
def change
|
||||||
|
create_table :settings do |t|
|
||||||
|
t.string :key, null: false
|
||||||
|
t.string :value
|
||||||
|
|
||||||
|
t.timestamps
|
||||||
|
end
|
||||||
|
|
||||||
|
add_index :settings, :key, unique: true
|
||||||
|
end
|
||||||
|
end
|
||||||
11
db/seeds.rb
11
db/seeds.rb
@@ -3,6 +3,17 @@
|
|||||||
# bin/rails db:seed
|
# bin/rails db:seed
|
||||||
# command (or created alongside the database with db:setup).
|
# command (or created alongside the database with db:setup).
|
||||||
# Seeding process should be idempotent.
|
# Seeding process should be idempotent.
|
||||||
|
#
|
||||||
|
# Admin account setup
|
||||||
|
# -------------------
|
||||||
|
# The preferred way to create the first admin account is through the web setup
|
||||||
|
# wizard, which is shown automatically on the first visit when no admin exists.
|
||||||
|
# The wizard also lets you configure runtime options (e.g. skip e-mail
|
||||||
|
# confirmation) and seed the default units without using the command line.
|
||||||
|
#
|
||||||
|
# The block below provides an alternative CLI path for headless / automated
|
||||||
|
# deployments. It is skipped when an admin account already exists (e.g. after
|
||||||
|
# the web wizard has run).
|
||||||
|
|
||||||
User.transaction do
|
User.transaction do
|
||||||
break if User.find_by status: :admin
|
break if User.find_by status: :admin
|
||||||
|
|||||||
@@ -1,158 +0,0 @@
|
|||||||
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
|
|
||||||
50
lib/tasks/test_multi_db.rake
Normal file
50
lib/tasks/test_multi_db.rake
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
namespace :test do
|
||||||
|
desc "Run Rails tests against all supported database adapters (SQLite, MySQL)"
|
||||||
|
task :all_adapters do
|
||||||
|
# DATABASE_URL overrides the adapter from database.yml at runtime.
|
||||||
|
# MySQL requires the mysql2 gem: bundle install --with mysql
|
||||||
|
adapters = {
|
||||||
|
"SQLite" => {
|
||||||
|
"DATABASE_URL" => "sqlite3:db/test.sqlite3"
|
||||||
|
},
|
||||||
|
"MySQL" => {
|
||||||
|
"DATABASE_URL" => format(
|
||||||
|
"mysql2://%s:%s@%s/%s",
|
||||||
|
ENV.fetch("DATABASE_USERNAME", "root"),
|
||||||
|
ENV.fetch("DATABASE_PASSWORD", ""),
|
||||||
|
ENV.fetch("DATABASE_HOST", "127.0.0.1"),
|
||||||
|
ENV.fetch("DATABASE_NAME", "fixin_test")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
failed = []
|
||||||
|
|
||||||
|
adapters.each do |name, extra_env|
|
||||||
|
puts "\n#{"=" * 60}"
|
||||||
|
puts " Running tests with #{name}"
|
||||||
|
puts "=" * 60
|
||||||
|
|
||||||
|
env = ENV.to_h.merge("RAILS_ENV" => "test").merge(extra_env)
|
||||||
|
|
||||||
|
# Reset test database; db:drop may fail on first run — that's fine
|
||||||
|
system(env, "bin/rails db:drop")
|
||||||
|
unless system(env, "bin/rails db:create db:schema:load")
|
||||||
|
failed << "#{name} (database setup)"
|
||||||
|
next
|
||||||
|
end
|
||||||
|
|
||||||
|
failed << name unless system(env, "bin/rails test")
|
||||||
|
end
|
||||||
|
|
||||||
|
puts "\n#{"=" * 60}"
|
||||||
|
if failed.any?
|
||||||
|
puts " FAILED: #{failed.join(", ")}"
|
||||||
|
puts "=" * 60
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
puts " All adapters passed!"
|
||||||
|
puts "=" * 60
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -1,8 +1,12 @@
|
|||||||
require "test_helper"
|
require "test_helper"
|
||||||
|
|
||||||
class Default::UnitsControllerTest < ActionDispatch::IntegrationTest
|
class Default::UnitsControllerTest < ActionDispatch::IntegrationTest
|
||||||
|
setup do
|
||||||
|
sign_in users(:alice)
|
||||||
|
end
|
||||||
|
|
||||||
test "should get index" do
|
test "should get index" do
|
||||||
get units_defaults_index_url
|
get default_units_url
|
||||||
assert_response :success
|
assert_response :success
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
18
test/controllers/registrations_controller_test.rb
Normal file
18
test/controllers/registrations_controller_test.rb
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
require "test_helper"
|
||||||
|
|
||||||
|
class RegistrationsControllerTest < ActionDispatch::IntegrationTest
|
||||||
|
test "sole admin cannot delete account" do
|
||||||
|
sign_in users(:admin)
|
||||||
|
delete user_registration_path
|
||||||
|
assert_redirected_to edit_user_registration_path
|
||||||
|
assert_equal t("registrations.destroy.sole_admin"), flash[:alert]
|
||||||
|
assert User.exists?(users(:admin).id)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "non-admin can delete account" do
|
||||||
|
sign_in users(:alice)
|
||||||
|
assert_difference ->{ User.count }, -1 do
|
||||||
|
delete user_registration_path
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -2,7 +2,9 @@ require "test_helper"
|
|||||||
|
|
||||||
class UsersControllerTest < ActionDispatch::IntegrationTest
|
class UsersControllerTest < ActionDispatch::IntegrationTest
|
||||||
setup do
|
setup do
|
||||||
@user = users(:one)
|
@admin = users(:admin)
|
||||||
|
@user = users(:alice)
|
||||||
|
sign_in @admin
|
||||||
end
|
end
|
||||||
|
|
||||||
test "should get index" do
|
test "should get index" do
|
||||||
@@ -10,39 +12,25 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
|
|||||||
assert_response :success
|
assert_response :success
|
||||||
end
|
end
|
||||||
|
|
||||||
test "should get new" do
|
|
||||||
get new_user_url
|
|
||||||
assert_response :success
|
|
||||||
end
|
|
||||||
|
|
||||||
test "should create user" do
|
|
||||||
assert_difference("User.count") do
|
|
||||||
post users_url, params: { user: { email: @user.email, status: @user.status } }
|
|
||||||
end
|
|
||||||
|
|
||||||
assert_redirected_to user_url(User.last)
|
|
||||||
end
|
|
||||||
|
|
||||||
test "should show user" do
|
test "should show user" do
|
||||||
get user_url(@user)
|
get user_url(@user)
|
||||||
assert_response :success
|
assert_response :success
|
||||||
end
|
end
|
||||||
|
|
||||||
test "should get edit" do
|
|
||||||
get edit_user_url(@user)
|
|
||||||
assert_response :success
|
|
||||||
end
|
|
||||||
|
|
||||||
test "should update user" do
|
test "should update user" do
|
||||||
patch user_url(@user), params: { user: { email: @user.email, status: @user.status } }
|
patch user_url(@user), params: { user: { status: :restricted } }, as: :turbo_stream
|
||||||
assert_redirected_to user_url(@user)
|
assert_equal "restricted", @user.reload.status
|
||||||
end
|
end
|
||||||
|
|
||||||
test "should destroy user" do
|
test "should not update self" do
|
||||||
assert_difference("User.count", -1) do
|
patch user_url(@admin), params: { user: { status: :active } }, as: :turbo_stream,
|
||||||
delete user_url(@user)
|
headers: { "HTTP_REFERER" => users_url }
|
||||||
end
|
assert_response :redirect
|
||||||
|
end
|
||||||
|
|
||||||
assert_redirected_to users_url
|
test "should forbid non-admin" do
|
||||||
|
sign_in @user
|
||||||
|
get users_url
|
||||||
|
assert_response :forbidden
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -183,7 +183,7 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
test 'delete profile' do
|
test 'delete profile' do
|
||||||
user = sign_in
|
user = sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
|
||||||
# TODO: remove condition after root_url changed to different path than
|
# TODO: remove condition after root_url changed to different path than
|
||||||
# profile in routes.rb
|
# profile in routes.rb
|
||||||
unless has_current_path?(edit_user_registration_path)
|
unless has_current_path?(edit_user_registration_path)
|
||||||
@@ -196,6 +196,14 @@ class UsersTest < ApplicationSystemTestCase
|
|||||||
assert_text t("devise.registrations.destroyed")
|
assert_text t("devise.registrations.destroyed")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test 'sole admin cannot delete profile' do
|
||||||
|
sign_in user: users(:admin)
|
||||||
|
unless has_current_path?(edit_user_registration_path)
|
||||||
|
first(:link_or_button, users(:admin).email).click
|
||||||
|
end
|
||||||
|
assert find(:button, t("users.registrations.edit.delete"))[:disabled]
|
||||||
|
end
|
||||||
|
|
||||||
test 'index forbidden for non admin' do
|
test 'index forbidden for non admin' do
|
||||||
sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
|
sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
|
||||||
visit users_path
|
visit users_path
|
||||||
|
|||||||
@@ -2,6 +2,10 @@ ENV["RAILS_ENV"] ||= "test"
|
|||||||
require_relative "../config/environment"
|
require_relative "../config/environment"
|
||||||
require "rails/test_help"
|
require "rails/test_help"
|
||||||
|
|
||||||
|
class ActionDispatch::IntegrationTest
|
||||||
|
include Devise::Test::IntegrationHelpers
|
||||||
|
end
|
||||||
|
|
||||||
class ActiveSupport::TestCase
|
class ActiveSupport::TestCase
|
||||||
# Run tests in parallel with specified workers
|
# Run tests in parallel with specified workers
|
||||||
parallelize(workers: :number_of_processors)
|
parallelize(workers: :number_of_processors)
|
||||||
|
|||||||
Reference in New Issue
Block a user