weight-recorder 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cae9eb183877b338a0fa881481a9aa22bf132f2f
-  data.tar.gz: 1f931cbbddc17446b50f7e3e91a09820c839683e
+  metadata.gz: 74b82aad9cbceb4cccbb238299e320480092c8ba
+  data.tar.gz: 8690d758f23d762c18d2ef5b2f715267de6aab88
 SHA512:
-  metadata.gz: e235eac007766b1c83939d5b59c22c5fd2615d89d51504494fa11d80bfdda90fe310fe2c15eeb7a9f87377389d5a633c4737f204960afc215063df4a82be1a03
-  data.tar.gz: a4d60474ac5ebfd7970d798f799dbb6e1c54a05f7702fb27af435d4c87e14b66d7db54132d3878ff7d57d8b489a3060f65a387034cc9542e6c1e84a759b5c521
+  metadata.gz: e83f583ead21d9d83e77895e674afcc5917a33930e4bf1f3658d1b125f57283b14be6bcdcd1a425d6f2b762e2a629d668dc7d5c3d66416907ccd90d41fbcc314
+  data.tar.gz: c2e543be74ea5a12947b381732ae1e9fc83640cd05ad1f25c5d06d2693c7e3e08227406194bf04e0aec23ba4828cfcd831e2573ee71267a8eae6464ddfeea337

data/lib/application.rb

@@ -107,18 +107,28 @@ module Recorder
       haml :chart
     end
 
+    get '/chart_recent' do
+      @weight_options = {min: @min, max: @max}
+      @bodyfat_options = {min: @min, max: @max}
+      @weight_data,@bodyfat_data = get_data(:recent)
+      haml :chart
+    end
+
 require 'date'
 require 'time'
 
-    def get_data(period=:all)
+    def get_data(period=:whole)
       @data = Data.order('created_at DESC')
       weight_data,bodyfat_data=[],[]
       today = Date.today
       week_before=Time.parse((today-7).strftime)
       month_before=Time.parse((today-28).strftime)
+      recent=Time.parse('2016-8-26')
       @data.each{|d|
         case period
-        when :all
+        when :whole
+        when :recent
+          next if d.date < recent
         when :week
           next if d.date < week_before
         when :month

data/lib/recorder/version.rb

@@ -1,3 +1,3 @@
 module Recorder
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/lib/views/layout.haml

@@ -21,11 +21,13 @@
           %button{class: ('btn btn-default navbar-btn')}
             %a(class="glyphicon glyphicon-th-list"){href: uri('data')} data
           %button{class: ('btn btn-default navbar-btn')}
-            %a(class="glyphicon glyphicon-picture"){href: uri('chart')} all
+            %a(class="glyphicon glyphicon-picture"){href: uri('chart')} whole
           %button{class: ('btn btn-default navbar-btn')}
             %a(class="glyphicon glyphicon-picture"){href: uri('chart_week')} week
           %button{class: ('btn btn-default navbar-btn')}
             %a(class="glyphicon glyphicon-picture"){href: uri('chart_month')} month
+          %button{class: ('btn btn-default navbar-btn')}
+            %a(class="glyphicon glyphicon-picture"){href: uri('chart_recent')} recent
 
       .container
         !=yield

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weight-recorder
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord