calc_working_hours 0.0.4 → 0.0.5

data/lib/calc_working_hours/time_card.rb

@@ -21,5 +21,43 @@ module CalcWorkingHours
       end
       @working_hours = WorkingHours.new("0:00").add_array_time(array_of_working_hours).time_string
     end
+
+    def total_working_hours_in_range(start_range, end_range)
+      array_of_working_hours_in_range = []
+      if start_range == true && end_range == true
+        unless valid_time_format?(start_range) || valid_time_format?(end_range)
+          raise "invalid time format (TimeCard total_working_hours)"
+        end
+      end
+      @time_card_rows.each do |row|
+        array_of_working_hours_in_range << row.working_hours_in_range(start_range, end_range)
+      end
+      return WorkingHours.new("0:00").add_array_time(array_of_working_hours_in_range).time_string
+    end
+
+    private
+
+    def valid_range?(first, second)
+      false
+      true if change_to_minute(first) < change_to_minute(second)
+    end
+
+    def valid_time_format?(time)
+      flag = false
+      if time.class == String
+        if /(\d+):(\d+)/ =~ time
+          if ($1.to_i <= 48 && $1.to_i >= 0) && ($2.to_i < 60 && $2.to_i >= 0)
+            flag = true
+          end
+        end
+      end
+      return flag
+    end
+
+    def change_to_minute(str)
+      /(\d+):(\d+)/ =~ str
+      return $1.to_i * 60 + $2.to_i
+    end
+
   end
 end

data/lib/calc_working_hours/time_card_row.rb

@@ -5,7 +5,7 @@ require "date"
 module CalcWorkingHours
 
   class TimeCardRow
-    attr_reader :starting_time, :ending_time, :break_time, :working_hours, :date_string
+    attr_reader :starting_time, :ending_time, :break_time, :working_hours, :date_string, :time_point, :working_hours_in_range
     def initialize(starting_time, ending_time, *break_time)
       unless valid_time_format?(starting_time) && valid_time_format?(ending_time)
         raise "failure initialize (invalid time format! TimeCardRow class)"
@@ -36,7 +36,15 @@ module CalcWorkingHours
       @ending_time = ending_time
       @break_time = break_time
       @working_hours = WorkingHours.new(ending_time).minus_time(starting_time).minus_time(total_break_time_string)
-
+      @time_point = []
+      @time_point << starting_time
+      unless break_time.empty?
+        break_time.each do |bt|
+          @time_point << bt[0]
+          @time_point << bt[1]
+        end
+      end
+      @time_point << ending_time
       self
     end
 
@@ -48,8 +56,36 @@ module CalcWorkingHours
       self
     end
 
+    def working_hours_in_range(start_range, end_range)
+      i = @time_point.size / 2
+      starting_time, ending_time = ""
+      array_of_working_hours = []
+      for counter in 1..i
+        counter = 2 * counter - 2
+        starting_time = @time_point[counter]
+        ending_time = @time_point[counter + 1]
+
+        if valid_range?(end_range, starting_time) || valid_range?(ending_time, start_range)
+        elsif valid_range?(start_range, starting_time) && valid_range?(end_range, ending_time)
+          array_of_working_hours << WorkingHours.new(end_range).minus_time(starting_time).time_string
+        elsif valid_range?(starting_time, start_range) && valid_range?(end_range, ending_time)
+          array_of_working_hours << WorkingHours.new(end_range).minus_time(start_range).time_string
+        elsif valid_range?(starting_time, start_range) && valid_range?(ending_time, end_range)
+          array_of_working_hours << WorkingHours.new(ending_time).minus_time(start_range).time_string
+        elsif valid_range?(start_range, starting_time) && valid_range?(ending_time, end_range)
+          array_of_working_hours << WorkingHours.new(ending_time).minus_time(starting_time).time_string
+        end
+      end
+      return @working_hours_in_range = WorkingHours.new("0:00").add_array_time(array_of_working_hours).time_string
+    end
+
     private
 
+    def valid_range?(first, second)
+      false
+      true if change_to_minute(first) <= change_to_minute(second)
+    end
+
     def total_break_time(break_time)
       total = WorkingHours.new("0:00")
       break_time.each do |time|

data/lib/calc_working_hours/version.rb

@@ -1,3 +1,3 @@
 module CalcWorkingHours
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/calc_working_hours/time_card_row_spec.rb

@@ -25,6 +25,22 @@ describe TimeCardRow do
       @time_card_row.set_date("2013/8/1").date_string.class.should == String
     end
 
+    it "time_pointは9:00,11:00,12:00,15:00,16:00,19:00" do 
+      @time_card_row.time_point.should == ["9:00", "11:00", "12:00", "15:00", "16:00", "19:00"]
+    end
+
+    it "労働時間のうち、10:00〜15:30の間の労働時間は4:00" do 
+      @time_card_row.working_hours_in_range("10:00", "15:30").should == "4:00"
+    end
+
+    it "労働時間のうち、11:30〜14:00の間の労働時間は2:00" do 
+      @time_card_row.working_hours_in_range("11:00", "14:00").should == "2:00"
+    end
+
+    it "労働時間のうち、14:00〜17:00の間の労働時間は2:00" do 
+      @time_card_row.working_hours_in_range("14:00", "17:00").should == "2:00"
+    end
+
   end
 
   context "適正な時間設定と、不適な設定時間を設定したとき" do

data/spec/calc_working_hours/time_recorder_spec.rb

@@ -26,5 +26,9 @@ describe TimeRecorder do
       @time_recorder.time_cards["0000000084"].total_working_hours.should == "149:12"
     end
 
+    it "タイムカードのidが0000000002の人物の11:00〜16:00の労働時間は87:02であること" do 
+      @time_recorder.time_cards["0000000002"].total_working_hours_in_range("11:00", "16:00").should == "87:02"
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calc_working_hours
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70321991304440 !ruby/object:Gem::Requirement
+  requirement: &70311384099360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70321991304440
+  version_requirements: *70311384099360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70321991303700 !ruby/object:Gem::Requirement
+  requirement: &70311384098460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321991303700
+  version_requirements: *70311384098460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70321991302820 !ruby/object:Gem::Requirement
+  requirement: &70311384096960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321991302820
+  version_requirements: *70311384096960
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70321991301920 !ruby/object:Gem::Requirement
+  requirement: &70311384095880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321991301920
+  version_requirements: *70311384095880
 description: 例えば、173:08のような表記の時間を計算するライブラリです
 email:
 - ''
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2137619453684458958
+      hash: 4216760181021085759
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2137619453684458958
+      hash: 4216760181021085759
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10