clevic 0.7.0 → 0.8.0

data/lib/clevic/version.rb

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

data/models/accounts_models.rb

@@ -16,21 +16,18 @@ class Entry < Clevic::Record
   belongs_to :debit, :class_name => 'Account', :foreign_key => 'debit_id'
   belongs_to :credit, :class_name => 'Account', :foreign_key => 'credit_id'
 
-  # define how fields will be displayed
-  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
-      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
-      plain       :active, :sample => 'WW'
-      plain       :vat, :label => 'VAT', :sample => 'WW', :tooltip => 'Does this include VAT?'
-      
-      records     :order => 'date, id'
-    end
+  define_ui do
+    plain       :date, :sample => '88-WWW-99'
+    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
+    plain       :active, :sample => 'WW'
+    plain       :vat, :label => 'VAT', :sample => 'WW', :tooltip => 'Does this include VAT?'
+    
+    records     :order => 'date, id'
   end
   
   # called when data is changed in the UI
@@ -82,16 +79,14 @@ class Account < Clevic::Record
   has_many :credits, :class_name => 'Entry', :foreign_key => 'credit_id'
   
   # define how fields are displayed
-  def self.ui( parent )
-    Clevic::TableView.new( self, parent ).create_model do
-      plain       :name
-      restricted  :vat, :label => 'VAT', :set => %w{ yes no all }
-      plain       :account_type
-      plain       :pastel_number, :alignment => Qt::AlignRight, :label => 'Pastel'
-      plain       :fringe, :format => "%.1f"
-      plain       :active
-      
-      records  :order => 'name,account_type'
-    end
+  define_ui do
+    plain       :name
+    restricted  :vat, :label => 'VAT', :set => %w{ yes no all }
+    plain       :account_type
+    plain       :pastel_number, :alignment => Qt::AlignRight, :label => 'Pastel'
+    plain       :fringe, :format => "%.1f"
+    plain       :active
+    
+    records  :order => 'name,account_type'
   end
 end

data/models/minimal_models.rb

@@ -1,5 +1,7 @@
 require 'clevic.rb'
 
+# see sql/accounts.sql for schema
+
 # db connection
 Clevic::DbOptions.connect do
   database 'accounts_test'

data/models/times_models.rb

@@ -14,67 +14,73 @@ class Entry < Clevic::Record
   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'
+  define_ui 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 do
+      display    'activity'
+      order      'lower(activity)'
+      sample     'Troubleshooting'
+      conditions 'active = true'
     end
+    
+    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
 
-  # 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
+  def self.actions( view, action_builder )
+    action_builder.action :smart_copy, 'Smart Copy', :shortcut => 'Ctrl+"' do
+      smart_copy( view )
+    end
+    
+    action_builder.action :invoice_from_project, 'Invoice from Project', :shortcut => 'Ctrl+Shift+I' do
+      invoice_from_project( view.current_index, view )
     end
   end
   
+  # do a smart copy from the previous line
+  def self.smart_copy( view )
+    view.sanity_check_read_only
+    view.sanity_check_ditto
+    
+    if view.current_index.row > 1
+      # fetch previous item
+      model = view.model
+      previous_item = model.collection[view.current_index.row - 1]
+      
+      # copy the relevant fields
+      view.current_index.entity.start = previous_item.end
+      [:date, :project, :invoice, :activity, :module, :charge, :person].each do |attr|
+        view.current_index.entity.send( "#{attr.to_s}=", previous_item.send( attr ) )
+      end
+      
+      # tell view to update
+      top_left_index = model.create_index( view.current_index.row, 0 )
+      bottom_right_index = model.create_index( view.current_index.row, view.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( view.current_index.row, view.builder.index( :end ) ) )
+    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
   
+  # auto-complete invoice number field from project
   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
+    if [:project,:invoice].include?( current_field ) && current_index.entity.project != nil
       # most recent entry, ordered in reverse
       invoice = current_index.entity.project.latest_invoice
       
@@ -97,36 +103,31 @@ 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
+  define_ui 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
 
 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
+  define_ui do
+    plain     :project
+    plain     :description
+    distinct  :client
+    plain     :rate
+    plain     :active
+    
+    records   :order => 'project'
   end
   
   # Return the latest invoice for this project
@@ -145,12 +146,10 @@ 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
+  define_ui do
+    plain :activity
+    plain :active
+    
+    records :order => 'activity'
   end
 end

data/models/times_sqlite_models.rb

@@ -13,8 +13,8 @@ class Entry < Clevic::Record
   belongs_to :project
   
   # define how fields are displayed
-  def self.ui( parent )
-    Clevic::TableView.new( self, parent ).create_model do
+  def self.build_table_model( model_builder )
+    model_builder.instance_exec 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'
@@ -95,8 +95,8 @@ end
 class Project < Clevic::Record
   has_many :entries
 
