Skip to content
GitLab
Explore
Sign in
Register
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
88e18c21
Commit
88e18c21
authored
3 years ago
by
Mario Raciti
Browse files
Options
Downloads
Patches
Plain Diff
TMSS-610
: Add skeleton for cycle reporting
parent
df1202fb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!634
WIP: COBALT commissioning delta
,
!492
Resolve TMSS-610
,
!481
Draft: SW-971 SW-973 SW-975: Various fixes to build LOFAR correctly.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
+64
-0
64 additions, 0 deletions
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
+16
-1
16 additions, 1 deletion
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
with
80 additions
and
1 deletion
SAS/TMSS/backend/src/tmss/tmssapp/adapters/reports.py
+
64
−
0
View file @
88e18c21
...
...
@@ -6,6 +6,70 @@ from rest_framework.request import Request
from
datetime
import
timedelta
def
create_cycle_report
(
request
:
Request
,
current_cycle
:
models
.
Cycle
,
other_cycles
:
[
models
.
Cycle
])
->
{}:
"""
Create a cycle report as a JSON object.
"""
current_cycle_pk
=
current_cycle
.
pk
other_cycles_pk
=
[
c
.
pk
for
c
in
other_cycles
]
if
other_cycles
else
[]
result
=
{
'
current_cycle
'
:
current_cycle_pk
}
# TODO: Manage default cases. See TMSS-610.
# Add properties
result
[
'
cycles
'
]
=
[]
for
c
in
sorted
(
other_cycles_pk
+
[
current_cycle_pk
,
]):
result
[
'
cycles
'
].
append
({
c
:
{
'
telescope_time_distribution
'
:
_get_telescope_time_distribution
(),
'
average_efficiency
'
:
_get_average_efficiency
(),
'
completion_level
'
:
_get_completion_level
(),
'
observation_hours_per_category
'
:
_get_observation_hours_per_category
(),
'
weekly_efficiency
'
:
_get_weekly_efficiency
(),
'
data_ingested_per_site_and_category
'
:
_get_data_ingested_per_site_and_category
(),
'
projects_summary
'
:
_get_projects_summary
(),
'
usage_mode
'
:
_get_usage_mode
(),
'
failures
'
:
_get_failures
(),
}})
return
result
def
_get_average_efficiency
():
return
0
def
_get_completion_level
():
return
0
def
_get_telescope_time_distribution
():
return
0
def
_get_observation_hours_per_category
():
return
0
def
_get_weekly_efficiency
():
return
0
def
_get_data_ingested_per_site_and_category
():
return
0
def
_get_projects_summary
():
return
0
def
_get_usage_mode
():
return
0
def
_get_failures
():
return
0
def
create_project_report
(
request
:
Request
,
project
:
models
.
Project
)
->
{}:
"""
Create a project report as a JSON object.
...
...
This diff is collapsed.
Click to expand it.
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
+
16
−
1
View file @
88e18c21
...
...
@@ -23,7 +23,7 @@ from drf_yasg.openapi import Parameter
from
lofar.sas.tmss.tmss.tmssapp.viewsets.lofar_viewset
import
LOFARViewSet
,
LOFARNestedViewSet
,
AbstractTemplateViewSet
,
LOFARCopyViewSet
,
LOFARFilterBackend
from
lofar.sas.tmss.tmss.tmssapp
import
models
from
lofar.sas.tmss.tmss.tmssapp
import
serializers
from
lofar.sas.tmss.tmss.tmssapp.adapters.reports
import
create_project_report
from
lofar.sas.tmss.tmss.tmssapp.adapters.reports
import
create_cycle_report
,
create_project_report
from
django.http
import
JsonResponse
from
datetime
import
datetime
...
...
@@ -318,6 +318,21 @@ class CycleViewSet(LOFARViewSet):
serializer_class
=
serializers
.
CycleSerializer
ordering
=
[
'
start
'
]
@swagger_auto_schema
(
responses
=
{
200
:
'
The Report information
'
,
403
:
'
forbidden
'
},
operation_description
=
"
Get Report information for the cycle.
"
)
@action
(
methods
=
[
'
get
'
],
detail
=
True
,
url_name
=
"
report
"
,
name
=
"
Get Report
"
)
def
report
(
self
,
request
,
pk
=
None
,
other_cycles
=
None
):
# TODO: Maybe would it be better to implement this method outside of the viewset?
# Let's assume the cycle istance is the current cycle for the moment.
cycle
=
get_object_or_404
(
models
.
Cycle
,
pk
=
pk
)
cycles
=
[]
if
other_cycles
is
not
None
:
for
c
in
other_cycles
:
cycles
.
append
(
get_object_or_404
(
models
.
Cycle
,
pk
=
c
.
pk
))
result
=
create_cycle_report
(
request
,
cycle
,
cycles
)
return
Response
(
result
,
status
=
status
.
HTTP_200_OK
)
class
CycleQuotaViewSet
(
LOFARViewSet
):
queryset
=
models
.
CycleQuota
.
objects
.
all
()
...
...
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