diff --git a/coordinator/ProcessorSurveysWRSIS.py b/coordinator/ProcessorSurveysWRSIS.py index 92c0a1281521821a4604511b3e9a64a0a3abbf4d..8bee755841078d2e34004282b2983db82fb05f56 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',