[Rt-commit] rt branch, 4.6/canned-reports, updated. rt-4.4.1-162-g00d21de

[Dustin Collins]

The branch, 4.6/canned-reports has been updated
       via  00d21de47feba129ab408135f2a267a79e7ff9e8 (commit)
       via  6b09db52208b30d3713ca0ddc9795fc7c0fac06d (commit)
      from  d20c5c91784ad08b9f31c80369d5e8af628b5370 (commit)

Summary of changes:
 share/html/CannedReport/Elements/Graph   |  4 ++--
 share/html/CannedReport/Elements/Menu    | 12 +++++++-----
 share/static/css/base/canned-reports.css |  5 +++++
 share/static/js/canned-reports.js        |  6 +++---
 4 files changed, 17 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 6b09db52208b30d3713ca0ddc9795fc7c0fac06d
Author: Dustin Collins <strega at bestpractical.com>
Date:   Tue Jan 3 01:18:06 2017 -0500

    Fix loading label synchronization issue

diff --git a/share/html/CannedReport/Elements/Menu b/share/html/CannedReport/Elements/Menu
index 203b5fe..b3a9a37 100644
--- a/share/html/CannedReport/Elements/Menu
+++ b/share/html/CannedReport/Elements/Menu
@@ -36,9 +36,11 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 
-<div class="reports-menu-loading">
-    <label>Loading...</label>
-</div>
-<div class="reports-menu">
-    <& MenuItems/ReportSelect, Name => "Time Worked"  &>
+<div class="reports-menu-container">
+    <div class="reports-menu-loading">
+        <label>Loading...</label>
+    </div>
+    <div class="reports-menu">
+        <& MenuItems/ReportSelect, Name => "Time Worked"  &>
+    </div>
 </div>
diff --git a/share/static/css/base/canned-reports.css b/share/static/css/base/canned-reports.css
index f809f6a..e370d09 100644
--- a/share/static/css/base/canned-reports.css
+++ b/share/static/css/base/canned-reports.css
@@ -1,4 +1,9 @@
 
+.reports-menu-container {
+    background-color: transparent;
+    height: 30px;
+}
+
 .reports-menu {
     background-color: transparent;
     height: 30px;
diff --git a/share/static/js/canned-reports.js b/share/static/js/canned-reports.js
index d306347..502939c 100644
--- a/share/static/js/canned-reports.js
+++ b/share/static/js/canned-reports.js
@@ -96,14 +96,14 @@ window.onclick = function(event) {
 var _graphUpdateTimer = {}
 function setGraphNeedsUpdate(key, value) {
     window.clearTimeout(_graphUpdateTimer)
-    _graphUpdateTimer = window.setTimeout(function() {updateGraph()}, 2000)
+    _graphUpdateTimer = window.setTimeout(function() {updateGraph()}, 10)
 }
 
 var graphIsUpdating = false
 function updateGraph() {
     if (!graphIsUpdating) {
         graphIsUpdating = true
-        window.setTimeout(graphBeganUpdating(), 10);
+        graphBeganUpdating()
         window.setTimeout(function() {
             getReportResults(_parameters, null, function (success, content) {
                 if (success) {
@@ -117,7 +117,7 @@ function updateGraph() {
                     graphFinishedUpdating()
                 }
             })
-        }, 100);
+        }, 10);
     }
 }
 

commit 00d21de47feba129ab408135f2a267a79e7ff9e8
Author: Dustin Collins <strega at bestpractical.com>
Date:   Tue Jan 3 01:18:26 2017 -0500

    Adjust transition curve

diff --git a/share/html/CannedReport/Elements/Graph b/share/html/CannedReport/Elements/Graph
index bc50044..8ba28d2 100644
--- a/share/html/CannedReport/Elements/Graph
+++ b/share/html/CannedReport/Elements/Graph
@@ -78,7 +78,7 @@ function updateGraphData(data, completion) {
         svg.select("g").selectAll(".bar").data(currentGraphData)
             .transition()
             .duration(200)
-            .ease(d3.easeLinear)
+            .ease(d3.easeQuadIn)
             .attr("y", height)
             .attr("height", 0)
     }
@@ -112,7 +112,7 @@ function loadGraph(data, completion) {
 
     g.selectAll(".bar").data(data).transition()
         .duration(300)
-        .ease(d3.easeLinear)
+        .ease(d3.easeQuadInOut)
         .attr("y", function(d) { return y(d.value); })
         .attr("height", function(d) { return height - y(d.value); })
 

-----------------------------------------------------------------------