Merge pull request #10 from programcsharp/master

update

Author: jehhynes

Build/CommonAssemblyInfo.cs

@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyProduct("Griddly")]
-[assembly: AssemblyCopyright("Copyright © 2015 Chris Hynes and Data Research Group")]
+[assembly: AssemblyCopyright("Copyright © 2013-2017 Chris Hynes and Data Research Group")]
 
 [assembly: ComVisible(false)]
 
@@ -15,6 +15,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.5.22")]
-[assembly: AssemblyFileVersion("1.5.22")]
+[assembly: AssemblyVersion("1.8.0")]
+[assembly: AssemblyFileVersion("1.8.0")]
 //[assembly: AssemblyInformationalVersion("1.4.5-editlyalpha2")]

Griddly.Mvc/GriddlyButton.cs

@@ -37,6 +37,11 @@ public GriddlyButton(string additionalClassName = null)
         public string ConfirmMessage { get; set; }
         public bool AlignRight { get; set; }
 
+        /// <summary>
+        /// A function name to use to show the confirm message. Takes two parameters, message and callback. Callback is a function to call to continue the button click if the confirm was accepted.
+        /// </summary>
+        public string ConfirmPromptFunction { get; set; }
+
         /// <summary>
         /// The row ids to include in the button action (default uses grid default)
         /// </summary>

Griddly.Mvc/GriddlyFilter.cs

@@ -126,7 +126,7 @@ public void SetSelectedItems(object value)
 
                     if (defaultValues == null || value is string)
                     {
-                        string valueString = value.ToString();// GetValueString(value);
+                        string valueString = GetValueString(value);
 
                         foreach (SelectListItem item in SelectableItems)
                             item.Selected = item.Value == valueString;
@@ -137,7 +137,7 @@ public void SetSelectedItems(object value)
                         {
                             if (valueObject != null)
                             {
-                                string valueString = valueObject.ToString();// GetValueString(valueObject);
+                                string valueString = GetValueString(valueObject);
 
                                 foreach (SelectListItem item in SelectableItems.Where(x => x.Value == valueString))
                                     item.Selected = true;
@@ -159,6 +159,15 @@ public void SetSelectedItems(object value)
             }
         }
 
+        string GetValueString(object value)
+        {
+            string result = value.ToString();
+
+            if (value is bool)
+                result = result.ToLower();
+
+            return result;
+        }
         //string GetValueString(object value)
         //{
         //    Type valueType = Nullable.GetUnderlyingType(value.GetType()) ?? value.GetType();

Griddly.Mvc/GriddlyFilterExtensions.cs

@@ -149,8 +149,8 @@ static List<SelectListItem> BuildBoolItems(string trueLabel, string falseLabel)
         {
             return new List<SelectListItem>()
             {
-                new SelectListItem() { Value = "True", Text = trueLabel },
-                new SelectListItem() { Value = "False", Text = falseLabel },
+                new SelectListItem() { Value = "true", Text = trueLabel },
+                new SelectListItem() { Value = "false", Text = falseLabel },
             };
         }
     }

Griddly.Mvc/GriddlyResult.cs

@@ -37,6 +37,16 @@ public SortField[] GetSortFields(NameValueCollection items)
                 })
                 .ToArray();
         }
+
+        public abstract IEnumerable GetAllNonGeneric(SortField[] sortFields);
+
+        public abstract IList GetPageNonGeneric(int pageNumber, int pageSize, SortField[] sortFields);
+
+        public abstract void PopulateSummaryValuesNonGeneric(GriddlySettings settings);
+
+        public abstract long GetCount();
+
+        public abstract IEnumerable<P> GetAllForProperty<P>(string propertyName, SortField[] sortFields);
     }
 
     public abstract class GriddlyResult<T> : GriddlyResult
@@ -143,20 +153,23 @@ public override void ExecuteResult(ControllerContext context)
                         fileName = fileName.Replace(c, '_');
                 }
 
-                var records = GetAll(sortFields);
                 if (exportFormat == GriddlyExportFormat.Custom)
                 {
-                    result = GriddlySettings.HandleCustomExport(records, items);
+                    result = GriddlySettings.HandleCustomExport(this, items);
                 }
-                else if (exportFormat == GriddlyExportFormat.Xlsx)
+                else
                 {
-                    result = new GriddlyExcelResult<T>(records, settings, fileName, items["exportName"]);
-                }
-                else // if (exportFormat == GriddlyExportFormat.Csv || exportFormat == GriddlyExportFormat.Tsv)
-                {
-                    result = new GriddlyCsvResult<T>(records, settings, fileName, exportFormat.Value, items["exportName"]);
+                    var records = GetAll(sortFields);
+                    if (exportFormat == GriddlyExportFormat.Xlsx)
+                    {
+                        result = new GriddlyExcelResult<T>(records, settings, fileName, items["exportName"]);
+                    }
+                    else // if (exportFormat == GriddlyExportFormat.Csv || exportFormat == GriddlyExportFormat.Tsv)
+                    {
+                        result = new GriddlyCsvResult<T>(records, settings, fileName, exportFormat.Value, items["exportName"]);
+                    }
                 }
-
+                
                 result.ExecuteResult(context);
             }
         }
@@ -167,7 +180,25 @@ public override void ExecuteResult(ControllerContext context)
 
         public abstract void PopulateSummaryValues(GriddlySettings<T> settings);
 
