Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add "_1" to sample effort #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions reports/projects/glitrs/everything.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
/>
Expand Down Expand Up @@ -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" />
Expand All @@ -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>
</report>