Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bilingual RewardPointRedemptionEvent names #2380

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions evap/development/fixtures/test_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -153474,9 +153474,11 @@
"model": "rewards.rewardpointredemptionevent",
"pk": 1,
"fields": {
"name": "Big party",
"name_de": "Große Feier",
jooooosef marked this conversation as resolved.
Show resolved Hide resolved
"name_en": "Big party",
"date": "2099-12-31",
"redeem_end_date": "2099-12-30"
"redeem_end_date": "2099-12-30",
"step": 3
jooooosef marked this conversation as resolved.
Show resolved Hide resolved
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion evap/rewards/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class RewardPointRedemptionEventForm(forms.ModelForm):
class Meta:
model = RewardPointRedemptionEvent
fields = ("name", "date", "redeem_end_date", "step")
fields = ("name_en", "name_de", "date", "redeem_end_date", "step")

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Generated by Django 5.1.3 on 2025-01-27 20:24

from django.db import migrations, models


def update_names(apps, _schema_editor):
RewardPointRedemptionEvent = apps.get_model("rewards", "RewardPointRedemptionEvent")
for event in RewardPointRedemptionEvent.objects.all():
event.name_de = event.name_en
event.save()


class Migration(migrations.Migration):

dependencies = [
("rewards", "0006_rewardpointredemptionevent_step"),
]

operations = [
migrations.RenameField(
model_name="rewardpointredemptionevent",
old_name="name",
new_name="name_en",
),
migrations.AlterField(
model_name="rewardpointredemptionevent",
name="name_en",
field=models.CharField(max_length=1024, unique=True, verbose_name="name (english)"),
),
migrations.AddField(
model_name="rewardpointredemptionevent",
name="name_de",
field=models.CharField(null=True, unique=True, max_length=1024, verbose_name="name (german)"),
preserve_default=False,
),
migrations.RunPython(update_names, reverse_code=migrations.RunPython.noop),
migrations.AlterField(
model_name="rewardpointredemptionevent",
name="name_de",
field=models.CharField(max_length=1024, unique=True, verbose_name="name (german)"),
),
]
5 changes: 4 additions & 1 deletion evap/rewards/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
from django.utils.translation import gettext_lazy as _

from evap.evaluation.models import Semester, UserProfile
from evap.evaluation.tools import translate


class RewardPointRedemptionEvent(models.Model):
name = models.CharField(max_length=1024, verbose_name=_("event name"))
name_de = models.CharField(max_length=1024, unique=True, verbose_name=_("name (german)"))
name_en = models.CharField(max_length=1024, unique=True, verbose_name=_("name (english)"))
name = translate(en="name_en", de="name_de")
date = models.DateField(verbose_name=_("event date"))
redeem_end_date = models.DateField(verbose_name=_("redemption end date"))
step = models.PositiveSmallIntegerField(
Expand Down
11 changes: 7 additions & 4 deletions evap/rewards/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ def test_create_redemption_event(self):
response = self.app.get(self.url, user=self.manager)

form = response.forms["reward-point-redemption-event-form"]
form.set("name", "Test3Event")
form.set("name_de", "Test3Event_de")
form.set("name_en", "Test3Event_en")
form.set("date", "2014-12-10")
form.set("redeem_end_date", "2014-11-20")

Expand All @@ -152,19 +153,21 @@ class TestEventEditView(WebTestStaffMode):
@classmethod
def setUpTestData(cls):
cls.manager = make_manager()
cls.event = baker.make(RewardPointRedemptionEvent, name="old name")
cls.event = baker.make(RewardPointRedemptionEvent, name_en="old name", name_de="alter Name")
cls.url = reverse("rewards:reward_point_redemption_event_edit", args=[cls.event.pk])

def test_edit_redemption_event(self):
"""submits a newly created redemption event and checks that the event has been created"""
response = self.app.get(self.url, user=self.manager)

form = response.forms["reward-point-redemption-event-form"]
form.set("name", "new name")
form.set("name_en", "new name")
form.set("name_de", "neuer Name")

response = form.submit()
self.assertRedirects(response, reverse("rewards:reward_point_redemption_events"))
self.assertEqual(RewardPointRedemptionEvent.objects.get(pk=self.event.pk).name, "new name")
self.assertEqual(RewardPointRedemptionEvent.objects.get(pk=self.event.pk).name_en, "new name")
self.assertEqual(RewardPointRedemptionEvent.objects.get(pk=self.event.pk).name_de, "neuer Name")


class TestEventExportView(WebTestStaffModeWith200Check):
Expand Down