Skip to content
Snippets Groups Projects
Commit ccdc0ca8 authored by Christoffer Stoll's avatar Christoffer Stoll
Browse files

Merge branch 'development' into 'master' 

exclude -9900 values, even if "include invalid values" is enabled

See merge request !29
parents bcb0eeda 76c4a34b
No related branches found
No related tags found
1 merge request!29exclude -9900 values, even if "include invalid values" is enabled
Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
+ 2
− 1
View file @ ccdc0ca8
......@@ -3,9 +3,10 @@
All notable changes to this project will be documented in this file.
Changes before version 3.1.0 is not included
## [latest commits]
## [3.1.2] - 2024-09-26
- Added variable for container name in docker-compose file
- Exclude -9900 values, even if "include invalid values" is enabled in "historical data" module. The change is in Mean class, so it may affect others
## [3.1.1] - 2024-06-28
......
api/core/data/mean.py
+ 14
− 14
View file @ ccdc0ca8
......@@ -134,7 +134,7 @@ class Mean:
SELECT
to_char (o.to_time, 'YYYY-MM-DD HH24:MI:SS') as "datetime",
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s)
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900)
THEN ROUND(o.value,%(fraction)s)::double PRECISION
ELSE NULL
END as "value",
......@@ -159,7 +159,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -206,7 +206,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -253,7 +253,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -298,7 +298,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -351,7 +351,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -402,7 +402,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -447,7 +447,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -494,7 +494,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -549,7 +549,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -630,7 +630,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -717,7 +717,7 @@ class Mean:
END from_time,
o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -774,7 +774,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......@@ -829,7 +829,7 @@ class Mean:
SELECT
o.from_time, o.to_time, o.sampling_point_id,
CASE
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) THEN o.value
WHEN o.verification_flag <= %(verificationFlag)s AND (o.validation_flag in (1,2,3) or %(useInvalidValues)s) AND (o.value != -9900) THEN o.value
ELSE NULL
END val
FROM
......
api/endpoints/version/routes.py
+ 1
− 1
View file @ ccdc0ca8
......@@ -3,7 +3,7 @@ from flask_jwt_extended import create_access_token
import requests
version_endpoint = Blueprint('version', __name__)
current_version = "3.1.1"
current_version = "3.1.2"
@version_endpoint.route('/api/version', methods=['GET'])
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment