show heading for transaction view

closes gh-136
hrj · Feb 15, 2017 · fbcf267 · fbcf267
1 parent f87fdce
commit fbcf267
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/base/src/main/scala/co/uproot/abandon/Report.scala b/base/src/main/scala/co/uproot/abandon/Report.scala
@@ -7,7 +7,7 @@ import scala.xml.Elem
 case class BalanceReportEntry(accName: Option[AccountName], render: String)
 case class BalanceReport(leftEntries:Seq[BalanceReportEntry], rightEntries:Seq[BalanceReportEntry], totalLeft:String, totalRight:String)
 
-case class RegisterReportEntry(txns: Seq[DetailedPost], render: String)
+case class RegisterReportEntry(accountName: String, txns: Seq[DetailedPost], render: String)
 case class RegisterReportGroup(groupTitle: String, entries: Seq[RegisterReportEntry])
 
 case class LedgerExportEntry(accountName: AccountName, amount: BigDecimal)
@@ -163,14 +163,12 @@ object Reports {
           case (accountName, amount) =>
             val myPostings = txnGroup.flatMap(_.children).filter(_.name equals accountName)
             val render = "%-50s %20.2f %20.2f" format (accountName, sumDeltas(myPostings), amount)
-            (accountName, myPostings, render)
+            RegisterReportEntry(accountName.toString, myPostings, render)
         }
 
-        val sortedTotalDeltasPerAccount = totalDeltasPerAccount.toSeq.sortBy(_._1.toString)
+        val sortedTotalDeltasPerAccount = totalDeltasPerAccount.toSeq.sortBy(_.accountName)
 
-        reportGroups :+= RegisterReportGroup(
-          groupName,
-          sortedTotalDeltasPerAccount.map { case (accountName, postings, render) => RegisterReportEntry(postings, render) })
+        reportGroups :+= RegisterReportGroup(groupName, sortedTotalDeltasPerAccount)
     }
     reportGroups
   }
@@ -193,14 +191,12 @@ object Reports {
           case (accountName, amount) =>
             val myTxns = monthlyGroup.flatMap(_.children).filter(_.name equals accountName)
             val render = "%-50s %20.2f %20.2f" format (accountName, myTxns.foldLeft(Zero)(_ + _.delta), amount)
-            (accountName, myTxns, render)
+            RegisterReportEntry(accountName.toString, myTxns, render)
         }
 
-        val sortedTotalDeltasPerAccount = totalDeltasPerAccount.toSeq.sortBy(_._1.toString)
+        val sortedTotalDeltasPerAccount = totalDeltasPerAccount.toSeq.sortBy(_.accountName)
 
-        reportGroups :+= RegisterReportGroup(
-          formatGroupingDate(month),
-          sortedTotalDeltasPerAccount.map { case (accountName, txns, render) => RegisterReportEntry(txns, render) })
+        reportGroups :+= RegisterReportGroup(formatGroupingDate(month), sortedTotalDeltasPerAccount)
     }
     reportGroups
   }

diff --git a/gui/src/main/scala/co/uproot/abandon/RegReport.scala b/gui/src/main/scala/co/uproot/abandon/RegReport.scala
@@ -18,12 +18,12 @@ object RegUIReport extends UIReport {
   def mkRegisterReport(appState: AppState, reportSettings: RegisterReportSettings) = {
     val registers = Reports.registerReport(appState, reportSettings)
     val registerItems = registers.map { rg =>
-      new TreeItem(RegisterReportEntry(Nil, rg.groupTitle)) {
+      new TreeItem(RegisterReportEntry(null, Nil, rg.groupTitle)) {
         children = rg.entries.map(new TreeItem(_))
         expanded = true
       }
     }
-    val reportRoot = new TreeItem(RegisterReportEntry(Nil, "Register report (account, delta, total)")) {
+    val reportRoot = new TreeItem(RegisterReportEntry(null, Nil, "Register report (account, change during period, balance at end of period)")) {
       children = registerItems
       expanded = true
     }
@@ -33,7 +33,13 @@ object RegUIReport extends UIReport {
         if (e.character equals "\r") {
           val selectedItemOpt = selectionModel().getSelectedItems().headOption
           selectedItemOpt foreach { selectedItem =>
-            // println(e)
+            val heading =
+              if (selectedItem.getValue.accountName == null) {
+                selectedItem.getValue.render
+              } else {
+                selectedItem.getParent.getValue.render + " / " + selectedItem.getValue.accountName
+              }
+
             val txStage = new Stage() {
               scene = new Scene(800, 600) {
                 root = new ScrollPane {
@@ -42,7 +48,7 @@ object RegUIReport extends UIReport {
                 stylesheets += "default_theme.css"
               }
               initModality(Modality.ApplicationModal)
-              title = "Transactions"
+              title = "Transactions for " + heading
             }
             txStage.show
           }