weight-recorder 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37b8cef4286eff5f68a74e5bce11df52c7c51750
-  data.tar.gz: f1c9cac910de4bef254e232b311955cce3283a62
+  metadata.gz: 04fc913ff738d9c2de6b940171ef6eccf8f13e35
+  data.tar.gz: 432108a4c9d9081b56f7bba2fd28cfb0a7c224df
 SHA512:
-  metadata.gz: 6d1b3af76a0a36c67e9ef4f75508fd3e16d68d9f066c71d1b22400fd7eca92d1ca6a9a5f3239d42ddb6f504960d76ae72995978122ef4234f591d4db4806f7fb
-  data.tar.gz: 099b9af4aee0e3081b39ab11d38e26070f99abc91cd2b3fc96a262a1deb095e57d6d67e71f9255dc192dd0e0bf9a378e7273afb4348df250c670a5f97441e5e4
+  metadata.gz: 2f852b2c0b419cff4092f187caaf618b85d75e73b250509a1b71dbb436867ef027cc2eed0acd100f7c1456da380f4ceb7a1b62f627dd32b61bb9b339fe11168e
+  data.tar.gz: bfbfc80b825add0f68d7754e3d1718b85380b4fc8db52c37658bb546c20208feb152fc40ba54d840f40f7cfa48811dfdae068b365c26ff990ebd619aafa2df0e

data/lib/application.rb

@@ -34,7 +34,7 @@ module Recorder
 
     get '/data/new' do
       @data = Data.new
-
+#      @date0 = Time.now.strftime('%Y/%m/%d %H:%M')
       haml :new
     end
 
@@ -66,6 +66,7 @@ module Recorder
         Data.create!(weight: params[:weight],
                      bodyfat: params[:bodyfat],
                      date: date0,
+#                     date: params[:date],
                      memo: params[:memo]
                      )
 
@@ -83,22 +84,23 @@ module Recorder
       redirect '/'
     end
 
+    @min,@max=82,90
     get '/chart' do
-      @weight_options = {min: 84, max: 90}
+      @weight_options = {min: @min, max: @max}
       @bodyfat_options = {min: 15, max: 30}
       @weight_data,@bodyfat_data = get_data()
       haml :chart
     end
 
     get '/chart_week' do
-      @weight_options = {min: 84, max: 90}
+      @weight_options = {min: @min, max: @max}
       @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}
+      @weight_options = {min: @min, max: @max}
       @bodyfat_options = {min: 15, max: 30}
       @weight_data,@bodyfat_data = get_data(:month)
       haml :chart

data/lib/recorder/version.rb

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

data/lib/views/_form.haml

@@ -1,15 +1,15 @@
 .control-group
   %label.col-sm-2.control-label(for='weight') Weight
   .col-sm-4
-    %input.form-control(name='weight' placehoder='in kg' type='text'){value: @data.weight}
+    %input.form-control(name='weight' placeholder='in kg' type='text'){value: @data.weight}
 .control-group
   %label.col-sm-2.control-label(for='bodyfat') Body Fat
   .col-sm-4
-    %input.form-control(name='bodyfat' placehoder='in percentage' type='text'){value: @data.bodyfat}
+    %input.form-control(name='bodyfat' placeholder='in percentage' type='text'){value: @data.bodyfat}
 .control-group
   %label.col-sm-2.control-label(for='date') Date
   .col-sm-4
-    %input.form-control(name='date' placehoder='' type='text'){value: @data.date}
+    %input.form-control(name='date' placeholder='current time, edit later' type='text'){value: @data.date}
 .control-group
   %label.col-sm-2.control-label(for='memo') Memo
   .col-sm-4

data/lib/views/chart.haml

@@ -1,4 +1,4 @@
-%h2 Total Charts
+%h2 Record charts
 
 %p
   != line_chart @weight_data, @weight_options

metadata

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

data/lib/views/#edit.haml#

@@ -1,8 +0,0 @@
-%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