clevic 0.11.1 → 0.12.0

data/lib/clevic/text_delegate.rb

@@ -0,0 +1,84 @@
+require 'clevic/item_delegate.rb'
+
+module Clevic
+
+  class TextDelegate < ItemDelegate
+    
+    # Doesn't do anything useful yet, but I'm leaving
+    # it here so I don't have to change other code.
+    class TextEditor < Qt::PlainTextEdit
+    end
+    
+    # this is overridden in Qt::ItemDelegate, but that
+    # always catches the return key. Which we want for text editing.
+    # Instead, we use Ctrl-Enter to save the edited text.
+    # return true if event is handled, false otherwise
+    def eventFilter( object, event )
+      if object.class == TextEditor && event.class == Qt::KeyEvent
+        retval =
+        case
+          when event.ctrl? && ( event.enter? || event.return? )
+            # close and save
+            # copied from QItemDelegate.
+            emit commitData( object )
+            emit closeEditor( object )
+            true
+          
+          # send an enter or return to the text editor
+          when event.enter? || event.return?
+            object.event( event )
+            true
+        end
+      end
+      retval || super
+    end
+    
+    # maybe open in a separate window?
+    def full_edit
+      puts "#{self.class.name} full_edit"
+    end
+    
+    # Override the Qt method
+    def createEditor( parent_widget, style_option_view_item, model_index )
+      if false && model_index.gui_value.count("\n") == 0
+        # futzing about here, really
+        @editor = Qt::LineEdit.new( parent_widget )
+      else
+        @editor = TextEditor.new( parent_widget )
+        @editor.install_event_filter( self )
+      end
+      @editor
+    end
+    
+    # Override the Qt::ItemDelegate method.
+    def updateEditorGeometry( editor, style_option_view_item, model_index )
+      rect = Qt::Rect.new( style_option_view_item.rect.top_left, style_option_view_item.rect.size ) 
+      
+      # ask the editor for how much space it wants, and set the editor
+      # to that size when it displays in the table
+      rect.set_width( [editor.size_hint.width,rect.width].max )
+      rect.set_height( editor.size_hint.height )
+      
+      unless editor.parent.rect.contains( rect )
+        # 46 because TableView returns an incorrect bottom.
+        # And I can't find out how to get the correct value.
+        rect.move_bottom( parent.contents_rect.bottom - 46 )
+      end
+      editor.set_geometry( rect )
+    end
+
+    # Override the Qt method to send data to the editor from the model.
+    def setEditorData( editor, model_index )
+      editor.plain_text = model_index.gui_value
+    end
+    
+    # Send the data from the editor to the model. The data will
+    # be translated by translate_from_editor_text,
+    def setModelData( editor, abstract_item_model, model_index )
+      model_index.attribute_value = editor.to_plain_text
+      abstract_item_model.data_changed( model_index )
+    end
+
+  end
+
+end

data/lib/clevic/version.rb

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

data/lib/clevic/view.rb

@@ -77,8 +77,34 @@ module Clevic
     def define_actions( table_view, action_builder )
     end
     
-    # define data changed events
-    def notify_data_changed( table_view, top_left_model_index, bottom_right_model_index )
+    # notify 
+    def notify_field( table_view, model_index )
+      ndc = model_index.field.notify_data_changed
+      case ndc
+        when Proc
+          ndc.call( self, table_view, model_index )
+          
+        when Symbol
+          send( ndc, table_view, model_index )
+      end
+    end
+    
+    # Define data changed events. Default is to call notify_data_changed
+    # for each field in the rectangular area defined by top_left and bottom_right
+    # (which are Qt::ModelIndex instances)
+    def notify_data_changed( table_view, top_left, bottom_right )
+      if top_left == bottom_right
+        # shortcut to just the one, seeing as it's probably the most common
+        notify_field( table_view, top_left )
+      else
+        # do the entire rectagular area
+        (top_left.row..bottom_right.row).each do |row_index|
+          (top_left.column..bottom_right.column).each do |column_index|
+            model_index = table_view.model.create_index( row_index, column_index )
+            notify_field( table_view, model_index )
+          end
+        end
+      end
     end
     
     # be notified of key presses

data/models/accounts_models.rb

