Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Import fixes

Browse Source
This commit is contained in:
cryptogopher 2019-09-21 23:48:59 +02:00
parent 3a09bf6fce
commit eb43c4be21
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/ingredients_controller.rb
View File

@ -42,11 +42,17 @@ class IngredientsController < ApplicationController
CSV.foreach(params[:file].path, headers: true).with_index(2) do |row, line| CSV.foreach(params[:file].path, headers: true).with_index(2) do |row, line|
r = row.to_h r = row.to_h
unless r.has_key?('Name')
warnings << "Line 1: required 'Name' column is missing" if line == 2
end
i = { i = {
name: r.delete('Name'), name: r.delete('Name'),
ref_amount: 100.0,
ref_unit: units['g'],
group: r.delete('Group') || :other, group: r.delete('Group') || :other,
nutrients_attributes: [] nutrients_attributes: []
} }
r.each do |col, val| r.each do |col, val|
if col.blank? if col.blank?
warnings << "Line 1: column header missing" if line == 2 warnings << "Line 1: column header missing" if line == 2
@ -64,8 +70,8 @@ class IngredientsController < ApplicationController
" in column #{col}" unless column_units[quantity] " in column #{col}" unless column_units[quantity]
end end
end end
next if quantities[quantity].blank? || val.blank?
next if val.blank?
amount, amount_unit_sn, * = val.rstrip.partition(/\[.*\]$/) amount, amount_unit_sn, * = val.rstrip.partition(/\[.*\]$/)
unit = nil unit = nil
if amount_unit_sn.present? if amount_unit_sn.present?
@ -80,6 +86,7 @@ class IngredientsController < ApplicationController
end end
end end
next if quantities[quantity].blank?
if quantity == 'Reference' if quantity == 'Reference'
i.update({ i.update({
ref_amount: amount.to_d, ref_amount: amount.to_d,

8
db/migrate/001_create_units.rb
View File

@ -36,12 +36,18 @@ class CreateUnits < ActiveRecord::Migration
reversible do |dir| reversible do |dir|
dir.up do dir.up do
Unit.create project: nil, shortname: "%", name: "percent"
Unit.create project: nil, shortname: "g", name: "gram" Unit.create project: nil, shortname: "g", name: "gram"
Unit.create project: nil, shortname: "mg", name: "milligram"
Unit.create project: nil, shortname: "ug", name: "microgram"
Unit.create project: nil, shortname: "kg", name: "kilogram" Unit.create project: nil, shortname: "kg", name: "kilogram"
Unit.create project: nil, shortname: "kcal", name: "kilocalorie"
Unit.create project: nil, shortname: "%", name: "percent"
# https://www.fsai.ie/uploadedFiles/Consol_Reg1169_2011.pdf # https://www.fsai.ie/uploadedFiles/Consol_Reg1169_2011.pdf
# https://www.fsai.ie/legislation/food_legislation/food_information_fic/nutrition_labelling.html # https://www.fsai.ie/legislation/food_legislation/food_information_fic/nutrition_labelling.html
e = Quantity.create project: nil, domain: :diet, parent: nil, name: "Energy",
description: "Total energy"
Quantity.create project: nil, domain: :diet, parent: nil, name: "Proteins", Quantity.create project: nil, domain: :diet, parent: nil, name: "Proteins",
description: "Total amount of proteins" description: "Total amount of proteins"