From be00dc1de2de33e937ffae9827354c5c0bb650ad Mon Sep 17 00:00:00 2001
From: Sergey Yanovich <ynvich@gmail.com>
Date: Wed, 16 Jan 2008 05:20:15 +0200
Subject: [PATCH] [app] Display reporting currency (bug #130)

---
 app/chrome/content/chart.js    | 16 +++++++++++++++
 app/test/aaTestAccountViews.js | 45 ++++++++++++++++++++++++++----------------
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/app/chrome/content/chart.js b/app/chrome/content/chart.js
index aadf765..b42ec38 100644
--- a/app/chrome/content/chart.js
+++ b/app/chrome/content/chart.js
@@ -54,6 +54,7 @@ function loadURI(uri)
 }
 
 var gView = null;
+var gLoaded = false;
 
 function chartPageLoad()
 {
@@ -63,6 +64,11 @@ function chartPageLoad()
   gView = new aaView();
   if (quotes.length > 0) {
     gView.quote = quotes.queryElementAt(0, nsCI.aaIQuote);
+    document.getElementById("chart.date").dateValue =
+      new Date(gView.quote.time / 1000);
+    document.getElementById("chart.resource").value =
+      gView.quote.resource.tag;
+    notifyReady();
   } else {
     gView.quote = Components.classes["@aasii.org/base/quote;1"]
       .createInstance(nsCI.aaIQuote);
@@ -112,6 +118,16 @@ function updateResource()
 function setResource()
 {
   session().save(gView.quote, null);
+  notifyReady();
+}
+
+function notifyReady()
+{
+  gLoaded = true;
+  document.getElementById("canSet").setAttribute("disabled", "true");
+  document.getElementById("canSet").setAttribute("collapsed", "true");
+  document.getElementById("isSet").removeAttribute("disabled");
+  document.getElementById("isSet").removeAttribute("collapsed");
 }
 
 function aaView()
diff --git a/app/test/aaTestAccountViews.js b/app/test/aaTestAccountViews.js
index e882a04..b94de42 100644
--- a/app/test/aaTestAccountViews.js
+++ b/app/test/aaTestAccountViews.js
@@ -88,41 +88,43 @@ function ModuleInit()
       chart_resource_submit_check);
   this._tests[11].instance.item = 0;
   /* 12 */
+  this._repeat(9);
+  /* 13 */
   this._add(transfer_page_CID, transfer_page_contractID,
       transfer_page_name, transfer_page_test, transfer_page_check);
-  /* 13 */
+  /* 14 */
   this._add(transfer_from_CID, transfer_from_contractID, transfer_from_name,
       transfer_from_test, flow_select_check);
-  /* 14 */
+  /* 15 */
   this._add(transfer_from_discard_CID, transfer_from_discard_contractID,
       transfer_from_discard_name, flow_discard_test,
       transfer_from_discard_check);
-  this._tests[14].instance.item = 0;
-  /* 15 */
-  this._repeat(13);
+  this._tests[15].instance.item = 0;
   /* 16 */
+  this._repeat(14);
+  /* 17 */
   this._add(transfer_from_submit_CID, transfer_from_submit_contractID,
       transfer_from_submit_name, flow_submit_test, transfer_from_submit_check);
-  this._tests[16].instance.item = 5;
-  /* 17 */
+  this._tests[17].instance.item = 5;
+  /* 18 */
   this._add(transfer_to_CID, transfer_to_contractID, transfer_to_name,
       transfer_to_test, flow_select_check);
-  /* 18 */
+  /* 19 */
   this._add(transfer_to_discard_CID, transfer_to_discard_contractID,
       transfer_to_discard_name, flow_discard_test,
       transfer_to_discard_check);
-  this._tests[18].instance.item = 0;
-  /* 19 */
-  this._repeat(17);
+  this._tests[19].instance.item = 0;
   /* 20 */
+  this._repeat(18);
+  /* 21 */
   this._add(transfer_to_submit_CID, transfer_to_submit_contractID,
       transfer_to_submit_name, flow_submit_test, transfer_to_submit_check);
-  this._tests[20].instance.item = 9;
-  this._tests[20].instance.extra = flow_last_line_check;
-  /* 21 */
+  this._tests[21].instance.item = 9;
+  this._tests[21].instance.extra = flow_last_line_check;
+  /* 22 */
   this._add(transfer_save_CID, transfer_save_contractID,
       transfer_save_name, transfer_save_test);
-  /* 22 */
+  /* 23 */
   this._add(add_flow_when_selecting_CID, add_flow_when_selecting_contractID,
       add_flow_when_selecting_name, transfer_from_test,
       add_flow_when_selecting_check);
@@ -575,7 +577,9 @@ function chart_page_test(runner)
 function chart_sync_check(runner)
 {
   var result = true;
-  var quote = getFrame(runner).contentWindow.wrappedJSObject.gView.quote;
+  var wnd = getFrame(runner).contentWindow.wrappedJSObject;
+  var quote = wnd.gView.quote;
+  var loaded = wnd.gLoaded;
   if (! quote) {
     runner.addJSFailure(" no quote object");
     return false;
@@ -598,6 +602,11 @@ function chart_sync_check(runner)
     result = false;
   }
 
+  if ( loaded ^ getElement(runner, "chart.set").hasAttribute("collapsed")) {
+    runner.addJSFailure(" chart.set command out of sync");
+    result = false;
+  }
+
   return result;
 }
 
@@ -618,7 +627,7 @@ function chart_check(runner)
 
 function chart_page_check(runner)
 {
-  if (! chart_check)
+  if (! chart_check(runner))
     runner.addJSFailure("[chart page]");
 }
 
@@ -651,6 +660,8 @@ function chart_resource_submit_check(runner)
   if ( ! chart_sync_check(runner))
     runner.addJSFailure("[chart->date] out of sync");
   sendOnClick(getElement(runner, "chart.set"));
+  if ( ! chart_sync_check(runner))
+    runner.addJSFailure("[chart->date] out of sync");
 }
 
 /* Transfer Page Test */
-- 
2.11.4.GIT