diff --git a/src/tokens/templates/tokenfind_list.html b/src/tokens/templates/tokenfind_list.html index 67a3019d..58bbb468 100644 --- a/src/tokens/templates/tokenfind_list.html +++ b/src/tokens/templates/tokenfind_list.html @@ -15,6 +15,7 @@ Your Secret Tokens | {{ block.super }} Camp Token + Category Description Found @@ -23,15 +24,24 @@ Your Secret Tokens | {{ block.super }} {% for tokenfind in object_list %} {{ tokenfind.token.camp.title }} + {{ tokenfind.token.category }} {{ tokenfind.token.token }} {{ tokenfind.token.description }} {{ tokenfind.created }} {% endfor %} + {% for unfound in unfound_list %} + {{ unfound.camp.title }} + - + {{ unfound.category }} + - + - + {% endfor %} {% else %}

You haven't found any secret tokens yet. Happy hunting!

{% endif %} +
{% endblock %} diff --git a/src/tokens/views.py b/src/tokens/views.py index 0723c4b3..06ad168b 100644 --- a/src/tokens/views.py +++ b/src/tokens/views.py @@ -25,3 +25,9 @@ class TokenFindListView(LoginRequiredMixin, ListView): def get_queryset(self): return TokenFind.objects.filter(user=self.request.user) + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + # find the tokens the user still needs to find + context['unfound_list'] = Token.objects.all().exclude(id__in=TokenFind.objects.filter(user=self.request.user).values_list('id', flat=True)) + return context +