Kolpack-Software-Consulting/LeafWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add remaining fields for query

Browse Source
This commit is contained in:
James Kolpack
2020-07-03 10:18:13 -04:00
parent d107cc8e8b
commit 7ad10d6ddc
5 changed files with 118 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebCms/Views/Queue/Index.cshtml
+16 -8
View File
@@ -52,31 +52,39 @@
<div class="row">
<div class="col-md-6">
<div class="row">
<div class="col-sm-7">
<div class="col-7">
@Html.EditorFor(m => m.Q.lat, new { size = "small", append = "&deg;" })
</div>
<div class="col-sm-5">
<div class="col-5">
@Html.EditorFor(m => m.Q.latr, new { size = "small", prepend = "&plusmn;", append = "&deg;" })
</div>
</div>
</div>
<div class="col-md-6 border-left">
<div class="row">
<div class="col-sm-7">
<div class="col-7">
@Html.EditorFor(m => m.Q.lon, new { size = "small", append = "&deg;" })
</div>
<div class="col-sm-5">
<div class="col-5">
@Html.EditorFor(m => m.Q.lonr, new { size = "small", prepend = "&plusmn;", append = "&deg;" })
</div>
</div>
</div>
</div>
<hr />
<div class="text-body font-weight-bold pb-3">Curve Variation range minimum</div>
<div class="row">
<div class="col">
<div class="text-body">Curve Variation range minimum</div>
@Html.EditorFor(m => m.Q.co2s, new { size = "small", append = "umol/m" })
<div class="col-md-6">
@Html.EditorFor(m => m.Q.co2s, new { size = "small", append = "umol/m", prepend = ">" })
</div>
<div class="col-md-6">
@Html.EditorFor(m => m.Q.pari, new { size = "small", append = "umol/m2/s", prepend = ">" })
</div>
<div class="col-md-6">
@Html.EditorFor(m => m.Q.tleaf, new { size = "small", append = "oC", prepend = ">" })
</div>
<div class="col-md-6">
@Html.EditorFor(m => m.Q.phips2, new { size = "small", prepend = ">" })
</div>
</div>
</div>
WebCms/Views/Shared/DisplayTemplates/LeafInputDataViewModels.cshtml
+19 -7
View File
@@ -11,7 +11,7 @@
@RendDistinctValues("Latitude [&deg;]", Model.Select(m => m.Site.Latitude?.ToString()))
@RendDistinctValues("Longitude [&deg;]", Model.Select(m => m.Site.Longitude?.ToString()))
@RendDistinctValues("Elevation [m]", Model.Select(m => m.Site.Elevation?.ToString()))
@RendDistinctValues("CO2S",
@*@RendDistinctValues("CO2S",
Model.Select(m =>
m.SiteName + " (" + m.Id + "): " +
string.Join(", ",
@@ -33,21 +33,33 @@
m.SiteName + " (" + m.Id + "): " +
(m.Data?.Max(d => d.CO2S)
- m.Data?.Min(d => d.CO2S))), "<br />")
@RendValue("CO2S Max Range", Model.Max(m =>
m.Data?.Max(d => d.CO2S)
- m.Data?.Min(d => d.CO2S))?.ToString())
@RendValue("CO2S Min Range", Model.Min(m =>
m.Data?.Max(d => d.CO2S)
- m.Data?.Min(d => d.CO2S))?.ToString())*@
@RendValue("CO2 response curves (CO2S) Max range", Model.Max(m =>
m.Data?.Max(d => d.CO2S)
- m.Data?.Min(d => d.CO2S))?.ToString())
@RendValue("Light response curves (PARi) Max range", Model.Max(m =>
m.Data?.Max(d => d.PARi)
- m.Data?.Min(d => d.PARi))?.ToString())
@RendValue("Temperature response curves (Tleaf) Max Range", Model.Max(m =>
m.Data?.Max(d => d.Tleaf)
- m.Data?.Min(d => d.Tleaf))?.ToString())
@RendValue("Fluorometry measurements (PhiPS2) Max Range", Model.Max(m =>
m.Data?.Max(d => d.PhiPS2)
- m.Data?.Min(d => d.PhiPS2))?.ToString())
@helper RendValue(string label, string value)
{
<div class="row pb-lg-2 pb-sm-1 @if (ViewData.Model == null){<text>d-none</text> }">
<div class="col-sm-3 text-truncate border-right border-bottom pl-4 pl-sm-5">
<div class="row pb-lg-2 pb-sm-1 @if (ViewData.Model == null || string.IsNullOrEmpty(value)){<text>d-none</text> }">
<div class="col-sm-5 text-truncate border-right border-bottom pl-4 pl-sm-5">
@Html.Raw(label)
</div>
<div class="col-sm-9 border-bottom pl-5 pl-sm-2">
<div class="col-sm-7 border-bottom pl-5 pl-sm-2">
@Html.Raw(@value)
</div>
</div>