Characters
diff --git a/guild/templates/guild/playsession_detail.html b/guild/templates/guild/playsession_detail.html
new file mode 100644
index 0000000..8a386ea
--- /dev/null
+++ b/guild/templates/guild/playsession_detail.html
@@ -0,0 +1,77 @@
+{% extends 'base.html' %}
+
+{% load guild_extras %}
+
+{% block content %}
+
+
+
+
+ Session: {{ playsession.date }}
+
+
+
+
+
+
+
+
+
+
Characters
+
+
+
+
Rewards
+
+
Add Reward
+
+
+
+
+ | Amount |
+ Resource |
+ Character |
+ |
+
+
+
+ {% for reward in playsession.reward_set.all %}
+
+ | {{ reward.amount }} |
+ {{ reward.resource.name }} |
+
+ {% if reward.character %}
+ {{ reward.character.name }}
+ {% else %}
+ Every Guild Member
+ {% endif %}
+ |
+
+ Remove
+ |
+
+ {% endfor %}
+
+
+
+{% if playsession.reward_set.count == 0 %}
+
No rewards earned.
+{% endif %}
+
+
Summary
+
+
{{playsession.summary|md|safe}}
+
+{% endblock content %}
\ No newline at end of file
diff --git a/guild/templates/guild/resource_detail.html b/guild/templates/guild/resource_detail.html
new file mode 100644
index 0000000..7d860ae
--- /dev/null
+++ b/guild/templates/guild/resource_detail.html
@@ -0,0 +1,16 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
Resource: {{ resource.name }}
+
+
+
+
+
+ {{ resource.description|linebreaks }}
+
+{% endblock content %}
\ No newline at end of file
diff --git a/guild/templates/guild/resource_form.html b/guild/templates/guild/resource_form.html
new file mode 100644
index 0000000..20792ba
--- /dev/null
+++ b/guild/templates/guild/resource_form.html
@@ -0,0 +1,13 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+{% endblock content %}
\ No newline at end of file
diff --git a/guild/templates/guild/reward_confirm_delete.html b/guild/templates/guild/reward_confirm_delete.html
new file mode 100644
index 0000000..44cf3a2
--- /dev/null
+++ b/guild/templates/guild/reward_confirm_delete.html
@@ -0,0 +1,23 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
Reward Delete
+
+
Are you sure you want to delete
+
+ {{ reward.amount }} {{ reward.resource.name }} -
+ {% if reward.character %}
+ {{ reward.character.name }}
+ {% else %}
+ Every Guild Member
+ {% endif %}
+?
+
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/guild/templates/guild/reward_form.html b/guild/templates/guild/reward_form.html
new file mode 100644
index 0000000..a273132
--- /dev/null
+++ b/guild/templates/guild/reward_form.html
@@ -0,0 +1,13 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+{% endblock content %}
\ No newline at end of file
diff --git a/guild/templates/guild/settings.html b/guild/templates/guild/settings.html
new file mode 100644
index 0000000..3c11f91
--- /dev/null
+++ b/guild/templates/guild/settings.html
@@ -0,0 +1,26 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
Settings
+
+
+
+
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/guild/urls.py b/guild/urls.py
index 79eccc6..94cc7d2 100644
--- a/guild/urls.py
+++ b/guild/urls.py
@@ -3,6 +3,9 @@ import guild.views as views
import guild.views.player as player_views
import guild.views.character as character_views
import guild.views.adventure as adventure_views
+import guild.views.playsession as playsession_views
+import guild.views.settings as settings_views
+import guild.views.resource as resource_views
from django.contrib.auth import views as auth_views
urlpatterns = [
@@ -86,17 +89,52 @@ urlpatterns = [
),
path(
"adventures/
/playsession/create/",
- adventure_views.PlaySessionCreateView.as_view(),
+ playsession_views.PlaySessionCreateView.as_view(),
name="create_playsession",
),
path(
"adventures//playsession//update/",
- adventure_views.PlaySessionUpdateView.as_view(),
+ playsession_views.PlaySessionUpdateView.as_view(),
name="playsession_update",
),
path(
"adventures//playsession//delete/",
- adventure_views.PlaySessionDeleteView.as_view(),
+ playsession_views.PlaySessionDeleteView.as_view(),
name="playsession_delete",
),
+ path(
+ "playsessions//",
+ playsession_views.PlaySessionDetailView.as_view(),
+ name="playsession_detail",
+ ),
+ path(
+ "playsessions//rewards/create/",
+ playsession_views.CreateRewardView.as_view(),
+ name="create_reward",
+ ),
+ path(
+ "playsessions//rewards//delete/",
+ playsession_views.RewardDeleteView.as_view(),
+ name="reward_delete",
+ ),
+ path(
+ "settings/",
+ settings_views.SettingsView.as_view(),
+ name="settings",
+ ),
+ path(
+ "resources/create/",
+ resource_views.CreateResourceView.as_view(),
+ name="create_resource",
+ ),
+ path(
+ "resources//",
+ resource_views.ResourceDetailView.as_view(),
+ name="resource_detail",
+ ),
+ path(
+ "resources//update/",
+ resource_views.ResourceUpdateView.as_view(),
+ name="resource_update",
+ ),
]
diff --git a/guild/views/__init__.py b/guild/views/__init__.py
index 605c93c..72fa1ea 100644
--- a/guild/views/__init__.py
+++ b/guild/views/__init__.py
@@ -3,7 +3,7 @@ from django.views.generic import TemplateView, ListView, DetailView
from django.views.generic.edit import CreateView
from django.contrib.auth.mixins import LoginRequiredMixin
-from guild.models import Adventure, Character, Player
+from guild.models import Adventure, Character, Player, Reward
# Create your views here.
@@ -21,4 +21,13 @@ class HomeView(LoginRequiredMixin, TemplateView):
context["adventures"] = advs
context["players"] = Player.objects.all()
context["characters"] = Character.objects.all()
+
+ context["rewards"] = Reward.objects.filter(character=None).order_by(
+ "-playsession__date"
+ )
+ context["resources"] = {}
+ for reward in context["rewards"]:
+ if reward.resource.name not in context["resources"]:
+ context["resources"][reward.resource.name] = 0
+ context["resources"][reward.resource.name] += reward.amount
return context
diff --git a/guild/views/adventure.py b/guild/views/adventure.py
index 7c5c6b3..9705881 100644
--- a/guild/views/adventure.py
+++ b/guild/views/adventure.py
@@ -39,38 +39,3 @@ class AdventureUpdateView(LoginRequiredMixin, UpdateView):
class AdventureDeleteView(LoginRequiredMixin, DeleteView):
model = Adventure
success_url = "/"
-
-
-class PlaySessionCreateView(LoginRequiredMixin, CreateView):
- model = PlaySession
- form_class = PlaySessionForm
-
- def dispatch(self, request, *args, **kwargs):
- self.adventure = get_object_or_404(Adventure, pk=kwargs["pk"])
- return super().dispatch(request, *args, **kwargs)
-
- def form_valid(self, form: BaseModelForm) -> HttpResponse:
- form.instance.adventure = self.adventure
- return super().form_valid(form)
-
-
-class PlaySessionUpdateView(LoginRequiredMixin, UpdateView):
- model = PlaySession
- form_class = PlaySessionForm
- pk_url_kwarg = "playsession_pk"
-
- def dispatch(self, request, *args, **kwargs):
- self.adventure = get_object_or_404(Adventure, pk=kwargs["pk"])
- return super().dispatch(request, *args, **kwargs)
-
-
-class PlaySessionDeleteView(LoginRequiredMixin, DeleteView):
- model = PlaySession
- pk_url_kwarg = "playsession_pk"
-
- def dispatch(self, request, *args, **kwargs):
- self.adventure = get_object_or_404(Adventure, pk=kwargs["pk"])
- return super().dispatch(request, *args, **kwargs)
-
- def get_success_url(self) -> str:
- return self.adventure.get_absolute_url()
diff --git a/guild/views/character.py b/guild/views/character.py
index 36836da..8aab3e0 100644
--- a/guild/views/character.py
+++ b/guild/views/character.py
@@ -1,8 +1,8 @@
from django.views.generic import TemplateView, ListView, DetailView
from django.views.generic.edit import CreateView, UpdateView, DeleteView
from django.contrib.auth.mixins import LoginRequiredMixin
-
-from guild.models import Character
+from django.db.models import Q
+from guild.models import Character, Reward
class CharacterListView(LoginRequiredMixin, ListView):
@@ -18,6 +18,18 @@ class CreateCharacterView(LoginRequiredMixin, CreateView):
class CharacterDetailView(LoginRequiredMixin, DetailView):
model = Character
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context["rewards"] = Reward.objects.filter(
+ Q(character=self.object) | Q(character=None)
+ ).order_by("-playsession__date")
+ context["resources"] = {}
+ for reward in context["rewards"]:
+ if reward.resource.name not in context["resources"]:
+ context["resources"][reward.resource.name] = 0
+ context["resources"][reward.resource.name] += reward.amount
+ return context
+
class CharacterUpdateView(LoginRequiredMixin, UpdateView):
model = Character
diff --git a/guild/views/playsession.py b/guild/views/playsession.py
new file mode 100644
index 0000000..a6720a7
--- /dev/null
+++ b/guild/views/playsession.py
@@ -0,0 +1,78 @@
+from typing import Any, Dict, Optional, Type
+from django.forms.models import BaseModelForm
+from django.http import HttpResponse
+from django.shortcuts import get_object_or_404
+from django.urls import reverse
+from django.views.generic import TemplateView, ListView, DetailView
+from django.views.generic.edit import CreateView, UpdateView, DeleteView
+from django.contrib.auth.mixins import LoginRequiredMixin
+from guild.forms import PlaySessionForm, RewardForm
+
+from guild.models import Adventure, PlaySession, Reward
+
+
+class PlaySessionCreateView(LoginRequiredMixin, CreateView):
+ model = PlaySession
+ form_class = PlaySessionForm
+
+ def dispatch(self, request, *args, **kwargs):
+ self.adventure = get_object_or_404(Adventure, pk=kwargs["pk"])
+ return super().dispatch(request, *args, **kwargs)
+
+ def form_valid(self, form: BaseModelForm) -> HttpResponse:
+ form.instance.adventure = self.adventure
+ return super().form_valid(form)
+
+
+class PlaySessionDetailView(LoginRequiredMixin, DetailView):
+ model = PlaySession
+
+
+class PlaySessionUpdateView(LoginRequiredMixin, UpdateView):
+ model = PlaySession
+ form_class = PlaySessionForm
+ pk_url_kwarg = "playsession_pk"
+
+ def dispatch(self, request, *args, **kwargs):
+ self.adventure = get_object_or_404(Adventure, pk=kwargs["pk"])
+ return super().dispatch(request, *args, **kwargs)
+
+
+class PlaySessionDeleteView(LoginRequiredMixin, DeleteView):
+ model = PlaySession
+ pk_url_kwarg = "playsession_pk"
+
+ def dispatch(self, request, *args, **kwargs):
+ self.adventure = get_object_or_404(Adventure, pk=kwargs["pk"])
+ return super().dispatch(request, *args, **kwargs)
+
+ def get_success_url(self) -> str:
+ return self.adventure.get_absolute_url()
+
+
+class CreateRewardView(LoginRequiredMixin, CreateView):
+ model = Reward
+ form_class = RewardForm
+
+ def dispatch(self, request, *args, **kwargs):
+ self.playsession = get_object_or_404(PlaySession, pk=kwargs["pk"])
+ return super().dispatch(request, *args, **kwargs)
+
+ def form_valid(self, form: BaseModelForm) -> HttpResponse:
+ form.instance.playsession = self.playsession
+ return super().form_valid(form)
+
+ def get_success_url(self) -> str:
+ return reverse("guild:playsession_detail", kwargs={"pk": self.playsession.pk})
+
+
+class RewardDeleteView(LoginRequiredMixin, DeleteView):
+ model = Reward
+ pk_url_kwarg = "reward_pk"
+
+ def dispatch(self, request, *args, **kwargs):
+ self.playsession = get_object_or_404(PlaySession, pk=kwargs["pk"])
+ return super().dispatch(request, *args, **kwargs)
+
+ def get_success_url(self) -> str:
+ return reverse("guild:playsession_detail", kwargs={"pk": self.playsession.pk})
diff --git a/guild/views/resource.py b/guild/views/resource.py
new file mode 100644
index 0000000..c4dd501
--- /dev/null
+++ b/guild/views/resource.py
@@ -0,0 +1,28 @@
+from django.views.generic import TemplateView, ListView, DetailView
+from django.views.generic.edit import CreateView, UpdateView, DeleteView
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.urls import reverse
+
+from guild.models import Resource
+
+
+class CreateResourceView(LoginRequiredMixin, CreateView):
+ model = Resource
+ fields = ["name", "description"]
+
+ def get_success_url(self):
+ return reverse("guild:settings")
+
+
+class ResourceDetailView(LoginRequiredMixin, DetailView):
+ model = Resource
+
+
+class ResourceUpdateView(LoginRequiredMixin, UpdateView):
+ model = Resource
+ fields = ["name", "description"]
+
+
+class ResourceDeleteView(LoginRequiredMixin, DeleteView):
+ model = Resource
+ success_url = "/"
diff --git a/guild/views/settings.py b/guild/views/settings.py
new file mode 100644
index 0000000..d953a83
--- /dev/null
+++ b/guild/views/settings.py
@@ -0,0 +1,12 @@
+from django.views.generic import TemplateView
+
+from guild.models import Resource
+
+
+class SettingsView(TemplateView):
+ template_name = "guild/settings.html"
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context["resources"] = Resource.objects.all()
+ return context
diff --git a/templates/base.html b/templates/base.html
index ac9b7b0..3f41471 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -87,5 +87,10 @@
{% endblock %}
+
+