weight-recorder 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f6944195147fc778f858c2ac0fd38b33d3164ae
-  data.tar.gz: 4c70a8b41f2f92e2bf9ea15456cb3c9ba26dbb57
+  metadata.gz: 37b8cef4286eff5f68a74e5bce11df52c7c51750
+  data.tar.gz: f1c9cac910de4bef254e232b311955cce3283a62
 SHA512:
-  metadata.gz: 2419a8349fc7f277510ba97dfdde77b3f83b1c174eba4ecdcf3db603837d8c359ffecc89a9462db7833e89c6c218ab1160a73513868816126e83db22ebefae51
-  data.tar.gz: a6ef9c191b2b3e6a5f21a3deeb52e44d0484ba06ba9f4c8e78aa705fe328ee351f8990528e90e5966e4886a45c07962ee8f33ebc0ca925d6a01d983a0fbb9db3
+  metadata.gz: 6d1b3af76a0a36c67e9ef4f75508fd3e16d68d9f066c71d1b22400fd7eca92d1ca6a9a5f3239d42ddb6f504960d76ae72995978122ef4234f591d4db4806f7fb
+  data.tar.gz: 099b9af4aee0e3081b39ab11d38e26070f99abc91cd2b3fc96a262a1deb095e57d6d67e71f9255dc192dd0e0bf9a378e7273afb4348df250c670a5f97441e5e4

data/hikis/modify_db.hiki

@@ -97,6 +97,12 @@ cid         name        type        notnull     dflt_value  pk
 sqlite> .quit
 >>>
 
+!sqlite3の編集
+ ...>
+で抜けられなくなって．．．
+ ...>;
+でした．
+
 ! weight-recorderの修正
 以降の修正は，
  bundle exec rackup

data/lib/application.rb

@@ -86,14 +86,40 @@ module Recorder
     get '/chart' do
       @weight_options = {min: 84, max: 90}
       @bodyfat_options = {min: 15, max: 30}
-      @weight_data,@bodyfat_data = get_data
+      @weight_data,@bodyfat_data = get_data()
       haml :chart
     end
 
-    def get_data
+    get '/chart_week' do
+      @weight_options = {min: 84, max: 90}
+      @bodyfat_options = {min: 15, max: 30}
+      @weight_data,@bodyfat_data = get_data(:week)
+      haml :chart
+    end
+
+    get '/chart_month' do
+      @weight_options = {min: 84, max: 90}
+      @bodyfat_options = {min: 15, max: 30}
+      @weight_data,@bodyfat_data = get_data(:month)
+      haml :chart
+    end
+
+require 'date'
+require 'time'
+    def get_data(period=:all)
       @data = Data.order('created_at DESC')
       weight_data,bodyfat_data=[],[]
-      @data.each{|d| 
+      today = Date.today
+      week_before=Time.parse((today-7).strftime)
+      month_before=Time.parse((today-28).strftime)
+      @data.each{|d|
+        case period
+        when :all
+        when :week
+          next if d.date < week_before
+        when :month
+          next if d.date < month_before
+        end
         weight_data << [d.date,d.weight]
         bodyfat_data << [d.date,d.bodyfat]
       }

data/lib/recorder/version.rb

@@ -1,3 +1,3 @@
 module Recorder
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/views/#edit.haml#

@@ -0,0 +1,8 @@
+%h1 Editing data
+
+%form.form-horizontal(method='post'){action: uri("/data/#{@data.id}")}
+  != haml :_form, locals: {task: @task}
+  %input(name='_method' type='hidden' value='put')
+  .form-group
+    .col-sm-offset-2.col-sm-10
+      %button(name='commit' type='submit') Update

data/lib/views/layout.haml

@@ -17,10 +17,14 @@
           %a.navbar-brand Bob's weight
           %button{class: ('btn btn-default navbar-btn')}
             %a(class="glyphicon glyphicon-pencil"){href: uri('data/new')} new
-          %button{class: ('btn btn-default navbar-btn')}
-            %a(class="glyphicon glyphicon-picture"){href: uri('chart')} chart
           %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
+          %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
 
       .container
         !=yield

data/lib/views/new.haml

@@ -1,18 +1,7 @@
 %h1 New Data
 
 %form.form-horizontal(method='post'){action: uri('/data')}
-  .control-group
-    %label.control-label(for='weight') Weight[kg]
-    .controls
-      %input#weight.span3(name='weight' type='text'){value: @data.weight}
-  .control-group
-    %label.control-label(for='bodyfat') Body Fat[%]
-    .controls
-      %input#bodyfat.span3(name='bodyfat' type='text'){value: @data.bodyfat}
-  .control-group
-    %label.control-label(for='date') Measuring Time
-    .controls
-      %input#bodyfat.span3(name='date' type='text'){value: @data.date}
+  != haml :_form, locals: {task: @task}
   .control-group
     .controls
       %button(name='commit' type='submit') Create

data/lib/views/new.haml.old

@@ -0,0 +1,18 @@
+%h1 New Data
+
+%form.form-horizontal(method='post'){action: uri('/data')}
+  .control-group
+    %label.control-label(for='weight') Weight[kg]
+    .controls
+      %input#weight.span3(name='weight' type='text'){value: @data.weight}
+  .control-group
+    %label.control-label(for='bodyfat') Body Fat[%]
+    .controls
+      %input#bodyfat.span3(name='bodyfat' type='text'){value: @data.bodyfat}
+  .control-group
+    %label.control-label(for='date') Measuring Time
+    .controls
+      %input#bodyfat.span3(name='date' type='text'){value: @data.date}
+  .control-group
+    .controls
+      %button(name='commit' type='submit') Create

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weight-recorder
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -243,7 +243,7 @@ files:
 - lib/recorder/data.rb
 - lib/recorder/db.rb
 - lib/recorder/version.rb
-- lib/views/#layout.haml#
+- lib/views/#edit.haml#
 - lib/views/_errors.haml
 - lib/views/_form.haml
 - lib/views/chart.haml
@@ -251,6 +251,7 @@ files:
 - lib/views/index.haml
 - lib/views/layout.haml
 - lib/views/new.haml
+- lib/views/new.haml.old
 - weight-recorder.gemspec
 - weight-recorder.wiki/README_en.md
 - weight-recorder.wiki/modify_db.md

data/lib/views/#layout.haml#

@@ -1,17 +0,0 @@
-!!!
-%html
-  %head
-    %meta(charset='utf-8')
-    %meta(name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1,user-scalable=no")
-    %title Weight Recorder
-    /%link(href='/css/bootstrap.min.css' rel='stylesheet' type='text/css')
-    %link(rel='stylesheet' type='text/css'){href: uri('css/bootstrap.min.css')}
-
-                %a(class="glyphicon glyphicon-plus-sign" href='data/new') new
-          %button{class: ('btn btn-default navbar-btn')}
-            %a(class="glyphicon glyphicon-asterisk" href='chart') chart
-            %a(class="glyphicon glyphicon-asterisk" href='data') data
-          %button{class: ('btn btn-default navbar-btn')}
-
-      .container
-        !=yield