openall_time_applet 0.0.38 → 0.0.40

data/models/task.rb

@@ -7,20 +7,31 @@ class Openall_time_applet::Models::Task < Knj::Datarow
     [:Timelog, :task_id, :timelogs]
   ]
   
+  def initialize(*args, &block)
+    super(*args, &block)
+    
+    #Fix default values.
+    self[:active] = 1 if self[:active].to_s == ""
+  end
+  
   def self.update_cache(d, args)
     res = nil
     args[:oata].oa_conn do |conn|
       res = conn.request(:getAllTasksForUser)
     end
     
+    #Update all tasks for current user.
+    found_ids = []
     res.each do |task_data|
-      task = self.ob.get_by(:Task, {"openall_uid" => task_data["uid"]})
+      task = self.ob.get_by(:Task, "openall_uid" => task_data["uid"])
       data_hash = {
         :openall_uid => task_data["uid"],
-        :title => task_data["title"]
+        :title => task_data["title"],
+        :status => task_data["status"],
+        :active => 1
       }
       
-      org = self.ob.get_by(:Organisation, {"openall_uid" => task_data["organisation_uid"]})
+      org = self.ob.get_by(:Organisation, "openall_uid" => task_data["organisation_uid"])
       data_hash[:organisation_id] = org.id if org
       
       if task
@@ -28,6 +39,54 @@ class Openall_time_applet::Models::Task < Knj::Datarow
       else
         task = self.ob.add(:Task, data_hash)
       end
+      
+      found_ids << task.id
+    end
+    
+    #Mark all tasks not given as not-active.
+    d.ob.list(:Task, "id_not" => found_ids) do |task|
+      task[:active] = 0
+    end
+  end
+  
+  #Returns all open tasks or tasks that are attached to timelogs.
+  def self.tasks_to_show(d)
+    tasks = {}
+    
+    #Get lists of tasks that are not closed.
+    self.ob.list(:Task, "status_not" => "Closed", "active" => 1) do |task|
+      tasks[task.id] = task
+    end
+    
+    #Get missing tasks that have attached timelogs.
+    self.ob.list(:Task, [:Timelog, "task_id_not"] => tasks.keys) do |task|
+      tasks[task.id] = task
+    end
+    
+    #Sort the found tasks
+    Knj::ArrayExt.hash_sort(tasks) do |task1, task2|
+      task1[1][:title].to_s.downcase <=> task2[1][:title].to_s.downcase
+    end
+    
+    #Return the found tasks.
+    if block_given?
+      tasks.each do |task_id, task|
+        yield(task)
+      end
+    else
+      return tasks.values
     end
   end
+  
+  #Returns the name of the task (and the organisation).
+  def name
+    str = self[:title].to_s.strip
+    str = "[#{_("no name")}]" if str.empty?
+    
+    if org = self.organisation
+      str << " (#{Knj::Strings.shorten(org.name, 15)})"
+    end
+    
+    return str
+  end
 end

data/models/timelog.rb

@@ -15,14 +15,18 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
     #Fix default time-type (SQLite3 doesnt support this).
     self[:timetype] = "normal" if self[:timetype].to_s == ""
     self[:timestamp] = Datet.new.dbstr if self[:timestamp].to_s == ""
+    self[:timetype] = "normal" if self[:timetype].to_s == ""
   end
   
   #Treat data before inserting into database.
   def self.add(d)
+    d.data[:timestamp] = Datet.new if !d.data.key?(:timestmap) or !d.data[:timestamp]
     d.data[:time] = 0 if d.data[:time].to_s.strip.length <= 0
     d.data[:time_transport] = 0 if d.data[:time_transport].to_s.strip.length <= 0
     d.data[:parent_timelog_id] = 0 if !d.data.key?(:parent_timelog_id)
     d.data[:sync_need] = 1 if !d.data.key?(:sync_need)
+    d.data[:task_id] = 0 if !d.data.key?(:task_id)
+    d.data[:timetype] = "normal" if !d.data.key?(:timetype)
   end
   
   #Pushes timelogs and time to OpenAll.
@@ -30,6 +34,10 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
     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|
