openall_time_applet 0.0.25 → 0.0.26

data/Gemfile.lock

@@ -1,40 +1,44 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    atk (1.1.3)
-      glib2 (>= 1.1.3)
+    atk (1.1.4)
+      glib2 (>= 1.1.4)
     cairo (1.12.2)
       pkg-config
-    datet (0.0.9)
+    datet (0.0.14)
     diff-lcs (1.1.3)
-    gdk_pixbuf2 (1.1.3)
-      glib2 (>= 1.1.3)
+    gdk_pixbuf2 (1.1.4)
+      glib2 (>= 1.1.4)
     gettext (2.2.1)
       locale
     git (1.2.5)
-    glib2 (1.1.3)
+    glib2 (1.1.4)
       pkg-config
-    gtk2 (1.1.3)
-      atk (>= 1.1.3)
-      gdk_pixbuf2 (>= 1.1.3)
-      pango (>= 1.1.3)
-    http2 (0.0.4)
+    gtk2 (1.1.4)
+      atk (>= 1.1.4)
+      gdk_pixbuf2 (>= 1.1.4)
+      pango (>= 1.1.4)
+    http2 (0.0.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.3)
-    knjrbfw (0.0.65)
+    json (1.7.4)
+    knjrbfw (0.0.78)
       datet
       http2
+      php4r
       tsafe
       wref
     locale (2.0.5)
-    pango (1.1.3)
+    pango (1.1.4)
       cairo (>= 1.10.0)
-      glib2 (>= 1.1.3)
-    pkg-config (1.1.3)
+      glib2 (>= 1.1.4)
+    php4r (0.0.2)
+      datet
+      http2
+    pkg-config (1.1.4)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -48,8 +52,8 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
     sqlite3 (1.3.6)
-    tsafe (0.0.1)
-    wref (0.0.4)
+    tsafe (0.0.11)
+    wref (0.0.5)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.0.25
+0.0.26

data/gui/trayicon.rb

@@ -60,10 +60,10 @@ class Openall_time_applet::Gui::Trayicon
     
     #Generate image.
     require "RMagick"
-    canvas = Magick::Image.new(53, 53){
+    canvas = Magick::Image.new(53, 53) do
       self.background_color = "transparent"
       self.format = "png"
-    }
+    end
     
     color = "#a1a80a" if color == "green_casalogic"
     
@@ -86,9 +86,7 @@ class Openall_time_applet::Gui::Trayicon
   
   def on_statusicon_rightclick(tray, button, time)
     menu = Gtk::Menu.new
-    
-    #Make a list of all timelogs in the menu.
-    @args[:oata].ob.list(:Timelog, "parent_timelog_id" => 0, "orderby" => "id") do |timelog|
+    @args[:oata].trayicon_timelogs do |timelog|
       label = timelog.descr_short
       
       #If this is the active timelog, make the label bold, by getting the label-child and using HTML-markup on it.

data/gui/win_main.rb

@@ -7,6 +7,7 @@ class Openall_time_applet::Gui::Win_main
     @gui = Gtk::Builder.new.add("#{File.dirname(__FILE__)}/../glade/win_main.glade")
     @gui.translate
     @gui.connect_signals{|h| method(h)}
+    @gui["window"].icon = "#{File.dirname(__FILE__)}/../gfx/icon_time_black.png"
     
     
     #Generate list-store containing tasks for the task-column.
@@ -299,7 +300,7 @@ class Openall_time_applet::Gui::Win_main
     @gui["tvTimelogsPrepareTransfer"].model.clear
     @timelogs_sync_count = 0
     
-    @args[:oata].ob.list(:Timelog, {"sync_need" => 1, "orderby" => "timestamp"}) do |timelog|
+    @args[:oata].ob.list(:Timelog, "sync_need" => 1, "task_id_not" => ["", 0], "orderby" => "timestamp") do |timelog|
       #Read time and transport from timelog.
       time = timelog[:time].to_i
       transport = timelog[:time_transport].to_i
@@ -400,7 +401,7 @@ class Openall_time_applet::Gui::Win_main
   def reload_timelogs
     return nil if @dont_reload or @gui["tvTimelogs"].destroyed?
     @gui["tvTimelogs"].model.clear
-    @args[:oata].ob.list(:Timelog, "orderby" => [["timestamp", "desc"]]) do |timelog|
+    @args[:oata].ob.list(:Timelog, "orderby" => ["task_id", "descr", "timestamp"]) do |timelog|
       begin
         tstamp_str = timelog.timestamp_str
       rescue => e

data/gui/win_preferences.rb

@@ -7,6 +7,7 @@ class Openall_time_applet::Gui::Win_preferences
     @gui = Gtk::Builder.new.add("../glade/win_preferences.glade")
     @gui.translate
     @gui.connect_signals{|h| method(h)}
+    @gui["window"].icon = "#{File.dirname(__FILE__)}/../gfx/icon_time_black.png"
     
     self.load_values
     
