mirror/RPGnotes
1
0
Fork 0
mirror of https://github.com/Findus23/RPGnotes.git synced 2024-09-19 15:43:45 +02:00
Code Releases Activity

fix days

Browse source
This commit is contained in:
Lukas Winkler 2021-09-08 11:44:24 +02:00
parent 08b9abaa83
commit 080df5907c
Signed by: lukas
GPG key ID: 54DE4D798D244853
3 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
days/templates/days/day_detail.html
View file

@ -16,13 +16,13 @@
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
<a class="btn btn-primary add-button" href="{% url "dayadd" day.campaign.slug %}">Add Day</a> <a class="btn btn-primary add-button" href="{% url "dayadd" %}">Add Day</a>
</div> </div>
<div class="col-8"> <div class="col-8">
<div class="day-heading"> <div class="day-heading">
<h1> <h1>
{{ day.prettyname }} {{ day.prettyname }}
<a href="{% url "dayedit" day.campaign.slug day.day %}"> <a href="{% url "dayedit" day.day %}">
edit edit
</a> </a>
</h1> </h1>

14
days/views.py
View file

@ -18,13 +18,8 @@ class DayDetailView(generic.DetailView):
model = IngameDay model = IngameDay
context_object_name = "day" context_object_name = "day"
def get_context_data(self, **kwargs):
data = super().get_context_data(**kwargs)
data["days"] = IngameDay.objects.filter(campaign__slug=self.kwargs['campslug'])
return data
def get_object(self, queryset=None): def get_object(self, queryset=None):
return IngameDay.objects.get(campaign__slug=self.kwargs['campslug'], day=self.kwargs['day']) return IngameDay.objects.get(day=self.kwargs['day'])
class DayCreateView(generic.CreateView): class DayCreateView(generic.CreateView):
@ -44,14 +39,11 @@ class DayEditView(generic.UpdateView):
data['edit'] = True data['edit'] = True
return data return data
# def get_object(self, queryset=None): def get_object(self, queryset=None):
# return IngameDay.objects.get(campaign__slug=self.kwargs['campslug'], day=self.kwargs['day']) return IngameDay.objects.get(day=self.kwargs['day'])
class DayDeleteView(generic.DeleteView): class DayDeleteView(generic.DeleteView):
template_name = "common/campaign_confirm_delete.html" template_name = "common/campaign_confirm_delete.html"
model = IngameDay model = IngameDay
success_url = reverse_lazy('daylist') success_url = reverse_lazy('daylist')
# def get_object(self, queryset=None):
# return IngameDay.objects.get(campaign__slug=self.kwargs['campslug'], day=self.kwargs['day'])

5
loot/views.py
View file

@ -2,8 +2,8 @@ from django.db.models import Sum
from django.urls import reverse_lazy from django.urls import reverse_lazy
from django.views import generic from django.views import generic
from loot.models import Loot
from loot.forms import LootForm from loot.forms import LootForm
from loot.models import Loot
class LootListView(generic.ListView): class LootListView(generic.ListView):
@ -11,9 +11,6 @@ class LootListView(generic.ListView):
model = Loot model = Loot
context_object_name = "loot" context_object_name = "loot"
# def get_queryset(self):
# return Loot.objects.filter(campaign__slug=self.kwargs['campslug'])
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
data = super().get_context_data(**kwargs) data = super().get_context_data(**kwargs)
data['total_value'] = self.get_queryset().aggregate(Sum("value_gold"))["value_gold__sum"] data['total_value'] = self.get_queryset().aggregate(Sum("value_gold"))["value_gold__sum"]