Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
47586b22
Commit
47586b22
authored
3 years ago
by
Jörn Künsemöller
Browse files
Options
Downloads
Patches
Plain Diff
TMSS-393
: add more filters to subtask viewset in backend
parent
ed4febed
No related branches found
No related tags found
2 merge requests
!634
WIP: COBALT commissioning delta
,
!556
Resolve TMSS-912
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
+9
-1
9 additions, 1 deletion
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
with
9 additions
and
1 deletion
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
+
9
−
1
View file @
47586b22
...
...
@@ -4,7 +4,8 @@ This file contains the viewsets (based on the elsewhere defined data models and
from
django.shortcuts
import
get_object_or_404
from
rest_framework
import
viewsets
from
.lofar_viewset
import
LOFARViewSet
,
LOFARNestedViewSet
,
AbstractTemplateViewSet
from
.lofar_viewset
import
LOFARViewSet
,
LOFARNestedViewSet
,
AbstractTemplateViewSet
,
FILTER_OVERRIDES
from
.specification
import
NumberInFilter
from
..
import
models
from
..
import
serializers
from
django_filters
import
rest_framework
as
filters
...
...
@@ -131,6 +132,12 @@ class DataproductFeedbackTemplateViewSet(AbstractTemplateViewSet):
class
SubTaskFilter
(
filters
.
FilterSet
):
id
=
NumberInFilter
(
field_name
=
'
id
'
,
lookup_expr
=
'
in
'
)
id_min
=
filters
.
NumberFilter
(
field_name
=
'
id
'
,
lookup_expr
=
'
gte
'
)
id_max
=
filters
.
NumberFilter
(
field_name
=
'
id
'
,
lookup_expr
=
'
lte
'
)
state
=
filters
.
ModelMultipleChoiceFilter
(
field_name
=
'
state
'
,
queryset
=
models
.
SubtaskState
.
objects
.
all
())
name
=
filters
.
CharFilter
(
field_name
=
'
task_blueprints__scheduling_unit_blueprint__name
'
,
lookup_expr
=
'
icontains
'
)
# todo: correct name?
class
Meta
:
model
=
Subtask
fields
=
{
...
...
@@ -139,6 +146,7 @@ class SubTaskFilter(filters.FilterSet):
'
stop_time
'
:
[
'
lt
'
,
'
gt
'
],
'
cluster__name
'
:
[
'
exact
'
,
'
icontains
'
],
}
filter_overrides
=
FILTER_OVERRIDES
class
SubtaskViewSet
(
LOFARViewSet
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment