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
4bde7fec
Commit
4bde7fec
authored
3 years ago
by
Mario Raciti
Browse files
Options
Downloads
Patches
Plain Diff
TMSS-1052
: Update contains_overlapping_observation flag
parent
33361ebe
No related branches found
No related tags found
2 merge requests
!634
WIP: COBALT commissioning delta
,
!595
Resolve TMSS-1052
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
+2
-2
2 additions, 2 deletions
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
with
2 additions
and
2 deletions
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
+
2
−
2
View file @
4bde7fec
...
@@ -28,7 +28,7 @@ def create_cycle_report(request: Request, cycle: models.Cycle, start: datetime,
...
@@ -28,7 +28,7 @@ def create_cycle_report(request: Request, cycle: models.Cycle, start: datetime,
'
data_ingested_per_site_and_category
'
:
_get_data_ingested_per_site_and_category
(
cycle
,
start
,
stop
),
'
data_ingested_per_site_and_category
'
:
_get_data_ingested_per_site_and_category
(
cycle
,
start
,
stop
),
'
projects_summary
'
:
_get_projects_summary
(
request
,
cycle
,
start
,
stop
),
'
projects_summary
'
:
_get_projects_summary
(
request
,
cycle
,
start
,
stop
),
'
usage_mode
'
:
_get_usage_mode
(
cycle
,
start
,
stop
),
'
failures
'
:
_get_failures
(
cycle
,
start
,
stop
),}
'
usage_mode
'
:
_get_usage_mode
(
cycle
,
start
,
stop
),
'
failures
'
:
_get_failures
(
cycle
,
start
,
stop
),}
result
[
'
contains_overlapping_observations
'
]
=
True
if
any
([
issubclass
(
warning
.
category
,
TaskOverlappingWarning
)
for
warning
in
w
])
else
False
result
[
'
contains_overlapping_observations
'
]
=
any
([
issubclass
(
warning
.
category
,
TaskOverlappingWarning
)
for
warning
in
w
])
return
result
return
result
...
@@ -340,7 +340,7 @@ def create_project_report(request: Request, project: models.Project, start: date
...
@@ -340,7 +340,7 @@ def create_project_report(request: Request, project: models.Project, start: date
result
=
{
'
project
'
:
project
.
pk
,
'
quota
'
:
_get_quotas_from_project
(
request
,
project
.
pk
),
'
SUBs
'
:
subs
,
result
=
{
'
project
'
:
project
.
pk
,
'
quota
'
:
_get_quotas_from_project
(
request
,
project
.
pk
),
'
SUBs
'
:
subs
,
'
durations
'
:
durations
,
'
LTA dataproducts
'
:
_get_lta_dataproducts
(
project
.
name
,
start
,
stop
),
'
durations
'
:
durations
,
'
LTA dataproducts
'
:
_get_lta_dataproducts
(
project
.
name
,
start
,
stop
),
'
SAPs exposure
'
:
_get_saps_exposure
(
project
.
pk
,
start
,
stop
),}
'
SAPs exposure
'
:
_get_saps_exposure
(
project
.
pk
,
start
,
stop
),}
result
[
'
contains_overlapping_observations
'
]
=
True
if
any
([
issubclass
(
warning
.
category
,
TaskOverlappingWarning
)
for
warning
in
w
])
else
False
result
[
'
contains_overlapping_observations
'
]
=
any
([
issubclass
(
warning
.
category
,
TaskOverlappingWarning
)
for
warning
in
w
])
return
result
return
result
...
...
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