calc_working_hours 0.1.1 → 0.1.2

data/lib/calc_working_hours/time_card.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module CalcWorkingHours
-  attr_reader :time_card_rows, :card_id, :working_hours, :id
+  attr_reader :time_card_rows, :card_id, :id
   class TimeCard
     def initialize(card_id, id)
       @time_card_rows = []
@@ -20,7 +20,7 @@ module CalcWorkingHours
       @time_card_rows.each do |row|
         array_of_working_hours << row.working_hours.time_string
       end
-      @working_hours = WorkingHours.new("0:00").add_array_time(array_of_working_hours).time_string
+      return WorkingHours.new("0:00").add_array_time(array_of_working_hours).time_string
     end
 
     def total_working_hours_in_range(start_range, end_range)

data/lib/calc_working_hours/time_card_row.rb

@@ -49,7 +49,11 @@ module CalcWorkingHours
     end
 
     def set_fixed_working_hours(time)
-      @overtime = @working_hours.minus_time(time)
+      if @working_hours.time_string < time
+        @overtime = @working_hours.minus_time(@working_hours.time_string)
+      else
+        @overtime = @working_hours.minus_time(time)
+      end
       self
     end
 

data/lib/calc_working_hours/version.rb

@@ -1,3 +1,3 @@
 module CalcWorkingHours
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/calc_working_hours/time_card_row_spec.rb

@@ -45,6 +45,10 @@ describe TimeCardRow do
       @time_card_row.set_fixed_working_hours("7:20").overtime.time_string.should == "0:40"
     end
 
+    it "所定労働時間を8:20とすると、残業時間は0:00となる" do 
+      @time_card_row.set_fixed_working_hours("8:20").overtime.time_string.should == "0:00"
+    end
+
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calc_working_hours
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-09-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70172561966200 !ruby/object:Gem::Requirement
+  requirement: &70179713519400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70172561966200
+  version_requirements: *70179713519400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70172561965440 !ruby/object:Gem::Requirement
+  requirement: &70179713518660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172561965440
+  version_requirements: *70179713518660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172561964700 !ruby/object:Gem::Requirement
+  requirement: &70179713517960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172561964700
+  version_requirements: *70179713517960
 description: 例えば、173:08のような表記の時間を計算するライブラリです
 email:
 - ''
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3856871302863514967
+      hash: -646011693737778433
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3856871302863514967
+      hash: -646011693737778433
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10