From 7670863c6e1c71328e7d91146c3622970848af1c Mon Sep 17 00:00:00 2001
From: Dr Rob Cooke <03rcooke@users.noreply.github.com>
Date: Thu, 12 May 2022 13:30:12 +0200
Subject: [PATCH] add "_1" to sample effort

---
 reports/projects/glitrs/everything.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/reports/projects/glitrs/everything.xml b/reports/projects/glitrs/everything.xml
index 29a4cba7..053e5f86 100644
--- a/reports/projects/glitrs/everything.xml
+++ b/reports/projects/glitrs/everything.xml
@@ -33,7 +33,7 @@
   LEFT JOIN sample_attribute_values sav1 ON sav1.sample_id = o.sample_id and sav1.sample_attribute_id = #sample_plot_id# and sav1.deleted=false
   LEFT JOIN sample_attribute_values sav2 ON sav2.sample_id = o.sample_id and sav2.sample_attribute_id = #sample_effort_reported_id# and sav2.deleted=false
   LEFT JOIN cache_termlists_terms ctt6 ON ctt6.id = sav2.int_value
-  LEFT JOIN sample_attribute_values sav3 ON sav3.sample_id = o.sample_id and sav3.sample_attribute_id = #sample_effort_id# and sav3.deleted=false
+  LEFT JOIN sample_attribute_values sav3 ON sav3.sample_id = o.sample_id and sav3.sample_attribute_id = #sample_effort_1_id# and sav3.deleted=false
   LEFT JOIN sample_attribute_values sav4 ON sav4.sample_id = o.sample_id and sav4.sample_attribute_id = #sample_realm_id# and sav4.deleted=false
   LEFT JOIN cache_termlists_terms ctt7 ON ctt7.id = sav4.int_value
   LEFT JOIN sample_attribute_values sav5 ON sav5.sample_id = o.sample_id and sav5.sample_attribute_id = #sample_data_purpose_id# and sav5.deleted=false
@@ -141,7 +141,7 @@
       display="ID of Sample Effort Reported sample attribute" 
       datatype="integer"
     />
-    <param name="sample_effort_id" 
+    <param name="sample_effort_1_id" 
       display="ID of Sample Effort sample attribute" 
       datatype="integer"
     />
@@ -252,7 +252,7 @@
     <column name="date_type" sql="o.date_type" visible="false" />
     <column name="date" display="Sample Date" datatype="date" />
     <column name="sample_effort_reported" display="Sample Effort Reported" sql="coalesce(ctt6.term, 'NA')" datatype="text" />
-    <column name="sample_effort" display="Sample Effort" sql="coalesce(sav3.text_value, 'NA')" datatype="text" />
+    <column name="sample_effort_1" display="Sample Effort 1" sql="coalesce(sav3.text_value, 'NA')" datatype="text" />
     <column name="sample_realm" display="Sample Realm" sql="coalesce(ctt7.term, 'NA')" datatype="text" />
     <column name="sample_data_purpose" display="Sample Data Purpose" sql="coalesce(ctt8.term, 'NA')" datatype="text" />
     <column name="sample_data_purpose_info" display="Sample Data Purpose Information" sql="coalesce(sav6.text_value, 'NA')" datatype="text" />
@@ -279,4 +279,4 @@
     <column name="occurrence_taxon_name_in_source" display="Taxon Name in Source" sql="coalesce(oav8.text_value, 'NA')" datatype="text" />
     <column name="occurrence_taxonomy_notes" display="Taxonomy Notes" sql="coalesce(oav9.text_value, 'NA')" datatype="text" />
   </columns>
-</report>
\ No newline at end of file
+</report>