From 55b149827adafe0de4139026676ab5d01c538dfa Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Wed, 23 Apr 2014 07:43:35 +0000
Subject: [PATCH] VRFS-1576 report layout

---
 web/app/assets/javascripts/affiliate_report.js  | 17 +++++++++++++----
 .../views/clients/_affiliate_report.html.erb    |  9 +++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/web/app/assets/javascripts/affiliate_report.js b/web/app/assets/javascripts/affiliate_report.js
index d20d208ed..662611131 100644
--- a/web/app/assets/javascripts/affiliate_report.js
+++ b/web/app/assets/javascripts/affiliate_report.js
@@ -17,15 +17,24 @@
 
         function populateAffiliateReport(report) {
             console.log(report);
-            /*var template = context.JK.fillTemplate($('#template-account-affiliate').html(), {
-                email: userDetail.email
-            });*/
+            var by_date = '';
+            var ii=0, dates_len = report['by_date'].length;
+            for (var ii=0; ii < dates_len; ii += 1) {
+                var dd = report['by_date'][ii];
+                by_date += '<div style="float:left; margin-left:50px">'+dd[0]+'</div>';
+                by_date += '<div style="float:left; margin-left:20px;">'+dd[1].toString()+'</div>';
+                by_date += '<br />';
+            }
+            var template = context.JK.fillTemplate($('#template-account-affiliate').html(), {
+                total_count: report['total_count'],
+                by_date: by_date
+            });
+            $('#account-affiliate-content-scroller').html(template);
         }
 
         /****************** MAIN PORTION OF SCREEN *****************/
             // events for main screen
         function events() {
-            //$('#account-identity-content-scroller').on('click', '#account-edit-email-cancel', function(evt) { evt.stopPropagation(); navToAccount(); return false; } );
         }
 
         function renderAffiliateReport() {
diff --git a/web/app/views/clients/_affiliate_report.html.erb b/web/app/views/clients/_affiliate_report.html.erb
index 5386d9e31..46d04308a 100644
--- a/web/app/views/clients/_affiliate_report.html.erb
+++ b/web/app/views/clients/_affiliate_report.html.erb
@@ -15,7 +15,6 @@
   <!-- profile scrolling area -->
   <div class="content-body">
     <div id="account-affiliate-content-scroller" class="content-body-scroller">
-      AFFILIATE
     </div>
   </div>
   <!-- end content scrolling area -->
@@ -26,7 +25,13 @@
   <div class="content-wrapper account-affiliate">
     <br />
     <div class="account-left">
-      <h2>affiliate:</h2>
+      <div style='float:right; margin-right:20px;'><h2>Total Count:&nbsp;&nbsp;{total_count}</h2></div>
+      <br />
+      <div style="overflow:scroll; margin-left: 50px; margin-top: 20px">
+        <div style="float:left;">Registration Date</div><div style="float:left; margin-left:20px">Number of Users</div>
+      <br />
+      {by_date}
+      </div>
     </div>
     <br clear="all" />
   </div>