@@ -47,7 +48,7 @@ class Openall_time_applet::Gui::Win_preferences
   end
   
   def on_btnReminderSave_clicked
-    if !Knj::Php.is_numeric(@gui["txtReminderEveryMinute"].text)
+    if !(Float(@gui["txtReminderEveryMinute"].text) rescue false)
       Knj::Gtk2.msgbox(_("Reminder-minute was not numeric."))
       return nil
     end
@@ -106,7 +107,7 @@ class Openall_time_applet::Gui::Win_preferences
   
   def on_btnAutoSyncSave_clicked
     interval = @gui["txtAutoSyncInterval"].text
-    if !Knj::Php.is_numeric(interval)
+    if !(Float(interval) rescue false)
       Knj::Gtk2.msgbox(_("The interval was not numeric."))
       return false
     end

data/gui/win_worktime_overview.rb

@@ -8,6 +8,7 @@ class Openall_time_applet::Gui::Win_worktime_overview
     @gui = Gtk::Builder.new.add("../glade/win_worktime_overview.glade")
     @gui.translate
     @gui.connect_signals{|h| method(h)}
+    @gui["window"].icon = "#{File.dirname(__FILE__)}/../gfx/icon_time_black.png"
     
     @date = Datet.new
     self.build_week

data/lib/openall_time_applet.rb

@@ -283,7 +283,7 @@ class Openall_time_applet
   end
   
   #Synchronizes organisations, tasks and worktimes.
-  def sync_static(args = nil)
+  def sync_static(args = {})
     sw = Knj::Gtk2::StatusWindow.new("transient_for" => args["transient_for"])
     
     return Knj::Thread.new do
@@ -469,6 +469,22 @@ class Openall_time_applet
       win_main.gui["statusbar"].push(0, newstatus)
     end
   end
+  
+  def trayicon_timelogs
+    yielded_titles = {}
+    
+    #Make a list of all timelogs in the menu.
+    @ob.list(:Timelog, "parent_timelog_id" => 0, "orderby" => "descr") do |timelog|
+      task_id = timelog[:task_id].to_i
+      yielded_titles[task_id] = {} if !yielded_titles.key?(task_id)
+      
+      title = timelog.descr_short.strip.downcase
+      next if yielded_titles[task_id].key?(title)
+      yielded_titles[task_id][title] = true
+      
+      yield(timelog)
+    end
+  end
 end
 
 #Gettext support.

data/models/timelog.rb

@@ -28,26 +28,28 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
   def self.push_time_updates(d, args)
     args[:oata].oa_conn do |conn|
       #Go through timelogs that needs syncing and has a task set.
-      self.ob.list(:Timelog, {"sync_need" => 1, "task_id_not" => ["", 0]}) do |timelog|
+      self.ob.list(:Timelog, "sync_need" => 1, "task_id_not" => ["", 0]) do |timelog|
         secs_sum = timelog[:time_sync].to_i + timelog[:time_transport].to_i
         next if secs_sum <= 0 or !timelog.task
         
+        post_hash = {
+          :task_uid => timelog.task[:openall_uid].to_i,
+          :comment => timelog[:descr],
+          :worktime => Knj::Strings.secs_to_human_time_str(timelog[:time_sync]),
+          :workinternal => timelog[:workinternal],
+          :timestamp => timelog[:timestamp],
+          :timetype => timelog[:timetype],
+          :transporttime => Knj::Strings.secs_to_human_time_str(timelog[:time_transport]),
+          :transportlength => timelog[:transportlength].to_i,
+          :transportcosts => timelog[:transportcosts].to_i,
+          :transportdescription => timelog[:transportdescription],
+          :travelfixed => timelog[:travelfixed]
+        }
+        
         #The timelog has not yet been created in OpenAll - create it!
         res = conn.request(
           :method => :createWorktime,
-          :post => {
-            :task_uid => timelog.task[:openall_uid].to_i,
-            :comment => timelog[:descr],
-            :worktime => Knj::Strings.secs_to_human_time_str(timelog[:time]),
-            :workinternal => timelog[:workinternal],
-            :timestamp => timelog[:timestamp],
-            :timetype => timelog[:timetype],
-            :transporttime => Knj::Strings.secs_to_human_time_str(timelog[:time_transport]),
-            :transportlength => timelog[:transportlength].to_i,
-            :transportcosts => timelog[:transportcosts].to_i,
-            :transportdescription => timelog[:transportdescription],
-            :travelfixed => timelog[:travelfixed]
-          }
+          :post => post_hash
         )
         
         parent_timelog = timelog.parent_timelog

data/openall_time_applet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openall_time_applet}
-  s.version = "0.0.25"
+  s.version = "0.0.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-27}
+  s.date = %q{2012-08-04}
   s.description = %q{Off-line time-tracking for OpenAll with syncing when online.}
   s.email = %q{k@spernj.org}
   s.executables = ["OpenAll Timelogging", "openall_time_applet.rb"]