@@ -9,7 +9,7 @@ Clevic::DbOptions.connect( $options ) do
     database options[:database]
   end
   adapter :postgresql
-  username 'accounts'
+  username options[:username].blank? ? 'accounts' : options[:username]
 end
 
 class Entry < ActiveRecord::Base
@@ -20,7 +20,19 @@ class Entry < ActiveRecord::Base
   
   define_ui do
     plain       :date, :sample => '88-WWW-99'
-    distinct    :description, :conditions => "now() - date <= '1 year'", :sample => 'm' * 26
+    distinct    :description do |f|
+      f.conditions "now() - date <= '1 year'"
+      f.sample( 'm' * 26 )
+      f.notify_data_changed = lambda do |entity_view, table_view, model_index|
+        if model_index.entity.credit.nil? && model_index.entity.debit.nil?
+          entity_view.update_from_description( model_index )
+          
+          # move edit cursor to amount field
+          table_view.selection_model.clear
+          table_view.override_next_index( model_index.choppy( :column => :amount ) )
+        end
+      end
+    end
     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
@@ -32,44 +44,26 @@ class Entry < ActiveRecord::Base
     records     :order => 'date, id'
   end
   
-  # called when data is changed in the UI
-  def self.data_changed( top_left, bottom_right, view )
-    if top_left == bottom_right
-      update_credit_debit( top_left, view )
-    else
-      puts "top_left: #{top_left.inspect}"
-      puts "bottom_right: #{bottom_right.inspect}"
-      puts "can't do data_changed for a range"
-    end
-  end
-  
-  # check that the current field is :descriptions, then
-  # copy the values for the credit and debit fields
-  # from the previous similar entry
-  def self.update_credit_debit( current_index, view )
-    return unless current_index.valid?
-    current_field = current_index.attribute
-    if current_field == :description
-      # most recent entry, ordered in reverse
-      similar = self.find(
-        :first,
-        :conditions => ["#{current_field} = ?", current_index.attribute_value],
-        :order => 'date desc'
-      )
-      if similar != nil
-        # set the values
-        current_index.entity.debit = similar.debit
-        current_index.entity.credit = similar.credit
-        current_index.entity.category = similar.category
-        
-        # emit signal to update view from top_left to bottom_right
-        top_left_index = current_index.choppy( :column => 0 )
-        bottom_right_index = current_index.choppy( :column => view.model.column_count - 1 )
-        view.dataChanged( top_left_index, bottom_right_index )
-        
-        # move edit cursor to amount field
-        view.selection_model.clear
-        view.override_next_index( current_index.choppy( :column => view.field_column( :amount ) ) )
+  # Copy the values for the credit and debit fields
+  # from the previous similar entry with a similar description
+  def self.update_from_description( current_index )
+    return if current_index.attribute_value.nil?
+    # most recent entry, ordered in reverse
+    similar = self.find(
+      :first,
+      :conditions => ["#{current_index.attribute} = ?", current_index.attribute_value],
+      :order => 'date desc'
+    )
+    if similar != nil
+      # set the values
+      current_index.entity.debit = similar.debit
+      current_index.entity.credit = similar.credit
+      current_index.entity.category = similar.category
+      
+      # emit signal to that whole row has changed
+      current_index.model.data_changed do |change|
+        change.top_left = current_index.choppy( :column => 0 )
+        change.bottom_right = current_index.choppy( :column => current_index.model.column_count - 1 )
       end
     end
   end

data/models/times_models.rb

@@ -19,11 +19,35 @@ class Entry < ActiveRecord::Base
   
   define_ui do
     plain       :date, :sample => '28-Dec-08'
-    relational  :project, :display => 'project', :conditions => 'active = true', :order => 'lower(project)'
+    
+    # The project field
+    relational  :project do |field|
+      field.display = 'project'
+      field.conditions = 'active = true'
+      field.order = 'lower(project)'
+      
+      # handle data changed events. In this case,
+      # auto-fill-in the invoice field.
+      field.notify_data_changed do |entity_view, table_view, model_index|
+        if model_index.entity.invoice.nil?
+          entity_view.invoice_from_project( table_view, model_index ) do
+            # move here next if the invoice was changed
+            table_view.override_next_index model_index.choppy( :column => :start )
+          end
+        end
+      end
+    end
+    
     relational  :invoice, :display => 'invoice_number', :conditions => "status = 'not sent'", :order => 'invoice_number'
