-
Notifications
You must be signed in to change notification settings - Fork 1
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
Feauture/add project filters #97
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
from django_filters.rest_framework import FilterSet | ||
from django_filters import filters | ||
|
||
from apps.general.constants import LEVEL_CHOICES | ||
from apps.general.models import Skill | ||
from apps.project.constants import ( | ||
BUSYNESS_CHOICES, | ||
STATUS_CHOICES, | ||
DIRECTION_CHOICES, | ||
) | ||
from apps.project.models import Project | ||
|
||
|
||
class ProjectFilter(FilterSet): | ||
""" | ||
Класс для фильтрации проектов по имени, дате начала, дате конца, занятости в часах в неделю, статусу набора | ||
участников, статусу проекта, направлению разработки, навыкам и уровню | ||
""" | ||
|
||
name = filters.CharFilter(lookup_expr="icontains") | ||
started = filters.DateFromToRangeFilter() | ||
ended = filters.DateFromToRangeFilter() | ||
busyness = filters.MultipleChoiceFilter(choices=BUSYNESS_CHOICES) | ||
recruitment_status = filters.BooleanFilter() | ||
status = filters.MultipleChoiceFilter(choices=STATUS_CHOICES) | ||
direction = filters.MultipleChoiceFilter(choices=DIRECTION_CHOICES) | ||
skill = filters.ModelMultipleChoiceFilter(queryset=Skill.objects.all()) | ||
level = filters.MultipleChoiceFilter(choices=LEVEL_CHOICES) | ||
|
||
class Meta: | ||
model = Project | ||
fields = ( | ||
"name", | ||
"started", | ||
"ended", | ||
"busyness", | ||
"recruitment_status", | ||
"status", | ||
"direction", | ||
"skill", | ||
"level", | ||
) |
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
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Backend/src/backend/apps/project/models.py Lines 102 to 107 in f9f155b
Связь со скилами и уровнями проектов реализована через тех специалистов, кторые необходимы проекту. |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Backend/src/backend/api/v1/projects/filters.py
Lines 27 to 28 in f9f155b
У проектов не должно быть непосредственной связи со скилами и уровнями. Соответственно и фильтрация так работать не должна.