aclindsa/ofxgo
1
0
Fork 0
mirror of https://github.com/aclindsa/ofxgo.git synced 2025-06-15 05:58:38 -04:00
Code Issues Releases Wiki Activity

Use CurrSymbol instead of String to represent currencies

Browse Source
This commit is contained in:
Aaron Lindsay
2017-04-17 20:20:22 -04:00
parent faac776ca4
commit 2046fa32e5
10 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/ofx/banktransactions.go
View File

@ -75,12 +75,12 @@ func bankTransactions() {
}
}
func printTransaction(defCurrency ofxgo.String, tran *ofxgo.Transaction) {
func printTransaction(defCurrency ofxgo.CurrSymbol, tran *ofxgo.Transaction) {
currency := defCurrency
if len(tran.Currency) > 0 {
currency = tran.Currency
} else if len(tran.OrigCurrency) > 0 {
if ok, _ := tran.Currency.Valid(); ok {
currency = tran.Currency
} else if ok, _ := tran.OrigCurrency.Valid(); ok {
currency = tran.OrigCurrency
}
var name string
@ -94,5 +94,5 @@ func printTransaction(defCurrency ofxgo.String, tran *ofxgo.Transaction) {
name = name + " - " + string(tran.Memo)
}
fmt.Printf("%s %-15s %-11s %s\n", tran.DtPosted, tran.TrnAmt.String()+" "+string(currency), tran.TrnType, name)
fmt.Printf("%s %-15s %-11s %s\n", tran.DtPosted, tran.TrnAmt.String()+" "+currency.String(), tran.TrnType, name)
}

8
cmd/ofx/cctransactions.go
View File

@ -60,10 +60,10 @@ func ccTransactions() {
fmt.Println("Transactions:")
for _, tran := range stmt.BankTranList.Transactions {
currency := stmt.CurDef
if len(tran.Currency) > 0 {
currency = tran.Currency
} else if len(tran.OrigCurrency) > 0 {
if ok, _ := tran.Currency.Valid(); ok {
currency = tran.Currency
} else if ok, _ := tran.OrigCurrency.Valid(); ok {
currency = tran.OrigCurrency
}
var name string
@ -77,7 +77,7 @@ func ccTransactions() {
name = name + " - " + string(tran.Memo)
}
fmt.Printf("%s %-15s %-11s %s\n", tran.DtPosted, tran.TrnAmt.String()+" "+string(currency), tran.TrnType, name)
fmt.Printf("%s %-15s %-11s %s\n", tran.DtPosted, tran.TrnAmt.String()+" "+currency.String(), tran.TrnType, name)
}
}
}

14
cmd/ofx/invtransactions.go
View File

@ -178,12 +178,12 @@ func printInvTran(it *ofxgo.InvTran) {
fmt.Printf("%s", it.DtTrade)
}
func printInvBuy(defCurrency ofxgo.String, ib *ofxgo.InvBuy) {
func printInvBuy(defCurrency ofxgo.CurrSymbol, ib *ofxgo.InvBuy) {
printInvTran(&ib.InvTran)
currency := defCurrency
if ib.Currency != nil {
if ok, _ := ib.Currency.CurSym.Valid(); ok {
currency = ib.Currency.CurSym
} else if ib.OrigCurrency != nil {
} else if ok, _ := ib.OrigCurrency.CurSym.Valid(); ok {
currency = ib.Currency.CurSym
}
@ -191,15 +191,15 @@ func printInvBuy(defCurrency ofxgo.String, ib *ofxgo.InvBuy) {
// TODO print ticker instead of CUSIP
}
func printInvSell(defCurrency ofxgo.String, is *ofxgo.InvSell) {
func printInvSell(defCurrency ofxgo.CurrSymbol, is *ofxgo.InvSell) {
printInvTran(&is.InvTran)
currency := defCurrency
if is.Currency != nil {
if ok, _ := is.Currency.CurSym.Valid(); ok {
currency = is.Currency.CurSym
} else if is.OrigCurrency != nil {
} else if ok, _ := is.OrigCurrency.CurSym.Valid(); ok {
currency = is.Currency.CurSym
}
fmt.Printf(" %s (%s %s)@%s %s (Total: %s)\n", is.Units, is.SecID.UniqueIDType, is.SecID.UniqueID, is.UnitPrice, currency, is.Total)
fmt.Printf(" %s (%s %s)@%s %s (Total: %s)\n", is.Units, is.SecID.UniqueIDType, is.SecID.UniqueID, is.UnitPrice, currency.String(), is.Total)
// TODO print ticker instead of CUSIP
}