openall_time_applet 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/conf/db_schema.rb

@@ -7,14 +7,26 @@ Openall_time_applet::DB_SCHEMA = {
         {"name" => "value", "type" => "text"}
       ]
     },
+    "Organisation" => {
+      "columns" => [
+        {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
+        {"name" => "openall_uid", "type" => "int"},
+        {"name" => "name", "type" => "varchar"}
+      ],
+      "indexes" => [
+        "openall_uid"
+      ]
+    },
     "Task" => {
       "columns" => [
         {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
         {"name" => "openall_uid", "type" => "int"},
+        {"name" => "organisation_id", "type" => "int"},
         {"name" => "title", "type" => "varchar"}
       ],
       "indexes" => [
-        "openall_uid"
+        "openall_uid",
+        "organisation_id",
       ]
     },
     "Timelog" => {

data/glade/win_worktime_overview.glade

@@ -7,6 +7,7 @@
     <property name="title" translatable="yes">Week status</property>
     <property name="window_position">center</property>
     <property name="default_width">440</property>
+    <property name="default_height">440</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -44,7 +45,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="labWeek">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Week</property>
@@ -91,11 +92,33 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHBox" id="boxContent">
+          <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <placeholder/>
+              <object class="GtkHBox" id="boxContent">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
           <packing>

data/gui/win_worktime_overview.rb

@@ -6,18 +6,24 @@ class Openall_time_applet::Gui::Win_worktime_overview
     @gui.translate
     @gui.connect_signals{|h| method(h)}
     
-    self.build_week(Knj::Datet.new)
+    @date = Knj::Datet.new
+    self.build_week
     
     @gui["window"].show_all
   end
   
-  def build_week(date)
+  def build_week
+    date = @date
+    
     stats = {
       :task_total => {},
-      :days_total => {}
+      :days_total => {},
+      :week_total => 0
     }
     
-    @args[:oata].ob.list(:Worktime, {"timestamp_month" => date}) do |wt|
+    @gui["labWeek"].label = sprintf(_("Week %s"), date.time.strftime("%W"))
+    
+    @args[:oata].ob.list(:Worktime, {"timestamp_week" => date}) do |wt|
       task = wt.task
       date = wt.timestamp
       
@@ -27,13 +33,32 @@ class Openall_time_applet::Gui::Win_worktime_overview
       stats[:days_total][date.date] = {:secs => 0, :tasks => {}} if !stats[:days_total].key?(date.date)
       stats[:days_total][date.date][:secs] += wt[:worktime].to_i
       stats[:days_total][date.date][:tasks][task.id] = task
+      
+      stats[:week_total] += wt[:worktime].to_i
     end
     
-    table = Gtk::Table.new(4, 4)
+    table = Gtk::Table.new(5, 5)
+    table.row_spacings = 3
+    table.column_spacings = 3
     row = 0
     
+    
+    #Draw top total-row.
+    week_total_title = Gtk::Label.new
+    week_total_title.markup = "<b>#{sprintf(_("Week total: %s hours"), Knj::Locales.number_out(stats[:week_total].to_f / 3600.0, 2))}</b>"
+    table.attach(week_total_title, 0, 5, row, row + 1)
+    row += 1
+    
+    
+    #Make empty label to make space between total row and days.
+    table.attach(Gtk::Label.new(" "), 0, 5, row, row + 1)
+    row += 1
+    
+    
+    #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))
+      
       day_title = Gtk::Label.new
       day_title.markup = "<b>#{date.out(:time => false)}</b>"
       day_title.xalign = 0
@@ -43,11 +68,14 @@ class Openall_time_applet::Gui::Win_worktime_overview
       day_sum.markup = "<b>#{Knj::Locales.number_out(day_sum_float, 2)}</b>"
       day_sum.xalign = 1
       
-      table.attach(day_title, 0, 2, row, row + 1)
-      table.attach(day_sum, 3, 4, row, row + 1)
+      table.attach(day_title, 0, 3, row, row + 1)
+      table.attach(day_sum, 4, 5, row, row + 1)
       row += 1
       
       stats[:days_total][day_no][:tasks].each do |task_id, task|
+        uid_title = Gtk::Label.new(Knj::Locales.number_out(task[:openall_uid], 0))
+        uid_title.xalign = 0
+        
         task_title = Gtk::Label.new(task.title)
         task_title.xalign = 0
         
@@ -55,22 +83,45 @@ class Openall_time_applet::Gui::Win_worktime_overview
         task_sum = Gtk::Label.new(Knj::Locales.number_out(task_sum_float, 2))
         task_sum.xalign = 1
         
+        company_title = Gtk::Label.new(task.organisation_name)
+        company_title.xalign = 0
+        
         table.attach(Gtk::Label.new(""), 0, 1, row, row + 1)
-        table.attach(task_title, 1, 2, row, row + 1)
-        table.attach(Gtk::Label.new("Company"), 2, 3, row, row + 1)
-        table.attach(task_sum, 3, 4, row, row + 1)
+        table.attach(uid_title, 1, 2, row, row + 1)
+        table.attach(task_title, 2, 3, row, row + 1)
+        table.attach(company_title, 3, 4, row, row + 1)
+        table.attach(task_sum, 4, 5, row, row + 1)
         row += 1
       end
+      
+      #Make empty label to devide the days with one row.
+      table.attach(Gtk::Label.new(" "), 0, 5, row, row + 1)
+      row += 1
     end
     
+    if stats[:days_total].empty?
+      table = Gtk::Label.new(_("No worktimes was found that week."))
+    end
+    
+    #Remove previous table.
+    if @table
+      @gui["boxContent"].remove(@table)
+      @table.destroy
+    end
+    
+    #Attach and set new table.
     @gui["boxContent"].pack_start(table)
+    @gui["window"].show_all
+    @table = table
   end
   
   def on_btnNext_clicked
-    print "Next.\n"
+    @date.days + 7
+    self.build_week
   end
   
   def on_btnPrevious_clicked
-    print "Previous.\n"
+    @date.days - 7
+    self.build_week
   end
 end

data/lib/openall_time_applet.rb

@@ -1,6 +1,6 @@
 require "rubygems"
 
-if ENV["HOME"] == "/home/kaspernj"
+if ENV["HOME"] == "/home/kaspernj" and File.exists?("/home/kaspernj/Dev/Ruby/knjrbfw")
   #For development.
   require "/home/kaspernj/Dev/Ruby/knjrbfw/lib/knjrbfw"
 else
@@ -160,6 +160,10 @@ class Openall_time_applet
     @ob.static(:Worktime, :update_cache, {:oata => self})
   end
   
+  def update_organisation_cache
+    @ob.static(:Organisation, :update_cache, {:oata => self})
+  end
+  
   #Pushes time-updates to OpenAll.
   def push_time_updates
     @ob.static(:Timelog, :push_time_updates, {:oata => self})
@@ -176,16 +180,20 @@ class Openall_time_applet
     
     Knj::Thread.new do
       begin
+        sw.label = _("Updating organisation-cache.")
+        self.update_organisation_cache
+        sw.percent = 0.25
+        
         sw.label = _("Updating task-cache.")
         self.update_task_cache
-        sw.percent = 0.3
-        
-        sw.label = _("Updating worktime-cache.")
-        self.update_worktime_cache
-        sw.percent = 0.66
+        sw.percent = 0.5
         
         sw.label = _("Pushing time-updates.")
         self.push_time_updates
+        sw.percent = 0.75
+        
+        sw.label = _("Updating worktime-cache.")
+        self.update_worktime_cache
         sw.percent = 1
         
         sw.label = _("Done")

data/models/organisation.rb

@@ -0,0 +1,22 @@
+class Openall_time_applet::Models::Organisation < Knj::Datarow
+  def self.update_cache(d, args)
+    res = nil
+    args[:oata].oa_conn do |conn|
+      res = conn.request(:getAllOrganisationsForUser)
+    end
+    
+    res.each do |org_data|
+      org = self.ob.get_by(:Organisation, {"openall_uid" => org_data["uid"]})
+      org_data = {
+        :openall_uid => org_data["uid"],
+        :name => org_data["name"]
+      }
+      
+      if org
+        org.update(org_data)
+      else
+        org = self.ob.add(:Organisation, org_data)
+      end
+    end
+  end
+end

data/models/task.rb

@@ -1,4 +1,8 @@
 class Openall_time_applet::Models::Task < Knj::Datarow
+  has_one [
+    :Organisation
+  ]
+  
   has_many [
     [:Timelog, :task_id, :timelogs]
   ]
@@ -11,15 +15,18 @@ class Openall_time_applet::Models::Task < Knj::Datarow
     
     res.each do |task_data|
       task = self.ob.get_by(:Task, {"openall_uid" => task_data["uid"]})
-      task_data = {
+      data_hash = {
         :openall_uid => task_data["uid"],
         :title => task_data["title"]
       }
       
+      org = self.ob.get_by(:Organisation, {"openall_uid" => task_data["organisation_uid"]})
+      data_hash[:organisation_id] = org.id if org
+      
       if task
-        task.update(task_data)
+        task.update(data_hash)
       else
-        task = self.ob.add(:Task, task_data)
+        task = self.ob.add(:Task, data_hash)
       end
     end
   end

data/openall_time_applet.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openall_time_applet}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     "lib/openall_time_applet.rb",
     "locales/da_DK/LC_MESSAGES/default.mo",
     "locales/da_DK/LC_MESSAGES/default.po",
+    "models/organisation.rb",
     "models/task.rb",
     "models/timelog.rb",
     "models/worktime.rb",

metadata

@@ -2,7 +2,7 @@
 name: openall_time_applet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -157,6 +157,7 @@ files:
 - lib/openall_time_applet.rb
 - locales/da_DK/LC_MESSAGES/default.mo
 - locales/da_DK/LC_MESSAGES/default.po
+- models/organisation.rb
 - models/task.rb
 - models/timelog.rb
 - models/worktime.rb
@@ -177,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 55925093073077767
+      hash: -2304336637192139149
       segments: 
       - 0
       version: "0"