openall_time_applet 0.0.18 → 0.0.19

data/Gemfile.lock

@@ -3,12 +3,12 @@ GEM
   specs:
     atk (1.1.3)
       glib2 (>= 1.1.3)
-    cairo (1.12.1)
+    cairo (1.12.2)
       pkg-config
     diff-lcs (1.1.3)
     gdk_pixbuf2 (1.1.3)
       glib2 (>= 1.1.3)
-    gettext (2.2.0)
+    gettext (2.2.1)
       locale
     git (1.2.5)
     glib2 (1.1.3)
@@ -17,13 +17,15 @@ GEM
       atk (>= 1.1.3)
       gdk_pixbuf2 (>= 1.1.3)
       pango (>= 1.1.3)
-    jeweler (1.8.3)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.1)
-    knjrbfw (0.0.32)
+    json (1.7.3)
+    knjrbfw (0.0.55)
+      tsafe
+      wref
     locale (2.0.5)
     pango (1.1.3)
       cairo (>= 1.10.0)
@@ -43,6 +45,8 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
     sqlite3 (1.3.6)
+    tsafe (0.0.1)
+    wref (0.0.4)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.19

data/conf/db_schema.rb

@@ -33,6 +33,7 @@ Openall_time_applet::DB_SCHEMA = {
       "columns" => [
         {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
         {"name" => "task_id", "type" => "int"},
+        {"name" => "parent_timelog_id", "type" => "int", "null" => false},
         {"name" => "timestamp", "type" => "datetime"},
         {"name" => "time", "type" => "int"},
         {"name" => "time_sync", "type" => "varchar"},
@@ -48,7 +49,8 @@ Openall_time_applet::DB_SCHEMA = {
         {"name" => "sync_last", "type" => "datetime"}
       ],
       "indexes" => [
-        "task_id"
+        "task_id",
+        "parent_timelog_id"
       ]
     },
     "Timelog_logged_time" => {

data/glade/win_main.glade

@@ -145,6 +145,47 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkTable" id="tableRunning">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="n_columns">3</property>
+                        <child>
+                          <object class="GtkLabel" id="labRunningTimelog">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="labRunningTask">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="labRunningTime">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkButton" id="btnSwitch">
                         <property name="label" translatable="yes">Switch</property>
@@ -157,7 +198,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                   </object>
@@ -308,121 +349,6 @@
             <property name="position">2</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkFrame" id="frameTimelogInfo">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkAlignment" id="alignment3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkTable" id="table1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="n_rows">3</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">3</property>
-                    <property name="row_spacing">3</property>
-                    <child>
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Description</property>
-                      </object>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Task</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Time</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="labTimelogInfoDescr">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="labTimelogInfoTask">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="labTimelogInfoTime">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Timelog info&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkStatusbar" id="statusbar">
             <property name="visible">True</property>
@@ -432,7 +358,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">4</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </object>

data/gui/trayicon.rb

@@ -38,7 +38,7 @@ class Openall_time_applet::Gui::Trayicon
     end
     
     #Calculate minutes tracked and generate variables.
-    secs = Time.now.to_i - @args[:oata].timelog_active_time.to_i
+    secs = Time.now.to_i - @args[:oata].timelog_active_time.to_i + @args[:oata].timelog_active.time_total
     mins = (secs.to_f / 60.0)
     
     if mins >= 60
@@ -88,14 +88,14 @@ class Openall_time_applet::Gui::Trayicon
     menu = Gtk::Menu.new
     
     #Make a list of all timelogs in the menu.
-    @args[:oata].ob.list(:Timelog, {"orderby" => "id"}) do |timelog|
+    @args[:oata].ob.list(:Timelog, "parent_timelog_id" => 0, "orderby" => "id") 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.
       if @args[:oata].timelog_active and @args[:oata].timelog_active.id == timelog.id
         mi = Gtk::ImageMenuItem.new(Gtk::Stock::MEDIA_RECORD)
         
-        secs = Time.now.to_i - @args[:oata].timelog_active_time.to_i
+        secs = Time.now.to_i - @args[:oata].timelog_active_time.to_i + timelog.time_total
         mins = (secs.to_f / 60.0).round(0)
         
         mi.children[0].markup = "<b>#{Knj::Web.html(label)} (#{mins})</b>"

data/gui/win_main.rb

@@ -226,7 +226,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, "parent_timelog_id" => 0, "orderby" => [["timestamp", "desc"]]) do |timelog|
       begin
         tstamp_str = timelog.timestamp_str
       rescue => e
@@ -259,7 +259,7 @@ class Openall_time_applet::Gui::Win_main
     do_destroy = true
     
     @args[:oata].ob.list(:Timelog) do |timelog|
-      if timelog[:time].to_f > 0 or timelog[:time_transport].to_f > 0 or timelog[:sync_need].to_i == 1
+      if timelog.time_total > 0 or timelog.time_total(:transport => true) > 0 or timelog[:sync_need].to_i == 1
         timelog_found = timelog
         break
       end
@@ -305,9 +305,7 @@ class Openall_time_applet::Gui::Win_main
   
   #This method handles the "Timelog info"-frame. Hides, shows and updates the info in it.
   def timelog_info_trigger
-    if !@gui["expOverview"].expanded? and tlog = @args[:oata].timelog_active
-      @gui["labTimelogInfoDescr"].markup = "<b>#{Knj::Web.html(tlog[:descr])}</b>"
-      
+    if tlog = @args[:oata].timelog_active
       task = tlog.task
       if !task
         task_text = "[#{_("no task sat on the timelog")}]"
@@ -315,18 +313,20 @@ class Openall_time_applet::Gui::Win_main
         task_text = task.name
       end
       
-      @gui["labTimelogInfoTask"].markup = "<b>#{Knj::Web.html(task_text)}</b>"
+      @gui["labRunningTimelog"].label = tlog[:descr]
+      @gui["labRunningTask"].label = task_text
       
-      time_tracked = Knj::Strings.secs_to_human_time_str(@args[:oata].timelog_active_time_tracked + tlog[:time].to_i)
-      @gui["labTimelogInfoTime"].markup = "<b>#{Knj::Web.html(time_tracked)}</b>"
+      time_tracked = Knj::Strings.secs_to_human_time_str(@args[:oata].timelog_active_time_tracked + tlog.time_total)
       
-      @gui["frameTimelogInfo"].show_all
-    else
-      visible = @gui["frameTimelogInfo"].visible?
-      @gui["frameTimelogInfo"].hide
+      @gui["labRunningTime"].label = time_tracked
       
-      #Resize to minimum height, so a big space isnt left.
-      @gui["window"].resize(@gui["window"].size[0], 1) if visible and !@gui["expOverview"].expanded?
+      @gui["txtDescr"].hide
+      @gui["cbTask"].hide
+      @gui["tableRunning"].show_all
+    else
+      @gui["txtDescr"].show
+      @gui["cbTask"].show
+      @gui["tableRunning"].hide
     end
   end
   
@@ -387,7 +387,7 @@ class Openall_time_applet::Gui::Win_main
       
       #Update time tracked.
       if timelog_id == act_timelog_id
-        secs = act_timelog[:time].to_i + @args[:oata].timelog_active_time_tracked
+        secs = act_timelog.time_total + @args[:oata].timelog_active_time_tracked
         iter[3] = "<b>#{Knj::Strings.secs_to_human_time_str(secs)}</b>"
         bold = true
       end

data/lib/openall_time_applet.rb

@@ -24,7 +24,7 @@ class Openall_time_applet
   class Models
     #Autoloader for subclasses.
     def self.const_missing(name)
-      require "../models/#{name.to_s.downcase}.rb"
+      require "#{File.dirname(__FILE__)}/../models/#{name.to_s.downcase}.rb"
       return Openall_time_applet::Models.const_get(name)
     end
   end
@@ -33,7 +33,7 @@ class Openall_time_applet
   class Gui
     #Autoloader for subclasses.
     def self.const_missing(name)
-      require "../gui/#{name.to_s.downcase}.rb"
+      require "#{File.dirname(__FILE__)}/../gui/#{name.to_s.downcase}.rb"
       return Openall_time_applet::Gui.const_get(name)
     end
   end
@@ -42,7 +42,7 @@ class Openall_time_applet
   def self.const_missing(name)
     namel = name.to_s.downcase
     tries = [
-      "../classes/#{namel}.rb"
+      "#{File.dirname(__FILE__)}/../classes/#{namel}.rb"
     ]
     tries.each do |try|
       if File.exists?(try)
@@ -89,7 +89,7 @@ class Openall_time_applet
     @ob = Knj::Objects.new(
       :datarow => true,
       :db => @db,
-      :class_path => "../models",
+      :class_path => "#{File.dirname(__FILE__)}/../models",
       :class_pre => "",
       :module => Openall_time_applet::Models
     )
@@ -175,7 +175,7 @@ class Openall_time_applet
   
   #Updates the database according to the db-schema.
   def update_db
-    require "../conf/db_schema.rb"
+    require "#{File.dirname(__FILE__)}/../conf/db_schema.rb"
     Knj::Db::Revision.new.init_db("debug" => false, "db" => @db, "schema" => Openall_time_applet::DB_SCHEMA)
   end
   
@@ -343,8 +343,30 @@ class Openall_time_applet
   def timelog_stop_tracking
     if @timelog_active
       secs_passed = Time.now.to_i - @timelog_active_time.to_i
-      @timelog_active.update(
-        :time => @timelog_active[:time].to_i + secs_passed,
+      
+      #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,
         :sync_need => 1
       )
       @timelog_logged_time[:timestamp_end] = Time.now
@@ -359,24 +381,6 @@ class Openall_time_applet
   #Sets a new timelog to track. Stops tracking of previous timelog if already tracking.
   def timelog_active=(timelog)
     begin
-      #Check if there has been logged time another day - if so, clone it and begin logging on the clone instead.
-      tlt = @ob.list(:Timelog_logged_time, {
-        "timelog" => timelog,
-        "timestamp_start_day_not" => Time.now,
-        "limit" => 1
-      })
-      if !tlt.empty?
-        timelog = @ob.add(:Timelog, {
-          :task_id => timelog[:task_id],
-          :timestamp => Time.now,
-          :descr => timelog[:descr],
-          :transportdescription => timelog[:transportdescription],
-          :workinternal => timelog[:workinternal],
-          :timetype => timelog[:timetype]
-        })
-        #raise sprintf(_("You have already logged on this timelog on %s"), tlt.first.timestamp_start.out)
-      end
-      
       self.timelog_stop_tracking
       @timelog_logged_time = @ob.add(:Timelog_logged_time, {:timelog_id => timelog.id})
       @timelog_active = timelog

data/models/timelog.rb

@@ -1,10 +1,12 @@
 class Openall_time_applet::Models::Timelog < Knj::Datarow
   has_one [
-    :Task
+    :Task,
+    [:Timelog, :parent_timelog_id, :parent_timelog]
   ]
   
   has_many [
-    {:class => :Timelog_logged_time, :col => :timelog_id, :method => :logged_times, :autodelete => true}
+    {:class => :Timelog_logged_time, :col => :timelog_id, :method => :logged_times, :autodelete => true},
+    {:class => :Timelog, :col => :parent_timelog_id, :method => :child_timelogs, :autodelete => true}
   ]
   
   def initialize(*args, &block)
@@ -19,6 +21,7 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
   def self.add(d)
     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)
   end
   
   #Pushes timelogs and time to OpenAll.
@@ -69,13 +72,29 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
     return descr
   end
   
+  #Returns the total amount of seconds for this timelog (and any sub-timelogs).
+  def time_total(args = {})
+    if args[:transport]
+      col = :time_transport
+    else
+      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
+  end
+  
   #Returns the time as a human readable format.
   def time_as_human
-    return Knj::Strings.secs_to_human_time_str(self[:time])
+    return Knj::Strings.secs_to_human_time_str(self.time_total)
   end
   
   #Returns the transport-time as a human readable format.
   def time_transport_as_human
-    return Knj::Strings.secs_to_human_time_str(self[:time_transport])
+    return Knj::Strings.secs_to_human_time_str(self.time_total(:transport => true))
   end
 end

data/models/timelog_logged_time.rb

@@ -1,6 +1,6 @@
 class Openall_time_applet::Models::Timelog_logged_time < Knj::Datarow
   has_one [
-    {:class => :Timelog, :col => :timelog_id, :method => :timelog, :depends => true}
+    {:class => :Timelog, :col => :timelog_id, :method => :timelog, :required => true}
   ]
   
   def self.add(d)

data/openall_time_applet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openall_time_applet}
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-05}
+  s.date = %q{2012-07-10}
   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"]

