[GNUnet-SVN] [taler-merchant-frontends] branch master updated: Half-baking popup closure by JS.

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant-frontends.

The following commit(s) were added to refs/heads/master by this push:
     new ea2e6db  Half-baking popup closure by JS.
ea2e6db is described below

commit ea2e6db15fe77b48cd434e3778ca50e486ab3cdf
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Mar 13 22:19:58 2017 +0100

    Half-baking popup closure by JS.
---
 talerfrontends/blog/static/backoffice.js      | 45 +++++++++++++++++++--------
 talerfrontends/blog/static/web-common         |  2 +-
 talerfrontends/blog/templates/backoffice.html |  2 +-
 talerfrontends/donations/static/web-common    |  2 +-
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/talerfrontends/blog/static/backoffice.js 
b/talerfrontends/blog/static/backoffice.js
index e52e650..83372c3 100644
--- a/talerfrontends/blog/static/backoffice.js
+++ b/talerfrontends/blog/static/backoffice.js
@@ -37,6 +37,20 @@ function amount_to_string(amount){
   return `${number.toFixed(2)} ${amount.currency}`;
 }
 
+function close_popup(){
+
+  var ctx = document.getElementsByClassName("track-content")[0];
+  var tbody = xpath_get("table/tbody", ctx).snapshotItem(0);
+  var tbody_children = xpath_get("table/tbody/tr", ctx);
+
+  for(var i=1; i<tbody_children.snapshotLength; i++){
+    tbody.removeChild(tbody_children.snapshotItem(i));
+  }
+
+  var overlay = document.getElementsByClassName("overlay")[0];
+
+}
+
 function amount_sum(a1, a2){
   if(a1.currency != a2.currency)
     throw "Currency mismatch, terminating.";
@@ -76,9 +90,18 @@ function parse_date(date){
   return `${d.getUTCDate()} ${months[d.getUTCMonth()]} ${d.getUTCFullYear()}, 
${hours}:${minutes}`;
 }
 
-function toggle_visible(overlay){
-  overlay.style.visibility = "visible";
-  overlay.style.opacity = 1;
+function toggle_overlay(){
+  var overlay = document.getElementsByClassName("overlay")[0];
+  if(overlay.style.visibility == "visible"){
+    overlay.style.visibility = "hidden";
+    overlay.style.opacity = 0;
+  }
+  else
+  {
+    overlay.style.visibility = "visible";
+    overlay.style.opacity = 1;
+  }
+
 }
 
 function track_transfer(exchange, wtid){
@@ -90,17 +113,13 @@ function track_transfer(exchange, wtid){
     if(4 == req.readyState){
       if(200 == req.status){
         var tracks = JSON.parse(req.responseText);
-        console.log("Transfer tracks", req.responseText);
         var table = document.getElementById("history");
         var tbody = xpath_get("tbody", table).snapshotItem(0);
-        console.log("tbody", tbody);
         var tbody_children = xpath_get("tbody/*[position() > 1]", table);
-        console.log("get children", tbody_children);
-        console.log("children lenght", tbody_children.snapshotLength);
         for(var i=0; i<tbody_children.snapshotLength; i++){
-          console.log("remove child:", tbody_children.snapshotItem(i));
           tbody.removeChild(tbody_children.snapshotItem(i));
         }
+        fill_table(tracks.deposits_sums, tracks.execution_time);
         // TBD.
       }
     // TBD.
@@ -143,7 +162,7 @@ function track_order(order_id, instance){
                            <td 
class="date">${parse_date(entry.execution_time)}</td>`;
 
           table.appendChild(row);
-          toggle_visible(overlay);
+          toggle_overlay();
         }
       }
       if (202 == req.status){
@@ -151,7 +170,7 @@ function track_order(order_id, instance){
         var overlay = document.getElementsByClassName("overlay")[0];
         var track_content = 
document.getElementsByClassName("track-content")[0];
         track_content.innerHTML = "This order is still waiting to be paid 
back.";
-        toggle_visible(overlay);
+        toggle_overlay();
       } 
     }
 
@@ -172,7 +191,7 @@ function xpath_get(xpath, ctx){
 /**
  * Append results to the table showing results.
  */
-function fill_table(history){
+function fill_table(history, execution_time){
   var table = document.getElementById("history");
   var tbody = xpath_get("tbody", table).snapshotItem(0);
   for (var i=0; i<history.length; i++){
@@ -192,8 +211,8 @@ function fill_table(history){
     td_date.className = "date";
     td_order_id.innerHTML = `<a href="#${i}" 
onclick='track_order("${entry.order_id}", "FSF");'>${entry.order_id}</a>`;
     td_summary.innerHTML = "TBD";
-    td_amount.innerHTML = amount_to_string(entry.amount);
-    td_date.innerHTML = parse_date(entry.timestamp);
+    td_amount.innerHTML = amount_to_string(entry.amount || 
entry.deposit_value);
+    td_date.innerHTML = parse_date(entry.timestamp || execution_time);
     row.appendChild(td_order_id);
     row.appendChild(td_summary);
     row.appendChild(td_amount);
diff --git a/talerfrontends/blog/static/web-common 
b/talerfrontends/blog/static/web-common
index 0be9ac9..aae7c0a 160000
--- a/talerfrontends/blog/static/web-common
+++ b/talerfrontends/blog/static/web-common
@@ -1 +1 @@
-Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598
+Subproject commit aae7c0a87a9ff1640c3cd72dd4df0ac590f8b0e4
diff --git a/talerfrontends/blog/templates/backoffice.html 
b/talerfrontends/blog/templates/backoffice.html
index 649c2ba..0fd2532 100644
--- a/talerfrontends/blog/templates/backoffice.html
+++ b/talerfrontends/blog/templates/backoffice.html
@@ -17,7 +17,7 @@
   <div id="popup1" class="overlay">
     <div class="popup">
       <h2>
-        <a class="close" href="/backoffice">&times;</a>
+        <a class="close" href="#" onclick="close_popup();">&times;</a>
       </h2>
       <div class="track-content">
         <table>
diff --git a/talerfrontends/donations/static/web-common 
b/talerfrontends/donations/static/web-common
index 0be9ac9..aae7c0a 160000
--- a/talerfrontends/donations/static/web-common
+++ b/talerfrontends/donations/static/web-common
@@ -1 +1 @@
-Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598
+Subproject commit aae7c0a87a9ff1640c3cd72dd4df0ac590f8b0e4

-- 
To stop receiving notification emails like this one, please contact
address@hidden