gaugendre/charasheet
1
0
Fork 0
mirror of https://github.com/Crocmagnon/charasheet.git synced 2024-05-05 19:35:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: allow players to update party effects (#206)

Browse source 
---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Gabriel Augendre 2024-03-05 19:05:41 +01:00 committed by GitHub
parent 92ac0caa33
commit 7f38d60365
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 30 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/party/templates/party/snippets/effect_card.html
View file

@ -3,17 +3,15 @@
<div class="card {% if rounds == 0 %}text-bg-secondary{% endif %} effect" data-id="{{ effect.pk }}">
<div class="card-body">
<h5 class="card-title">
{% if party.game_master == request.user %}
<button
hx-get="{% url "party:delete_effect" pk=party.pk effect_pk=effect.pk %}"
hx-target="#effects"
hx-swap="outerHTML"
class="btn btn-sm btn-danger delete"
type="button"
>
<i class="fa-solid fa-trash"></i>
</button>
{% endif %}
<button
hx-get="{% url "party:delete_effect" pk=party.pk effect_pk=effect.pk %}"
hx-target="#effects"
hx-swap="outerHTML"
class="btn btn-sm btn-danger delete"
type="button"
>
<i class="fa-solid fa-trash"></i>
</button>
{{ effect.name }}
</h5>
<h6 class="card-subtitle mb-2 {% if rounds != 0 %}text-muted{% endif %}">

38
src/party/templates/party/snippets/effects.html
View file

@ -9,26 +9,24 @@
id="add-effect"
class="btn btn-primary"><i class="fa-solid fa-plus"></i> Ajouter un effet
</button>
{% if party.game_master == request.user %}
<div class="btn-group">
<button
hx-get="{% url "party:increase_rounds" pk=party.pk %}"
hx-target="#effects"
hx-swap="outerHTML"
type="button"
id="increase-rounds"
class="btn btn-outline-secondary"><i class="fa-solid fa-plus"></i> tours
</button>
<button
hx-get="{% url "party:decrease_rounds" pk=party.pk %}"
hx-target="#effects"
hx-swap="outerHTML"
type="button"
id="decrease-rounds"
class="btn btn-outline-secondary"><i class="fa-solid fa-minus"></i> tours
</button>
</div>
{% endif %}
<div class="btn-group">
<button
hx-get="{% url "party:increase_rounds" pk=party.pk %}"
hx-target="#effects"
hx-swap="outerHTML"
type="button"
id="increase-rounds"
class="btn btn-outline-secondary"><i class="fa-solid fa-plus"></i> tours
</button>
<button
hx-get="{% url "party:decrease_rounds" pk=party.pk %}"
hx-target="#effects"
hx-swap="outerHTML"
type="button"
id="decrease-rounds"
class="btn btn-outline-secondary"><i class="fa-solid fa-minus"></i> tours
</button>
</div>
</div>
<div id="effects-cards" class="row mt-1 row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-lg-4 g-4">
{% for effect in party.effects.all %}

32
src/party/tests/test_interactions.py
View file

@ -4,7 +4,6 @@ import pytest
from django.urls import reverse
from model_bakery import baker
from pytest_django.live_server_helper import LiveServer
from selenium.common import NoSuchElementException
from selenium.webdriver.common.by import By
from selenium.webdriver.firefox.webdriver import WebDriver
from selenium.webdriver.support.select import Select
@ -285,37 +284,6 @@ def test_gm_can_delete_any_existing_effect(
BattleEffect.objects.get(pk=effects[1].pk)
@pytest.mark.django_db()
def test_player_cant_change_existing_running_effect(
selenium: WebDriver,
live_server: LiveServer,
):
"""Members of the group can only view existing running effects, no update."""
user, password = "player", "password"
player = User.objects.create_user(user, password=password)
character = baker.make(Character, player=player)
party = baker.make(Party)
party.characters.set([character])
effects = baker.make(BattleEffect, _quantity=2, party=party)
go_to_party(selenium, live_server, party, user, password)
effect = effects[0]
effect_element = selenium.find_element(
By.CSS_SELECTOR,
f'.effect[data-id="{effect.pk}"]',
)
assert effect.name in effect_element.text
assert effect.target in effect_element.text
assert effect.description in effect_element.text
with pytest.raises(NoSuchElementException):
selenium.find_element(By.CSS_SELECTOR, ".effect .delete")
with pytest.raises(NoSuchElementException):
selenium.find_element(By.ID, "increase-rounds")
with pytest.raises(NoSuchElementException):
selenium.find_element(By.ID, "decrease-rounds")
def fill_effect(
selenium: WebDriver,
name: str,

6
src/party/views.py
View file

@ -96,7 +96,7 @@ def party_add_effect(request, pk):
@require_GET
@login_required
def party_increase_rounds(request, pk):
party = get_object_or_404(Party.objects.managed_by(request.user), pk=pk)
party = get_object_or_404(Party.objects.played_or_mastered_by(request.user), pk=pk)
party.effects.increase_rounds()
return render(request, "party/snippets/effects.html", {"party": party})
@ -104,7 +104,7 @@ def party_increase_rounds(request, pk):
@require_GET
@login_required
def party_decrease_rounds(request, pk):
party = get_object_or_404(Party.objects.managed_by(request.user), pk=pk)
party = get_object_or_404(Party.objects.played_or_mastered_by(request.user), pk=pk)
party.effects.decrease_rounds()
return render(request, "party/snippets/effects.html", {"party": party})
@ -112,7 +112,7 @@ def party_decrease_rounds(request, pk):
@require_GET
@login_required
def party_delete_effect(request, pk, effect_pk):
party = get_object_or_404(Party.objects.managed_by(request.user), pk=pk)
party = get_object_or_404(Party.objects.played_or_mastered_by(request.user), pk=pk)
BattleEffect.objects.filter(pk=effect_pk).delete()
return render(request, "party/snippets/effects.html", {"party": party})