From fda7d2fe9c30e2726fd50b6b5ff6a01992b1683f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli (WEB DEV)" Date: Thu, 20 Oct 2016 23:41:54 +0200 Subject: [PATCH] completato fix sorting (oltre a filtro + ricerca) --> manca solo paginazione! --- .../Controllers/LocationsController.cs | 4 +++- StockManMVC/Views/Locations/Index.cshtml | 9 +++++++-- .../Views/Locations/_ListByType.cshtml | 6 ++---- StockManMVC/bin/StockManMVC.dll | Bin 137216 -> 137728 bytes 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/StockManMVC/Controllers/LocationsController.cs b/StockManMVC/Controllers/LocationsController.cs index ec0affd..dd3c9fe 100644 --- a/StockManMVC/Controllers/LocationsController.cs +++ b/StockManMVC/Controllers/LocationsController.cs @@ -22,7 +22,7 @@ namespace StockManMVC.Controllers if (SortOrd == null) SortOrd = ""; ViewBag.LocTypeID = new SelectList(db.LocType, "ID", "Descr", LocTypeID); ViewBag.LocTypeSel = LocTypeID; - ViewBag.SearchString = SearchVal; + ViewBag.SearchVal = SearchVal; var location = db.Location.Include(l => l.LocType); return View(location.ToList()); } @@ -34,6 +34,8 @@ namespace StockManMVC.Controllers if (LocTypeID == null) LocTypeID = ""; if (SearchVal == null) SearchVal = ""; if (SortOrd == null) SortOrd = ""; + ViewBag.LocTypeSel = LocTypeID; + ViewBag.SearchVal = SearchVal; ViewBag.DescrSortParm = String.IsNullOrEmpty(SortOrd) ? "Descr_desc" : ""; ViewBag.LocTypeSortParm = SortOrd == "LocType" ? "LocType_desc" : "LocType"; var CurrLocations = db.Location.Where(s => s.ID != ""); diff --git a/StockManMVC/Views/Locations/Index.cshtml b/StockManMVC/Views/Locations/Index.cshtml index 40d14bb..b92dcb6 100644 --- a/StockManMVC/Views/Locations/Index.cshtml +++ b/StockManMVC/Views/Locations/Index.cshtml @@ -11,6 +11,7 @@
Configurazione Posizioni + @Html.Hidden("SortOrd")
@Html.DropDownList("LocTypeID", null, "-- TUTTI --", htmlAttributes: new { @class = "form-control" }) @@ -41,10 +42,11 @@ function refreshSelectedData() { var LocTypeID = $("#LocTypeID").val(); var SearchVal = $("#SearchVal").val(); - $("#mainDiv").load('@(Url.Action("ListByType", "Locations", null, Request.Url.Scheme))?LocTypeID=' + LocTypeID + '&SearchVal=' + SearchVal); + var SortOrd = $("#SortOrd").val(); + $("#mainDiv").load('@(Url.Action("ListByType", "Locations", null, Request.Url.Scheme))?LocTypeID=' + LocTypeID + '&SearchVal=' + SearchVal + '&SortOrd=' + SortOrd); // modifico URL! - history.replaceState('LocTypeID=' + LocTypeID, 'Locations', '?LocTypeID=' + LocTypeID + '&SearchVal=' + SearchVal) + history.replaceState('LocTypeID=' + LocTypeID, 'Locations', '?LocTypeID=' + LocTypeID + '&SearchVal=' + SearchVal + '&SortOrd=' + SortOrd) } $(document).ready(function () { $("#LocTypeID").change(function () { @@ -53,6 +55,9 @@ $("#SearchVal").change(function () { refreshSelectedData(); }); + $("#SortOrd").change(function () { + refreshSelectedData(); + }); }); function LoadCreateNew() { diff --git a/StockManMVC/Views/Locations/_ListByType.cshtml b/StockManMVC/Views/Locations/_ListByType.cshtml index 92e228f..aa53a8a 100644 --- a/StockManMVC/Views/Locations/_ListByType.cshtml +++ b/StockManMVC/Views/Locations/_ListByType.cshtml @@ -3,12 +3,10 @@ diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll index 74825f1faf7fb147c7bc4c4bc7933565cc571bec..c294a34704afc46a4ecc68143cf4754cf3ec9988 100644 GIT binary patch delta 4559 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 B4r>4a
- @*@Html.DisplayNameFor(model => model.Descr)*@ - @Html.ActionLink(Html.DisplayNameFor(model => model.Descr).ToString(), "Index", new { SortOrd = ViewBag.DescrSortParm }) + @Html.ActionLink(Html.DisplayNameFor(model => model.Descr).ToString(), "Index", new { LocTypeID = ViewBag.LocTypeSel, SearchVal = ViewBag.SearchVal, SortOrd = ViewBag.DescrSortParm }) - @*@Html.DisplayNameFor(model => model.LocType.Descr)*@ - @Html.ActionLink(Html.DisplayNameFor(model => model.LocType.Descr).ToString(), "Index", new { SortOrd = ViewBag.LocTypeSortParm }) + @Html.ActionLink(Html.DisplayNameFor(model => model.LocType.Descr).ToString(), "Index", new { LocTypeID = ViewBag.LocTypeSel, SearchVal = ViewBag.SearchVal, SortOrd = ViewBag.LocTypeSortParm })