✨ [#127] add temporal m2m#140
Open
TimdeBeer1 wants to merge 9 commits into
Open
Conversation
TimdeBeer1
force-pushed
the
feature/127-temporal-m2m
branch
3 times, most recently
from
5857381 to
e8bce2c
Compare
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #140 +/- ##
==========================================
+ Coverage 89.49% 90.22% +0.73%
==========================================
Files 102 105 +3
Lines 1780 2006 +226
Branches 73 98 +25
==========================================
+ Hits 1593 1810 +217
- Misses 155 161 +6
- Partials 32 35 +3 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
TimdeBeer1
force-pushed
the
feature/127-temporal-m2m
branch
7 times, most recently
from
d03acc2 to
017449e
Compare
TimdeBeer1
force-pushed
the
feature/127-temporal-m2m
branch
from
017449e to
763a316
Compare
Contributor
|
@TimdeBeer1 Can you resolve the conflicts and also fix the code coverage? |
TimdeBeer1
force-pushed
the
feature/127-temporal-m2m
branch
2 times, most recently
from
b52f580 to
aa3387d
Compare
TimdeBeer1
force-pushed
the
feature/127-temporal-m2m
branch
from
aa3387d to
55e004e
Compare
TimdeBeer1
force-pushed
the
feature/127-temporal-m2m
branch
from
6bf8452 to
7d59a77
Compare
danielmursa-dev
requested changes
May 11, 2026
Contributor
danielmursa-dev
left a comment
danielmursa-dev
left a comment
There was a problem hiding this comment.
Good, some small things!
| widgets = ( | ||
| AdminDateWidget( | ||
| attrs={ | ||
| "placeholder": "Startdatum", |
Contributor
There was a problem hiding this comment.
Suggested change
| "placeholder": "Startdatum", | |
| "placeholder": _("Startdatum"), |
| ), | ||
| AdminDateWidget( | ||
| attrs={ | ||
| "placeholder": "Einddatum", |
Contributor
There was a problem hiding this comment.
Suggested change
| "placeholder": "Einddatum", | |
| "placeholder": _("Einddatum"), |
| class FunctieTeamInlineForm(forms.ModelForm): | ||
| periode = FormDateRangeField( | ||
| widget=DateRangeWidget(), | ||
| label="Periode", |
Contributor
There was a problem hiding this comment.
Suggested change
| label="Periode", | |
| label=_("Periode"), |
| class FunctieOrganisatorischeEenheidInlineForm(forms.ModelForm): | ||
| periode = FormDateRangeField( | ||
| widget=DateRangeWidget(), | ||
| label="Periode", |
Contributor
There was a problem hiding this comment.
Suggested change
| label="Periode", | |
| label=_("Periode"), |
| extra = 1 | ||
|
|
||
| def get_formset(self, request, obj=None, **kwargs): | ||
| from openorganisatie.organisatie.admin.forms import FunctieTeamInlineForm |
Contributor
There was a problem hiding this comment.
I don't know how, but I think is better to not include imports inside the functions, you can move the functie admin stuff here in this file, and keep there only the widget.
If is possible, or try other solutions
| end = period.get("einddatum") | ||
|
|
||
| if not start: | ||
| raise serializers.ValidationError({"teams_input": "Startdatum is verplicht."}) |
Contributor
There was a problem hiding this comment.
Suggested change
| raise serializers.ValidationError({"teams_input": "Startdatum is verplicht."}) | |
| raise serializers.ValidationError({"teams_input": _("Startdatum is verplicht.")}) |
|
|
||
| if end and start > end: | ||
| raise serializers.ValidationError( | ||
| {"teams_input": "Einddatum moet na startdatum liggen."} |
Contributor
There was a problem hiding this comment.
Suggested change
| {"teams_input": "Einddatum moet na startdatum liggen."} | |
| {"teams_input": _("Einddatum moet na startdatum liggen.")} |
| from ..models.relaties import FunctieTeam, OrganisatorischeEenheidFunctie | ||
|
|
||
|
|
||
| def build_period_range(period): |
Contributor
There was a problem hiding this comment.
You can add this in the PeriodField as a validator and make it more generic, I mean the ValidationError message
Comment on lines
+42
to
+46
| if not self.periode: | ||
| raise ValidationError({"periode": "Periode is verplicht."}) | ||
|
|
||
| if not self.periode.lower: | ||
| raise ValidationError({"periode": "Startdatum is verplicht."}) |
Contributor
There was a problem hiding this comment.
Here you can just remove blank=True, null=True from DateRangeField to require period
Comment on lines
+48
to
+56
| qs = FunctieTeam.objects.filter( | ||
| functie_id=self.functie_id, | ||
| team_id=self.team_id, | ||
| ).exclude(pk=self.pk) | ||
|
|
||
| if qs.filter(periode__overlap=self.periode).exists(): | ||
| raise ValidationError( | ||
| {"periode": "Deze periode overlapt met een bestaande toewijzing."} | ||
| ) |
Contributor
There was a problem hiding this comment.
Is there a way to replace this with a constraint?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #127
Changes
[Describe the changes here]