From 5d621fb4b75c0c3f0a063682b101dc4cf27c77bb Mon Sep 17 00:00:00 2001
From: Artem Martynovich <artem.martynovich@gmail.com>
Date: Thu, 16 Jan 2020 19:37:22 +0600
Subject: [PATCH] Data for Current Trust Score and Action Solved elements on
 every page.

---
 backend/device_registry/templates/admin_base.html | 10 +++++-----
 backend/profile_page/models.py                    |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/backend/device_registry/templates/admin_base.html b/backend/device_registry/templates/admin_base.html
index 6478e0b83..013a5eac8 100644
--- a/backend/device_registry/templates/admin_base.html
+++ b/backend/device_registry/templates/admin_base.html
@@ -101,14 +101,14 @@ <h2>Status Overview</h2>
         <div class="sidebar-bottom-box">
           <div class="sidebar-bottom-item">
             <p>Current Trust Score</p>
-            <p id="trust-score">75%</p>
+            <p id="trust-score">{% widthratio user.profile.average_trust_score 1 100 %} </p>
           </div>
           <div id="trust-graph-100">
             <span id="trust-graph-var"></span>
           </div>
           <div id="action-solved-block" class="sidebar-bottom-item">
             <p>Actions Solved</p>
-            <p id="action-solved">29/50</p>
+            <p id="action-solved">{{ user.profile.actions_resolved_since_monday }}/5</p>
           </div>
           <div id="action-solved-graph">
             <span id="action-solved-var"></span>
@@ -151,7 +151,7 @@ <h2>Status Overview</h2>
       </main>
     </div>
   </div>
-  
+
 {% endblock %}
 
 {% block scripts %}
@@ -165,7 +165,7 @@ <h2>Status Overview</h2>
     #trust-graph-var {
       width: 75%;
     }
-    
+
   </style>
   <script src="{% static '/js/csrf.js' %}"></script>
   <script type="text/javascript">
@@ -192,7 +192,7 @@ <h2>Status Overview</h2>
           "$email": "{{ user.email }}",
           "$phone": "{{ user.profile.phone }}"
       });
-      
+
     {% endif %}
   </script>
 {% endblock %}
diff --git a/backend/profile_page/models.py b/backend/profile_page/models.py
index d43912670..e4c3e9808 100644
--- a/backend/profile_page/models.py
+++ b/backend/profile_page/models.py
@@ -9,6 +9,7 @@
 from django.dispatch import receiver
 from django.utils import timezone
 
+from dateutil.relativedelta import relativedelta, MO
 from mixpanel import Mixpanel, MixpanelException
 from phonenumber_field.modelfields import PhoneNumberField
 
@@ -53,6 +54,12 @@ def actions_count(self):
             Q(device__owner=self.user) & RecommendedAction.get_affected_query()) \
             .values('action_id').distinct().count()
 
+    @property
+    def actions_resolved_since_monday(self):
+        monday = (timezone.now() - relativedelta(weekday=MO(-1))).date()
+        return RecommendedAction.objects.filter(device__owner=self.user, resolved_at__gte=monday)\
+            .values('action_id').distinct().count()
+
     @property
     def github_repos(self):
         try: