openall_time_applet 0.0.26 → 0.0.27

data/VERSION

@@ -1 +1 @@
-0.0.26
+0.0.27

data/gui/win_main.rb

@@ -147,7 +147,7 @@ class Openall_time_applet::Gui::Win_main
         10 => {:col => :sync_need},
         11 => {
           :col => :task_id,
-          :value_callback => lambda{ |data|
+          :value_callback => lambda{|data|
             task = @args[:oata].ob.get_by(:Task, {"title" => data[:value]})
             
             if !task
@@ -156,7 +156,7 @@ class Openall_time_applet::Gui::Win_main
               return task.id
             end
           },
-          :value_set_callback => proc{ |data| data[:model].task_name }
+          :value_set_callback => proc{|data| data[:model].task_name }
         }
       }
     )

data/lib/openall_time_applet.rb

@@ -349,29 +349,8 @@ class Openall_time_applet
     if @timelog_active
       secs_passed = Time.now.to_i - @timelog_active_time.to_i
       
-      #Check if there has been logged time another day - if so, clone it and begin log on the clone instead.
-      if @timelog_active.timestamp.time.strftime("%Y-%m-%d") != Time.now.strftime("%Y-%m-%d")
-        timelog_use = @ob.get_by(:Timelog, {
-          "parent_timelog" => @timelog_active,
-          "timestamp_day" => Time.now
-        })
-        if !timelog_use
-          timelog_use = @ob.add(:Timelog, {
-            :task_id => @timelog_active[:task_id],
-            :parent_timelog_id => @timelog_active.id,
-            :timestamp => Time.now,
-            :descr => @timelog_active[:descr],
-            :transportdescription => @timelog_active[:transportdescription],
-            :workinternal => @timelog_active[:workinternal],
-            :timetype => @timelog_active[:timetype]
-          })
-        end
-      else
-        timelog_use = @timelog_active
-      end
-      
-      timelog_use.update(
-        :time => timelog_use[:time].to_i + secs_passed,
+      @timelog_active.update(
+        :time => @timelog_active[:time].to_i + secs_passed,
         :sync_need => 1
       )
       @timelog_logged_time[:timestamp_end] = Time.now
@@ -385,10 +364,27 @@ class Openall_time_applet
   
   #Sets a new timelog to track. Stops tracking of previous timelog if already tracking.
   def timelog_active=(timelog)
+    timelog_use = @ob.get_by(:Timelog, {
+      "task_id" => timelog[:task_id],
+      "descr" => timelog[:descr],
+      "timestamp_day" => Time.now
+    })
+    if !timelog_use
+      timelog_use = @ob.add(:Timelog, {
+        :task_id => timelog[:task_id],
+        :parent_timelog_id => timelog.id,
+        :timestamp => Time.now,
+        :descr => timelog[:descr],
+        :transportdescription => timelog[:transportdescription],
+        :workinternal => timelog[:workinternal],
+        :timetype => timelog[:timetype]
+      })
+    end
+    
     begin
       self.timelog_stop_tracking
-      @timelog_logged_time = @ob.add(:Timelog_logged_time, {:timelog_id => timelog.id})
-      @timelog_active = timelog
+      @timelog_logged_time = @ob.add(:Timelog_logged_time, :timelog_id => timelog_use.id)
+      @timelog_active = timelog_use
       @timelog_active_time = Time.new
       
       @events.call(:timelog_active_changed)
@@ -433,13 +429,12 @@ class Openall_time_applet
     self.status = sprintf(_("Restarted automatic sync. to run every %s minutes."), Knj::Locales.number_out(interval, 1))
     
     #Start new timeout.
-    @autosync_timeout = Gtk.timeout_add(interval_msecs) do
-      if !@sync_thread
-        @sync_thread = Knj::Thread.new(&self.method(:run_autosync))
-      end
-      
-      true
-    end
+    @autosync_timeout = Gtk.timeout_add(interval_msecs, &self.method(:gtk_timeout))
+  end
+  
+  def gtk_timeout
+    @sync_thread = Knj::Thread.new(&self.method(:run_autosync)) if !@sync_thread
+    true
   end
   
   #This method is executing the automatic synchronization.

data/models/timelog.rb

@@ -97,12 +97,7 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
       col = :time
     end
     
-    time = self[col].to_i
-    self.ob.list(:Timelog, "parent_timelog" => self) do |tlog|
-      time += tlog[col].to_i
-    end
-    
-    return time
+    return self[col].to_i
   end
   
   #Returns the time as a human readable format.

data/openall_time_applet.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openall_time_applet}
-  s.version = "0.0.26"
+  s.version = "0.0.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

metadata

@@ -2,7 +2,7 @@
 name: openall_time_applet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -209,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1135881411050114948
+      hash: 1133532196206197522
       segments: 
       - 0
       version: "0"