Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
atdb-ldv
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ASTRON SDC
atdb-ldv
Commits
266bf1fd
Commit
266bf1fd
authored
7 months ago
by
Nico Vermaas
Browse files
Options
Downloads
Patches
Plain Diff
bugfix: validation page should ignore discarded
parent
6ccbc362
No related branches found
No related tags found
1 merge request
!381
Sdc 1607 bugfix discard repurpose aggregation
Pipeline
#100076
passed
7 months ago
Stage: test
Stage: build
Stage: deploy_to_test
Stage: deploy_to_production
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
atdb/taskdatabase/services/activities_handler.py
+1
-1
1 addition, 1 deletion
atdb/taskdatabase/services/activities_handler.py
atdb/taskdatabase/services/common.py
+1
-0
1 addition, 0 deletions
atdb/taskdatabase/services/common.py
atdb/taskdatabase/views.py
+1
-1
1 addition, 1 deletion
atdb/taskdatabase/views.py
with
3 additions
and
2 deletions
atdb/taskdatabase/services/activities_handler.py
+
1
−
1
View file @
266bf1fd
import
logging
;
import
logging
;
from
django.conf
import
settings
from
django.conf
import
settings
from
django.db.models
import
Sum
from
.common
import
State
,
AggregationStrategy
,
VERIFIED_STATUSSES
,
PROCESSED_STATUSSES
,
INGEST_FRACTION_STATUSSES
,
\
from
.common
import
State
,
AggregationStrategy
,
VERIFIED_STATUSSES
,
PROCESSED_STATUSSES
,
INGEST_FRACTION_STATUSSES
,
\
UPDATE_ARCHIVE_STATUSSES
,
ACTIVITY_RESET_STATUSSEN
UPDATE_ARCHIVE_STATUSSES
,
ACTIVITY_RESET_STATUSSEN
from
taskdatabase.models
import
Task
,
Activity
,
Configuration
from
taskdatabase.models
import
Task
,
Activity
,
Configuration
...
...
This diff is collapsed.
Click to expand it.
atdb/taskdatabase/services/common.py
+
1
−
0
View file @
266bf1fd
...
@@ -27,6 +27,7 @@ class State(Enum):
...
@@ -27,6 +27,7 @@ class State(Enum):
FINISHED
=
"
finished
"
FINISHED
=
"
finished
"
FINISHING
=
"
finishing
"
FINISHING
=
"
finishing
"
SUSPENDED
=
"
suspended
"
SUSPENDED
=
"
suspended
"
DISCARD
=
"
discard
"
DISCARDED
=
"
discarded
"
DISCARDED
=
"
discarded
"
FAILED
=
"
failed
"
FAILED
=
"
failed
"
COLLECTING_DATA
=
"
collecting_data
"
COLLECTING_DATA
=
"
collecting_data
"
...
...
This diff is collapsed.
Click to expand it.
atdb/taskdatabase/views.py
+
1
−
1
View file @
266bf1fd
...
@@ -688,7 +688,7 @@ def get_filtered_tasks(request, pre_filtered_tasks=None, distinct=None):
...
@@ -688,7 +688,7 @@ def get_filtered_tasks(request, pre_filtered_tasks=None, distinct=None):
# this assumes a similarity between tasks that share a field used as 'distinct'. (in practise that is sas_id)
# this assumes a similarity between tasks that share a field used as 'distinct'. (in practise that is sas_id)
# this is only the case for tasks of the same 'task_type', and currently this is only used for 'regular' tasks.
# this is only the case for tasks of the same 'task_type', and currently this is only used for 'regular' tasks.
# (to turn that around, 'task_type=aggregation' should be omitted from this filter).
# (to turn that around, 'task_type=aggregation' should be omitted from this filter).
my_distinct_tasks
=
filtered_tasks
.
filter
(
task_type
=
'
regular
'
).
order_by
(
distinct
,
my_sort
).
distinct
(
distinct
)
my_distinct_tasks
=
filtered_tasks
.
filter
(
task_type
=
'
regular
'
).
exclude
(
status
=
'
discarded
'
).
order_by
(
distinct
,
my_sort
).
distinct
(
distinct
)
return
filtered_tasks
.
filter
(
id__in
=
my_distinct_tasks
).
order_by
(
my_sort
)
return
filtered_tasks
.
filter
(
id__in
=
my_distinct_tasks
).
order_by
(
my_sort
)
else
:
else
:
return
filtered_tasks
.
order_by
(
my_sort
)
return
filtered_tasks
.
order_by
(
my_sort
)
...
...
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