hsoft / moneyguru / changeset / 4a48ab198a51

 # -*- coding: utf-8 -*-
 # Created By: Virgil Dupras
 # Created On: 2010-07-25
 # Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+#
 # This software is licensed under the "HS" License as described in the "LICENSE" file,
 # which should be included with this package. The terms are also available at
 # http://www.hardcoded.net/licenses/hs_license
 class Columns(object):
     def __init__(self, colnames):
         self.colnames = colnames[:] # We're altering the list, make a copy
     def columns_to_right(self, colname):
         column_index = self.colnames.index(colname)
         return self.colnames[column_index+1:]
     def move_column(self, colname, index):
         try:
             self.colnames.remove(colname)
         except ValueError:
             pass # move nothing
         else:
             self.colnames.insert(index, colname)
     def set_columns(self, colnames):
         self.colnames = colnames

@@ -17,6 +17,7 @@ from .table import RowWithDebitAndCredit
 from .transaction_table_base import TransactionTableBase
 class EntryTable(TransactionTableBase):
     ALL_ATTRS = ['description', 'payee', 'transfer', 'increase', 'decrease']
     INVALIDATING_MESSAGES = TransactionTableBase.INVALIDATING_MESSAGES | set(['shown_account_changed'])
     def __init__(self, view, account_view):

@@ -12,9 +12,16 @@ from hsgui.table import Table, GUITable
 from ..model.amount import Amount
 from ..model.sort import sort_string
 from .column import Columns
 # Subclasses of this class must have a "view" and a "document" attribute
 class GUITable(GUITableBase):
     ALL_ATTRS = []
     def __init__(self):
         GUITableBase.__init__(self)
         self.columns = Columns(self.ALL_ATTRS)
     def can_move(self, row_indexes, position):
         if not 0 <= position <= len(self):
             return False
@@ -83,10 +90,8 @@ class Row(RowBase):
     def _get_autofill_dest_attrs(self, key_attr, all_attrs):
         """Returns a set of attrs to fill depending on which columns are right to key_attr
         """
         columns = self.table._columns
         if columns:
             column_index = columns.index(key_attr)
             right_columns = set(columns[column_index + 1:])
         if self.table.columns.colnames:
             right_columns = set(self.table.columns.columns_to_right(key_attr))
             return set(all_attrs) & right_columns
         else:
             return set(all_attrs)

@@ -17,6 +17,8 @@ from .table import Row, RowWithDate, row
 from .transaction_table_base import TransactionTableBase
 class TransactionTable(TransactionTableBase):
     ALL_ATTRS = ['description', 'payee', 'from', 'to', 'amount']
     def __init__(self, view, transaction_view):
         TransactionTableBase.__init__(self, view, transaction_view)

@@ -19,7 +19,6 @@ class TransactionTableBase(GUITable, Vie
     def __init__(self, view, parent_view):
         ViewChild.__init__(self, view, parent_view)
         GUITable.__init__(self)
         self._columns = [] # empty columns == unrestricted autofill
     #--- Override
     def _is_edited_new(self):
@@ -58,10 +57,7 @@ class TransactionTableBase(GUITable, Vie
         return self.document.can_move_transactions(transactions, before, after)
     def change_columns(self, columns):
         """Call this when the order or the visibility of the columns change"""
         columns = [c if c != 'from_' else 'from' for c in columns]
         self._columns = columns
         self.columns.set_columns(columns)
     def duplicate_selected(self):
         self.document.duplicate_transactions(self.selected_transactions)

@@ -200,6 +200,7 @@ def test_field_completion_is_case_sensit
 @with_app(app_one_entry)
 def test_field_completion_on_set_entry_transfer(app):
     # Setting a transfer autocompletes the amount and the description.
     app.etable.columns.move_column('transfer', 0)
     app.etable.add()
     row = app.etable.selected_row
     row.transfer = 'Salary'
@@ -222,6 +223,7 @@ def test_field_completion_on_set_entry_d
 @with_app(app_one_entry)
 def test_field_completion_on_set_entry_payee(app):
     # Setting a transfer autocompletes the amount and the description.
     app.etable.columns.move_column('payee', 0)
     app.etable.add()
     row = app.etable.selected_row
     row.payee = 'Payee'
@@ -345,16 +347,19 @@ def assert_completion_order_changed(app)
     eq_(complete_etable(app, 'd', 'description'), 'esc1')
     eq_(complete_etable(app, 'c', 'transfer'), 'at1')
     eq_(complete_etable(app, 'p', 'payee'), 'ay1')
     app.etable.columns.move_column('description', 0)
     app.etable.add()
     row = app.etable.selected_row
     row.description = 'desc1'
     eq_(app.etable[app.etable.selected_indexes[0]].payee, 'pay1')
     eq_(app.etable[app.etable.selected_indexes[0]].transfer, 'cat1')
     app.etable.columns.move_column('transfer', 0)
     app.etable.add()
     row = app.etable.selected_row
     row.transfer = 'cat1'
     eq_(app.etable[app.etable.selected_indexes[0]].description, 'desc1')
     eq_(app.etable[app.etable.selected_indexes[0]].payee, 'pay1')
     app.etable.columns.move_column('payee', 0)
     app.etable.add()
     row = app.etable.selected_row
     row.payee = 'pay1'

@@ -868,6 +868,7 @@ def test_autofill_ignores_blank(app):
 @with_app(app_autofill)
 def test_autofill_on_set_from(app):
     # Setting 'from' autocompletes the rest.
     app.ttable.columns.move_column('from', 0)
     app.ttable.add()
     row = app.ttable.edited
     row.from_ = 'Salary'
@@ -878,7 +879,8 @@ def test_autofill_on_set_from(app):
 @with_app(app_autofill)
 def test_autofill_on_set_to(app):
-    # Setting 'from' autocompletes the rest.
+    # Setting 'to' autocompletes the rest.
     app.ttable.columns.move_column('to', 0)
     app.ttable.add()
     row = app.ttable.edited
     row.to = 'Checking'
@@ -901,6 +903,7 @@ def test_autofill_on_set_description(app
 @with_app(app_autofill)
 def test_autofill_on_set_payee(app):
     # Setting a transfer autocompletes the amount and the description.
     app.ttable.columns.move_column('payee', 0)
     app.ttable.add()
     row = app.ttable.edited
     row.payee = 'Payee'
@@ -932,7 +935,7 @@ def test_autofill_uses_the_latest_entere
 def test_change_columns_fixed_from(app):
     # When 'from_' is passed in change_columns(), it is automatically changed to 'from'
     app.mw.select_transaction_table()
-    app.ttable.change_columns(['from_', 'description', 'to', 'amount'])
+    app.ttable.change_columns(['from', 'description', 'to', 'amount'])
     app.ttable[0].from_ = 'foo' # no crash

commit 975:	4a48ab198a51
parent 974:	047f459046bd
branch:	default

hsoft / moneyguru (http://hardcoded.net/moneyguru)