+    
+    # call time_color method for foreground color value
     plain       :start, :foreground => :time_color, :tooltip => :time_tooltip
+    
+    # another way to call time_color method for foreground color value
     plain       :end, :foreground => lambda{|x| x.time_color}, :tooltip => :time_tooltip
-    plain       :description, :sample => 'This is a long string designed to hold lots of data and description'
+    
+    # multiline text
+    text        :description, :sample => 'This is a long string designed to hold lots of data and description'
     
     relational :activity do
       display    'activity'
@@ -34,18 +58,25 @@ class Entry < ActiveRecord::Base
     
     distinct    :module, :tooltip => 'Module or sub-project'
     plain       :charge, :tooltip => 'Is this time billable?'
-    distinct    :person, :tooltip => 'The person who did the work'
+    distinct    :person, :default => 'John', :tooltip => 'The person who did the work'
     
     records     :order => 'date, start, id'
   end
 
-  def self.actions( view, action_builder )
+  def self.define_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 )
+      invoice_from_project( view, view.current_index ) do
+        # execute the block if the invoice is changed
+        
+        # save this before selection model is cleared
+        current_index = view.current_index
+        view.selection_model.clear
+        view.current_index = current_index.choppy( :column => :start )
+      end
     end
   end
   
@@ -54,63 +85,68 @@ class Entry < ActiveRecord::Base
     view.sanity_check_read_only
     view.sanity_check_ditto
     
-    # need a reference to current_index here, because selection_model.clear will invalidate
-    # view.current_index. And anyway, its shorter and easier to read.
+    # need a reference to current_index here, because selection_model.clear will
+    # invalidate view.current_index. And anyway, its shorter and easier to read.
     current_index = view.current_index
-    if current_index.row > 1
+    if current_index.row >= 1
       # fetch previous item
       previous_item = view.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.date = previous_item.date if current_index.entity.date.blank?
+      # depends on previous line
+      current_index.entity.start = previous_item.end if current_index.entity.date == previous_item.date
+      
+      # copy rest of fields
+      [: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 = current_index.choppy( :column => 0 )
-      bottom_right_index = current_index.choppy( :column => view.model.fields.size - 1 )
-      view.dataChanged( top_left_index, bottom_right_index )
+      view.model.data_changed do |change|
+        change.top_left = current_index.choppy( :column => 0 )
+        change.bottom_right = current_index.choppy( :column => view.model.fields.size - 1 )
+      end
       
-      # move to end time field
-      view.selection_model.clear
+      # move to the first empty time field
       next_field =
       if current_index.entity.start.blank?
         :start
       else
         :end
       end
-      next_index = current_index.choppy( :column => view.field_column( next_field ) )
-      view.override_next_index( next_index )
+      
+      # next cursor location
+      view.selection_model.clear
+      view.current_index = current_index.choppy( :column => next_field )
     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 )
-    current_field = current_index.attribute
-    if [:project,:invoice].include?( current_field ) && current_index.entity.project != nil
+  # Auto-complete invoice number field from project.
+  # &block will be executed if an invoice was assigned
+  # If block takes one parameter, pass the new invoice.
+  def self.invoice_from_project( table_view, current_index, &block )
+    if 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
-        changed_index = current_index.choppy( :column => view.field_column( :invoice ) )
-        view.dataChanged( changed_index, changed_index )
+        table_view.model.data_changed( current_index.choppy( :column => :invoice ) )
         
-        # move edit cursor to start time field
-        view.selection_model.clear
-        view.override_next_index( current_index.choppy( :column => view.field_column( :start ) ) )
+        unless block.nil?
+          if block.arity == 1
+            block.call( invoice )
+          else
+            block.call
+          end
+        end
       end
     end
   end
+  
 end
 
 class Invoice < ActiveRecord::Base
@@ -123,7 +159,7 @@ class Invoice < ActiveRecord::Base
     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_date, :format => '%d-%b-%y', :edit_format => '%d-%b-%Y', :tooltip => 'the date and time when the quote was supplied', :default => lambda{|x| DateTime.now}
     plain :quote_amount
     plain :description
     

