Added Unit types
This commit is contained in:
@@ -1,2 +1,6 @@
|
||||
module UnitsHelper
|
||||
def type_options
|
||||
translations = t('.types')
|
||||
Unit.types.map { |k,v| [translations[k.to_sym], k] }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,2 +1,24 @@
|
||||
class Unit < ActiveRecord::Base
|
||||
# https://en.wikipedia.org/wiki/International_System_of_Units
|
||||
enum type: {
|
||||
number: 0,
|
||||
share: 1,
|
||||
|
||||
length: 10,
|
||||
mass: 11,
|
||||
time: 12,
|
||||
temperature: 13,
|
||||
|
||||
volume: 20,
|
||||
density: 21,
|
||||
ndensity: 22,
|
||||
|
||||
frequency: 30,
|
||||
velocity: 31,
|
||||
flow: 32,
|
||||
|
||||
energy: 30,
|
||||
|
||||
pressure: 40
|
||||
}
|
||||
end
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
<%= error_messages_for @unit %>
|
||||
|
||||
<div class="box tabular">
|
||||
<p><%= f.text_field :name, :required => true, :size => 40 %></p>
|
||||
<p><%= f.text_field :shortname, :required => true, :size => 10 %></p>
|
||||
<p><%#= f.select :summary, :cols => 60, :rows => 2 %></p>
|
||||
<div class="splitcontent">
|
||||
<div class="splitcontentleft">
|
||||
<p><%= f.text_field :shortname, required: true, size: 10 %></p>
|
||||
</div>
|
||||
<div class="splitcontentright">
|
||||
<p><%= f.select :type, type_options, required: true %></p>
|
||||
</div>
|
||||
</div>
|
||||
<p><%= f.text_field :name, required: true, size: 40 %></p>
|
||||
</div>
|
||||
|
||||
@@ -4,8 +4,7 @@
|
||||
|
||||
<div class="contextual">
|
||||
<% if @project && User.current.allowed_to?(:manage_units, @project) %>
|
||||
<%= link_to t(".heading_new_unit"), new_project_unit_path(@project),
|
||||
:class => 'icon icon-add',
|
||||
<%= link_to t(".heading_new_unit"), '#', :class => 'icon icon-add',
|
||||
:onclick => 'showAndScrollTo("add-unit", "unit_name"); return false;' %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user