From: Louis Jeckel <louis.jeckel@outlook.cm>
Date: Fri, 11 Sep 2020 16:42:05 +0000 (+0200)
Subject: metrics
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=655893d9e79b3928041b88ebc09d65b55bea8e2e;p=psq.git

metrics
---

diff --git a/app/Nova/Metrics/FileAccess.php b/app/Nova/Metrics/FileAccess.php
index 06e9a73..9a8c5ca 100644
--- a/app/Nova/Metrics/FileAccess.php
+++ b/app/Nova/Metrics/FileAccess.php
@@ -30,9 +30,9 @@ class FileAccess extends Value
     public function ranges()
     {
         return [
-            30 => '30 jours',
             'TODAY' => 'Today',
             7 => '7 jours',
+            30 => '30 jours',
             60 => '60 jours',
             365 => '365 jours',
             'MTD' => 'Month To Date',
diff --git a/app/Nova/Metrics/RegistrationCompletePartition.php b/app/Nova/Metrics/RegistrationCompletePartition.php
index ca0499a..a2337db 100644
--- a/app/Nova/Metrics/RegistrationCompletePartition.php
+++ b/app/Nova/Metrics/RegistrationCompletePartition.php
@@ -20,8 +20,8 @@ class RegistrationCompletePartition extends Partition
     public function calculate(NovaRequest $request)
     {
         return $this->result([
-            'Compte activé' => User::registrationComplete()->count(),
-            'Compte non activé' => User::registrationIncomplete()->count(),
+            'Compte activé' => User::registeredUser()->registrationComplete()->count(),
+            'Compte non activé' => User::registeredUser()->registrationIncomplete()->count(),
         ]);
     }
 
@@ -44,5 +44,5 @@ class RegistrationCompletePartition extends Partition
     {
         return 'registration-complete';
     }
-    
+
 }
diff --git a/app/Nova/Metrics/TotalUsers.php b/app/Nova/Metrics/TotalUsers.php
index 6ba37f9..6a70a84 100644
--- a/app/Nova/Metrics/TotalUsers.php
+++ b/app/Nova/Metrics/TotalUsers.php
@@ -18,7 +18,7 @@ class TotalUsers extends Value
      */
     public function calculate(NovaRequest $request)
     {
-        return $this->result(User::count());
+        return $this->result(User::registeredUser()->count());
     }
 
 
diff --git a/app/Nova/Metrics/UsersPartition.php b/app/Nova/Metrics/UsersPartition.php
index ee9bd9c..0e271ef 100644
--- a/app/Nova/Metrics/UsersPartition.php
+++ b/app/Nova/Metrics/UsersPartition.php
@@ -23,7 +23,8 @@ class UsersPartition extends Partition
             'Abonnés (groupe)' => $g = User::hasOrgSubscription()->count(),
             'Abonnés (indiv)' => $i = User::hasIndSubscription()->count(),
             "Période d'essai" => $t = User::isOnTrial()->count(),
-            "Reste" => User::count() - $i - $g - $t
+            "Découverte" => $d = User::isOnDiscovery()->count(),
+            "Reste" => User::count() - $i - $g - $t -$d
         ]);
     }
 
diff --git a/app/User.php b/app/User.php
index e35109e..0b7ef00 100644
--- a/app/User.php
+++ b/app/User.php
@@ -260,7 +260,7 @@ class User extends Authenticatable implements MustVerifyEmail
     /**
      * @return bool
      */
-    public function isOnDiscovery(): bool
+    public function isOnDiscoverUser(): bool
     {
         return $this->discover_ends_at !== null &&
             $this->discover_ends_at->isFuture();
@@ -437,7 +437,7 @@ class User extends Authenticatable implements MustVerifyEmail
                 break;
 
             case self::TYPE_DISCOVER:
-                if($this->isOnDiscovery()) {
+                if($this->isOnDiscoverUser()) {
                     $id = 'discover';
                 } else if ($this->discover_ends_at === null){
                     $id = 'inactive';