openall_time_applet 0.0.21 → 0.0.22

data/Gemfile

@@ -8,6 +8,8 @@ gem "sqlite3"
 gem "gettext"
 gem "json"
 gem "rmagick"
+gem "datet"
+gem "http2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -5,6 +5,7 @@ GEM
       glib2 (>= 1.1.3)
     cairo (1.12.2)
       pkg-config
+    datet (0.0.4)
     diff-lcs (1.1.3)
     gdk_pixbuf2 (1.1.3)
       glib2 (>= 1.1.3)
@@ -17,6 +18,8 @@ GEM
       atk (>= 1.1.3)
       gdk_pixbuf2 (>= 1.1.3)
       pango (>= 1.1.3)
+    http2 (0.0.0)
+      knjrbfw
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -53,8 +56,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
+  datet
   gettext
   gtk2
+  http2
   jeweler (~> 1.8.3)
   json
   knjrbfw

data/VERSION

@@ -1 +1 @@
-0.0.21
+0.0.22

data/classes/connection.rb

@@ -4,7 +4,7 @@ require "json"
 class Openall_time_applet::Connection
   def initialize(args)
     @args = args
-    @http = Knj::Http2.new(
+    @http = Http2.new(
       :host => @args[:host],
       :port => @args[:port],
       :follow_redirects => false,
@@ -17,10 +17,10 @@ class Openall_time_applet::Connection
   
   def login
     #For some weird reason OpenAll seems to only accept multipart-post-requests??
-    @http.post_multipart("index.php?c=Auth&m=validateLogin", {"username" => @args[:username], "password" => @args[:password]})
+    @http.post_multipart(:url => "index.php?c=Auth&m=validateLogin", :post => {"username" => @args[:username], "password" => @args[:password]})
     
     #Verify login by reading dashboard HTML.
-    res = @http.get("index.php?c=Dashboard")
+    res = @http.get(:url => "index.php?c=Dashboard")
     
     if !res.body.match(/<ul\s*id="webticker"\s*>/) and !res.body.index("<a href=\"index.php?c=Dashboard&m=editDashboard\">") == nil
       tmp_path = "#{Knj::Os.tmpdir}/openall_login_debug.txt"
@@ -44,9 +44,9 @@ class Openall_time_applet::Connection
     
     #Send request to OpenAll via HTTP.
     if args[:post]
-      res = @http.post_multipart(args[:url], args[:post])
+      res = @http.post_multipart(:url => args[:url], :post => args[:post])
     else
-      res = @http.get(args[:url])
+      res = @http.get(:url => args[:url])
     end
     
     raise _("Empty body returned from OpenAll.") if res.body.to_s.strip.length <= 0

data/glade/win_main.glade

@@ -146,59 +146,29 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkTable" id="tableRunning">
+                      <object class="GtkHButtonBox" id="hbuttonbox3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="n_columns">3</property>
                         <child>
-                          <object class="GtkLabel" id="labRunningTimelog">
+                          <object class="GtkButton" id="btnSwitch">
+                            <property name="label" translatable="yes">Switch</property>
                             <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>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
+                            <signal name="clicked" handler="on_btnSwitch_clicked" swapped="no"/>
                           </object>
                           <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</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>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_action_appearance">False</property>
-                        <signal name="clicked" handler="on_btnSwitch_clicked" swapped="no"/>
-                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">3</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
@@ -349,6 +319,119 @@
             <property name="position">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkVBox" id="vboxPrepareTransfer">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkFrame" id="frame2">
+                <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="GtkVBox" id="vbox4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">3</property>
+                        <child>
+                          <object class="GtkViewport" id="viewport2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">automatic</property>
+                                <property name="vscrollbar_policy">automatic</property>
+                                <child>
+                                  <object class="GtkTreeView" id="tvTimelogsPrepareTransfer">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHButtonBox" id="hbuttonbox4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">3</property>
+                            <property name="layout_style">end</property>
+                            <child>
+                              <object class="GtkButton" id="btnSyncPrepareTransfer">
+                                <property name="label">gtk-harddisk</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_stock">True</property>
+                                <signal name="clicked" handler="on_btnSyncPrepareTransfer_clicked" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</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;Prepare transfer&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="labTotal">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">[totals]</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkStatusbar" id="statusbar">
             <property name="visible">True</property>
@@ -358,7 +441,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="position">4</property>
           </packing>
         </child>
       </object>

data/gui/trayicon.rb

@@ -39,7 +39,7 @@ class Openall_time_applet::Gui::Trayicon
     
     #Calculate minutes tracked and generate variables.
     secs = Time.now.to_i - @args[:oata].timelog_active_time.to_i + @args[:oata].timelog_active.time_total
-    mins = (secs.to_f / 60.0)
+    mins = (secs.to_f / 60.0).floor
     
     if mins >= 60
       hours = mins / 60

data/gui/win_main.rb

@@ -118,7 +118,7 @@ class Openall_time_applet::Gui::Win_main
       :model_class => :Timelog,
       :renderers => init_data[:renderers],
       :change_before => proc{|d|
-        if (d[:col_no] == 11 or d[:col_no] == 3 or d[:col_no] == 2) and @args[:oata].timelog_active and @args[:oata].timelog_active.id == d[:model].id
+        if d[:col_no] == 3 and @args[:oata].timelog_active and @args[:oata].timelog_active.id == d[:model].id
           raise _("You cannot edit the time for the active timelog.")
         end
         
@@ -127,6 +127,12 @@ class Openall_time_applet::Gui::Win_main
       :change_after => proc{
         @dont_reload = false
       },
+      :on_edit => proc{|d|
+        @tv_editting = true
+      },
+      :on_edit_done => proc{|d|
+        @tv_editting = nil
+      },
       :cols => {
         1 => :descr,
         2 => {:col => :timestamp, :type => :datetime},
@@ -160,10 +166,7 @@ class Openall_time_applet::Gui::Win_main
     
     
     #Connect certain column renderers to the editingStarted-method, so editing can be canceled, if the user tries to edit forbidden data on the active timelog.
-    init_data[:renderers][1].signal_connect_after("editing-started", :descr, &self.method(:on_cell_editingStarted))
-    init_data[:renderers][2].signal_connect_after("editing-started", :timestamp, &self.method(:on_cell_editingStarted))
     init_data[:renderers][3].signal_connect_after("editing-started", :time, &self.method(:on_cell_editingStarted))
-    init_data[:renderers][11].signal_connect_after("editing-started", :task, &self.method(:on_cell_editingStarted))
     
     
     #Fills the timelogs-treeview with data.
@@ -194,13 +197,179 @@ class Openall_time_applet::Gui::Win_main
     end
     
     
+    
+    #Initializes sync-box.
+    @gui["btnSyncPrepareTransfer"].label = _("Transfer")
+    
+    #Generate list-store containing tasks for the task-column.
+    task_ls = Gtk::ListStore.new(String, String)
+    iter = task_ls.append
+    iter[0] = _("None")
+    iter[1] = 0.to_s
+    
+    tasks = [_("Choose:")]
+    @args[:oata].ob.list(:Task, {"orderby" => "title"}) do |task|
+      iter = task_ls.append
+      iter[0] = task[:title]
+      iter[1] = task.id.to_s
+      tasks << task
+    end
+    
+    #Initialize timelog treeview.
+    init_data = Knj::Gtk2::Tv.init(@gui["tvTimelogsPrepareTransfer"], [
+      _("ID"),
+      _("Description"),
+      _("Timestamp"),
+      _("Time"),
+      _("Transport"),
+      _("Length"),
+      _("Transport descr."),
+      _("Transport costs"),
+      {
+        :title => _("Fixed travel"),
+        :type => :toggle
+      },
+      {
+        :title => _("Int. work"),
+        :type => :toggle
+      },
+      {
+        :title => _("Sync?"),
+        :type => :toggle
+      },
+      {
+        :title => _("Task"),
+        :type => :combo,
+        :model => task_ls,
+        :has_entry => false
+      },
+      _("Sync time")
+    ])
+    
+    #Make columns editable.
+    Knj::Gtk2::Tv.editable_text_renderers_to_model(
+      :ob => @args[:oata].ob,
+      :tv => @gui["tvTimelogsPrepareTransfer"],
+      :model_class => :Timelog,
+      :renderers => init_data[:renderers],
+      :change_before => proc{ @dont_reload_sync = true },
+      :change_after => proc{ @dont_reload_sync = false; self.update_sync_totals },
+      :cols => {
+        1 => :descr,
+        2 => {:col => :timestamp, :type => :datetime},
+        3 => {:col => :time, :type => :time_as_sec},
+        4 => {:col => :time_transport, :type => :time_as_sec},
+        5 => {:col => :transportlength, :type => :int},
+        6 => {:col => :transportdescription},
+        7 => {:col => :transportcosts, :type => :human_number, :decimals => 2},
+        8 => {:col => :travelfixed},
+        9 => {:col => :workinternal},
+        10 => {:col => :sync_need},
+        11 => {
+          :col => :task_id,
+          :value_callback => lambda{ |data|
+            task = @args[:oata].ob.get_by(:Task, {"title" => data[:value]})
+            
+            if !task
+              return 0
+            else
+              return task.id
+            end
+          },
+          :value_set_callback => proc{ |data| data[:model].task_name }
+        },
+        12 => {:col => :time_sync, :type => :time_as_sec}
+      }
+    )
+    @gui["tvTimelogsPrepareTransfer"].columns[0].visible = false
+    @gui["vboxPrepareTransfer"].hide
+    @reload_preparetransfer_id = @args[:oata].ob.connect("object" => :Timelog, "signals" => ["add", "update", "delete"], &self.method(:reload_timelogs))
+    
+    
+    
     #Show the window.
-    @gui["window"].show_all
+    @gui["window"].show
     self.timelog_info_trigger
     width = @gui["window"].size[0]
     @gui["window"].resize(width, 1)
   end
   
+  def reload_timelogs_preparetransfer
+    return nil if @dont_reload_sync or @gui["tvTimelogsPrepareTransfer"].destroyed?
+    @gui["tvTimelogsPrepareTransfer"].model.clear
+    @timelogs_sync_count = 0
+    
+    @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
+      
+      #If transport is logged, then the work if offsite. It should be rounded up by 30 min. Else 15 min. round up.
+      if transport > 0
+        roundup = 1800
+      else
+        roundup = 900
+      end
+      
+      #Do the actual counting.
+      count_rounded_time = 0
+      loop do
+        break if count_rounded_time >= time
+        count_rounded_time += roundup
+      end
+      
+      #Set sync-time on timelog.
+      timelog[:time_sync] = count_rounded_time
+      
+      Knj::Gtk2::Tv.append(@gui["tvTimelogsPrepareTransfer"], [
+        timelog.id,
+        timelog[:descr],
+        timelog.timestamp_str,
+        timelog.time_as_human,
+        timelog.time_transport_as_human,
+        Knj::Locales.number_out(timelog[:transportlength], 0),
+        timelog.transport_descr_short,
+        Knj::Locales.number_out(timelog[:transportcosts], 2),
+        Knj::Strings.yn_str(timelog[:travelfixed], true, false),
+        Knj::Strings.yn_str(timelog[:workinternal], true, false),
+        Knj::Strings.yn_str(timelog[:sync_need], true, false),
+        timelog.task_name,
+        Knj::Strings.secs_to_human_time_str(count_rounded_time)
+      ])
+      @timelogs_sync_count += 1
+    end
+  end
+  
+  def on_btnSync_clicked
+    self.reload_timelogs_preparetransfer
+    
+    if @timelogs_sync_count <= 0
+      #Show error-message and destroy the window, if no timelogs was to be synced.
+      Knj::Gtk2.msgbox("msg" => _("There is nothing to sync at this time."), "run" => false)
+    else
+      #...else show the window.
+      @gui["expOverview"].hide
+      self.update_sync_totals
+      @gui["vboxPrepareTransfer"].show
+    end
+  end
+  
+  def update_sync_totals
+    total_secs = 0
+    
+    @gui["tvTimelogsPrepareTransfer"].model.each do |model, path, iter|
+      time_val = @gui["tvTimelogsPrepareTransfer"].model.get_value(iter, 12)
+      
+      begin
+        total_secs += Knj::Strings.human_time_str_to_secs(time_val)
+      rescue
+        #ignore - user is properly entering stuff.
+      end
+    end
+    
+    @gui["labTotal"].markup = "<b>#{_("Total hours:")}</b> #{Knj::Strings.secs_to_human_time_str(total_secs)}"
+  end
+  
   #This method is called, when editting starts in a description-, time- or task-cell. If it is the active timelog, then editting is canceled.
   def on_cell_editingStarted(renderer, editable, path, col_title)
     iter = @gui["tvTimelogs"].model.get_iter(path)
@@ -285,6 +454,8 @@ class Openall_time_applet::Gui::Win_main
   def on_window_destroy
     #Unconnect reload-event. Else it will crash on call to destroyed object. Also frees up various ressources.
     @args[:oata].ob.unconnect("object" => :Timelog, "conn_id" => @reload_id)
+    @args[:oata].ob.unconnect("object" => :Timelog, "conn_id" => @reload_preparetransfer_id)
+    
     @args[:oata].events.disconnect(:timelog_active_changed, @event_timelog_active_changed) if @event_timelog_active_changed
     @event_timelog_active_changed = nil
     Gtk.timeout_remove(@timeout_id)
@@ -306,27 +477,8 @@ 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 tlog = @args[:oata].timelog_active
-      task = tlog.task
-      if !task
-        task_text = "[#{_("no task sat on the timelog")}]"
-      else
-        task_text = task.name
-      end
-      
-      @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_total)
-      
-      @gui["labRunningTime"].label = time_tracked
-      
-      @gui["txtDescr"].hide
-      @gui["cbTask"].hide
-      @gui["tableRunning"].show_all
-    else
-      @gui["txtDescr"].show
-      @gui["cbTask"].show
-      @gui["tableRunning"].hide
+      @gui["btnSwitch"].label = time_tracked[0..4]
     end
   end
   
@@ -362,14 +514,31 @@ class Openall_time_applet::Gui::Win_main
     if tlog_act
       but.image = Gtk::Image.new(Gtk::Stock::MEDIA_STOP, Gtk::IconSize::BUTTON)
       but.label = _("Stop")
+      
+      @gui["txtDescr"].text = tlog_act[:descr]
+      
+      if task = tlog_act.task
+        @gui["cbTask"].sel = task.name
+      else
+        @gui["cbTask"].sel = _("Choose:")
+      end
+      
+      @gui["txtDescr"].sensitive = false
+      @gui["cbTask"].sensitive = false
     else
       but.image = Gtk::Image.new(Gtk::Stock::MEDIA_RECORD, Gtk::IconSize::BUTTON)
       but.label = _("Start")
+      
+      @gui["txtDescr"].text = ""
+      @gui["cbTask"].sel = _("Choose:")
+      @gui["txtDescr"].sensitive = true
+      @gui["cbTask"].sensitive = true
     end
   end
   
   #This method runs through all rows in the treeview and checks if a row should be marked with bold. It also increases the time in the time-column for the tracked timelog.
   def check_rows
+    return nil if @tv_editting
     act_timelog = @args[:oata].timelog_active
     
     if act_timelog
@@ -403,10 +572,6 @@ class Openall_time_applet::Gui::Win_main
     end
   end
   
-  def on_btnSync_clicked
-    @args[:oata].show_prepare_sync
-  end
-  
   def on_miSyncStatic_activate
     @args[:oata].sync_static("transient_for" => @gui["window"])
   end
@@ -446,4 +611,14 @@ class Openall_time_applet::Gui::Win_main
   def on_txtDescr_activate(*args)
     self.on_btnSwitch_clicked
   end
+  
+  def on_btnSyncPrepareTransfer_clicked
+    begin
+      #Destroy this window and start syncing for real.
+      @gui["window"].destroy
+      @args[:oata].sync_real
+    rescue => e
+      Knj::Gtk2.msgbox(Knj::Errors.error_str(e))
+    end
+  end
 end

data/gui/win_worktime_overview.rb

@@ -9,7 +9,7 @@ class Openall_time_applet::Gui::Win_worktime_overview
     @gui.translate
     @gui.connect_signals{|h| method(h)}
     
-    @date = Knj::Datet.new
+    @date = Datet.new
     self.build_week
     
     @gui["window"].show_all
@@ -66,7 +66,7 @@ class Openall_time_applet::Gui::Win_worktime_overview
     
     #Draw all the days.
     stats[:days_total].keys.sort.each do |day_no|
-      date = Knj::Datet.in(Time.new(date.year, date.month, day_no))
+      date = Datet.in(Time.new(date.year, date.month, day_no))
       
       day_title = Gtk::Label.new
       day_title.markup = "<b>#{date.day_str(:short => true)} #{date.time.strftime("%d/%m")} - #{stats[:days_total][day_no][:first_time].time.strftime("%H:%M")}</b>"

data/lib/openall_time_applet.rb

@@ -2,13 +2,19 @@
 require "rubygems"
 
 #For secs-to-human-string (MySQL-format), model-framework, database-framework, options-framework, date-framework and more.
-if ENV["HOME"] == "/home/kaspernj" and File.exists?("/home/kaspernj/Dev/Ruby/knjrbfw")
-  #For development.
-  require "/home/kaspernj/Dev/Ruby/knjrbfw/lib/knjrbfw"
-else
-  require "knjrbfw"
+gems = ["wref", "datet", "http2", "knjrbfw"]
+gems.each do |gem|
+  fpath = "#{File.dirname(__FILE__)}/../../#{gem}/lib/#{gem}.rb"
+  if File.exists?(fpath)
+    puts "Require custom Gem-path: '#{fpath}'."
+    require fpath
+  else
+    puts "Require Gem normally: '#{gem}'."
+    require gem
+  end
 end
 
+
 require "sqlite3"
 require "gettext"
 require "base64"
@@ -185,7 +191,7 @@ class Openall_time_applet
       loop do
         enabled = Knj::Strings.yn_str(Knj::Opts.get("reminder_enabled"), true, false)
         if enabled and !@reminder_next
-          @reminder_next = Knj::Datet.new
+          @reminder_next = Datet.new
           @reminder_next.mins + Knj::Opts.get("reminder_every_minute").to_i
         elsif enabled and @reminder_next and Time.now >= @reminder_next
           self.reminding_exec

data/models/timelog.rb

@@ -14,7 +14,7 @@ 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] = Knj::Datet.new.dbstr if self[:timestamp].to_s == ""
+    self[:timestamp] = Datet.new.dbstr if self[:timestamp].to_s == ""
   end
   
   #Treat data before inserting into database.
@@ -24,11 +24,43 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
     d.data[:parent_timelog_id] = 0 if !d.data.key?(:parent_timelog_id)
   end
   
+  #This method is called from objects-framework when it wants to delete this object. It checks for various cases where the timelog shouldnt be deleted.
+  def delete
+    #Ensure that child timelogs with logged time do not get deleted automatically!
+    self.child_timelogs do |child_timelog|
+      if child_timelog.time_total > 0
+        raise sprintf(_("Child timelog '%1$s' (%2$s) has logged time (%3$s) and this timelog cannot be deleted."), child_timelog[:descr], child_timelog.id, child_timelog.time_as_human)
+      end
+      
+      if child_timelog.time_total(:transport => true) > 0
+        raise _("A child timelog has logged transport time and this timelog cannot be deleted.")
+      end
+    end
+  end
+  
+  #This method proxies updates to child timelogs as well (not time though).
+  def update(hash)
+    #Update the data on this object.
+    super(hash)
+    
+    #Certain data should be updated on child timelogs as well.
+    hash.each do |key, val|
+      key = key.to_sym
+      
+      case key
+        when :descr, :task_id, :timetype, :transportdescription, :travelfixed, :workinternal, :sync_need
+          self.child_timelogs do |child_timelog|
+            child_timelog[key] = val
+          end
+      end
+    end
+  end
+  
   #Pushes timelogs and time to OpenAll.
   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
         
@@ -50,8 +82,23 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
           }
         )
         
