Commit e89d1e36a662caec8164e96c3cd3dfd340d0190b to octopod's airgead

octopod / airgead

Description:	A personal finance manager written in RubyCocoa & DataMapper
Homepage:	http://airgead.octopod.info
Clone URL:	git://github.com/octopod/airgead.git Give this clone URL to anyone. `git clone git://github.com/octopod/airgead.git`
Search Repo:

Add Account and Balance fields to the transaction view

  * Make Account the outline view column

octopod (author)

Fri Jul 04 17:11:28 -0700 2008

commit e89d1e36a662caec8164e96c3cd3dfd340d0190b
tree 10f60a10f058a675a462752aa708bcec5cb7b1c7
parent 8a5feb97d18479457aaf21dc0eacabb6a2617c91

app/datasources/transaction_outline_view_data_source.rb
misc/English.lproj/MainMenu.xib
spec/datasources/transaction_outline_view_data_source_spec.rb

app/datasources/transaction_outline_view_data_source.rb

0
@@ -57,8 +57,16 @@ class TransactionOutlineViewDataSource < NSObject
0
       transaction.effective_date
0
     when 'name'
0
       transaction.name
0
+    when 'account'
0
+      if transaction.entries.length > 2
0
+        '-- Split --'
0
+      else
0
+        transaction.entries_except_for_account(@account)[0].account.name
0
+      end
0
     when 'credit_cents', 'debit_cents'
0
       transaction.entry_for_account(@account).send(attribute).to_money_value
0
+    when 'balance'
0
+      nil
0
     else
0
       raise "Unknown column #{column.identifier}"
0
     end
0
@@ -70,8 +78,12 @@ class TransactionOutlineViewDataSource < NSObject
0
       nil
0
     when 'name'
0
       nil
0
+    when 'account'
0
+      entry.account.name
0
     when 'credit_cents', 'debit_cents'
0
       entry.send(attribute).to_money_value
0
+    when 'balance'
0
+      nil
0
     else
0
       raise "Unknown column #{column.identifier}"
0
     end

misc/English.lproj/MainMenu.xib

0
@@ -8,7 +8,7 @@
0
     <string key="IBDocument.HIToolboxVersion">352.00</string>
0
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
0
       <bool key="EncodedWithXMLCoder">YES</bool>
0
-			<integer value="244"/>
0
+			<integer value="209"/>
0
     </object>
0
     <object class="NSArray" key="IBDocument.PluginDependencies">
0
       <bool key="EncodedWithXMLCoder">YES</bool>
0
@@ -30,7 +30,7 @@
0
       <object class="NSWindowTemplate" id="825963059">
0
         <int key="NSWindowStyleMask">15</int>
0
         <int key="NSWindowBacking">2</int>
0
-				<string key="NSWindowRect">{{187, 219}, {974, 522}}</string>
0
+				<string key="NSWindowRect">{{187, 219}, {1217, 522}}</string>
0
         <int key="NSWTFlags">1886912512</int>
0
         <string key="NSWindowTitle">Window</string>
0
         <string key="NSWindowClass">NSWindow</string>
0
@@ -67,27 +67,27 @@
0
                             <object class="NSOutlineView" id="429807795">
0
                               <reference key="NSNextResponder" ref="62086120"/>
0
                               <int key="NSvFlags">256</int>
0
-															<string key="NSFrameSize">{308, 489}</string>
0
+															<string key="NSFrameSize">{383, 489}</string>
0
                               <reference key="NSSuperview" ref="62086120"/>
0
                               <bool key="NSEnabled">YES</bool>
0
                               <object class="NSTableHeaderView" key="NSHeaderView" id="558667917">
0
                                 <reference key="NSNextResponder" ref="668448960"/>
0
                                 <int key="NSvFlags">256</int>
0
-																<string key="NSFrameSize">{308, 17}</string>
0
+																<string key="NSFrameSize">{383, 17}</string>
0
                                 <reference key="NSSuperview" ref="668448960"/>
0
                                 <reference key="NSTableView" ref="429807795"/>
0
                               </object>
0
                               <object class="_NSCornerView" key="NSCornerView" id="359693503">
0
                                 <reference key="NSNextResponder" ref="1015760259"/>
0
                                 <int key="NSvFlags">256</int>
0
-																<string key="NSFrame">{{309, 0}, {16, 17}}</string>
0
+																<string key="NSFrame">{{384, 0}, {16, 17}}</string>
0
                                 <reference key="NSSuperview" ref="1015760259"/>
0
                               </object>
0
                               <object class="NSMutableArray" key="NSTableColumns">
0
                                 <bool key="EncodedWithXMLCoder">YES</bool>
0
                                 <object class="NSTableColumn" id="506966912">
0
                                   <string key="NSIdentifier">name</string>
0
-																	<double key="NSWidth">3.050000e+02</double>
0
+																	<double key="NSWidth">3.800000e+02</double>
0
                                   <double key="NSMinWidth">1.600000e+01</double>
0
                                   <double key="NSMaxWidth">1.000000e+03</double>
0
                                   <object class="NSTableHeaderCell" key="NSHeaderCell">
0
@@ -168,7 +168,7 @@
0
                               <bool key="NSAllowsTypeSelect">YES</bool>
0
                             </object>
0
                           </object>
0
-													<string key="NSFrame">{{1, 17}, {308, 489}}</string>
0
+													<string key="NSFrame">{{1, 17}, {383, 489}}</string>
0
                           <reference key="NSSuperview" ref="1015760259"/>
0
                           <reference key="NSNextKeyView" ref="429807795"/>
0
                           <reference key="NSDocView" ref="429807795"/>
0
@@ -178,7 +178,7 @@
0
                         <object class="NSScroller" id="314095154">
0
                           <reference key="NSNextResponder" ref="1015760259"/>
0
                           <int key="NSvFlags">256</int>
0
-													<string key="NSFrame">{{309, 17}, {15, 489}}</string>
0
+													<string key="NSFrame">{{384, 17}, {15, 489}}</string>
0
                           <reference key="NSSuperview" ref="1015760259"/>
0
                           <reference key="NSTarget" ref="1015760259"/>
0
                           <string key="NSAction">_doScroller:</string>
0
@@ -188,7 +188,7 @@
0
                         <object class="NSScroller" id="787812498">
0
                           <reference key="NSNextResponder" ref="1015760259"/>
0
                           <int key="NSvFlags">256</int>
0
-													<string key="NSFrame">{{1, 506}, {308, 15}}</string>
0
+													<string key="NSFrame">{{1, 506}, {383, 15}}</string>
0
                           <reference key="NSSuperview" ref="1015760259"/>
0
                           <int key="NSsFlags">1</int>
0
                           <reference key="NSTarget" ref="1015760259"/>
0
@@ -202,7 +202,7 @@
0
                             <bool key="EncodedWithXMLCoder">YES</bool>
0
                             <reference ref="558667917"/>
0
                           </object>
0
-													<string key="NSFrame">{{1, 0}, {308, 17}}</string>
0
+													<string key="NSFrame">{{1, 0}, {383, 17}}</string>
0
                           <reference key="NSSuperview" ref="1015760259"/>
0
                           <reference key="NSNextKeyView" ref="558667917"/>
0
                           <reference key="NSDocView" ref="558667917"/>
0
@@ -211,7 +211,7 @@
0
                         </object>
0
                         <reference ref="359693503"/>
0
                       </object>
0
-											<string key="NSFrameSize">{325, 522}</string>
0
+											<string key="NSFrameSize">{400, 522}</string>
0
                       <reference key="NSSuperview" ref="494434834"/>
0
                       <reference key="NSNextKeyView" ref="62086120"/>
0
                       <int key="NSsFlags">50</int>
0
@@ -223,7 +223,7 @@
0
                       <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
0
                     </object>
0
                   </object>
0
-									<string key="NSFrameSize">{325, 522}</string>
0
+									<string key="NSFrameSize">{400, 522}</string>
0
                   <reference key="NSSuperview" ref="753459240"/>
