diff --git a/bookwyrm/templates/annual_summary/layout.html b/bookwyrm/templates/annual_summary/layout.html index b5ba9cc78..ab25458c8 100644 --- a/bookwyrm/templates/annual_summary/layout.html +++ b/bookwyrm/templates/annual_summary/layout.html @@ -192,6 +192,31 @@ + {% if goal_status and goal_status.percent >= 100 %} +
+
+

+ {% with goal=goal_status.goal goal_percent=goal_status.percent %} + {% blocktrans trimmed count counter=goal %} + {{ display_name }} set a goal of reading {{ goal }} book in {{ year }},
+ and achieved {{ goal_percent }}% of that goal + {% plural %} + {{ display_name }} set a goal of reading {{ goal }} books in {{ year }},
+ and achieved {{ goal_percent }}% of that goal + {% endblocktrans %} + {% endwith %} +

+

{% trans "Way to go!" %}

+
+
+ +
+
+
+
+
+ {% endif %} + {% if ratings_total > 0 %}
diff --git a/bookwyrm/views/annual_summary.py b/bookwyrm/views/annual_summary.py index 00ca4210d..0b618c218 100644 --- a/bookwyrm/views/annual_summary.py +++ b/bookwyrm/views/annual_summary.py @@ -79,6 +79,9 @@ class AnnualSummary(View): ) ratings_stats = ratings.aggregate(Avg("rating")) + # annual goal status + goal_status = get_goal_status(user, year) + data = { "summary_user": user, "year": year, @@ -101,6 +104,7 @@ class AnnualSummary(View): review.book.id for review in ratings.filter(rating=5) ], "paginated_years": paginated_years, + "goal_status": goal_status, } return TemplateResponse(request, "annual_summary/layout.html", data) @@ -195,7 +199,8 @@ def is_year_available(user, year): year = int(year) if earliest_year <= year < today.year: return True - if year == today.year and today >= date(today.year, 12, FIRST_DAY): + #if year == today.year and today >= date(today.year, 12, FIRST_DAY): + if year == today.year and today >= date(today.year, 1, 1): return True return False @@ -208,3 +213,17 @@ def get_books_from_shelfbooks(books_ids): books = models.Edition.objects.filter(id__in=books_ids).order_by(ordered) return books + + +def get_goal_status(user, year): + """return a dict with the year's goal status""" + + try: + goal = models.AnnualGoal.objects.get(user=user, year=year) + except: + return None + + if goal.privacy != "public": + return None + + return dict(**goal.progress, **{"goal": goal.goal})