Changed Unit.type -> .group
Added Unit validations. Added default Units.
This commit is contained in:
parent
8082e42225
commit
fea736bd36
@ -1,6 +1,6 @@
|
||||
module UnitsHelper
|
||||
def type_options
|
||||
translations = t('.types')
|
||||
Unit.types.map { |k,v| [translations[k.to_sym], k] }
|
||||
def group_options
|
||||
translations = t('.groups')
|
||||
Unit.groups.map { |k,v| [translations[k.to_sym], k] }
|
||||
end
|
||||
end
|
||||
|
@ -1,6 +1,8 @@
|
||||
class Unit < ActiveRecord::Base
|
||||
belongs_to :project
|
||||
|
||||
# https://en.wikipedia.org/wiki/International_System_of_Units
|
||||
enum type: {
|
||||
enum group: {
|
||||
number: 0,
|
||||
share: 1,
|
||||
|
||||
@ -21,4 +23,8 @@ class Unit < ActiveRecord::Base
|
||||
|
||||
pressure: 40
|
||||
}
|
||||
|
||||
validates :project, associated: true
|
||||
validates :name, :shortname, presence: true
|
||||
validates :group, inclusion: groups.keys
|
||||
end
|
||||
|
@ -6,7 +6,7 @@
|
||||
<p><%= f.text_field :shortname, required: true, size: 10 %></p>
|
||||
</div>
|
||||
<div class="splitcontentright">
|
||||
<p><%= f.select :type, type_options, required: true %></p>
|
||||
<p><%= f.select :group, group_options, required: true %></p>
|
||||
</div>
|
||||
</div>
|
||||
<p><%= f.text_field :name, required: true, size: 40 %></p>
|
||||
|
@ -15,7 +15,7 @@ en:
|
||||
heading: 'Units'
|
||||
heading_new_unit: 'New unit'
|
||||
form:
|
||||
types:
|
||||
groups:
|
||||
number: 'count'
|
||||
share: 'share'
|
||||
length: 'length'
|
||||
|
@ -4,7 +4,20 @@ class CreateUnits < ActiveRecord::Migration
|
||||
t.references :project
|
||||
t.string :name
|
||||
t.string :shortname
|
||||
t.integer :type
|
||||
t.integer :group
|
||||
end
|
||||
|
||||
reversible do |dir|
|
||||
dir.up do
|
||||
Unit.create project: nil, shortname: "", name: "count", group: :number
|
||||
Unit.create project: nil, shortname: "%", name: "percent", group: :share
|
||||
Unit.create project: nil, shortname: "g", name: "gram", group: :mass
|
||||
Unit.create project: nil, shortname: "kg", name: "kilogram", group: :mass
|
||||
end
|
||||
|
||||
dir.down do
|
||||
Unit.delete_all
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user