From 0f8c1e130c563b980dd65626b82654dddf667bc7 Mon Sep 17 00:00:00 2001
From: tm689 <tm689@cam.ac.uk>
Date: Tue, 4 Jul 2023 13:31:39 +0100
Subject: [PATCH] fix: handle KEY columns
---
coordinator/ProcessorSurveysWRSIS.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/coordinator/ProcessorSurveysWRSIS.py b/coordinator/ProcessorSurveysWRSIS.py
index 92c0a12..8bee755 100644
--- a/coordinator/ProcessorSurveysWRSIS.py
+++ b/coordinator/ProcessorSurveysWRSIS.py
@@ -104,6 +104,7 @@ def nested_to_flattened(df):
'Rust Details',
'Other Disease',
'Sample Details',
+ 'Survey Details.Survey No',
'Survey Details.Latitude',
'Survey Details.First Rust Observation Date',
'Survey Details.Longitude',
@@ -163,7 +164,6 @@ def nested_to_flattened(df):
'live_stemrust_samples_count',
'dead_yellowrust_samples_count',
'SET-OF-live_leafrust_samples',
- 'KEY',
'other_diseases_group-other_diseases',
'survey_infromation-location-Altitude',
'SET-OF-dead_stemrust_samples',
@@ -178,9 +178,6 @@ def nested_to_flattened(df):
for i in NEW_COLUMNS:
df[i] = ""
- #TODO: replace with a better KEY column
- df["KEY"] = df.index
-
# add dedicated rust columns, with default values
NEW_RUST_COLUMNS = {"Stem Rust.Incident":"none","Stem Rust.Severity":"-9","Stem Rust.Reaction":"na",
"Leaf Rust.Incident":"none","Leaf Rust.Severity":"-9","Leaf Rust.Reaction":"na",
@@ -221,6 +218,7 @@ def get_WRSIS_form_as_csv(form_credentials: dict, jobPath: str, config: dict, st
'Rust Details' : 'None',
'Other Disease' : 'None',
'Sample Details' : 'None',
+ 'Survey Details.Survey No' : 'KEY',
'Survey Details.Latitude' : 'survey_infromation-location-Latitude',
'Survey Details.First Rust Observation Date' : 'None',
'Survey Details.Longitude' : 'survey_infromation-location-Longitude',
--
GitLab