+        parent_timelog = timelog.parent_timelog
+        timelog.delete_empty_children
+        
         #Delete timelog.
-        d.ob.delete(timelog)
+        if timelog.child_timelogs("count" => true) <= 0
+          d.ob.delete(timelog)
+        else
+          timelog[:time] = 0
+          timelog[:time_transport] = 0
+        end
+        
+        if parent_timelog
+          parent_timelog_child_timelogs = parent_timelog.child_timelogs("count" => true)
+          if parent_timelog_child_timelogs <= 0
+            d.ob.delete(parent_timelog)
+          end
+        end
       end
     end
   end
@@ -97,4 +144,15 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
   def time_transport_as_human
     return Knj::Strings.secs_to_human_time_str(self.time_total(:transport => true))
   end
+  
+  def delete_empty_children
+    self.child_timelogs do |child_timelog|
+      time = child_timelog.time_total
+      time_transport = child_timelog.time_total(:transport => true)
+      
+      if time <= 0 and time_transport <= 0
+        self.ob.delete(child_timelog)
+      end
+    end
+  end
 end

data/models/worktime.rb

@@ -18,7 +18,7 @@ class Openall_time_applet::Models::Worktime < Knj::Datarow
       save_hash = {
         :openall_uid => wt_d["uid"],
         :task_id => task.id,
-        :timestamp => Knj::Datet.in(wt_d["timestamp"]),
+        :timestamp => Datet.in(wt_d["timestamp"]),
         :worktime => Knj::Strings.human_time_str_to_secs(wt_d["worktime"]),
         :transporttime => Knj::Strings.human_time_str_to_secs(wt_d["transporttime"]),
         :comment => wt_d["comment"]

data/openall_time_applet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openall_time_applet}
-  s.version = "0.0.21"
+  s.version = "0.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-10}
+  s.date = %q{2012-07-16}
   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"]
@@ -39,12 +39,10 @@ Gem::Specification.new do |s|
     "glade/win_main.glade",
     "glade/win_overview.glade",
     "glade/win_preferences.glade",
-    "glade/win_sync_overview.glade",
     "glade/win_worktime_overview.glade",
     "gui/trayicon.rb",
     "gui/win_main.rb",
     "gui/win_preferences.rb",
-    "gui/win_sync_overview.rb",
     "gui/win_worktime_overview.rb",
     "lib/openall_time_applet.rb",
     "locales/da_DK/LC_MESSAGES/default.mo",
@@ -74,6 +72,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<gettext>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<rmagick>, [">= 0"])
+      s.add_runtime_dependency(%q<datet>, [">= 0"])
+      s.add_runtime_dependency(%q<http2>, [">= 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"])
@@ -86,6 +86,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<gettext>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rmagick>, [">= 0"])
+      s.add_dependency(%q<datet>, [">= 0"])
+      s.add_dependency(%q<http2>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -99,6 +101,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<gettext>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rmagick>, [">= 0"])
+    s.add_dependency(%q<datet>, [">= 0"])
+    s.add_dependency(%q<http2>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/spec/openall_time_applet_spec.rb

@@ -8,7 +8,7 @@ describe "OpenallTimeApplet" do
   end
   
   it "should be able to clone timelogs" do
-    date = Knj::Datet.new
+    date = Datet.new
     date.days - 1
     
     timelog = $oata.ob.add(:Timelog, {
@@ -32,6 +32,11 @@ describe "OpenallTimeApplet" do
     
     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
+    
+    #Or else it wont be possible to delete main timelog.
+    timelog.child_timelogs do |child_timelog|
+      child_timelog[:time] = 0
+    end
   end
   
   it "should automatically delete sub-timelogs" do

metadata

@@ -2,7 +2,7 @@
 name: openall_time_applet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-10 00:00:00 +02:00
+date: 2012-07-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,8 +80,30 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: datet
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: http2
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,10 +111,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +122,10 @@ dependencies:
         version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,10 +133,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,10 +144,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,7 +155,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id013
 description: Off-line time-tracking for OpenAll with syncing when online.
 email: k@spernj.org
 executables: 
@@ -166,12 +188,10 @@ files:
 - glade/win_main.glade
 - glade/win_overview.glade
 - glade/win_preferences.glade
-- glade/win_sync_overview.glade
 - glade/win_worktime_overview.glade
 - gui/trayicon.rb
 - gui/win_main.rb
 - gui/win_preferences.rb
-- gui/win_sync_overview.rb
 - gui/win_worktime_overview.rb
 - lib/openall_time_applet.rb
 - locales/da_DK/LC_MESSAGES/default.mo
@@ -198,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1036250711865852589
+      hash: -3066886317205834200
       segments: 
       - 0
       version: "0"

data/glade/win_sync_overview.glade

@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Prepare transfer</property>
-    <property name="window_position">center</property>
-    <property name="default_width">850</property>
-    <property name="default_height">480</property>
-    <signal name="destroy" handler="on_window_destroy" swapped="no"/>
-    <child>
-      <object class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkFrame" id="frame1">
-            <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="alignment1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkVBox" id="vbox2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">3</property>
-                    <child>
-                      <object class="GtkViewport" id="viewport1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
-                            <child>
-                              <object class="GtkTreeView" id="tvTimelogs">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHButtonBox" id="hbuttonbox1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">3</property>
-                        <property name="layout_style">end</property>
-                        <child>
-                          <object class="GtkButton" id="btnSync">
-                            <property name="label">gtk-harddisk</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="use_stock">True</property>
-                            <signal name="clicked" handler="on_btnSync_clicked" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Prepare transfer&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="labTotal">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">[totals]</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

data/gui/win_sync_overview.rb

@@ -1,213 +0,0 @@
-#This class handels the window that will be shown before the actual sync takes place.
-class Openall_time_applet::Gui::Win_sync_overview
-  def initialize(args)
-    @args = args
-    
-    @gui = Gtk::Builder.new.add("../glade/win_sync_overview.glade")
-    @gui.translate
-    @gui.connect_signals{|h|method(h)}
-    @gui["btnSync"].label = _("Transfer")
-    
-    #Generate list-store containing tasks for the task-column.
-    task_ls = Gtk::ListStore.new(String, String)
-    iter = task_ls.append
-    iter[0] = _("None")
-    iter[1] = 0.to_s
-    
-    tasks = [_("Choose:")]
-    @args[:oata].ob.list(:Task, {"orderby" => "title"}) do |task|
-      iter = task_ls.append
-      iter[0] = task[:title]
-      iter[1] = task.id.to_s
-      tasks << task
-    end
-    
-    #Initialize timelog treeview.
-    init_data = Knj::Gtk2::Tv.init(@gui["tvTimelogs"], [
-      _("ID"),
-      _("Description"),
-      _("Timestamp"),
-      _("Time"),
-      _("Transport"),
-      _("Length"),
-      _("Transport descr."),
-      _("Transport costs"),
-      {
-        :title => _("Fixed travel"),
-        :type => :toggle
-      },
-      {
-        :title => _("Int. work"),
-        :type => :toggle
-      },
-      {
-        :title => _("Sync?"),
-        :type => :toggle
-      },
-      {
-        :title => _("Task"),
-        :type => :combo,
-        :model => task_ls,
-        :has_entry => false
-      },
-      _("Sync time")
-    ])
-    
-    #Make columns editable.
-    Knj::Gtk2::Tv.editable_text_renderers_to_model(
-      :ob => @args[:oata].ob,
-      :tv => @gui["tvTimelogs"],
-      :model_class => :Timelog,
-      :renderers => init_data[:renderers],
-      :change_before => proc{ @dont_reload = true },
-      :change_after => proc{ @dont_reload = false; self.update_totals },
-      :cols => {
-        1 => :descr,
-        2 => {:col => :timestamp, :type => :datetime},
-        3 => {:col => :time, :type => :time_as_sec},
-        4 => {:col => :time_transport, :type => :time_as_sec},
-        5 => {:col => :transportlength, :type => :int},
-        6 => {:col => :transportdescription},
-        7 => {:col => :transportcosts, :type => :human_number, :decimals => 2},
-        8 => {:col => :travelfixed},
-        9 => {:col => :workinternal},
-        10 => {:col => :sync_need},
-        11 => {
-          :col => :task_id,
-          :value_callback => lambda{ |data|
-            task = @args[:oata].ob.get_by(:Task, {"title" => data[:value]})
-            
-            if !task
-              return 0
-            else
-              return task.id
-            end
-          },
-          :value_set_callback => proc{ |data| data[:model].task_name }
-        },
-        12 => {:col => :time_sync, :type => :time_as_sec}
-      }
-    )
-    @gui["tvTimelogs"].columns[0].visible = false
-    
-    
-=begin
-    rowc = 1
-    @args[:oata].ob.list(:Timelog, {"sync_need" => 1, "task_id_not" => 0}) do |timelog|
-      
-      
-      #Spawn widgets.
-      timelog_label = Gtk::Label.new(timelog[:descr])
-      timelog_label.xalign = 0
-      timelog_label.selectable = true
-      
-      logged_time_label = Gtk::Label.new(Knj::Strings.secs_to_human_time_str(timelog[:time]))
-      logged_time_label.xalign = 0
-      logged_time_label.selectable = true
-      
-      sync_time_text = Gtk::Entry.new
-      sync_time_text.text = Knj::Strings.secs_to_human_time_str(count_rounded_time)
-      sync_time_text.signal_connect(:changed, &self.method(:on_syncTimeText_changed))
-      @sync_time_text_widgets[timelog.id] = sync_time_text
-      
-      #Attach widgets in table.
-      @gui["tableTimelogs"].attach(timelog_label, 0, 1, rowc, rowc + 1)
-      @gui["tableTimelogs"].attach(logged_time_label, 1, 2, rowc, rowc + 1)
-      @gui["tableTimelogs"].attach(sync_time_text, 2, 3, rowc, rowc + 1)
-      
-      rowc += 1
-    end
-=end
-    
-    self.reload_timelogs
-    self.update_totals
-    
-    @reload_id = @args[:oata].ob.connect("object" => :Timelog, "signals" => ["add", "update", "delete"], &self.method(:reload_timelogs))
-    
-    if @timelogs_count <= 0
-      #Show error-message and destroy the window, if no timelogs was to be synced.
-      Knj::Gtk2.msgbox("msg" => _("There is nothing to sync at this time."), "run" => false)
-      @gui["window"].destroy
-    else
-      #...else show the window.
-      @gui["window"].show_all
-    end
-  end
-  
-  def reload_timelogs
-    return nil if @dont_reload or @gui["tvTimelogs"].destroyed?
-    @gui["tvTimelogs"].model.clear
-    @timelogs_count = 0
-    
-    @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
-      
-      #If transport is logged, then the work if offsite. It should be rounded up by 30 min. Else 15 min. round up.
-      if transport > 0
-        roundup = 1800
-      else
-        roundup = 900
-      end
-      
-      #Do the actual counting.
-      count_rounded_time = 0
-      loop do
-        break if count_rounded_time >= time
-        count_rounded_time += roundup
-      end
-      
-      #Set sync-time on timelog.
-      timelog[:time_sync] = count_rounded_time
-      
-      Knj::Gtk2::Tv.append(@gui["tvTimelogs"], [
-        timelog.id,
-        timelog[:descr],
-        timelog.timestamp_str,
-        timelog.time_as_human,
-        timelog.time_transport_as_human,
-        Knj::Locales.number_out(timelog[:transportlength], 0),
-        timelog.transport_descr_short,
-        Knj::Locales.number_out(timelog[:transportcosts], 2),
-        Knj::Strings.yn_str(timelog[:travelfixed], true, false),
-        Knj::Strings.yn_str(timelog[:workinternal], true, false),
-        Knj::Strings.yn_str(timelog[:sync_need], true, false),
-        timelog.task_name,
-        Knj::Strings.secs_to_human_time_str(count_rounded_time)
-      ])
-      @timelogs_count += 1
-    end
-  end
-  
-  def on_btnSync_clicked
-    begin
-      #Destroy this window and start syncing for real.
-      @gui["window"].destroy
-      @args[:oata].sync_real
-    rescue => e
-      Knj::Gtk2.msgbox(Knj::Errors.error_str(e))
-    end
-  end
-  
-  def update_totals
-    total_secs = 0
-    
-    @gui["tvTimelogs"].model.each do |model, path, iter|
-      time_val = @gui["tvTimelogs"].model.get_value(iter, 12)
-      
-      begin
-        total_secs += Knj::Strings.human_time_str_to_secs(time_val)
-      rescue
-        #ignore - user is properly entering stuff.
-      end
-    end
-    
-    @gui["labTotal"].markup = "<b>#{_("Total hours:")}</b> #{Knj::Strings.secs_to_human_time_str(total_secs)}"
-  end
-  
-  def on_window_destroy
-    #Unconnect reload-event. Else it will crash on call to destroyed object. Also frees up various ressources.
-    @args[:oata].ob.unconnect("object" => :Timelog, "conn_id" => @reload_id)
-  end
-end