From 72ebe9cc7b56fd5568f82cee0e7d5ccb1cc31d16 Mon Sep 17 00:00:00 2001
From: Greg Taylor <snagglepants@gmail.com>
Date: Wed, 6 Jun 2007 13:49:52 +0000
Subject: [PATCH] Finished the Players content block on the default main page.
 Yay. http://sandbox.evennia.com is the front page for the test site. None of
 the links work yet, just working on the front page.

---
 apps/website/views.py            |  1 +
 functions_db.py                  | 10 ++++++++++
 webtemplates/prosimii/index.html |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/website/views.py b/apps/website/views.py
index 62a0f8f372..c818ab3675 100644
--- a/apps/website/views.py
+++ b/apps/website/views.py
@@ -27,6 +27,7 @@ def page_index(request):
       "players_connected": functions_db.num_connected_players(),
       "players_registered": functions_db.num_total_players(),
       "players_connected_recent": functions_db.num_recently_connected_players(),
+      "players_registered_recent": functions_db.num_recently_created_players(),
    }
 
    context_instance = RequestContext(request)
diff --git a/functions_db.py b/functions_db.py
index 63ed391a15..141f99d28b 100644
--- a/functions_db.py
+++ b/functions_db.py
@@ -28,6 +28,16 @@ def num_connected_players():
    """
    return get_connected_players().count()
 
+def num_recently_created_players(days=7):
+   """
+   Returns a QuerySet containing the player User accounts that have been
+   connected within the last <days> days.
+   """
+   end_date = datetime.now()
+   tdelta = timedelta(days)
+   start_date = end_date - tdelta
+   return User.objects.filter(date_joined__range=(start_date, end_date)).count()
+
 def num_recently_connected_players(days=7):
    """
    Returns a QuerySet containing the player User accounts that have been
diff --git a/webtemplates/prosimii/index.html b/webtemplates/prosimii/index.html
index 5f93668997..b1db9cbac7 100644
--- a/webtemplates/prosimii/index.html
+++ b/webtemplates/prosimii/index.html
@@ -81,7 +81,7 @@
           <h1>Players</h1>
           <p>
             There are currently <strong>{{players_connected}}</strong> connected,
-            and a total of <strong>{{players_registered}}</strong> registered. Of these, {{players_recent}} were created this week, and <strong>{{players_connected_recent}}</strong> have connected within the last seven days.
+            and a total of <strong>{{players_registered}}</strong> registered. Of these, <strong>{{players_registered_recent}}</strong> were created this week, and <strong>{{players_connected_recent}}</strong> have connected within the last seven days.
           </p>
         </div>