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 1/3] 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:

From ad74b30fdeda8f838a505896ef34a5a1b581bc38 Mon Sep 17 00:00:00 2001
From: Artem Martynovich <artem.martynovich@gmail.com>
Date: Fri, 17 Jan 2020 14:33:49 +0600
Subject: [PATCH 2/3] Hook up progress bars to real values. Move max weekly RA
 to settings, use it in template; limit actions_resolved_since_monday to this
 value.

---
 backend/backend/settings/base.py               |  2 ++
 .../device_registry/templates/admin_base.html  | 18 +++++-------------
 backend/device_registry/templatetags/misc.py   |  7 +++++++
 backend/profile_page/models.py                 |  4 ++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/backend/backend/settings/base.py b/backend/backend/settings/base.py
index d6aa7381c..f9714101b 100644
--- a/backend/backend/settings/base.py
+++ b/backend/backend/settings/base.py
@@ -287,3 +287,5 @@ def check_ip_range(ipr):
 GITHUB_APP_CLIENT_ID = os.getenv('GITHUB_APP_CLIENT_ID')  # Github app Client ID
 GITHUB_APP_CLIENT_SECRET = os.getenv('GITHUB_APP_CLIENT_SECRET')    # Github App Client Secret
 GITHUB_APP_REDIRECT_URL = os.getenv('GITHUB_APP_REDIRECT_URL')    # Github App Redirect URL
+
+MAX_WEEKLY_RA = 5
diff --git a/backend/device_registry/templates/admin_base.html b/backend/device_registry/templates/admin_base.html
index 013a5eac8..1861045d7 100644
--- a/backend/device_registry/templates/admin_base.html
+++ b/backend/device_registry/templates/admin_base.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load static %}
 {% load highlight_selector %}
+{% load misc %}
 
 {% block css %}
 {% endblock %}
@@ -101,14 +102,14 @@ <h2>Status Overview</h2>
         <div class="sidebar-bottom-box">
           <div class="sidebar-bottom-item">
             <p>Current Trust Score</p>
-            <p id="trust-score">{% widthratio user.profile.average_trust_score 1 100 %} </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">{{ user.profile.actions_resolved_since_monday }}/5</p>
+            <p id="action-solved">{{ user.profile.actions_resolved_since_monday }}/{% settings_value "MAX_WEEKLY_RA" %}</p>
           </div>
           <div id="action-solved-graph">
             <span id="action-solved-var"></span>
@@ -156,21 +157,12 @@ <h2>Status Overview</h2>
 
 {% block scripts %}
   {{ block.super }}
-  <!-- Hardcoded style for graphic -->
-  <style>
-    #action-solved-var {
-      width: 58%;
-    }
-
-    #trust-graph-var {
-      width: 75%;
-    }
-
-  </style>
   <script src="{% static '/js/csrf.js' %}"></script>
   <script type="text/javascript">
       $(() => {
           feather.replace();
+          $('#action-solved-var').width("{% widthratio user.profile.actions_resolved_since_monday 5 100 %}%");
+          $('#trust-graph-var').width("{% widthratio user.profile.average_trust_score 1 100 %}%");
       });
     {% if MIXPANEL_TOKEN %}
       $('.sidebar-link').click((e) => {
diff --git a/backend/device_registry/templatetags/misc.py b/backend/device_registry/templatetags/misc.py
index 7ccbd9d5b..55b7af2bd 100644
--- a/backend/device_registry/templatetags/misc.py
+++ b/backend/device_registry/templatetags/misc.py
@@ -1,9 +1,16 @@
 from django import template
+from django.conf import settings
 from django.utils import timezone
 
+ALLOWED_SETTINGS = ['MAX_WEEKLY_RA']
 register = template.Library()
 
 
 @register.filter(name='fromunix')
 def fromunix(value):
     return timezone.datetime.fromtimestamp(value, timezone.get_default_timezone())
+
+
+@register.simple_tag
+def settings_value(name):
+    return getattr(settings, name, '') if name in ALLOWED_SETTINGS else ''
diff --git a/backend/profile_page/models.py b/backend/profile_page/models.py
index e4c3e9808..6083194cb 100644
--- a/backend/profile_page/models.py
+++ b/backend/profile_page/models.py
@@ -57,8 +57,8 @@ def actions_count(self):
     @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()
+        return min(RecommendedAction.objects.filter(device__owner=self.user, resolved_at__gte=monday)\
+            .values('action_id').distinct().count(), settings.MAX_WEEKLY_RA)
 
     @property
     def github_repos(self):

From d3c8684f4615b17c6bd324f0d9714b7a5619ac36 Mon Sep 17 00:00:00 2001
From: Artem Martynovich <artem.martynovich@gmail.com>
Date: Fri, 17 Jan 2020 15:19:12 +0600
Subject: [PATCH 3/3] Add comments to weekly RA logic.

---
 backend/backend/settings/base.py | 2 +-
 backend/profile_page/models.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/backend/settings/base.py b/backend/backend/settings/base.py
index f9714101b..939263f53 100644
--- a/backend/backend/settings/base.py
+++ b/backend/backend/settings/base.py
@@ -288,4 +288,4 @@ def check_ip_range(ipr):
 GITHUB_APP_CLIENT_SECRET = os.getenv('GITHUB_APP_CLIENT_SECRET')    # Github App Client Secret
 GITHUB_APP_REDIRECT_URL = os.getenv('GITHUB_APP_REDIRECT_URL')    # Github App Redirect URL
 
-MAX_WEEKLY_RA = 5
+MAX_WEEKLY_RA = 5  # The number of RAs for the user to resolve in a week (starting this Monday)
diff --git a/backend/profile_page/models.py b/backend/profile_page/models.py
index 6083194cb..46c2ae8e9 100644
--- a/backend/profile_page/models.py
+++ b/backend/profile_page/models.py
@@ -56,7 +56,7 @@ def actions_count(self):
 
     @property
     def actions_resolved_since_monday(self):
-        monday = (timezone.now() - relativedelta(weekday=MO(-1))).date()
+        monday = (timezone.now() - relativedelta(weekday=MO(-1))).date()  # Find this week's monday
         return min(RecommendedAction.objects.filter(device__owner=self.user, resolved_at__gte=monday)\
             .values('action_id').distinct().count(), settings.MAX_WEEKLY_RA)