data/spec/openall_time_applet_spec.rb

@@ -1,7 +1,47 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "OpenallTimeApplet" do
-  it "should spawn the tray icon" do
+  it "should be able to start" do
+    $tmp_path = "/tmp/openall_spec.sqlite3"
+    Openall_time_applet::CONFIG[:db_path] = $tmp_path
+    $oata = Openall_time_applet.new
+  end
+  
+  it "should be able to clone timelogs" do
+    date = Knj::Datet.new
+    date.days - 1
+    
+    timelog = $oata.ob.add(:Timelog, {
+      :descr => "Test 1",
+      :timestamp => date
+    })
+    
+    $oata.timelog_active = timelog
+    sleep 0.5
+    $oata.timelog_stop_tracking
+    
+    timelogs = $oata.ob.list(:Timelog, "orderby" => "timestamp").to_a
+    raise "Expected amount of timelogs to be 2 but it wasnt: #{timelogs.length}" if timelogs.length != 2
     
+    cloned = timelogs.last
+    raise "Expected date to be today but it wasnt: #{cloned.timestamp}" if cloned.timestamp.time.strftime("%Y-%m-%d") != Time.now.strftime("%Y-%m-%d")
+    
+    $oata.timelog_active = timelog
+    sleep 0.5
+    $oata.timelog_stop_tracking
+    
+    timelogs = $oata.ob.list(:Timelog, "orderby" => "timestamp").to_a
+    raise "Expected amount of timelogs to be 2 but it wasnt: #{timelogs.length}" if timelogs.length != 2
+  end
+  
+  it "should automatically delete sub-timelogs" do
+    main = $oata.ob.get_by(:Timelog, "parent_timelog_id" => 0)
+    $oata.ob.delete(main)
+    timelogs = $oata.ob.list(:Timelog, "orderby" => "timestamp").to_a
+    raise "Expected amount of timelogs to be 0 but it wasnt: #{timelogs.length}" if timelogs.length != 0
+  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.18
+  version: 0.0.19
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-05 00:00:00 +02:00
+date: 2012-07-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -198,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1991198915258529709
+      hash: 4278837870597211102
       segments: 
       - 0
       version: "0"