Karavel/fixin.me
0
0
Fork 0
forked from fixin.me/fixin.me
Code Pull Requests Activity

Merging from main master to my repo master. #4

Closed
Karavel wants to merge 53 commits from fixin.me/fixin.me:master into master
pull from: fixin.me/fixin.me:master
merge into: Karavel:master
Conversation 0 Commits 53 Files Changed 50 +35 -3
5 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 51011951f9 - Show all commits

1
app/assets/images/pictograms/download-multiple-outline.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M12 14L19 7H15V1H9V7H5L12 14M12 11.17L9.83 9H11V3H13V9H14.17L12 11.17M5 16V18H19V16H5M5 22V20H19V22H5Z" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 192 B

7
app/models/unit.rb
View File

@ -15,10 +15,11 @@ class Unit < ApplicationRecord
scope :defaults, ->{ where(user: nil) }
scope :with_defaults, ->{ self.or(Unit.where(user: nil)) }
scope :default_diff, ->{
scope :defaults_diff, ->{
other_units = Unit.arel_table.alias('other_units')
other_bases_units = Unit.arel_table.alias('other_bases_units')
constraints = other_bases_units[:id].eq(other_units[:base_id])
.and(other_bases_units[:symbol].eq(Arel::Table.new(:bases_units)[:symbol]))
.and(other_units[:symbol].eq(arel_table[:symbol]))
.and(other_units[:user_id].not_eq(arel_table[:user_id]))
@ -46,4 +47,8 @@ class Unit < ApplicationRecord
def movable?
subunits.empty?
end
def default?
user.nil?
end
end

19
app/views/default/units/_unit.html.erb Normal file
View File

@ -0,0 +1,19 @@
<%= tag.tr do %>
<td class="<%= class_names({subunit: unit.base}) %>">
<%= unit.symbol %>
</td>
<td class="actions">
<% if current_user.at_least(:active) && unit.default? %>
<%= image_button_to t(".import"), "download-outline", import_default_unit_path(unit) %>
<% end %>
<% if current_user.at_least(:admin) %>
<% if !unit.default? %>
<%= image_button_to t(".export"), "upload-outline", export_default_unit_path(unit) %>
<% else %>
<%= image_button_to t(".delete"), "delete-outline", unit_path(unit),
method: :delete %>
<% end %>
<% end %>
</td>
<% end %>

8
app/views/default/units/index.html.erb
View File

@ -1,5 +1,9 @@
<div class="rightside buttongrid">
<%= image_link_to t('.back'), 'arrow-left-bold-outline', units_path %>
<% if current_user.at_least(:active) %>
<%= image_link_to t('.import_all'), 'download-multiple-outline',
import_all_default_units_path, data: {turbo_stream: true} %>
<% end %>
<%= image_link_to t('.back'), 'arrow-left-bold-outline', units_path, class: 'tools' %>
</div>
<table class="main items">
@ -12,6 +16,6 @@
</tr>
</thead>
<tbody id="units">
<%= render(@units, partial: 'default') || render_no_items %>
<%= render(@units) || render_no_items %>
</tbody>
</table>

3
config/locales/en.yml
View File

@ -69,7 +69,10 @@ en:
success: Deleted unit
default:
units:
unit:
delete_default: Delete default
index:
import_all: Import all
back: Back to units...
users:
index: