clevic 0.6.0 → 0.7.0

data/lib/clevic/ui/search_dialog_ui.rb

@@ -1,8 +1,8 @@
 =begin
 ** Form generated from reading ui file 'search_dialog.ui'
 **
-** Created: Mon Jul 7 22:49:30 2008
-**      by: Qt User Interface Compiler version 4.3.2
+** Created: Wed Jul 23 11:45:29 2008
+**      by: Qt User Interface Compiler version 4.3.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
 =end
@@ -20,58 +20,57 @@ class Ui_SearchDialog
     attr_reader :backwards
 
     def setupUi(searchDialog)
-    searchDialog.setObjectName("searchDialog")
-    searchDialog.setWindowModality(Qt::WindowModal)
-    searchDialog.setWindowIcon(Qt::Icon.new("../../hilfer/bin/hilfer-icon.png"))
+    if searchDialog.objectName.nil?
+        searchDialog.objectName = "searchDialog"
+    end
+    searchDialog.windowModality = Qt::WindowModal
+    searchDialog.resize(307, 400)
+    icon = Qt::Icon.new("../../hilfer/bin/hilfer-icon.png")
+    searchDialog.windowIcon = icon
     @button_box = Qt::DialogButtonBox.new(searchDialog)
-    @button_box.setObjectName("button_box")
-    @button_box.setGeometry(Qt::Rect.new(30, 240, 261, 32))
-    @button_box.setOrientation(Qt::Horizontal)
-    @button_box.setStandardButtons(Qt::DialogButtonBox::Cancel|Qt::DialogButtonBox::NoButton|Qt::DialogButtonBox::Ok)
+    @button_box.objectName = "button_box"
+    @button_box.geometry = Qt::Rect.new(30, 240, 261, 32)
+    @button_box.orientation = Qt::Horizontal
+    @button_box.standardButtons = Qt::DialogButtonBox::Cancel|Qt::DialogButtonBox::NoButton|Qt::DialogButtonBox::Ok
     @selected_rows = Qt::CheckBox.new(searchDialog)
-    @selected_rows.setObjectName("selected_rows")
-    @selected_rows.setEnabled(false)
-    @selected_rows.setGeometry(Qt::Rect.new(30, 280, 191, 21))
+    @selected_rows.objectName = "selected_rows"
+    @selected_rows.enabled = false
+    @selected_rows.geometry = Qt::Rect.new(30, 280, 191, 21)
     @selected_columns = Qt::CheckBox.new(searchDialog)
-    @selected_columns.setObjectName("selected_columns")
-    @selected_columns.setEnabled(false)
-    @selected_columns.setGeometry(Qt::Rect.new(30, 310, 191, 21))
+    @selected_columns.objectName = "selected_columns"
+    @selected_columns.enabled = false
+    @selected_columns.geometry = Qt::Rect.new(30, 310, 191, 21)
     @search_label = Qt::Label.new(searchDialog)
-    @search_label.setObjectName("search_label")
-    @search_label.setGeometry(Qt::Rect.new(20, 10, 51, 21))
-    @search_label.setTextFormat(Qt::PlainText)
+    @search_label.objectName = "search_label"
+    @search_label.geometry = Qt::Rect.new(20, 10, 51, 21)
+    @search_label.textFormat = Qt::PlainText
     @search_combo = Qt::ComboBox.new(searchDialog)
-    @search_combo.setObjectName("search_combo")
-    @search_combo.setGeometry(Qt::Rect.new(90, 10, 201, 25))
-    @search_combo.setFocusPolicy(Qt::StrongFocus)
-    @search_combo.setEditable(true)
+    @search_combo.objectName = "search_combo"
+    @search_combo.geometry = Qt::Rect.new(90, 10, 201, 25)
+    @search_combo.focusPolicy = Qt::StrongFocus
+    @search_combo.editable = true
     @from_start = Qt::CheckBox.new(searchDialog)
-    @from_start.setObjectName("from_start")
-    @from_start.setGeometry(Qt::Rect.new(90, 50, 191, 21))
+    @from_start.objectName = "from_start"
+    @from_start.geometry = Qt::Rect.new(90, 50, 191, 21)
     @regex = Qt::CheckBox.new(searchDialog)
-    @regex.setObjectName("regex")
-    @regex.setGeometry(Qt::Rect.new(90, 80, 191, 21))
+    @regex.objectName = "regex"
+    @regex.geometry = Qt::Rect.new(90, 80, 191, 21)
     @whole_words = Qt::CheckBox.new(searchDialog)
-    @whole_words.setObjectName("whole_words")
-    @whole_words.setGeometry(Qt::Rect.new(90, 110, 191, 21))
+    @whole_words.objectName = "whole_words"
+    @whole_words.geometry = Qt::Rect.new(90, 110, 191, 21)
     @forwards = Qt::RadioButton.new(searchDialog)
-    @forwards.setObjectName("forwards")
-    @forwards.setGeometry(Qt::Rect.new(90, 140, 171, 26))
-    @forwards.setChecked(true)
+    @forwards.objectName = "forwards"
+    @forwards.geometry = Qt::Rect.new(90, 140, 171, 26)
+    @forwards.checked = true
     @backwards = Qt::RadioButton.new(searchDialog)
-    @backwards.setObjectName("backwards")
-    @backwards.setGeometry(Qt::Rect.new(90, 170, 176, 26))
-    @search_label.setBuddy(@search_combo)
-    Qt::Widget::setTabOrder(@search_combo, @selected_columns)
-    Qt::Widget::setTabOrder(@selected_columns, @selected_rows)
-    Qt::Widget::setTabOrder(@selected_rows, @button_box)
+    @backwards.objectName = "backwards"
+    @backwards.geometry = Qt::Rect.new(90, 170, 176, 26)
+    @search_label.buddy = @search_combo
+    Qt::Widget.setTabOrder(@search_combo, @selected_columns)
+    Qt::Widget.setTabOrder(@selected_columns, @selected_rows)
+    Qt::Widget.setTabOrder(@selected_rows, @button_box)
 
     retranslateUi(searchDialog)
-
-    size = Qt::Size.new(307, 400)
-    size = size.expandedTo(searchDialog.minimumSizeHint())
-    searchDialog.resize(size)
-
     Qt::Object.connect(@button_box, SIGNAL('accepted()'), searchDialog, SLOT('accept()'))
     Qt::Object.connect(@button_box, SIGNAL('rejected()'), searchDialog, SLOT('reject()'))
 
@@ -83,15 +82,15 @@ class Ui_SearchDialog
     end
 
     def retranslateUi(searchDialog)
-    searchDialog.setWindowTitle(Qt::Application.translate("SearchDialog", "Search", nil, Qt::Application::UnicodeUTF8))
-    @selected_rows.setText(Qt::Application.translate("SearchDialog", "Selected Rows", nil, Qt::Application::UnicodeUTF8))
-    @selected_columns.setText(Qt::Application.translate("SearchDialog", "Selected Columns", nil, Qt::Application::UnicodeUTF8))
-    @search_label.setText(Qt::Application.translate("SearchDialog", "Search", nil, Qt::Application::UnicodeUTF8))
-    @from_start.setText(Qt::Application.translate("SearchDialog", "From &Start", nil, Qt::Application::UnicodeUTF8))
-    @regex.setText(Qt::Application.translate("SearchDialog", "&Regular Expression", nil, Qt::Application::UnicodeUTF8))
-    @whole_words.setText(Qt::Application.translate("SearchDialog", "&Whole Words", nil, Qt::Application::UnicodeUTF8))
-    @forwards.setText(Qt::Application.translate("SearchDialog", "&Forwards", nil, Qt::Application::UnicodeUTF8))
-    @backwards.setText(Qt::Application.translate("SearchDialog", "&Backwards", nil, Qt::Application::UnicodeUTF8))
+    searchDialog.windowTitle = Qt::Application.translate("SearchDialog", "Search", nil, Qt::Application::UnicodeUTF8)
+    @selected_rows.text = Qt::Application.translate("SearchDialog", "Selected Rows", nil, Qt::Application::UnicodeUTF8)
+    @selected_columns.text = Qt::Application.translate("SearchDialog", "Selected Columns", nil, Qt::Application::UnicodeUTF8)
+    @search_label.text = Qt::Application.translate("SearchDialog", "Search", nil, Qt::Application::UnicodeUTF8)
+    @from_start.text = Qt::Application.translate("SearchDialog", "From &Start", nil, Qt::Application::UnicodeUTF8)
+    @regex.text = Qt::Application.translate("SearchDialog", "&Regular Expression", nil, Qt::Application::UnicodeUTF8)
+    @whole_words.text = Qt::Application.translate("SearchDialog", "&Whole Words", nil, Qt::Application::UnicodeUTF8)
+    @forwards.text = Qt::Application.translate("SearchDialog", "&Forwards", nil, Qt::Application::UnicodeUTF8)
+    @backwards.text = Qt::Application.translate("SearchDialog", "&Backwards", nil, Qt::Application::UnicodeUTF8)
     end # retranslateUi
 
     def retranslate_ui(searchDialog)

data/lib/clevic/version.rb

@@ -1,7 +1,7 @@
 module Clevic #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 6
+    MINOR = 7
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/{accounts_models.rb → models/accounts_models.rb}

@@ -2,13 +2,17 @@ require 'clevic.rb'
 
 # db connection
 Clevic::DbOptions.connect( $options ) do
-  database( debug? ? :accounts_test : :accounts )
+  # use a different db for testing, so real data doesn't get broken.
+  if options[:database].nil? || options[:database].empty?
+    database( debug? ? :accounts_test : :accounts )
+  else
+    database options[:database]
+  end
   adapter :postgresql
-  username 'panic'
+  username 'accounts'
 end
 
-class Entry < ActiveRecord::Base
-  include ActiveRecord::Dirty
+class Entry < Clevic::Record
   belongs_to :debit, :class_name => 'Account', :foreign_key => 'debit_id'
   belongs_to :credit, :class_name => 'Account', :foreign_key => 'credit_id'
 
@@ -16,9 +20,9 @@ class Entry < ActiveRecord::Base
   def self.ui( parent )
     Clevic::TableView.new( self, parent ).create_model do
       plain       :date, :sample => '88-WWW-99'
-      distinct    :description, :conditions => "now() - date <= '1 year'", :sample => 'm' * 26, :frequency => true
-      relational  :debit, 'name', :class_name => 'Account', :conditions => 'active = true', :order => 'lower(name)', :sample => 'Leilani Member Loan'
-      relational  :credit, 'name', :class_name => 'Account', :conditions => 'active = true', :order => 'lower(name)', :sample => 'Leilani Member Loan'
+      distinct    :description, :conditions => "now() - date <= '1 year'", :sample => 'm' * 26
+      relational  :debit, :display => 'name', :conditions => 'active = true', :order => 'lower(name)', :sample => 'Leilani Member Loan'
+      relational  :credit, :display => 'name', :conditions => 'active = true', :order => 'lower(name)', :sample => 'Leilani Member Loan'
       plain       :amount, :sample => 999999.99
       distinct    :category
       plain       :cheque_number
@@ -73,8 +77,7 @@ class Entry < ActiveRecord::Base
   end
 end
 
-class Account < ActiveRecord::Base
-  include ActiveRecord::Dirty
+class Account < Clevic::Record  
   has_many :debits, :class_name => 'Entry', :foreign_key => 'debit_id'
   has_many :credits, :class_name => 'Entry', :foreign_key => 'credit_id'
   
@@ -92,6 +95,3 @@ class Account < ActiveRecord::Base
     end
   end
 end
-
-# order of tab display
-$options[:models] = [ Entry, Account ]

data/models/minimal_models.rb

@@ -0,0 +1,19 @@
+require 'clevic.rb'
+
+# db connection
+Clevic::DbOptions.connect do
+  database 'accounts_test'
+  adapter :postgresql
+  username 'accounts'
+end
+
+# minimal definition to get combo boxes to show up
+class Entry < Clevic::Record
+  belongs_to :debit, :class_name => 'Account', :foreign_key => 'debit_id'
+  belongs_to :credit, :class_name => 'Account', :foreign_key => 'credit_id'
+end
+
+# minimal definition to get sensible values in combo boxes
+class Account < Clevic::Record
+  def to_s; name; end
+end

data/models/times_models.rb

@@ -0,0 +1,156 @@
+require 'clevic.rb'
+
+# db connection options
+db = Clevic::DbOptions.connect( $options ) do
+  # use a different db for testing, so real data doesn't get broken.
+  database( debug? ? :times_test : :times )
+  adapter :postgresql
+  username 'times'
+end
+
+# model definitions
+class Entry < Clevic::Record
+  belongs_to :invoice
+  belongs_to :activity
+  belongs_to :project
+  
+  # define how fields are displayed
+  def self.ui( parent )
+    Clevic::TableView.new( self, parent ).create_model do
+      plain       :date, :sample => '28-Dec-08'
+      relational  :project, :display => 'project', :conditions => 'active = true', :order => 'lower(project)'
+      relational  :invoice, :display => 'invoice_number', :conditions => "status = 'not sent'", :order => 'invoice_number'
+      plain       :start
+      plain       :end
+      plain       :description, :sample => 'This is a long string designed to hold lots of data and description'
+      relational  :activity, :display => 'activity', :order => 'lower(activity)', :sample => 'Troubleshooting', :conditions => 'active = true'
+      distinct    :module, :tooltip => 'Module or sub-project'
+      plain       :charge, :tooltip => 'Is this time billable?'
+      distinct    :person, :tooltip => 'The person who did the work'
+      
+      records     :order => 'date, start, id'
+    end
+  end
+
+  # called when a key is pressed in this model's table view
+  def self.key_press_event( event, current_index, view )
+    case
+      # copy almost all of the previous line
+      when event.ctrl? && event.quote_dbl?
+        if current_index.row > 1
+          # fetch previous item
+          model = current_index.model
+          previous_item = model.collection[current_index.row - 1]
+          
+          # copy the relevant fields
+          current_index.entity.start = previous_item.end
+          [:date, :project, :invoice, :activity, :module, :charge, :person].each do |attr|
+            current_index.entity.send( "#{attr.to_s}=", previous_item.send( attr ) )
+          end
+          
+          # tell view to update
+          top_left_index = model.create_index( current_index.row, 0 )
+          bottom_right_index = model.create_index( current_index.row, current_index.column + view.builder.fields.size )
+          view.dataChanged( top_left_index, bottom_right_index )
+          
+          # move to end time field
+          view.override_next_index( model.create_index( current_index.row, view.builder.index( :end ) ) )
+        end
+        # don't let anybody else handle the keypress
+        return true
+      
+      when event.ctrl? && event.i?
+        invoice_from_project( current_index, view )
+        # don't let anybody else handle the keypress
+        return true
+    end
+  end
+  
+  # called when data is changed in this model's table view
+  def self.data_changed( top_left, bottom_right, view )
+    invoice_from_project( top_left, view ) if ( top_left == bottom_right )
+  end
+  
+  def self.invoice_from_project( current_index, view )
+    # auto-complete invoice number field from project
+    current_field = current_index.attribute
+    if current_field == :project && current_index.entity.project != nil
+      # most recent entry, ordered in reverse
+      invoice = current_index.entity.project.latest_invoice
+      
+      unless invoice.nil?
+        # make a reference to the invoice
+        current_index.entity.invoice = invoice
+        
+        # update view from top_left to bottom_right
+        model = current_index.model
+        changed_index = model.create_index( current_index.row, view.builder.index( :invoice ) )
+        view.dataChanged( changed_index, changed_index )
+        
+        # move edit cursor to start time field
+        view.override_next_index( model.create_index( current_index.row, view.builder.index( :start ) ) )
+      end
+    end
+  end
+end
+
+class Invoice < Clevic::Record
+  has_many :entries
+
+  # define how fields are displayed
+  def self.ui( parent )
+    Clevic::TableView.new( self, parent ).create_model do
+      plain :date
+      distinct :client
+      plain :invoice_number
+      restricted :status, :set => ['not sent', 'sent', 'paid', 'debt', 'writeoff', 'internal']
+      restricted :billing, :set => %w{Hours Quote Internal}
+      plain :quote_date
+      plain :quote_amount
+      plain :description
+      
+      records :order => 'invoice_number'
+    end
+  end
+end
+
+class Project < Clevic::Record
+  has_many :entries
+
+  def self.ui( parent )
+    Clevic::TableView.new( Project, parent ).create_model do
+      plain     :project
+      plain     :description
+      distinct  :client
+      plain     :rate
+      plain     :active
+      
+      records   :order => 'project'
+    end
+  end
+  
+  # Return the latest invoice for this project
+  # Not part of the UI.
+  def latest_invoice
+    Invoice.find(
+      :first,
+      :conditions => ["client = ? and status = 'not sent'", self.client],
+      :order => 'invoice_number desc'
+    )
+  end
+
+end
+
+class Activity < Clevic::Record
+  has_many :entries
+
+  # define how fields are displayed
+  def self.ui( parent )
+    Clevic::TableView.new( Activity, parent ).create_model do
+      plain :activity
+      plain :active
+      
+      records :order => 'activity'
+    end
+  end
+end

