💫 feat: change infrastructure condition field to ManyToMany field (#3970) #4084
Conversation
This file contains 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
juggler31
force-pushed
the
state_amenagement_toM2M
branch
from
b720719
to
079ab62
Compare
juggler31
changed the title
juggler31
changed the title
juggler31
force-pushed
the
state_amenagement_toM2M
branch
from
079ab62
to
cdb732e
Compare
juggler31
force-pushed
the
state_amenagement_toM2M
branch
2 times, most recently
from
23530e8
to
1e6dfd9
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4084 +/- ##
==========================================
- Coverage 98.38% 95.90% -2.48%
==========================================
Files 267 267
Lines 20810 20819 +9
==========================================
- Hits 20473 19966 -507
- Misses 337 853 +516 ☔ View full report in Codecov by Sentry. |
Passing run #9592 ↗︎
Details:
Review all test suite changes for PR #4084 ↗︎ |
|||||||||||||||
juggler31
force-pushed
the
state_amenagement_toM2M
branch
from
1e6dfd9
to
2abc522
Compare
submarcos
reviewed
Apr 29, 2024
| {% else %} | ||
| <span>{{ condition.label }}<span> | ||
| {% endif %} | ||
| {% endfor %} |
There was a problem hiding this comment.
Why don't you use {{ object.conditions_display }} ?
submarcos
reviewed
Apr 29, 2024
| if extracted: | ||
| obj.conditions.set(extracted) | ||
| else: | ||
| obj.conditions.add(InfrastructureConditionFactory.create()) |
There was a problem hiding this comment.
can you factorize post_generation in an InfrastructureFatoyMixin ?
submarcos
reviewed
Apr 29, 2024
submarcos
reviewed
Apr 29, 2024
| @@ -21,7 +21,9 @@ CREATE VIEW {{ schema_geotrek }}.v_infrastructures AS WITH v_infra AS | |||
| {% endfor %} | |||
| CONCAT (e.min_elevation, 'm') AS altitude, | |||
| t.implantation_year, | |||
| t.condition_id, | |||
| {% for conditon in t.conditions %} | |||
| conditon_id, | |||
There was a problem hiding this comment.
I don't understand why you add each id in a dedicated column
Chatewgne
requested changes
Apr 30, 2024
|
|
||
| # Copy InfrastructureCondition to SignageCondition and BladeCondition | ||
| for infrastructure in Infrastructure.objects.all(): | ||
| infrastructure.conditions.add(infrastructure.condition) |
There was a problem hiding this comment.
Fails if we have an infrastructure with no Condition
juggler31
force-pushed
the
state_amenagement_toM2M
branch
2 times, most recently
from
d262e54
to
cc3bf46
Compare
juggler31
force-pushed
the
state_amenagement_toM2M
branch
4 times, most recently
from
59bd5c9
to
6059086
Compare
Chatewgne
approved these changes
May 22, 2024
geotrek/infrastructure/models.py
Outdated
| conditions = models.ManyToManyField( | ||
| InfrastructureCondition, | ||
| related_name='infrastructures', | ||
| verbose_name=_("Condition"), |
There was a problem hiding this comment.
Suggested change
| verbose_name=_("Condition"), | |
| verbose_name=_("Conditions"), |
juggler31
force-pushed
the
state_amenagement_toM2M
branch
2 times, most recently
from
7a7e7f5
to
164072f
Compare
submarcos
reviewed
Jul 19, 2024
| @@ -5,6 +5,9 @@ CHANGELOG | |||
| 2.108.0+dev (XXXX-XX-XX) | |||
| ---------------------------- | |||
|
|
|||
| **Improvements** | |||
|
|
|||
| - Change infrastructure condition field to ManyToMany field (#3970) | |||
There was a problem hiding this comment.
Suggested change
| - Change infrastructure condition field to ManyToMany field (#3970) | |
| - Change infrastructure condition field to ManyToMany field (#3970) | |
docs/changelog.rst
Outdated
| @@ -78,6 +81,7 @@ https://geotrek.readthedocs.io/en/latest/install/upgrade.html#postgresql | |||
| - Bump mapentity to 8.9.0 | |||
|
|
|||
|
|
|||
|
|
|||
docs/changelog.rst
Outdated
| @@ -129,7 +133,6 @@ https://geotrek.readthedocs.io/en/latest/install/upgrade.html#postgresql | |||
| - Add structures to Aggregator (#3569) | |||
| - Allow to filter flatpages by portal on admin list page | |||
|
|
|||
juggler31
force-pushed
the
state_amenagement_toM2M
branch
2 times, most recently
from
6b7b37d
to
a60e224
Compare
juggler31
force-pushed
the
state_amenagement_toM2M
branch
from
a60e224
to
1197850
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Related Issue
Checklist