Chart on pageviews changes (if less than 60 days show items for each day, otherwise it shows views for months instead)

warrenbuckley · warrenbuckley · commit d28257f36d2e · 2014-01-06T14:03:53.000Z
diff --git a/Analytics.Site/App_Data/Logs/UmbracoTraceLog.txt b/Analytics.Site/App_Data/Logs/UmbracoTraceLog.txt
diff --git a/Analytics.Site/App_Data/Umbraco.sdf b/Analytics.Site/App_Data/Umbraco.sdf
diff --git a/Analytics.Site/App_Plugins/Analytics/account.config b/Analytics.Site/App_Plugins/Analytics/account.config
@@ -1,6 +1 @@
-{
-  "Id": "4113171",
-  "Name": "www.nibble.be",
-  "Created": "2008-04-13T14:26:12+02:00",
-  "Updated": "2011-07-20T00:58:59.981+02:00"
-}
+﻿ 
diff --git a/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/PageViews.Controller.js b/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/PageViews.Controller.js
@@ -12,7 +12,7 @@
         
         $scope.$watch('dateFilter', function () {
             
-           
+            settingsResource.setDateFilter($scope.dateFilter.startDate, $scope.dateFilter.endDate);
             //Get Profile
             settingsResource.getprofile().then(function (response) {
                 $scope.profile = response.data;
diff --git a/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/resources/Settings.Resource.js b/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/resources/Settings.Resource.js
@@ -52,7 +52,8 @@ angular.module("umbraco.resources")
                 if (dateFilter.startDate == null) {
                     dateFilter.startDate = moment().subtract('days', 29).format('YYYY-MM-DD');
                     dateFilter.endDate = moment().format('YYYY-MM-DD');
-                    setDateFilter(dateFilter.startDate, dateFilter.endDate);
+                    $cookieStore.put("analyticsStartDate", dateFilter.startDate);
+                    $cookieStore.put("analyticsEndDate", dateFilter.endDate);
                 }
                 
                 return dateFilter;
diff --git a/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/resources/Stats.Resource.js b/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/resources/Stats.Resource.js
@@ -69,7 +69,7 @@ angular.module("umbraco.resources")
             },
 
             getvisitcharts: function (profileID, startDate, endDate) {
-                return $http.get("Analytics/AnalyticsApi/GetVisitsOverMonths", { params: { profile: profileID, startDate: startDate, endDate: endDate } });
+                return $http.get("Analytics/AnalyticsApi/GetVisitsOverTime", { params: { profile: profileID, startDate: startDate, endDate: endDate } });
             },
 
         };
diff --git a/Analytics.Site/App_Plugins/Analytics/profile.config b/Analytics.Site/App_Plugins/Analytics/profile.config
@@ -1,13 +1 @@
-{
-  "Id": "8245037",
-  "AccountId": "4113171",
-  "WebPropertyId": "UA-4113171-1",
-  "InternalWebPropertyId": "7923617",
-  "Name": "www.nibble.be",
-  "Currency": "USD",
-  "Timezone": "Europe/Brussels",
-  "WebsiteUrl": "www.nibble.be",
-  "Type": "WEB",
-  "Created": "2008-04-13T14:26:12+02:00",
-  "Updated": "2011-09-20T09:34:04.996+02:00"
-}
+﻿ 
diff --git a/Analytics.Site/App_Plugins/Analytics/settings.config b/Analytics.Site/App_Plugins/Analytics/settings.config
@@ -1,6 +1,6 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8" ?>
 <Analytics>
   <ClientId label="Client ID" description="This is the Client ID key from the Google API">206456221167-1a6npdlit92260gfaekomgon8cm0ratg</ClientId>
   <ClientSecret label="Client Secret" description="This is the Client Secret from the Google API">_LklwvmJC0EIkEprcRB4keQ_</ClientSecret>
-  <RefreshToken label="Refresh Token" description="The refresh token used to acquire new access tokens. This is sensitive information.">1/8T0O1zrI2lVG7exZzmvUMlhNQPbN7NL2Tp6ijimsCvo</RefreshToken>
+  <RefreshToken label="Refresh Token" description="The refresh token used to acquire new access tokens. This is sensitive information."></RefreshToken>
 </Analytics>
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/resources/Stats.Resource.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/resources/Stats.Resource.js
@@ -69,7 +69,7 @@ angular.module("umbraco.resources")
             },
 
             getvisitcharts: function (profileID, startDate, endDate) {
-                return $http.get("Analytics/AnalyticsApi/GetVisitsOverMonths", { params: { profile: profileID, startDate: startDate, endDate: endDate } });
+                return $http.get("Analytics/AnalyticsApi/GetVisitsOverTime", { params: { profile: profileID, startDate: startDate, endDate: endDate } });
             },
 
         };
diff --git a/Analytics/ChartHelper.cs b/Analytics/ChartHelper.cs
@@ -61,10 +61,21 @@ public static ChartData GetLineChartData(AnalyticsDataResponse apiResults)
             int dimensions  = apiResults.ColumnHeaders.Count(x => x.ColumnType == "DIMENSION");
             int metrics     = apiResults.ColumnHeaders.Count(x => x.ColumnType == "METRIC");
 
+            var chartLabels = new string[]{};
+
+            if (apiResults.ColumnHeaders.Count() == 5)
+            {
+                chartLabels = apiResults.Rows.Select(row => row.Cells[2] + "/" + row.Cells[1] + "/" + row.Cells[0]).ToArray();
+            }
+            else
+            {
+                chartLabels = apiResults.Rows.Select(row => row.Cells[1] + "/" + row.Cells[0]).ToArray();
+            }
+
             // Initialize the data object
             ChartData cd = new ChartData
             {
-                labels      = apiResults.Rows.Select(row => row.Cells[1] + "/" + row.Cells[0]).ToArray(),
+                labels      = chartLabels,
                 datasets    = new LineChartDataSet[metrics]
             };
 
diff --git a/Analytics/Controllers/AnalyticsApiController.cs b/Analytics/Controllers/AnalyticsApiController.cs
@@ -70,18 +70,31 @@ public AnalyticsProfile[] GetProfilesFromAccount(string accountId)
         /// <param name="startDate"></param>
         /// <param name="endDate"></param>
         /// <returns></returns>
-        public ChartData GetVisitsOverMonths(string profile, DateTime? startDate, DateTime? endDate)
+        public ChartData GetVisitsOverTime(string profile, DateTime? startDate, DateTime? endDate)
         {
             if (!startDate.HasValue)
                 startDate = DateTime.Now.Subtract(TimeSpan.FromDays(31));
             if (!endDate.HasValue)
                 endDate = DateTime.Now;
 
+            //Span of time
             TimeSpan span = endDate.Value - startDate.Value;
 
-            var dimensions = new[] {AnalyticsDimension.Year, AnalyticsDimension.Month};
-            //if (span.TotalDays < 90)
-            //    dimensions = new[] {AnalyticsDimension.Month,AnalyticsDimension.Day};
+            //Dimensions that changes based on time period
+            var dimensions = new string[]{};
+
+
+            //If less than 60 days show days
+            if (span.TotalDays < 60)
+            {
+                dimensions = new[] {AnalyticsDimension.Year, AnalyticsDimension.Month, AnalyticsDimension.Day};
+            }
+            else
+            {
+                dimensions = new[] { AnalyticsDimension.Year, AnalyticsDimension.Month };
+            }
+
+           
 
             // Get the visits from the Google Analytics API
             AnalyticsDataResponse data = GetGoogleService().Analytics.GetData(

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ angular.module("umbraco.resources")`
`52`	`52`	`if (dateFilter.startDate == null) {`
`53`	`53`	`dateFilter.startDate = moment().subtract('days', 29).format('YYYY-MM-DD');`
`54`	`54`	`dateFilter.endDate = moment().format('YYYY-MM-DD');`
`55`		`- setDateFilter(dateFilter.startDate, dateFilter.endDate);`
	`55`	`+ $cookieStore.put("analyticsStartDate", dateFilter.startDate);`
	`56`	`+ $cookieStore.put("analyticsEndDate", dateFilter.endDate);`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`return dateFilter;`