-        public abstract long GetCount();
+        public override IEnumerable<P> GetAllForProperty<P>(string propertyName, SortField[] sortFields)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override IEnumerable GetAllNonGeneric(SortField[] sortFields)
+        {
+            return GetAll(sortFields);
+        }
+               
+        public override IList GetPageNonGeneric(int pageNumber, int pageSize, SortField[] sortFields)
+        {
+            return (IList)(GetPage(pageNumber, pageSize, sortFields).ToList());
+        }
+               
+        public override void PopulateSummaryValuesNonGeneric(GriddlySettings settings)
+        {
+            PopulateSummaryValues((GriddlySettings<T>)settings);
+        }
     }
 
     public enum GriddlyExportFormat

Griddly.Mvc/GriddlySettings.cs

@@ -33,8 +33,8 @@ public abstract class GriddlySettings
         /// Defines an event handler for custom export requests.
         /// 
         /// First argument is the record set. Second argument is the posted form values.
-        /// </summary>s
-        public static Func<IEnumerable, NameValueCollection, ActionResult> HandleCustomExport = null;
+        /// </summary>
+        public static Func<GriddlyResult, NameValueCollection, ActionResult> HandleCustomExport = null;
         public static Action<GriddlySettings, HtmlHelper> BeforeRender = null;
         public static Action<GriddlySettings, ControllerContext> OnGriddlyResultExecuting = null;
 

Griddly.Mvc/Results/DapperResult.cs

@@ -79,6 +79,26 @@ public override void PopulateSummaryValues(GriddlySettings<T> settings)
             }
         }
 
+        public override IEnumerable<P> GetAllForProperty<P>(string propertyName, SortField[] sortFields)
+        {
+            if (propertyName.Contains("."))
+                throw new ArgumentException($"Property name may not contain a period. \"{propertyName}\"", "propertyName");
+
+            string sql = $"SELECT {propertyName} as _val FROM ({_sql}) [_proj] {(_fixedSort ? "" : $"ORDER BY {BuildSortClause(sortFields) ?? "CURRENT_TIMESTAMP"}")}";
+
+            try
+            {
+                IDbConnection cn = _getConnection();
+                IDbTransaction tx = _getTransaction != null ? _getTransaction() : null;
+
+                return cn.Query<P>(sql, _param, tx);
+            }
+            catch (Exception ex)
+            {
+                throw new DapperGriddlyException($"Error selecting property: {propertyName}.", sql, _param, ex);
+            }
+        }
+
         public override long GetCount()
         {
             if (_overallCount == null)
@@ -109,12 +129,10 @@ protected string BuildSortClause(SortField[] sortFields)
 
         protected virtual X ExecuteSingle<X>(string sql)
         {
-            
-                IDbConnection cn = _getConnection();
-                IDbTransaction tx = _getTransaction != null ? _getTransaction() : null;
+            IDbConnection cn = _getConnection();
+            IDbTransaction tx = _getTransaction != null ? _getTransaction() : null;
 
-                return cn.Query<X>(sql, _param, tx).Single();
-            
+            return cn.Query<X>(sql, _param, tx).Single();
         }
 
         // TODO: return IEnumerable so we don't have to .ToList()

Griddly.Mvc/Results/MapQueryableResult.cs

@@ -40,6 +40,11 @@ public override void PopulateSummaryValues(GriddlySettings<TOut> settings)
                 _result.PopulateSummaryValue(c);
         }
 
+        public override IEnumerable<P> GetAllForProperty<P>(string propertyName, SortField[] sortFields)
+        {
+            return _result.GetAllForProperty<P>(propertyName, sortFields);
+        }
+
         public override long GetCount()
         {
             return _result.GetCount();

Griddly.Mvc/Results/QueryableResult.cs

@@ -93,6 +93,12 @@ internal void PopulateSummaryValue(GriddlyColumn c)
             }
         }
 
+        public override IEnumerable<P> GetAllForProperty<P>(string propertyName, SortField[] sortFields)
+        {
+            return ApplySortFields(_result, sortFields)
+                .Select<P>(propertyName, null);
+        }
+
         public override long GetCount()
         {
             return _result.Count();

Griddly/Controllers/HomeController.cs

@@ -4,13 +4,23 @@
 using Griddly.Mvc.Results;
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Web.Mvc;
 
 namespace Griddly.Controllers
 {
     public class HomeController : Controller
     {
+        public static ActionResult HandleCustomExport(GriddlyResult result, NameValueCollection form)
+        {
+            return new JsonResult()
+            {
+                Data = result.GetAllForProperty<long?>("Id", null),
+                JsonRequestBehavior = JsonRequestBehavior.AllowGet,
+            };
+        }
+
         public ActionResult Index()
         {
             return View();

Griddly/Scripts/editly.js

@@ -1,7 +1,7 @@
 /*
  * Editly script
  * http://griddly.com
- * Copyright 2013-2015 Chris Hynes and Data Research Group, Inc.
+ * Copyright 2013-2017 Chris Hynes and Data Research Group, Inc.
  * Licensed under MIT (https://github.com/programcsharp/griddly/blob/master/LICENSE)
  *
  * WARNING: Don't edit this file -- it'll be overwitten when you upgrade.