Skip to content
Snippets Groups Projects
Verified Commit dfbe15d7 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Save person who created a checkpoint

parent 5f5b1af2
No related branches found
No related tags found
1 merge request!30Resolve "Checkpoint system"
Pipeline #76039 canceled
...@@ -30,6 +30,7 @@ class Migration(migrations.Migration): ...@@ -30,6 +30,7 @@ class Migration(migrations.Migration):
('lon', models.DecimalField(blank=True, decimal_places=8, max_digits=11, null=True, verbose_name='Longitude of check')), ('lon', models.DecimalField(blank=True, decimal_places=8, max_digits=11, null=True, verbose_name='Longitude of check')),
('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checkpoints', to='paweljong.event', verbose_name='Related event')), ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='checkpoints', to='paweljong.event', verbose_name='Related event')),
('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='event_checkpoints', to='core.person', verbose_name='Checked person')), ('person', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='event_checkpoints', to='core.person', verbose_name='Checked person')),
('checked_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='event_checkpoints_created', to='core.person', verbose_name='Checked by person')),
('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')), ('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')),
], ],
options={ options={
......
...@@ -411,6 +411,8 @@ class EventRegistration(ExtensibleModel): ...@@ -411,6 +411,8 @@ class EventRegistration(ExtensibleModel):
class Checkpoint(ExtensibleModel): class Checkpoint(ExtensibleModel):
event = models.ForeignKey(Event, verbose_name=_("Related event"), related_name="checkpoints") event = models.ForeignKey(Event, verbose_name=_("Related event"), related_name="checkpoints")
person = models.ForeignKey(Person, verbose_name=_("Checked person"), related_name="event_checkpoints")) person = models.ForeignKey(Person, verbose_name=_("Checked person"), related_name="event_checkpoints"))
checked_by = models.ForeignKey(Person, verbose_name=_("Checked by person"), related_name="event_checkpoints_created"))
comment = models.CharField(max_length=60, verbose_name=_("Comment")) comment = models.CharField(max_length=60, verbose_name=_("Comment"))
......
...@@ -981,6 +981,7 @@ class EventCheckpointView(PermissionRequiredMixin, FormView): ...@@ -981,6 +981,7 @@ class EventCheckpointView(PermissionRequiredMixin, FormView):
checkpoint.person = Person.objects.get(user__username=form.cleaned_data["username"]) checkpoint.person = Person.objects.get(user__username=form.cleaned_data["username"])
except Person.DoesNotExist: except Person.DoesNotExist:
messages.error(self.request, _("The provided username is not linked to a person.")) messages.error(self.request, _("The provided username is not linked to a person."))
checkpoint.checked_by = self.request.user.person
checkpoint.comment = form.cleaned_data["comment"] checkpoint.comment = form.cleaned_data["comment"]
checkpoint.timestamp = timezone.now() checkpoint.timestamp = timezone.now()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment