From b502ef3ea6620f951a4e8c76d5a4048ae38a3b4d Mon Sep 17 00:00:00 2001 From: Irwan Fathurrahman Date: Mon, 15 Jan 2024 09:25:03 +0700 Subject: [PATCH] Fix sql query for custom groundwater layer --- django_project/igrac/forms/groundwater_layer.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/django_project/igrac/forms/groundwater_layer.py b/django_project/igrac/forms/groundwater_layer.py index 9c45a0c..b93ec33 100644 --- a/django_project/igrac/forms/groundwater_layer.py +++ b/django_project/igrac/forms/groundwater_layer.py @@ -81,10 +81,14 @@ def update_sql(self, tree): elif well_type == GGMN: mv = 'mv_well_ggmn' sql = ( - "select id, ggis_uid, original_id, name, feature_type,purpose, status,organisation, country, year_of_drilling, aquifer_name, aquifer_type,manager, detail, location, created_at, created_by, last_edited_at, last_edited_by " - f"from {mv} where organisation_id IN (" + - f"{','.join(organisations)}" + - ") order by created_at DESC" + "select id, ggis_uid, original_id, name, feature_type,purpose, status, organisation, " + 'number_of_measurements_level as "groundwater_level_data", ' + 'number_of_measurements_quality as "groundwater_quality_data", ' + 'number_of_measurements_yield as "abstraction_discharge", ' + "country, year_of_drilling, aquifer_name, aquifer_type,manager, detail, location, created_at, created_by, last_edited_at, last_edited_by " + f"from {mv} where organisation_id IN (" + + f"{','.join(organisations)}" + + ") order by created_at DESC" ) tree.find('metadata/entry/virtualTable/sql').text = sql