0
                   <string key="NSClassName">NSView</string>
0
                 </object>
0
@@ -245,20 +245,20 @@
0
                             <object class="NSOutlineView" id="333376350">
0
                               <reference key="NSNextResponder" ref="175752880"/>
0
                               <int key="NSvFlags">256</int>
0
-															<string key="NSFrameSize">{623, 489}</string>
0
+															<string key="NSFrameSize">{791, 489}</string>
0
                               <reference key="NSSuperview" ref="175752880"/>
0
                               <bool key="NSEnabled">YES</bool>
0
                               <object class="NSTableHeaderView" key="NSHeaderView" id="922534749">
0
                                 <reference key="NSNextResponder" ref="291456491"/>
0
                                 <int key="NSvFlags">256</int>
0
-																<string key="NSFrameSize">{623, 17}</string>
0
+																<string key="NSFrameSize">{791, 17}</string>
0
                                 <reference key="NSSuperview" ref="291456491"/>
0
                                 <reference key="NSTableView" ref="333376350"/>
0
                               </object>
0
                               <object class="_NSCornerView" key="NSCornerView" id="290866849">
0
                                 <reference key="NSNextResponder" ref="995707690"/>
0
                                 <int key="NSvFlags">256</int>
0
-																<string key="NSFrame">{{624, 0}, {16, 17}}</string>
0
+																<string key="NSFrame">{{792, 0}, {16, 17}}</string>
0
                                 <reference key="NSSuperview" ref="995707690"/>
0
                               </object>
0
                               <object class="NSMutableArray" key="NSTableColumns">
0
@@ -298,7 +298,7 @@
0
                                           <bool key="EncodedWithXMLCoder">YES</bool>
0
                                           <string>%m/%d/%y</string>
0
                                           <integer value="3"/>
0
-																					<integer value="1040" id="262544395"/>
0
+																					<integer value="1040" id="231891639"/>
0
                                           <integer value="0"/>
0
                                         </object>
0
                                       </object>
0
@@ -316,7 +316,7 @@
0
                                 </object>
0
                                 <object class="NSTableColumn" id="511185289">
0
                                   <string key="NSIdentifier">name</string>
0
-																	<double key="NSWidth">3.620000e+02</double>
0
+																	<double key="NSWidth">2.830000e+02</double>
0
                                   <double key="NSMinWidth">4.000000e+01</double>
0
                                   <double key="NSMaxWidth">1.000000e+03</double>
0
                                   <object class="NSTableHeaderCell" key="NSHeaderCell">
0
@@ -341,15 +341,15 @@
0
                                   <bool key="NSIsEditable">YES</bool>
0
                                   <reference key="NSTableView" ref="333376350"/>
0
                                 </object>
0
-																<object class="NSTableColumn" id="996828807">
0
-																	<string key="NSIdentifier">debit_cents</string>
0
-																	<double key="NSWidth">6.400000e+01</double>
0
+																<object class="NSTableColumn" id="125199501">
0
+																	<string key="NSIdentifier">account</string>
0
+																	<double key="NSWidth">1.670000e+02</double>
0
                                   <double key="NSMinWidth">1.000000e+01</double>
0
                                   <double key="NSMaxWidth">3.402823e+38</double>
0
                                   <object class="NSTableHeaderCell" key="NSHeaderCell">
0
                                     <int key="NSCellFlags">75628032</int>
0
                                     <int key="NSCellFlags2">0</int>
0
-																		<string key="NSContents">Deposit</string>
0
+																		<string key="NSContents">Account</string>
0
                                     <reference key="NSSupport" ref="26"/>
0
                                     <object class="NSColor" key="NSBackgroundColor" id="691817132">
0
                                       <int key="NSColorSpace">6</int>
0
@@ -359,9 +359,36 @@
0
                                     </object>
0
                                     <reference key="NSTextColor" ref="471979499"/>
0
                                   </object>
0
+																	<object class="NSTextFieldCell" key="NSDataCell" id="381124814">
0
+																		<int key="NSCellFlags">337772096</int>
0
+																		<int key="NSCellFlags2">2048</int>
0
+																		<string key="NSContents">Text Cell</string>
0
+																		<reference key="NSSupport" ref="684534086"/>
0
+																		<reference key="NSControlView" ref="333376350"/>
0
+																		<reference key="NSBackgroundColor" ref="550176801"/>
0
+																		<reference key="NSTextColor" ref="642582955"/>
0
+																	</object>
0
+																	<int key="NSResizingMask">3</int>
0
+																	<bool key="NSIsResizeable">YES</bool>
0
+																	<bool key="NSIsEditable">YES</bool>
0
+																	<reference key="NSTableView" ref="333376350"/>
0
+																</object>
0
+																<object class="NSTableColumn" id="996828807">
0
+																	<string key="NSIdentifier">debit_cents</string>
0
+																	<double key="NSWidth">7.500000e+01</double>
0
+																	<double key="NSMinWidth">1.000000e+01</double>
0
+																	<double key="NSMaxWidth">3.402823e+38</double>
0
+																	<object class="NSTableHeaderCell" key="NSHeaderCell">
0
+																		<int key="NSCellFlags">75628032</int>
0
+																		<int key="NSCellFlags2">0</int>
0
+																		<string key="NSContents">Deposit</string>
0
+																		<reference key="NSSupport" ref="26"/>
0
+																		<reference key="NSBackgroundColor" ref="691817132"/>
0
+																		<reference key="NSTextColor" ref="471979499"/>
0
+																	</object>
0
                                   <object class="NSTextFieldCell" key="NSDataCell" id="732661689">
0
                                     <int key="NSCellFlags">337772096</int>
0
-																		<int key="NSCellFlags2">-2147481600</int>
0
+																		<int key="NSCellFlags2">-2080372736</int>
0
                                     <string key="NSContents">Text Cell</string>
0
                                     <reference key="NSSupport" ref="684534086"/>
0
                                     <object class="NSNumberFormatter" key="NSFormatter" id="908364217">
0
@@ -376,7 +403,7 @@
0
                                         <object class="NSMutableArray" key="dict.values">
0
                                           <bool key="EncodedWithXMLCoder">YES</bool>
0
                                           <integer value="1" id="9"/>
0
-																					<reference ref="262544395"/>
0
+																					<reference ref="231891639"/>
0
                                           <integer value="2" id="10"/>
0
                                         </object>
0
                                       </object>
0
@@ -434,7 +461,7 @@
0
                                 </object>
0
                                 <object class="NSTableColumn" id="183854112">
0
                                   <string key="NSIdentifier">credit_cents</string>
0
-																	<double key="NSWidth">8.400000e+01</double>
0
+																	<double key="NSWidth">7.100000e+01</double>
0
                                   <double key="NSMinWidth">1.000000e+01</double>
0
                                   <double key="NSMaxWidth">3.402823e+38</double>
0
                                   <object class="NSTableHeaderCell" key="NSHeaderCell">
0
@@ -447,7 +474,7 @@
0
                                   </object>
0
                                   <object class="NSTextFieldCell" key="NSDataCell" id="937830452">
0
                                     <int key="NSCellFlags">337772096</int>
0
-																		<int key="NSCellFlags2">-2147481600</int>
0
+																		<int key="NSCellFlags2">-2080372736</int>
0
                                     <string key="NSContents">Text Cell</string>
0
                                     <reference key="NSSupport" ref="684534086"/>
0
                                     <object class="NSNumberFormatter" key="NSFormatter" id="192915390">
0
@@ -462,7 +489,78 @@
0
                                         <object class="NSMutableArray" key="dict.values">
0
                                           <bool key="EncodedWithXMLCoder">YES</bool>
0
                                           <reference ref="9"/>
