From cb6d6090f3347c2c548d8a29d91f62c27f4a83cb Mon Sep 17 00:00:00 2001
From: Simon Redfern <simon@tesobe.com>
Date: Mon, 20 Jul 2015 04:20:54 +0200
Subject: [PATCH] Add Account Title to the views list.html so we can see which
 account we're working on

---
 .../scala/code/snippet/ViewsOverview.scala    | 20 ++++++++++++++++++-
 .../banks/star/accounts/star/views/list.html  |  3 +++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/code/snippet/ViewsOverview.scala b/src/main/scala/code/snippet/ViewsOverview.scala
index f3d9f52c..0a8fcc73 100644
--- a/src/main/scala/code/snippet/ViewsOverview.scala
+++ b/src/main/scala/code/snippet/ViewsOverview.scala
@@ -1,5 +1,6 @@
 package code.snippet
 
+import code.util.Helper._
 import net.liftweb.http.js.JE.{Call, Str}
 import net.liftweb.http.js.JsCmd
 import net.liftweb.util.Helpers._
@@ -10,7 +11,7 @@ import net.liftweb.http.{S, SHtml}
 import net.liftweb.json.JsonAST.JValue
 import net.liftweb.json._
 import net.liftweb.http.js.JsCmds.{SetHtml, Alert, RedirectTo}
-import net.liftweb.common.{Loggable, Box}
+import net.liftweb.common.{Full, Loggable, Box}
 import code.lib.ObpAPI
 import net.liftweb.http.SHtml.{text,ajaxSubmit, ajaxButton}
 import ObpAPI.{addView, deleteView, updateAccountLabel, getAccount}
@@ -35,6 +36,21 @@ class ViewsOverview(viewsDataJson: ViewsDataJSON) extends Loggable {
   val bank = viewsDataJson.bankId
   val account = viewsDataJson.accountId
 
+
+  // Get the Account Title
+  // TODO put this into code.util.Helper
+  def getAccountTitleFromAccount : String = {
+    val accountJsonBox = getAccount(bank, account, "owner")
+
+    val accountTitle = accountJsonBox match {
+      case Full(accountJson) => getAccountTitle(accountJson)
+      case _ => "Unknown Account"
+    }
+    accountTitle
+  }
+
+  def setAccountTitle = ".account_title *" #> getAccountTitleFromAccount
+
   def getTableContent(xhtml: NodeSeq) :NodeSeq = {
 
     //add ajax callback to save view
@@ -217,6 +233,8 @@ class ViewsOverview(viewsDataJson: ViewsDataJSON) extends Loggable {
       if (result.isDefined) {
         val msg = "Label " + newLabel + " has been set"
         Call("socialFinanceNotifications.notify", msg).cmd
+        // So we can see the new account title which may use the updated label
+        RedirectTo("")
       } else {
          val msg = "Sorry, Label" + newLabel + " could not be set ("+ result +")"
          Call("socialFinanceNotifications.notifyError", msg).cmd
diff --git a/src/main/webapp/banks/star/accounts/star/views/list.html b/src/main/webapp/banks/star/accounts/star/views/list.html
index acae9d11..9136e2be 100644
--- a/src/main/webapp/banks/star/accounts/star/views/list.html
+++ b/src/main/webapp/banks/star/accounts/star/views/list.html
@@ -38,6 +38,9 @@ See views.js for the javascript which manipulates the DOM for editing
 -->
 
 <div class="lift:surround?with=default;at=content">
+  <div class="lift:ViewsOverview.setAccountTitle" id="account_details">
+    <span id="accountShortDescription" class="account_title">Account Title</span>
+  </div>
   <div class="views">
     <div class="action-bar">
       <button id="view-add">Add new view</button>