From 2716b9bfb4713a9f874b11c5ce1a016d0df76214 Mon Sep 17 00:00:00 2001
From: James Kolpack <james.kolpack@gmail.com>
Date: Tue, 4 Aug 2020 21:40:32 -0400
Subject: [PATCH] Cleanup and small fixes

---
 WebCms/Config/ClientDependency.config         |  2 +-
 WebCms/Controllers/LeafWebPageIds.cs          |  1 +
 WebCms/Views/Results/Index.cshtml             | 54 ++++++++++++++-----
 .../Shared/EditorTemplates/Checkbox.cshtml    |  4 +-
 WebCms/scripts/LeafDataQuery.js               | 14 +++++
 5 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/WebCms/Config/ClientDependency.config b/WebCms/Config/ClientDependency.config
index c46fc96..2b740e0 100644
--- a/WebCms/Config/ClientDependency.config
+++ b/WebCms/Config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="1253434195" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="1125323495" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
 
   <!-- 
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
diff --git a/WebCms/Controllers/LeafWebPageIds.cs b/WebCms/Controllers/LeafWebPageIds.cs
index 0c108e6..634cdb1 100644
--- a/WebCms/Controllers/LeafWebPageIds.cs
+++ b/WebCms/Controllers/LeafWebPageIds.cs
@@ -9,6 +9,7 @@ namespace LeafWeb.WebCms.Controllers
         public const int Details_Admin = 1111;
         public const int Details_Results = 1183;
         public const int PasswordResetRequest = 1164;
+        public const int LeafInputCreate = 1099;
     }
 
     public static class LeafWebMemberProperties
diff --git a/WebCms/Views/Results/Index.cshtml b/WebCms/Views/Results/Index.cshtml
index 03a3281..cffaef4 100644
--- a/WebCms/Views/Results/Index.cshtml
+++ b/WebCms/Views/Results/Index.cshtml
@@ -1,4 +1,5 @@
 @using LeafWeb.Core.Entities
+@using LeafWeb.WebCms.Controllers
 @using LeafWeb.WebCms.Utility
 @model SearchViewModel
 @{
@@ -10,7 +11,7 @@
         <strong>@Model.Items.Count()</strong> results
     </div>
     <div class="col-12 col-sm-9">
-        @Html.Partial("_LeafDataQuery", Model.Q, 
+        @Html.Partial("_LeafDataQuery", Model.Q,
             new ViewDataDictionary{
             {"actionName", "Search"},
             {"controllerName", "Results"},
@@ -18,19 +19,32 @@
     </div>
 </div>
 
-<div class="table-responsive">
-    @grid.Table(columns:
-        grid.Columns(
-            grid.Column("Identifier", "Identifier"),
-            grid.Column("SiteId", "Site Id"),
-            //grid.Column("Name", "Submitted By"),
-            grid.Column("CurrentStatus", "Status", item => Status(item.Value)),
-            grid.Column("", format: item => Actions(item.Value), canSort: false)
-            ),
-        htmlAttributes: new { @class = "table table-sm table-striped table-bordered table-hover" }
-        )
-    @grid.PagerList()
-</div>
+@if (Model.Items.Any())
+{
+    <div class="table-responsive">
+        @grid.Table(columns:
+            grid.Columns(
+                grid.Column("Identifier", "Identifier"),
+                grid.Column("SiteId", "Site Id"),
+                //grid.Column("Name", "Submitted By"),
+                grid.Column("CurrentStatus", "Status", item => Status(item.Value)),
+                grid.Column("", format: item => Actions(item.Value), canSort: false)
+                ),
+            htmlAttributes: new { @class = "table table-sm table-striped table-bordered table-hover" }
+            )
+    </div>
+    <div class="row justify-content-end">
+        <div class="col-sm">@grid.PagerList()</div>
+        <div class="col-sm col-lg-5 pl-4 pt-3 pt-sm-0">
+            <span class="pr-2">Download Results</span>
+            @DownloadResults()
+        </div>
+    </div>
+}
+else
+{
+    <p>No results. <a href="@UmbracoContext.Current.UrlProvider.GetUrl(LeafWebPageIds.LeafInputCreate)">Click here to submit Leaf Data.</a></p>
+}
 
 
 @helper Actions(LeafInput leafInput)
@@ -42,3 +56,15 @@
 {
     @Html.Partial("DisplayTemplates/_LeafInputStatus", leafInput)
 }
+
+@helper DownloadResults()
+{
+    <div class="btn-group" role="group" aria-label="Download">
+        <a class="btn btn-outline-secondary small" role="button" href="@Url.Action("ResultsInputZip", "Download", Model.Q.GetNameValueCollection().ToRouteValueDictionary())">
+            <span class="fa fa-download"></span> Input
+        </a>
+        <a class="btn btn-outline-secondary small" role="button" href="@Url.Action("ResultsOutputZip", "Download", Model.Q.GetNameValueCollection().ToRouteValueDictionary())">
+            <span class="fa fa-download"></span> Output
+        </a>
+    </div>
+}
\ No newline at end of file
diff --git a/WebCms/Views/Shared/EditorTemplates/Checkbox.cshtml b/WebCms/Views/Shared/EditorTemplates/Checkbox.cshtml
index febc336..f487554 100644
--- a/WebCms/Views/Shared/EditorTemplates/Checkbox.cshtml
+++ b/WebCms/Views/Shared/EditorTemplates/Checkbox.cshtml
@@ -12,4 +12,6 @@
     var id = ViewData.TemplateInfo.GetFullHtmlFieldId("");
 }
 
-<input id="@id" name="@id" type="checkbox" @if(isChecked) {<text>checked="checked"</text>} />
\ No newline at end of file
+<input id="@id" name="@id" type="checkbox" 
+       @if(isChecked) {<text>checked="checked"</text>} 
+       @if(htmlAttributes.ContainsKey("class")){<text>class="@htmlAttributes["class"]"</text> } />
\ No newline at end of file
diff --git a/WebCms/scripts/LeafDataQuery.js b/WebCms/scripts/LeafDataQuery.js
index 20f18a9..b71ed23 100644
--- a/WebCms/scripts/LeafDataQuery.js
+++ b/WebCms/scripts/LeafDataQuery.js
@@ -6,6 +6,20 @@
                 required: function ()
                 {
                     return !!$(".lat input.form-control").val();
+                },
+                messages: {
+                    required: "Enter +/- range of latitude"
+                }
+            });
+    $("form#leafdataquery .lonr input.form-control")
+        .rules("add",
+            {
+                //required: true
+                required: function () {
+                    return !!$(".lon input.form-control").val();
+                },
+                messages: {
+                    required: "Enter +/- range of longitude"
                 }
             });
 });
\ No newline at end of file