-  def self.ui( parent )
-    Clevic::TableView.new( Project, parent ).create_model do
+  def self.build_table_model( model_builder )
+    model_builder.instance_exec do
       plain     :project
       plain     :description
       distinct  :client
@@ -123,8 +123,8 @@ class Activity < Clevic::Record
   has_many :entries
 
   # define how fields are displayed
-  def self.ui( parent )
-    Clevic::TableView.new( Activity, parent ).create_model do
+  def self.build_table_model( model_builder )
+    model_builder.instance_exec do
       plain :activity
       plain :active
       
@@ -137,8 +137,8 @@ class Invoice < Clevic::Record
   has_many :entries
 
   # define how fields are displayed
-  def self.ui( parent )
-    Clevic::TableView.new( Invoice, parent ).create_model do
+  def self.build_table_model( model_builder )
+    model_builder.instance_exec do
       plain :date
       distinct :client
       plain :invoice_number

data/models/values_models.rb

@@ -8,13 +8,14 @@ Clevic::DbOptions.connect( $options ) do
 end
 
 # This is a read-only view, which is currently not implemented
-class Values < Clevic::Record
+class Value < Clevic::Record
   set_table_name 'values'
-  has_many :debits, :class_name => 'Entry', :foreign_key => 'debit_id'
-  has_many :credits, :class_name => 'Entry', :foreign_key => 'credit_id'
-  def self.ui( parent )
-    Clevic::TableView.new( self, parent ).create_model do
-      readonly
+  #~ has_many :debits, :class_name => 'Entry', :foreign_key => 'debit_id'
+  #~ has_many :credits, :class_name => 'Entry', :foreign_key => 'credit_id'
+  
+  def self.build_table_model( model_builder )
+    model_builder.instance_exec do
+      read_only!
       plain       :date
       plain       :description
       plain       :debit

data/website/index.html

@@ -31,12 +31,14 @@
 	<p><a href="rdoc">RDoc</a> | <a href="http://rubyforge.org/projects/clevic/">Rubyforge Project</a></p>
 
 
-	<p>Code for inimal UI definition</p>
+	<p>Code for minimal UI definition</p>
 
 
 <pre><code>
 require 'clevic.rb'
 
+# see sql/accounts.sql for schema
+
 # db connection
 Clevic::DbOptions.connect do
   database 'accounts_test'
@@ -85,21 +87,18 @@ class Entry < Clevic::Record
   belongs_to :debit, :class_name => 'Account', :foreign_key => 'debit_id'
   belongs_to :credit, :class_name => 'Account', :foreign_key => 'credit_id'
 
-  # define how fields will be displayed
-  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
-      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
-      plain       :active, :sample => 'WW'
-      plain       :vat, :label => 'VAT', :sample => 'WW', :tooltip => 'Does this include VAT?'
-      
-      records     :order => 'date, id'
-    end
+  define_ui do
+    plain       :date, :sample => '88-WWW-99'
+    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
+    plain       :active, :sample => 'WW'
+    plain       :vat, :label => 'VAT', :sample => 'WW', :tooltip => 'Does this include VAT?'
+    
+    records     :order => 'date, id'
   end
   
   # called when data is changed in the UI
@@ -151,17 +150,15 @@ class Account < Clevic::Record
   has_many :credits, :class_name => 'Entry', :foreign_key => 'credit_id'
   
   # define how fields are displayed
-  def self.ui( parent )
-    Clevic::TableView.new( self, parent ).create_model do
-      plain       :name
-      restricted  :vat, :label => 'VAT', :set => %w{ yes no all }
-      plain       :account_type
-      plain       :pastel_number, :alignment => Qt::AlignRight, :label => 'Pastel'
-      plain       :fringe, :format => "%.1f"
-      plain       :active
-      
-      records  :order => 'name,account_type'
-    end
+  define_ui do
+    plain       :name
+    restricted  :vat, :label => 'VAT', :set => %w{ yes no all }
+    plain       :account_type
+    plain       :pastel_number, :alignment => Qt::AlignRight, :label => 'Pastel'
+    plain       :fringe, :format => "%.1f"
+    plain       :active
+    
+    records  :order => 'name,account_type'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clevic
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - John Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-25 00:00:00 +02:00
+date: 2008-08-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.1
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -85,6 +85,7 @@ files:
 - lib/clevic/delegates.rb
 - lib/clevic/extensions.rb
 - lib/clevic/field.rb
+- lib/clevic/field_builder.rb
 - lib/clevic/item_delegate.rb
 - lib/clevic/model_builder.rb
 - lib/clevic/model_column.rb