data/tasks/clevic.rake

@@ -0,0 +1,111 @@
+task :package => :ui
+
+desc "Update ChangeLog from the SVN log"
+task :changelog do |t|
+  ARGV.shift
+  exec "svn2cl --break-before-msg -o ChangeLog #{ARGV.join(' ')}"
+end
+
+# generate a _ui.rb filename from a .ui filename
+def ui_rb_file( ui_file )
+  ui_file.gsub( /\.ui$/, '_ui.rb' )
+end
+
+# list of .ui files
+UI_FILES = FileList.new( 'lib/clevic/ui/*.ui' )
+CLEAN.include( 'ChangeLog', 'coverage', 'profiling' )
+CLOBBER.include( 'ChangeLog', 'pkg', 'lib/clevic/ui/*_ui.rb' )
+
+UI_FILES.each do |ui_file|
+  # make tasks to generate _ui.rb files
+  file ui_rb_file( ui_file ) => [ ui_file ] do |t|
+    sh "rbuic4 #{t.prerequisites} -o #{t.name}" 
+  end
+  
+  # make tasks to start designer when the ui file is named
+  desc "Start Qt designer with #{ui_file}"
+  namespace :ui do |n|
+    task Pathname.new(ui_file).basename.to_s.ext do |t|
+      sh "designer #{ui_file}"
+    end
+  end
+end
+
+desc 'Generate all _ui.rb files'
+task :ui => UI_FILES.map{|x| ui_rb_file( x ) }
+
+namespace :ui do
+  desc 'Start Qt designer with the argument, or all .ui files.'
+  task :design do |t|
+    ARGV.shift()
+    if ARGV.size == 0
+      # start designer with all ui files
+      sh "designer #{UI_FILES.join(' ')}"
+    else
+      # start designer with all files that match an argument
+      sh "designer #{ ARGV.map{|x| UI_FILES.grep( /\/#{x}/ ) }.join(' ') }"
+    end
+    true
+  end
+end
+
+desc "Runs Clevic in normal mode, with live database."
+task :run => :ui do |t|
+  ARGV.shift()
+  exec "ruby -Ilib bin/clevic #{ARGV.join(' ')}"
+end
+
+desc "Runs Clevic in debug mode, with test databases"
+task :debug => :ui do |t|
+  ARGV.shift()
+  exec "ruby -w -rdebug -Ilib bin/clevic -D #{ARGV.join(' ')}"
+end
+
+desc "irb in this project's context"
+task :irb do |t|
+  ARGV.shift()
+  ENV['RUBYLIB'] ||= ''
+  ENV['RUBYLIB'] += ":#{File.expand_path('.')}/lib"
+  exec "irb -Ilib -rclevic"
+end
+
+# generate tasks for all model definition files
+MODELS_LIST = FileList.new( '**/*models.rb' )
+
+def short_model( model_file )
+  Pathname.new( model_file ).basename.to_s.gsub( /_models.rb/, '' )
+end
+
+MODELS_LIST.each do |model_file|
+  # generate irb contexts
+  desc "irb with #{model_file}"
+  namespace :irb do
+    task short_model( model_file ) do |t|
+      ARGV.shift()
+      ARGV.shift() if ARGV[0] == '--'
+      ENV['RUBYLIB'] ||= '.'
+      ENV['RUBYLIB'] += ":#{File.expand_path('.')}/lib"
+      exec "irb -Ilib -rclevic -r#{model_file} -rclevic/db_options.rb"
+    end
+  end
+  
+  # generate runs
+  namespace :run do
+    desc "run clevic with #{model_file}"
+    task short_model( model_file )  => :ui do |t|
+      ARGV.shift()
+      ARGV.shift() if ARGV[0] == '--'
+      cmd = "ruby -Ilib bin/clevic -D #{model_file} #{ARGV.join(' ')}"
+      puts "cmd: #{cmd.inspect}"
+      exec cmd
+    end
+  end
+
+  namespace :warn do
+    desc "run clevic with #{model_file} and warnings on"
+    task short_model( model_file )  => :ui do |t|
+      ARGV.shift()
+      exec "ruby -w -Ilib bin/clevic -D #{model_file} #{ARGV.join(' ')}"
+    end
+  end
+end