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.

Sign up for GitHub

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

Addobsvars #68

Merged
merged 2 commits into from
Oct 17, 2023
Merged

Addobsvars #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fe59d0
Added more fields to observation section, these are related to observ…
HenriKajasilta Oct 17, 2023
7565de0
Added corresponding element and variable names that were added in ui_…
HenriKajasilta Oct 17, 2023
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
23 changes: 23 additions & 0 deletions inst/extdata/display_names.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,15 @@ variable_name,soil_layer_count,Number of layers in soil sample,Maanäytteen kerr
variable_name,soil_layer_top_depth,"Soil layer depth, top (cm)","Kerroksen yläosan syvyys (cm)"
variable_name,soil_layer_base_depth,"Soil layer depth, bottom (cm)","Kerroksen alaosan syvyys (cm)"
variable_name,soil_classification_by_layer,Soil structure (MARA card),Maan rakenne (MARA-kortti)
variable_name,soil_bulk_density_moist,Bulk density (g/cm3),Irtotiheys (g/cm3)
variable_name,soil_water_wilting_pt,Soil water content at wilting point (cm3/cm3),Nuutumispiste (cm3/cm3)
variable_name,soil_water_field_cap_1,"Soil water content at field capacity, 30 kPA (cm3/cm3)", "Kenttäkapasiteetti, 30 kPA (cm3/cm3)"
variable_name,soil_water_saturated,Soil water content at saturation (cm3/cm3),Kylläisyyspiste (cm3/cm3)
variable_name,soil_silt_fraction,Soil silt fraction (%),Maaperän lietteen osuus (%)
variable_name,soil_sand_fraction,Soil sand fraction (%),Maaperän hiekan osuus (%)
variable_name,soil_clay_fraction,Soil clay fraction (%),Maaperän saven osuus (%)
variable_name,soil_organic_matter_layer,Total soil organic matter (kg[OM]/ha),Maaperän orgaaninen aines (kg[OA]/ha)
variable_name,soil_organic_C_perc_layer,Total soil organic carbon content (%),Orgaanisen hiilen osuus (%)
variable_name,root_depth,Root depth (m),Juurten syvyys (m)
variable_name,soil_compactification_depth,Soil compactification depth (cm),Tiivistymän syvyys (cm)
variable_name,earthworm_count,Number of earthworms,Lierojen lukumäärä
Expand All @@ -123,6 +132,8 @@ variable_name,growth_stage,Plant growth stage,Kasvuaste
variable_name,plant_density,Plant density (plants/m2),Kasvitiheys (kasveja/m2)
variable_name,specific_leaf_area,Specific leaf area (cm2/g),Ominaislehtiala (cm2/g)
variable_name,leaf_area_index,Leaf area index (m2/m2),Lehtialaindeksi (m2/m2)
variable_name,total_biomass_dw,"Total biomass, dry weight (kg/ha)","Kokonaisbiomassa, kuivapaino (kg/ha)"
variable_name,tops_C,Carbon in aboveground biomass (kg[C]/ha),Biomassa maanpinnalla (kg[C]/ha)
variable_name,canopy_height,Canopy height (m),Latvuston korkeus (m)
variable_name,canopeo_reading,Canopeo reading,Canopeo-lukema
variable_name,canopeo_image,Canopeo image,Canopeo-kuva
Expand Down Expand Up @@ -296,6 +307,15 @@ element_label,soil_layer_count_label,Number of layers in soil sample:,Maanäytte
element_label,soil_layer_top_depth_label,"Soil layer depth, top (cm):","Kerroksen yläosan syvyys (cm):"
element_label,soil_layer_base_depth_label,"Soil layer depth, bottom (cm):","Kerroksen alaosan syvyys (cm):"
element_label,soil_classification_by_layer_label,Soil structure (MARA card):,Maan rakenne (MARA-kortti):
element_label,soil_bulk_density_moist_label,Bulk density (g/cm3):,Irtotiheys (g/cm3):
element_label,soil_water_wilting_pt_label,Soil water content at wilting point (cm3/cm3):,Nuutumispiste (cm3/cm3):
element_label,soil_water_field_cap_1_label,"Soil water content at field capacity, 30 kPA (cm3/cm3):", "Kenttäkapasiteetti, 30 kPA (cm3/cm3):"
element_label,soil_water_saturated_label,Soil water content at saturation (cm3/cm3):,Kylläisyyspiste (cm3/cm3):
element_label,soil_silt_fraction_label,Soil silt fraction (%):,Maaperän lietteen osuus (%):
element_label,soil_sand_fraction_label,Soil sand fraction (%):,Maaperän hiekan osuus (%):
element_label,soil_clay_fraction_label,Soil clay fraction (%):,Maaperän saven osuus (%):
element_label,soil_organic_matter_layer_label,Total soil organic matter (kg[OM]/ha):,Maaperän orgaaninen aines (kg[OA]/ha):
element_label,soil_organic_C_perc_layer_label,Total soil organic carbon content (%):,Orgaanisen hiilen osuus (%):
element_label,root_depth_label,Root depth (m):,Juurten syvyys (m):
element_label,soil_compactification_depth_label,Soil compactification depth (cm):,Tiivistymän syvyys (cm):
element_label,earthworm_count_label,Number of earthworms:,Lierojen lukumäärä:
Expand All @@ -304,6 +324,8 @@ element_label,growth_stage_label,Plant growth stage:,Kasvuaste:
element_label,plant_density_label,Plant density (plants/m2):,Kasvitiheys (plants/m2):
element_label,specific_leaf_area_label,Specific leaf area (cm2/g):,Ominaislehtiala (cm2/g):
element_label,leaf_area_index_label,Leaf area index (m2/m2):,Lehtialaindeksi (m2/m2):
element_label,total_biomass_dw_label,"Total biomass, dry weight (kg/ha):","Kokonaisbiomassa, kuivapaino (kg/ha):"
element_label,tops_C_label,Carbon in aboveground biomass (kg[C]/ha):,Biomassa maanpinnalla (kg[C]/ha):
element_label,canopy_height_label,Canopy height (m):,Latvuston korkeus (m):
element_label,canopeo_reading_label,Canopeo reading:,Canopeo-lukema:
element_label,canopeo_image_label,Canopeo image:,Canopeo-kuva:
Expand Down Expand Up @@ -340,6 +362,7 @@ CRID,OAT,Oats (Avena sativa),Kaura (Avena sativa)
CRID,RYE,Rye (Secale cereale),Ruis (Secale cereale)
CRID,BAR,Barley (Hordeum vulgare),Ohra (Hordeum vulgare)
CRID,ZZ1,Mixed grain,Seosvilja
CRID,ZZ3,Mixed grass,Seosruoho
CRID,BWH,Buckwheat (Fagopyrum esculentum),Tattari (Fagopyrum esculentum)
CRID,POT,Potato (Solanum tuberosum),Peruna (Solanum tuberosum)
CRID,SBT,Sugar beet (Beta vulgaris var. altissima),Sokerijuurikas (Beta vulgaris var. altissima)
Expand Down
93 changes: 92 additions & 1 deletion inst/extdata/ui_structure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,12 @@
"code_name" : "soil_layer_count_table",
"type" : "dataTable",
"columns" : ["soil_layer_top_depth",
"soil_layer_base_depth", "soil_classification_by_layer"],
"soil_layer_base_depth", "soil_classification_by_layer",
"soil_bulk_density_moist", "soil_water_wilting_pt",
"soil_water_field_cap_1", "soil_water_saturated",
"soil_silt_fraction", "soil_sand_fraction",
"soil_clay_fraction", "soil_organic_matter_layer",
"soil_organic_C_perc_layer"],
"rows" : {
"soil_layers" : {
"row_variable" : "soil_layer_count",
Expand Down Expand Up @@ -961,6 +966,78 @@
"label" : "soil_classification_by_layer_label",
"choices" : "soil_classification_by_layer_choice",
"hide_in_event_list" : true
},

"soil_bulk_density_moist" : {
"code_name" : "soil_bulk_density_moist",
"type" : "numericInput",
"label" : "soil_bulk_density_moist_label",
"min" : 0,
"hide_in_event_list" : true
},

"soil_water_wilting_pt" : {
"code_name" : "soil_water_wilting_pt",
"type" : "numericInput",
"label" : "soil_water_wilting_pt_label",
"min" : 0,
"hide_in_event_list" : true
},

"soil_water_field_cap_1" : {
"code_name" : "soil_water_field_cap_1",
"type" : "numericInput",
"label" : "soil_water_field_cap_1_label",
"min" : 0,
"hide_in_event_list" : true
},

"soil_water_saturated" : {
"code_name" : "soil_water_saturated",
"type" : "numericInput",
"label" : "soil_water_saturated_label",
"min" : 0,
"hide_in_event_list" : true
},

"soil_silt_fraction" : {
"code_name" : "soil_silt_fraction",
"type" : "numericInput",
"label" : "soil_silt_fraction_label",
"min" : 0,
"hide_in_event_list" : true
},

"soil_sand_fraction" : {
"code_name" : "soil_sand_fraction",
"type" : "numericInput",
"label" : "soil_sand_fraction_label",
"min" : 0,
"hide_in_event_list" : true
},

"soil_clay_fraction" : {
"code_name" : "soil_clay_fraction",
"type" : "numericInput",
"label" : "soil_clay_fraction_label",
"min" : 0,
"hide_in_event_list" : true
},

"soil_organic_matter_layer" : {
"code_name" : "soil_organic_matter_layer",
"type" : "numericInput",
"label" : "soil_organic_matter_layer_label",
"min" : 0,
"hide_in_event_list" : true
},

"soil_organic_C_perc_layer" : {
"code_name" : "soil_organic_C_perc_layer",
"type" : "numericInput",
"label" : "soil_organic_C_perc_layer_label",
"min" : 0,
"hide_in_event_list" : true
}

}
Expand Down Expand Up @@ -1032,6 +1109,20 @@
"label" : "leaf_area_index_label",
"min" : 0
},

"total_biomass_dw" : {
"code_name" : "total_biomass_dw",
"type" : "numericInput",
"label" : "total_biomass_dw_label",
"min" : 0
},

"tops_C" : {
"code_name" : "tops_C",
"type" : "numericInput",
"label" : "tops_C_label",
"min" : 0
},

"canopy_height" : {
"code_name" : "canopy_height",
Expand Down
Loading