+        task = timelog.task
+        raise sprintf(_("No task has been set on timelog: '%s'."), timelog.descr_short) if !task
+        raise sprintf(_("Task is closed and the timelog cannot be synced: '%s'."), timelog.descr_short) if task[:status] == "Closed"
+        
         secs_sum = timelog[:time_sync].to_i + timelog[:time_transport].to_i
         next if secs_sum <= 0 or !timelog.task
         
@@ -74,6 +82,19 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
     end
   end
   
+  def update(data)
+    data.each do |key, val|
+      case key.to_sym
+        when :timetype
+          if !self.class.time_types.key?(val.to_s)
+            raise sprintf(_("No such time-type: '%s'."), val)
+          end
+      end
+    end
+    
+    super(data)
+  end
+  
   #Returns a short one-line short description.
   def descr_short
     descr = self[:descr].to_s.gsub("\n", " ").gsub(/\s{2,}/, " ")
@@ -121,4 +142,13 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
       end
     end
   end
+  
+  #The possible options for time-types that should be shown in various combo-boxes and such.
+  def self.time_types
+    return {
+      "normal" => _("Normal"),
+      "overtime150" => sprintf(_("Overtime %s"), 150),
+      "overtime200" => sprintf(_("Overtime %s"), 200)
+    }
+  end
 end

data/openall_time_applet.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{openall_time_applet}
-  s.version = "0.0.38"
+  s.name = "openall_time_applet"
+  s.version = "0.0.40"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-23}
-  s.description = %q{Off-line time-tracking for OpenAll with syncing when online.}
-  s.email = %q{k@spernj.org}
+  s.date = "2012-09-08"
+  s.description = "Off-line time-tracking for OpenAll with syncing when online."
+  s.email = "k@spernj.org"
   s.executables = ["OpenAll Timelogging", "openall_time_applet.rb"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -58,11 +58,11 @@ Gem::Specification.new do |s|
     "spec/sync_spec.rb",
     "spec/tray_timelogs_spec.rb"
   ]
-  s.homepage = %q{http://github.com/kaspernj/openall_time_applet}
+  s.homepage = "http://github.com/kaspernj/openall_time_applet"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Time-tracking for OpenAll.}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Time-tracking for OpenAll."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -76,7 +76,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rmagick>, [">= 0"])
       s.add_runtime_dependency(%q<datet>, [">= 0"])
       s.add_runtime_dependency(%q<http2>, [">= 0"])
+      s.add_runtime_dependency(%q<gtk2_expander_settings>, [">= 0"])
       s.add_runtime_dependency(%q<gtk2_treeview_settings>, [">= 0"])
+      s.add_runtime_dependency(%q<gtk2_window_settings>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
@@ -90,7 +92,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rmagick>, [">= 0"])
       s.add_dependency(%q<datet>, [">= 0"])
       s.add_dependency(%q<http2>, [">= 0"])
+      s.add_dependency(%q<gtk2_expander_settings>, [">= 0"])
       s.add_dependency(%q<gtk2_treeview_settings>, [">= 0"])
+      s.add_dependency(%q<gtk2_window_settings>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -105,7 +109,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rmagick>, [">= 0"])
     s.add_dependency(%q<datet>, [">= 0"])
     s.add_dependency(%q<http2>, [">= 0"])
+    s.add_dependency(%q<gtk2_expander_settings>, [">= 0"])
     s.add_dependency(%q<gtk2_treeview_settings>, [">= 0"])
+    s.add_dependency(%q<gtk2_window_settings>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

metadata

@@ -2,7 +2,7 @@
 name: openall_time_applet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.38
+  version: 0.0.40
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-23 00:00:00 +02:00
-default_executable: 
+date: 2012-09-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: knjrbfw
@@ -102,7 +101,7 @@ dependencies:
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: gtk2_treeview_settings
+  name: gtk2_expander_settings
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -113,8 +112,30 @@ dependencies:
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: gtk2_treeview_settings
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: gtk2_window_settings
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,10 +143,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -133,10 +154,10 @@ dependencies:
         version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -144,10 +165,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -155,7 +176,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id015
 description: Off-line time-tracking for OpenAll with syncing when online.
 email: k@spernj.org
 executables: 
@@ -206,7 +227,6 @@ files:
 - 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: 
 - MIT
@@ -220,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1563791381235763168
+      hash: -2908154702793645026
       segments: 
       - 0
       version: "0"
@@ -233,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Time-tracking for OpenAll.