0
-																					<reference ref="262544395"/>
0
+																					<reference ref="231891639"/>
0
+																					<reference ref="10"/>
0
+																				</object>
0
+																			</object>
0
+																			<string type="base64-UTF8" key="NS.positiveformat">wqQjLCMjMC4wMA</string>
0
+																			<string type="base64-UTF8" key="NS.negativeformat">wqQjLCMjMC4wMA</string>
0
+																			<nil key="NS.positiveattrs"/>
0
+																			<nil key="NS.negativeattrs"/>
0
+																			<object class="NSAttributedString" key="NS.zero">
0
+																				<nil key="NSString"/>
0
+																			</object>
0
+																			<object class="NSAttributedString" key="NS.nil">
0
+																				<nil key="NSString"/>
0
+																			</object>
0
+																			<object class="NSAttributedString" key="NS.nan">
0
+																				<string key="NSString">NaN</string>
0
+																				<reference key="NSAttributes" ref="946056478"/>
0
+																			</object>
0
+																			<reference key="NS.min" ref="903570186"/>
0
+																			<reference key="NS.max" ref="903570186"/>
0
+																			<object class="NSDecimalNumberHandler" key="NS.rounding">
0
+																				<int key="NS.roundingmode">3</int>
0
+																				<bool key="NS.raise.overflow">YES</bool>
0
+																				<bool key="NS.raise.underflow">YES</bool>
0
+																				<bool key="NS.raise.dividebyzero">YES</bool>
0
+																			</object>
0
+																			<string key="NS.decimal">.</string>
0
+																			<string key="NS.thousand">,</string>
0
+																			<bool key="NS.hasthousands">YES</bool>
0
+																			<bool key="NS.localized">YES</bool>
0
+																			<bool key="NS.allowsfloats">YES</bool>
0
+																		</object>
0
+																		<reference key="NSControlView" ref="333376350"/>
0
+																		<reference key="NSBackgroundColor" ref="550176801"/>
0
+																		<reference key="NSTextColor" ref="642582955"/>
0
+																	</object>
0
+																	<int key="NSResizingMask">3</int>
0
+																	<bool key="NSIsResizeable">YES</bool>
0
+																	<bool key="NSIsEditable">YES</bool>
0
+																	<reference key="NSTableView" ref="333376350"/>
0
+																</object>
0
+																<object class="NSTableColumn" id="464250883">
0
+																	<string key="NSIdentifier">balance</string>
0
+																	<double key="NSWidth">7.600000e+01</double>
0
+																	<double key="NSMinWidth">1.000000e+01</double>
0
+																	<double key="NSMaxWidth">3.402823e+38</double>
0
+																	<object class="NSTableHeaderCell" key="NSHeaderCell">
0
+																		<int key="NSCellFlags">75628032</int>
0
+																		<int key="NSCellFlags2">0</int>
0
+																		<string key="NSContents">Balance</string>
0
+																		<reference key="NSSupport" ref="26"/>
0
+																		<reference key="NSBackgroundColor" ref="691817132"/>
0
+																		<reference key="NSTextColor" ref="471979499"/>
0
+																	</object>
0
+																	<object class="NSTextFieldCell" key="NSDataCell" id="584087431">
0
+																		<int key="NSCellFlags">337772096</int>
0
+																		<int key="NSCellFlags2">-2080372736</int>
0
+																		<string key="NSContents">Text Cell</string>
0
+																		<reference key="NSSupport" ref="684534086"/>
0
+																		<object class="NSNumberFormatter" key="NSFormatter" id="744096271">
0
+																			<object class="NSMutableDictionary" key="NS.attributes">
0
+																				<bool key="EncodedWithXMLCoder">YES</bool>
0
+																				<object class="NSMutableArray" key="dict.sortedKeys">
0
+																					<bool key="EncodedWithXMLCoder">YES</bool>
0
+																					<string>allowsFloats</string>
0
+																					<string>formatterBehavior</string>
0
+																					<string>numberStyle</string>
0
+																				</object>
0
+																				<object class="NSMutableArray" key="dict.values">
0
+																					<bool key="EncodedWithXMLCoder">YES</bool>
0
+																					<reference ref="9"/>
0
+																					<integer value="1040"/>
0
                                           <reference ref="10"/>
0
                                         </object>
0
                                       </object>