data/{times_models.rb → models/times_sqlite_models.rb}

@@ -2,14 +2,12 @@ require 'clevic.rb'
 
 # db connection options
 Clevic::DbOptions.connect( $options ) do
-  database( debug? ? :times_test : :times )
-  adapter :postgresql
-  username 'panic'
+  database :times
+  adapter :sqlite3
 end
 
 # model definitions
-class Entry < ActiveRecord::Base
-  include ActiveRecord::Dirty
+class Entry < Clevic::Record
   belongs_to :invoice
   belongs_to :activity
   belongs_to :project
@@ -18,12 +16,12 @@ class Entry < ActiveRecord::Base
   def self.ui( parent )
     Clevic::TableView.new( self, parent ).create_model do
       plain       :date, :sample => '28-Dec-08'
-      relational  :project, 'project', :conditions => 'active = true', :order => 'lower(project)'
-      relational  :invoice, 'invoice_number', :conditions => "status = 'not sent'", :order => 'invoice_number'
+      relational  :project, :display => 'project', :conditions => "active = true", :order => 'lower(project)'
+      relational  :invoice, :display => 'invoice_number', :conditions => "status = 'not sent'", :order => 'invoice_number'
       plain       :start
       plain       :end
       plain       :description, :sample => 'This is a long string designed to hold lots of data and description'
-      relational  :activity, 'activity', :order => 'lower(activity)', :sample => 'Troubleshooting', :conditions => 'active = true'
+      relational  :activity, :display => 'activity', :order => 'lower(activity)', :sample => 'Troubleshooting', :conditions => 'active = #{connection.quoted_true}'
       distinct    :module, :tooltip => 'Module or sub-project'
       plain       :charge, :tooltip => 'Is this time billable?'
       distinct    :person, :tooltip => 'The person who did the work'
@@ -94,8 +92,7 @@ class Entry < ActiveRecord::Base
   end
 end
 
-class Project < ActiveRecord::Base
-  include ActiveRecord::Dirty
+class Project < Clevic::Record
   has_many :entries
 
   def self.ui( parent )
@@ -122,8 +119,7 @@ class Project < ActiveRecord::Base
 
 end
 
-class Activity < ActiveRecord::Base
-  include ActiveRecord::Dirty
+class Activity < Clevic::Record
   has_many :entries
 
   # define how fields are displayed
@@ -137,15 +133,14 @@ class Activity < ActiveRecord::Base
   end
 end
 
-class Invoice < ActiveRecord::Base
-  include ActiveRecord::Dirty
+class Invoice < Clevic::Record
   has_many :entries
 
   # define how fields are displayed
   def self.ui( parent )
     Clevic::TableView.new( Invoice, parent ).create_model do
       plain :date
-      distinct :client, :frequency => true
+      distinct :client
       plain :invoice_number
       restricted :status, :set => ['not sent', 'sent', 'paid', 'debt', 'writeoff', 'internal']
       restricted :billing, :set => %w{Hours Quote Internal}
@@ -157,6 +152,3 @@ class Invoice < ActiveRecord::Base
     end
   end
 end
-
-# tab widget order
-$options[:models] = [ Entry, Invoice, Project, Activity ]