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
8422c978
Commit
8422c978
authored
3 years ago
by
Mario Raciti
Browse files
Options
Downloads
Patches
Plain Diff
TMSS-770
: Add target name info for the project reporting
parent
cc762991
No related branches found
No related tags found
3 merge requests
!634
WIP: COBALT commissioning delta
,
!522
Resolve TMSS-770
,
!481
Draft: SW-971 SW-973 SW-975: Various fixes to build LOFAR correctly.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
+6
-0
6 additions, 0 deletions
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
with
6 additions
and
0 deletions
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
+
6
−
0
View file @
8422c978
from
django.db.models
import
F
,
Sum
from
django.db.models
import
F
,
Sum
from
lofar.sas.tmss.tmss.tmssapp
import
models
from
lofar.sas.tmss.tmss.tmssapp
import
models
from
lofar.sas.tmss.tmss.tmssapp
import
serializers
from
lofar.sas.tmss.tmss.tmssapp
import
serializers
from
lofar.sas.tmss.services.scheduling.constraints.template_constraints_v1
import
get_target_observation_task_name_from_requirements_doc
from
rest_framework.request
import
Request
from
rest_framework.request
import
Request
from
datetime
import
timedelta
from
datetime
import
timedelta
...
@@ -343,6 +344,11 @@ def _get_subs_and_durations_from_project(project_pk: int) -> ({}, {}):
...
@@ -343,6 +344,11 @@ def _get_subs_and_durations_from_project(project_pk: int) -> ({}, {}):
sub_observed_duration
=
sub
.
observed_duration
.
total_seconds
()
if
sub
.
observed_duration
else
0
sub_observed_duration
=
sub
.
observed_duration
.
total_seconds
()
if
sub
.
observed_duration
else
0
sub_info
=
{
'
id
'
:
sub
.
pk
,
'
name
'
:
sub
.
name
,
'
status
'
:
sub
.
status
,
'
start
'
:
sub
.
start_time
.
isoformat
(),
sub_info
=
{
'
id
'
:
sub
.
pk
,
'
name
'
:
sub
.
name
,
'
status
'
:
sub
.
status
,
'
start
'
:
sub
.
start_time
.
isoformat
(),
'
stop
'
:
sub
.
stop_time
.
isoformat
(),
'
duration
'
:
sub_duration
,
'
observed_duration
'
:
sub_observed_duration
}
'
stop
'
:
sub
.
stop_time
.
isoformat
(),
'
duration
'
:
sub_duration
,
'
observed_duration
'
:
sub_observed_duration
}
try
:
sub_info
[
'
target
'
]
=
get_target_observation_task_name_from_requirements_doc
(
sub
)
except
Exception
as
e
:
sub_info
[
'
target
'
]
=
None
# Gather durations
# Gather durations
durations
[
'
total
'
]
+=
sub_duration
# Total
durations
[
'
total
'
]
+=
sub_duration
# Total
if
sub
.
status
!=
'
cancelled
'
:
# Not cancelled SUBs
if
sub
.
status
!=
'
cancelled
'
:
# Not cancelled SUBs
...
...
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