Minor Hygiene

virtualcommons · Mar 30, 2015 · 222b9a5 · 222b9a5
1 parent 674021f
commit 222b9a5
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 16 deletions.
diff --git a/vcweb/core/models.py b/vcweb/core/models.py
@@ -3325,13 +3325,7 @@ def update_daily_experiments(sender, timestamp=None, start=None, **kwargs):
 
 
 def get_audit_data():
-    """
-    1) perform permissions checks on participants & experimenters
-    2) generate weekly activity log email with aggregate stats on participant signups,
-       experiment status changes (run or archived), invitations sent
-    """
     # FIXME add information regarding experiment status changes
-
     invalid_permission_participants = Participant.objects.select_related('user').active().exclude(
         user__groups__name=PermissionGroup.participant.value)
     invalid_permission_experimenters = Experimenter.objects.select_related('user').filter(user__is_active=True).exclude(
@@ -3359,22 +3353,27 @@ def get_audit_data():
 
 @receiver(signals.system_weekly_tick, dispatch_uid='schedule-weekly-tasks')
 def weekly_schedule_tasks(sender, start=None, **kwargs):
-
+    """
+    1) perform permissions checks on participants & experimenters
+    2) generate weekly activity log email with aggregate stats on participant signups,
+       experiment status changes (run or archived), invitations sent
+    """
     email = create_markdown_email(template="email/weekly-audit-email.txt", context=get_audit_data(),
                                   subject="VCWEB Audit", to_email=[settings.DEFAULT_EMAIL])
     email.send()
 
 
 @receiver(signals.system_monthly_tick, dispatch_uid='schedule-monthly-tasks')
 def validate_student_class_status(sender, start=None, **kwargs):
+    # FIXME: Need to verify that ASU web directory can handle this many requests in short span
     participants = Participant.objects.select_related('user').all()
     invalid_participants = []
     for participant in participants:
         if participant.email != participant.username:
-            print participant.username
             directory_profile = ASUWebDirectoryProfile(participant.username)
             if not directory_profile.is_undergraduate:
                 invalid_participants.append(participant)
 
     email = create_markdown_email(template="email/monthly-audit-email.txt", context={'participants': invalid_participants},
                                   subject="VCWEB Monthly Audit", to_email=[settings.DEFAULT_EMAIL])
+    email.send()
diff --git a/vcweb/core/templates/accounts/audit_report.html b/vcweb/core/templates/accounts/audit_report.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}
 
 {% block page %}
-<h2> Audit report of past seven days: {{from_date}} - {{to_date}}</h2><br/>
+<h2> Audit report for past seven days: {{from_date}} - {{to_date}}</h2><br/>
 <div class="row">
-    <div class="col-md-2">
-       <div class="panel panel-primary">
+    <div class="col-md-3">
+       <div class="panel panel-success">
           <div class="panel-heading">
             <h3 class="panel-title text-center" id="panel-title">Signups</h3>
           </div>
@@ -13,8 +13,8 @@ <h1 class="text-center">{{signups}}</h1>
           </div>
         </div> 
     </div> 
-    <div class="col-md-2">
-       <div class="panel panel-primary">
+    <div class="col-md-3">
+       <div class="panel panel-success">
           <div class="panel-heading">
             <h3 class="panel-title text-center" id="panel-title">Invitations Sent</h3>
           </div>
@@ -23,10 +23,30 @@ <h1 class="text-center">{{invites}}</h1>
           </div>
         </div> 
     </div>
+    <div class="col-md-3">
+       <div class="panel panel-success">
+          <div class="panel-heading">
+              <h3 class="panel-title text-center" id="panel-title">Experiments Archived</h3>
+          </div>
+          <div class="panel-body">
+            <h1 class="text-center">N/A</h1>
+          </div>
+        </div> 
+    </div>
+    <div class="col-md-3">
+       <div class="panel panel-success">
+          <div class="panel-heading">
+            <h3 class="panel-title text-center" id="panel-title">Experiments Run</h3>
+          </div>
+          <div class="panel-body">
+            <h1 class="text-center">N/A</h1>
+          </div>
+        </div> 
+    </div>
 </div>
 <div class="row">
     <div class="col-md-12">
-        <div class="panel panel-primary">
+        <div class="panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title" id="panel-title">Invalid Users</h3>
             </div>
@@ -49,7 +69,7 @@ <h3 class="panel-title" id="panel-title">Invalid Users</h3>
 </div>
 <div class="row"> 
     <div class="col-md-12">
-        <div class="panel panel-primary">
+        <div class="panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title" id="panel-title">Participants with improper permissions</h3>
             </div>
@@ -72,7 +92,7 @@ <h3 class="panel-title" id="panel-title">Participants with improper permissions<
 </div>
 <div class="row">
     <div class="col-md-12">
-        <div class="panel panel-primary">
+        <div class="panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title" id="panel-title">Experimenters with improper permissions</h3>
             </div>

diff --git a/vcweb/core/templates/base.html b/vcweb/core/templates/base.html
@@ -12,6 +12,7 @@
 {% url 'core:profile' as profile %}
 {% url 'core:register' as register %}
 {% url 'core:report_issues' as issues_url %}
+{% url 'core:audit_report' as audit_report %}
 {% url 'subjectpool:experimenter_index' as subjectpool %}
 <!DOCTYPE html>
 <html lang="en">
@@ -68,6 +69,9 @@
                 <li class='{{ request|active:login %} dropdown'>
                 <a class='dropdown-toggle' data-toggle='dropdown' href='#'>{{ user.email }} <i class='fa fa-chevron-down'></i></a>
                     <ul class='dropdown-menu'>
+                        {% if user.is_superuser %}
+                        <li><a href='{{ audit_report }}'><i class='fa fa-pie-chart'></i> Audit Report</a></li>
+                        {% endif %}
                         <li><a href='{{ profile }}'><i class='fa fa-user'></i> Account</a></li>
                         <li><a href='{{ logout }}'><i class='fa fa-sign-out'></i> Sign out</a></li>
                     </ul>