[Fix] #19841 : stats to zero

Author: richard.bunel@opendigitaleducation.com

src/main/resources/public/ts/controller.ts

@@ -182,9 +182,7 @@ export const statsController = ng.controller('StatsController', ['$scope', '$roo
 			chartGranularity: "month",
 			chartDatasets: function(){ return $scope.profileDataSets() },
 			getValue: function(container){
-				var default_granularity = this.type + "_MONTH"
-				var lastAggreg = container.getLastAggregation()
-				return (typeof lastAggreg === "object" && !isNaN(lastAggreg[default_granularity])) ? lastAggreg[default_granularity] : 0
+				return container.uniqueVisitorOfTheMonth
 			},
 			getChartData: function(container){
 				var aggregationFunction
@@ -221,10 +219,8 @@ export const statsController = ng.controller('StatsController', ['$scope', '$roo
 			getValue: function(container){
 				var refDate = new Date()
 				$scope.toMidnight(refDate).setDate(1)
-				var lastAggreg = container.getLastAggregation()
-
 				var connections = container.getAggregatedSum("LOGIN", refDate)
-				var uniqueVisitors = (typeof lastAggreg === "object" && !isNaN(lastAggreg["UNIQUE_VISITORS_MONTH"])) ? lastAggreg["UNIQUE_VISITORS_MONTH"] : 0
+				var uniqueVisitors = container.uniqueVisitorOfTheMonth
 				return uniqueVisitors > 0 ? Math.round((connections / uniqueVisitors) * 100)/100 : 0
 			},
 			getChartData: function(container){

src/main/resources/public/ts/model.ts

@@ -19,10 +19,12 @@ export const statistics = {
         this.name = data.name
         this.groups = data.groups ? data.groups : {}
         this.data = []
+        this.uniqueVisitorOfTheMonth = 0
         this.get()
-        this.getProfiles()
+        /*this.getProfiles()
         this.getModules()
         this.getModulesByProfile()
+        this.getChartData("UNIQUE_VISITORS_MONTH",statistics.scope.monthlySumFunction,statistics.scope.date)*/
     },
     scope: {} as any
 }
@@ -73,6 +75,7 @@ statistics.IndicatorContainer.prototype = {
                 stats.data[prop] = data[prop]
             }
             if(statistics.scope) statistics.scope.$apply()
+            stats.getProfiles()
         })
     },
     //AJAX get - retrieves values by profile
@@ -87,6 +90,7 @@ statistics.IndicatorContainer.prototype = {
         return http().get(this.API_PATH + 'list' + getquery).done(function(data){
             stats.data.profil = data
             if(statistics.scope) statistics.scope.$apply()
+            stats.getModules()
         })
     },
     //AJAX get - retrieves values by module
@@ -101,6 +105,7 @@ statistics.IndicatorContainer.prototype = {
         return http().get(this.API_PATH + 'list' + getquery).done(function(data){
             stats.data.module = data
             if(statistics.scope) statistics.scope.$apply()
+            stats.getModulesByProfile()
         })
     },
     //AJAX GET - retrieves values by profile by module
@@ -115,6 +120,7 @@ statistics.IndicatorContainer.prototype = {
         return http().get(this.API_PATH + 'list' + getquery).done(function(data){
             stats.data.moduleByProfile = data
             if(statistics.scope) statistics.scope.$apply()
+            stats.getChartData("UNIQUE_VISITORS_MONTH",statistics.scope.lastDayOfMonthAggregationFunction,statistics.scope.date)
         })
     },
     //Returns the last value (date wise)
@@ -276,6 +282,8 @@ statistics.IndicatorContainer.prototype = {
             refDate = refDate.add(1, 'd')
         }
 
+        this.uniqueVisitorOfTheMonth = chartData[chartData.length-1][0];
+
         return chartData
     }
 }