casraf/snpr
1
0
Fork 0
mirror of https://github.com/chenasraf/snpr.git synced 2026-05-18 01:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed fitbit-display

Browse Source
This commit is contained in:
Bastian Greshake
2013-02-03 17:29:34 +01:00
parent 13edea13a5
commit 29b85530c8
6 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/fitbit_profiles_controller.rb
View File

@@ -29,8 +29,8 @@ class FitbitProfilesController < ApplicationController
@step_counter = 0
@floor_counter = 0
@steps = @activity.map {|fa| [fa.date_logged,fa.steps.to_i]}.inspect
@total_steps = @activity.map {|fa| [fa.date_logged,@step_counter = @step_counter += fa.steps.to_i]}
@steps = @activity.map {|fa| [fa.date_logged.to_s,fa.steps.to_i]}.inspect
@total_steps = @activity.map {|fa| [fa.date_logged.to_s,@step_counter = @step_counter += fa.steps.to_i]}
if @total_steps.length != 0
begin
@mean_steps = @total_steps[-1][-1] / @total_length #@activity.length
@@ -38,14 +38,14 @@ class FitbitProfilesController < ApplicationController
end
end
@total_steps = @total_steps.inspect
@total_floors = @activity.map {|fa| [fa.date_logged,@floor_counter = @floor_counter += fa.floors.to_i]}.inspect
@floors = @activity.map {|fa| [fa.date_logged,fa.floors.to_i]}.inspect
@total_floors = @activity.map {|fa| [fa.date_logged.to_s,@floor_counter = @floor_counter += fa.floors.to_i]}.inspect
@floors = @activity.map {|fa| [fa.date_logged.to_s,fa.floors.to_i]}.inspect
end
#grab body measurements for graphs
if @fitbit_profile.body == true
@body = FitbitBody.find_all_by_fitbit_profile_id(@fitbit_profile.id, :order => "date_logged")
@bmi = @body.map {|fa| [fa.date_logged,fa.bmi.to_f]}.inspect
@bmi = @body.map {|fa| [fa.date_logged.to_s,fa.bmi.to_f]}.inspect
end
#grab sleep measurements for graphs
@@ -54,8 +54,8 @@ class FitbitProfilesController < ApplicationController
@no_sleep = FitbitSleep.find_all_by_fitbit_profile_id_and_minutes_asleep(@fitbit_profile.id,"0")
@total_asleep_counter = 0
@total_minutes_asleep = @sleep.map {|fa| [fa.date_logged,@total_asleep_counter = @total_asleep_counter += fa.minutes_asleep.to_i]}
@minutes_asleep = @sleep.map {|fa| [fa.date_logged,fa.minutes_asleep.to_i]}.inspect
@total_minutes_asleep = @sleep.map {|fa| [fa.date_logged.to_s,@total_asleep_counter = @total_asleep_counter += fa.minutes_asleep.to_i]}
@minutes_asleep = @sleep.map {|fa| [fa.date_logged.to_s,fa.minutes_asleep.to_i]}.inspect
if @total_minutes_asleep.length != 0
begin
@mean_sleep = @total_minutes_asleep[-1][-1] / (@sleep.length - @no_sleep.length)
@@ -64,10 +64,10 @@ class FitbitProfilesController < ApplicationController
end
@total_minutes_asleep = @total_minutes_asleep.inspect
@total_to_sleep_counter = 0
@total_minutes_to_sleep = @sleep.map {|fa| [fa.date_logged,@total_to_sleep_counter = @total_to_sleep_counter += fa.minutes_to_sleep.to_i]}.inspect
@minutes_to_sleep = @sleep.map {|fa| [fa.date_logged,fa.minutes_to_sleep.to_i]}.inspect
@total_minutes_to_sleep = @sleep.map {|fa| [fa.date_logged.to_s,@total_to_sleep_counter = @total_to_sleep_counter += fa.minutes_to_sleep.to_i]}.inspect
@minutes_to_sleep = @sleep.map {|fa| [fa.date_logged.to_s,fa.minutes_to_sleep.to_i]}.inspect
@awakenings = @sleep.map {|fa| [fa.date_logged,fa.number_awakenings.to_i]}.inspect
@awakenings = @sleep.map {|fa| [fa.date_logged.to_s,fa.number_awakenings.to_i]}.inspect

2
app/jobs/fitbit_edit.rb
View File

@@ -78,6 +78,8 @@ class FitbitEdit
end
else
@steps_array = @client.data_by_time_range("/activities/log/steps",{:base_date => Date.today.to_s,:period => :max})["activities-log-steps"]
puts "ACTIVITIES!!!"
puts @steps_array
@steps_array.each do |s|
@activity = FitbitActivity.find_or_create_by_fitbit_profile_id_and_date_logged(@fitbit_profile.id,s["dateTime"])
@activity.steps = s["value"]

2
app/jobs/mendeley_search.rb
View File

@@ -18,6 +18,8 @@ class MendeleySearch
result = Mendeley::API::Documents.
search(snp.name, { items: items, page: page })
documents.concat(result['documents'])
puts result["total_pages"]
puts page
page += 1
rescue => e
puts e.class

2
app/views/genotypes/_form.html.erb
View File

@@ -5,7 +5,7 @@
<div class="well">
<div class="clearfix">
<h5>Provide your genotyping file</h5>
<p>Customers of 23andMe & deCODEme can upload the unzipped text-files or unaltered archives as provided by the company (beta).\nCustomers of FamilyTree DNA can only upload the unzipped text-file right now.</p>
<p>Customers of 23andMe & deCODEme can upload the unzipped text-files or unaltered archives as provided by the company (beta).<br/>Customers of FamilyTree DNA can only upload the unzipped text-file right now.</p>
<p><%= f.file_field :genotype %></p>
</div>
<div class="clearfix">

6
db/schema.rb
View File

@@ -242,9 +242,9 @@ ActiveRecord::Schema.define(:version => 20130124085042) do
t.string "allele_frequency"
t.integer "ranking"
t.integer "number_of_users", :default => 0
t.datetime "mendeley_updated", :default => '2012-12-30 12:16:23'
t.datetime "plos_updated", :default => '2012-12-30 12:16:23'
t.datetime "snpedia_updated", :default => '2012-12-30 12:16:23'
t.datetime "mendeley_updated", :default => '2012-12-30 21:33:41'
t.datetime "plos_updated", :default => '2012-12-30 21:33:41'
t.datetime "snpedia_updated", :default => '2012-12-30 21:33:41'
t.datetime "created_at"
t.datetime "updated_at"
end

1
testdata/only_23andme.txt vendored
View File

@@ -7,3 +7,4 @@ rs7412983 1 2933043 AC
rs1800497 1 1234 AA
rs7903146 10 114748339 CC
rs2241423 15 65873892 GG
vg07s29419-2 11 114748339 CC