Changeset 7777

Timestamp:

07/08/09 14:20:04 (13 months ago)

Author:

josowski

Message:

Changing variable names and adding functions to adjust to changes in the ALM API.

References #1348

Files:

• head/ambra/webapp/src/main/webapp/javascript/chart/articleViewsCumulative.js (modified) (4 diffs)

head/ambra/webapp/src/main/webapp/javascript/chart/articleViewsCumulative.js

@@ -17 +17 @@
   dojo.declare("ambra.reporting.articleViewsCumulative", ambra.reporting.base, {
     
-    create:function(data, objectID, lineColor)
+    create:function(articleData, objectID, pubDate, lineColor)
     {
       var avChart = new dojox.charting.Chart2D(objectID);
@@ -30 +30 @@
       var cumulative = 0;
       var series = [ { x: 0, y: 0 } ];
-      var data = articleData.viewshistory.data;
-      var pubDate = new Date(articleData.pubdate);
+      var data = articleData.article.citations;
       
       for(var a = 0; a < data.length; a++) 
@@ -47 +46 @@
             "<td class=\"primary\">" + data[a].cumulativeTotal + "</td><td>" + data[a].total + 
             "</td></tr></tfoot><tbody><tr><td class=\"text\">HTML</td>" + 
-            "<td class=\"primary\">" + data[a].cumulativeDOC + "</td><td>" + data[a].document + 
+            "<td class=\"primary\">" + data[a].cumulativeHTML + "</td><td>" + data[a].html_views + 
             "</td></tr><tr><td class=\"text\">PDF</td><td class=\"primary\">" + 
-            data[a].cumulativePDF + "</td><td>" + data[a].pdf + "</td></tr>" + 
+            data[a].cumulativePDF + "</td><td>" + data[a].pdf_views + "</td></tr>" + 
             "<tr><td class=\"text\">XML</td><td class=\"primary\">" + 
-            data[a].cumulativeXML + "</td><td>" + data[a].xml + "</td>" + 
+            data[a].cumulativeXML + "</td><td>" + data[a].xml_views + "</td>" + 
             "</tr></tbody></table></div>"
         };
@@ -96 +95 @@
       
       avChart.render();
-    }  
+    },
+
+    massageChartData:function(data)
+    {
+      //Do some final calculations on the results
+      data.totalPDF = 0;
+      data.totalXML = 0;
+      data.totalHtml = 0;
+      data.total = 0;
+
+      for(var a = 0; a < data.length; a++) {
+        var totalViews = data[a].html_views + data[a].xml_views + data[a].pdf_views;
+        //Total views for the current period
+        data[a].total = totalViews;
+
+        //Total views so far
+        data[a].cumulativeTotal = data.total + totalViews;
+        data[a].cumulativePDF = data.totalPDF + data[a].pdf_views;
+        data[a].cumulativeXML = data.totalXML + data[a].xml_views;
+        data[a].cumulativeHTML = data.totalHtml + data[a].html_views;
+
+        //The grand totals
+        data.totalPDF += data[a].pdf_views;
+        data.totalXML += data[a].xml_views;
+        data.totalHtml += data[a].html_views;
+        data.total += totalViews;
+      }
+
+      return data;
+    }
   });
 })();