@@ -54,7 +54,9 @@ Gem::Specification.new do |s|
     "models/worktime.rb",
     "openall_time_applet.gemspec",
     "spec/openall_time_applet_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/sync_spec.rb",
+    "spec/tray_timelogs_spec.rb"
   ]
   s.homepage = %q{http://github.com/kaspernj/openall_time_applet}
   s.licenses = ["MIT"]

data/spec/openall_time_applet_spec.rb

@@ -102,6 +102,15 @@ describe "OpenallTimeApplet" do
     raise "Timelog was not deleted." if !timelog.deleted?
   end
   
+  it "should only return a specific amount of timelogs for tray-icon" do
+    count = 0
+    $oata.trayicon_timelogs do |timelog|
+      count += 1
+    end
+    
+    print "Count: #{count}\n"
+  end
+  
   it "should remove the temp db" do
     File.unlink($tmp_path) if File.exists?($tmp_path)
   end

data/spec/sync_spec.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "OpenallTimeApplet" do
+  it "should be able to start" do
+    begin
+      $tmp_path = "/tmp/openall_spec.sqlite3"
+      File.unlink($tmp_path) if File.exists?($tmp_path)
+      Openall_time_applet::CONFIG[:db_path] = $tmp_path
+      $oata = Openall_time_applet.new
+      
+      Knj::Opts.set("openall_host", "192.168.56.54")
+      Knj::Opts.set("openall_port", 80)
+      Knj::Opts.set("openall_username", "kaspernj")
+      Knj::Opts.set("openall_password", Base64.strict_encode64("123"))
+      Knj::Opts.set("openall_ssl", 0)
+    rescue Exception => e
+      STDOUT.print Knj::Errors.error_str(e)
+    end
+  end
+  
+  it "should only return a specific amount of timelogs for tray-icon" do
+    $oata.sync_static
+    sleep 1
+    raise "A new message box was shown: '#{Knj::Gtk2::Msgbox.cur_label}'." if Knj::Gtk2::Msgbox.shown?
+    
+    task = $oata.ob.get_by(:Task, "openall_uid_not" => ["", 0])
+    raise "No task could be found?" if !task
+    
+    idstr = Digest::MD5.hexdigest(Time.now.to_f.to_s)
+    titlestr = "Tlog test #{idstr}"
+    
+    tlog = $oata.ob.add(:Timelog,
+      :descr => titlestr,
+      :sync_need => 1,
+      :task_id => task.id,
+      :time => Knj::Strings.human_time_str_to_secs("01:30:15"),
+      :time_sync => Knj::Strings.human_time_str_to_secs("01:30:30")
+    )
+    
+    $oata.sync_real
+    $oata.sync_static
+    sleep 1
+    
+    worktime = $oata.ob.get_by(:Worktime, "comment" => titlestr)
+    raise "Could not find synced worktime." if !worktime
+    raise "Expected synced worktime to be '5430' but it was '#{worktime[:worktime]}'." if worktime[:worktime].to_i != 5430
+  end
+  
+  it "should remove the temp db" do
+    File.unlink($tmp_path) if File.exists?($tmp_path)
+  end
+end

data/spec/tray_timelogs_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "OpenallTimeApplet" do
+  it "should be able to start" do
+    $tmp_path = "/tmp/openall_spec.sqlite3"
+    File.unlink($tmp_path) if File.exists?($tmp_path)
+    Openall_time_applet::CONFIG[:db_path] = $tmp_path
+    $oata = Openall_time_applet.new
+  end
+  
+  it "should only return a specific amount of timelogs for tray-icon" do
+    task1 = $oata.ob.add(:Task, :title => "Task 1")
+    task2 = $oata.ob.add(:Task, :title => "Task 2")
+    
+    tlog1 = $oata.ob.add(:Timelog, :descr => "Tlog 1", :task_id => task1.id)
+    tlog2 = $oata.ob.add(:Timelog, :descr => "Tlog 1", :task_id => task1.id)
+    tlog3 = $oata.ob.add(:Timelog, :descr => "Tlog 1", :task_id => task2.id)
+    tlog4 = $oata.ob.add(:Timelog, :descr => "Tlog 4", :task_id => task2.id)
+    
+    count = 0
+    $oata.trayicon_timelogs do |timelog|
+      count += 1
+    end
+    
+    raise "Expected count 3 but got #{count}." if count != 3
+  end
+  
+  it "should remove the temp db" do
+    File.unlink($tmp_path) if File.exists?($tmp_path)
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: openall_time_applet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-27 00:00:00 +02:00
+date: 2012-08-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,6 +193,8 @@ files:
 - openall_time_applet.gemspec
 - spec/openall_time_applet_spec.rb
 - spec/spec_helper.rb
+- spec/sync_spec.rb
+- spec/tray_timelogs_spec.rb
 has_rdoc: true
 homepage: http://github.com/kaspernj/openall_time_applet
 licenses: 
@@ -207,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2066480460738112148
+      hash: -1135881411050114948
       segments: 
       - 0
       version: "0"