Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VIPSWeb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
VIPS
VIPSWeb
Commits
bfc9a738
Commit
bfc9a738
authored
11 months ago
by
Lene Wasskog
Browse files
Options
Downloads
Patches
Plain Diff
feat(timeseries): Display timeseries details and observation data
parent
726b8b27
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
observations/templates/observations/timeseries.html
+149
-1
149 additions, 1 deletion
observations/templates/observations/timeseries.html
observations/views.py
+5
-0
5 additions, 0 deletions
observations/views.py
with
154 additions
and
1 deletion
observations/templates/observations/timeseries.html
+
149
−
1
View file @
bfc9a738
<h1>
TIMESERIES {{ observation_time_series_id }}
</h1>
\ No newline at end of file
{% extends "base.html" %}
{% load i18n l10n static %}
{% comment %}
#
# Copyright (c) 2024 NIBIO
<http:
//
www.nibio.no
/>
.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
# it under the terms of the NIBIO Open Source License as published by
# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# NIBIO Open Source License for more details.
#
# You should have received a copy of the NIBIO Open Source License
# along with VIPSWeb. If not, see
<http:
//
www.nibio.no
/
licenses
/>
.
#
{% endcomment %}
{% load i18n %}
{% block title%}{% trans "Time series" %}{%endblock%}
{% block content %}
<div
class=
"singleBlockContainer"
>
<div
class=
"row"
>
<div
class=
"col-md-6"
>
<h1>
{% trans "Time series" %}
</h1>
<p><a
href=
"/observations"
class=
"btn btn-default back"
role=
"button"
>
{% trans "View all observations" %}
</a></p>
<h4>
{% trans "Organism" %}
</h4>
<p
id=
"organismName"
></p>
<h4>
{% trans "Crop" %}
</h4>
<p
id=
"cropOrganismName"
></p>
<h2
id=
"timeSeriesName"
></h2>
<p
id=
"timeSeriesDescription"
></p>
</div>
<div
class=
"col-md-6"
>
<div
id=
"observationViewMap"
class=
"map"
style=
"height: 400px;"
></div>
</div>
</div>
<div
class=
"row singleBlockContainer"
>
<div
class=
"col-md-12"
>
<div
id=
"observationTable"
class=
"table-responsive"
></div>
</div>
</div>
<div
style=
"display: none;"
><div
id=
"poiMarker"
title=
"Marker"
><img
src=
"{% static "
observations
/
images
/
observation_marker.png
"
%}"
/></div></div>
</div>
{% endblock %}
{% block customCSS %}
<link
rel=
"stylesheet"
href=
"{% static "
css
/3
rdparty
/
ol.css
"
%}"
type=
"text/css"
>
{% endblock %}
{% block customJS %}
<script
type=
"text/javascript"
src=
"{% url "
javascript-catalog
"
%}"
></script>
<script
type=
"text/javascript"
src=
"{% static "
js
/3
rdparty
/
moment.min.js
"
%}"
></script>
<script
type=
"text/javascript"
src=
"{% static "
js
/3
rdparty
/
ol.js
"
%}"
></script>
<script
type=
"text/javascript"
src=
"{% url "
views.settings_js
"
%}"
></script>
<script
type=
"text/javascript"
src=
"{% static "
js
/
util.js
"
%}"
></script>
<script
type=
"text/javascript"
src=
"{% static "
observations
/
js
/
observationViewMap.js
"
%}"
></script>
<script
type=
"text/javascript"
>
$
(
document
).
ready
(
function
()
{
var
uuidParam
=
settings
.
userUuid
!=
null
?
"
?userUUID=
"
+
settings
.
userUuid
:
""
;
$
.
getJSON
(
"
/vipslogicproxy/rest/observationtimeseries/{{observation_time_series_id}}/
"
+
uuidParam
,
function
(
observationTimeSeries
)
{
//console.log(observation);
document
.
getElementById
(
"
organismName
"
).
innerHTML
=
getLocalizedOrganismName
(
observationTimeSeries
.
organism
)
+
"
<i>(
"
+
observationTimeSeries
.
organism
.
latinName
+
"
)</i>
"
;
document
.
getElementById
(
"
cropOrganismName
"
).
innerHTML
=
getLocalizedOrganismName
(
observationTimeSeries
.
cropOrganism
)
+
"
<i>(
"
+
observationTimeSeries
.
cropOrganism
.
latinName
+
"
)</i>
"
;
document
.
getElementById
(
"
timeSeriesName
"
).
innerHTML
=
observationTimeSeries
.
name
;
document
.
getElementById
(
"
timeSeriesDescription
"
).
innerHTML
=
observationTimeSeries
.
description
;
console
.
info
(
"
observationTimeSeries
"
,
observationTimeSeries
);
let
observations
=
[];
$
.
getJSON
(
"
/vipslogicproxy/rest/observation/list/filter/{{ organization_id }}?observationTimeSeriesId={{ observation_time_series_id }}
"
,
function
(
observations
)
{
initTable
(
observations
);
});
if
(
!
observationTimeSeries
.
locationIsPrivate
)
{
if
(
observationTimeSeries
.
locationPointOfInterestId
>
0
)
{
$
.
getJSON
(
settings
.
vipslogicProtocol
+
"
://
"
+
settings
.
vipslogicServerName
+
"
/rest/poi/
"
+
observationTimeSeries
.
locationPointOfInterestId
,
function
(
poi
)
{
initMap
(
null
,
poi
,
"
observationViewMap
"
,
"
{{settings.MAP_ATTRIBUTION|safe}}
"
)
});
}
else
{
initMap
(
observationTimeSeries
.
geoinfo
,
null
,
"
observationViewMap
"
,
"
{{settings.MAP_ATTRIBUTION|safe}}
"
);
}
}
else
{
renderLocationIsHiddenMessage
();
}
});
});
function
initTable
(
observations
)
{
const
parent
=
document
.
getElementById
(
"
observationTable
"
).
parentNode
;
parent
.
innerHTML
=
""
;
if
(
!
observations
)
{
return
;
}
const
dataSchema
=
JSON
.
parse
(
observations
[
0
].
observationDataSchema
[
"
dataSchema
"
])
let
dataVars
=
{}
Object
.
keys
(
dataSchema
[
'
properties
'
]).
forEach
(
function
(
key
)
{
dataVars
[
key
]
=
dataSchema
[
'
properties
'
][
key
][
'
title
'
]
});
console
.
info
(
"
dataSchema
"
,
dataSchema
);
const
table
=
document
.
createElement
(
"
table
"
);
table
.
className
=
"
table table-striped
"
const
header
=
table
.
createTHead
();
const
headerRow
=
header
.
insertRow
(
0
);
const
headers
=
Object
.
keys
(
observations
[
0
]);
const
dateCell
=
headerRow
.
insertCell
();
dateCell
.
outerHTML
=
`<th>Observasjonsdag</th>`
;
Object
.
keys
(
dataVars
).
forEach
((
key
,
index
)
=>
{
const
dataCell
=
headerRow
.
insertCell
();
dataCell
.
outerHTML
=
"
<th>
"
+
dataVars
[
key
]
+
"
</th>
"
;
});
const
tbody
=
table
.
createTBody
();
observations
.
forEach
((
observation
,
rowIndex
)
=>
{
const
row
=
tbody
.
insertRow
(
rowIndex
);
const
dateCell
=
row
.
insertCell
();
dateCell
.
innerText
=
getStandardFormattedDate
(
observation
.
timeOfObservation
);
Object
.
keys
(
dataVars
).
forEach
((
key
,
index
)
=>
{
const
dataCell
=
row
.
insertCell
();
if
(
observation
.
observationData
)
{
dataCell
.
innerText
=
JSON
.
parse
(
observation
.
observationData
)[
key
];
}
else
{
dataCell
.
innerText
=
""
;
}
});
});
parent
.
appendChild
(
table
);
}
function
renderLocationIsHiddenMessage
(){
document
.
getElementById
(
"
observationViewMap
"
).
parentNode
.
innerHTML
=
"
<h2>{% trans
"
Map
view
not
available
"
%}</h2>
"
;
}
</script>
{% endblock %}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
observations/views.py
+
5
−
0
View file @
bfc9a738
...
...
@@ -75,7 +75,12 @@ def detail(request, observation_id):
return
render
(
request
,
'
observations/detail.html
'
,
context
)
def
timeseries
(
request
,
observation_time_series_id
):
if
request
.
session
.
get
(
"
vips_logic_user
"
,
None
)
!=
None
:
organization_id
=
request
.
session
[
"
vips_logic_user
"
][
"
organization_id
"
]
else
:
organization_id
=
settings
.
VIPS_ORGANIZATION_ID
context
=
{
"
organization_id
"
:
organization_id
,
"
observation_time_series_id
"
:
observation_time_series_id
,
}
return
render
(
request
,
'
observations/timeseries.html
'
,
context
)
\ No newline at end of file
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