From b5edb920b54236f02871fa6e7da7dd1fb23d81e7 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 21 Oct 2016 17:05:48 +0200 Subject: [PATCH] Eliminato filtro URL su FluxItemID non + necessario (ed eliminato oggetto MVCGrid relativo) --- SiteSelector/bin/SiteSelector.dll | Bin 8192 -> 8192 bytes StockManMVC/App_Start/MVCGridConfig.cs | 96 +----------------- .../Controllers/ItemFluxesController.cs | 8 +- StockManMVC/Controllers/ItemsController.cs | 6 +- .../Views/ItemFluxes/CreatePrecompiled.cshtml | 2 +- StockManMVC/Views/ItemFluxes/Delete.cshtml | 2 +- StockManMVC/Views/ItemFluxes/Edit.cshtml | 2 +- .../ItemFluxes/_CreatePrecompiled.cshtml | 2 +- .../Views/ItemFluxes/_ListByItem.cshtml | 2 +- .../Views/ItemStocks/ListByLocation.cshtml | 2 +- StockManMVC/Views/Items/Edit.cshtml | 2 +- StockManMVC/Views/Items/ListByFamily.cshtml | 2 +- StockManMVC/Views/Items/_Delete.cshtml | 2 +- StockManMVC/Views/Items/_Edit.cshtml | 2 +- .../Views/MagStatus/_StockByLocation.cshtml | 2 +- StockManMVC/bin/StockManMVC.dll | Bin 142336 -> 136704 bytes VersGen/bin/Release/VersGen.dll | Bin 4096 -> 4096 bytes VersGen/obj/Release/VersGen.dll | Bin 4096 -> 4096 bytes 18 files changed, 20 insertions(+), 112 deletions(-) diff --git a/SiteSelector/bin/SiteSelector.dll b/SiteSelector/bin/SiteSelector.dll index 538874d1ec892e39baf3d6e1b3d27fa2ec1285b3..1f88c8e543d642df052e180b766024332f12e59e 100644 GIT binary patch delta 2351 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 diff --git a/StockManMVC/App_Start/MVCGridConfig.cs b/StockManMVC/App_Start/MVCGridConfig.cs index b14f633..4127de9 100644 --- a/StockManMVC/App_Start/MVCGridConfig.cs +++ b/StockManMVC/App_Start/MVCGridConfig.cs @@ -57,7 +57,7 @@ namespace StockManMVC .WithVisibility(true, false) .WithAllowChangeVisibility(false) .WithHtmlEncoding(false) - .WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ID, StockItemID = i.ID, FluxItemID = i.ID })) + .WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ID, StockItemID = i.ID })) .WithValueTemplate(""); cols.Add("Family").WithColumnName("Family") .WithVisibility(true, false) @@ -163,98 +163,6 @@ namespace StockManMVC }) ); - MVCGridDefinitionTable.Add("FluxItemsGrid", new MVCGridBuilder(gridDefaults, colDefaults) // aggiungo valori di default... - .WithSorting(sorting: true, defaultSortColumn: "dtMov", defaultSortDirection: SortDirection.Dsc) - .WithAdditionalQueryOptionNames("ItemID") - .WithAdditionalQueryOptionNames("search") - //.WithRowCssClassExpression(p => p.dtExport.ToString() == "" ? "warning" : "") - .WithQueryStringPrefix("Flux") - .WithPaging(true) - .AddColumns(cols => - { - cols.Add("dtMov").WithColumnName("dtMov") - .WithVisibility(true, false) - .WithHeaderText("data") - .WithCellCssClassExpression(i => i.dtExport.ToString() == "" ? "text-warning mark" : "deleted") - .WithValueExpression(i => i.dtMov.ToShortDateString()); - cols.Add("Posizione").WithColumnName("Posizione") - .WithVisibility(true, false) - .WithHeaderText("Posizione") - .WithValueExpression(i => i.Location.Descr); - cols.Add("Tipo").WithColumnName("Tipo") - .WithVisibility(false, true) - .WithHeaderText("Tipo") - .WithValueExpression(i => i.MovTypeID); - cols.Add("Qta").WithColumnName("Qta") - .WithVisibility(true, false) - .WithHeaderText("Qta") - .WithCellCssClassExpression(p => p.MovType.CssClass + " text-right") - .WithValueExpression(i => i.Qta.ToString()); - cols.Add("UnitVal").WithColumnName("UnitVal") - .WithVisibility(false, true) - .WithHeaderText("Val/cad") - .WithCellCssClassExpression(p => " text-right") - .WithValueExpression(i => i.UnitVal.ToString("C2")); - cols.Add("TotValue").WithColumnName("TotValue") - .WithHeaderText("Importo") - .WithCellCssClassExpression(p => " text-right") - .WithValueExpression(i => i.TotValue.ToString("C2")); - cols.Add("Riferimento").WithColumnName("Riferimento") - .WithVisibility(true, false) - .WithHeaderText("Riferimento") - .WithValueExpression(i => i.ExtLocationID); - cols.Add("Operatore").WithColumnName("Operatore") - .WithVisibility(false, true) - .WithHeaderText("Operatore") - .WithValueExpression(i => i.Operator.LastName + ", " + i.Operator.FirstName); - cols.Add("Note").WithColumnName("Note") - .WithVisibility(false, true) - .WithHeaderText("Note") - .WithValueExpression(i => i.Note); - cols.Add("EditLink").WithColumnName("EditLink") - .WithSorting(false) - .WithVisibility(true, false) - .WithHeaderText("") - .WithHtmlEncoding(false) - .WithCellCssClassExpression(i => i.dtExport.ToString() == "" ? "" : "hidden deleted") - .WithValueExpression((i, c) => i.dtExport.ToString() == "" ? c.UrlHelper.Action("Edit", "ItemFluxes", new { id = i.ID }) : c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID, FluxItemID = i.ItemID })) - .WithValueTemplate(""); - cols.Add("ConvOrder").WithColumnName("ConvOrder") - .WithSorting(false) - .WithVisibility( true, false) - .WithHeaderText("") - .WithHtmlEncoding(false) - .WithCellCssClassExpression(i => i.dtExport.ToString() == "" && i.MovTypeID == "OFOR" ? "" : "hidden deleted") - .WithValueExpression((i, c) => i.dtExport.ToString() == "" ? c.UrlHelper.Action("ConvOrder", "ItemFluxes", new { id = i.ID }) : c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID, FluxItemID = i.ItemID })) - .WithValueTemplate(""); - cols.Add("DeleteLink").WithColumnName("DeleteLink") - .WithSorting(false) - .WithVisibility(true, false) - .WithHeaderText("") - .WithHtmlEncoding(false) - .WithCellCssClassExpression(i => i.dtExport.ToString() == "" ? "" : "hidden deleted") - .WithValueExpression((i, c) => i.dtExport.ToString() == "" ? c.UrlHelper.Action("Delete", "ItemFluxes", new { id = i.ID }) : c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID, FluxItemID = i.ItemID })) - .WithValueTemplate(""); - }) - .WithRetrieveDataMethod((context) => - { - - var options = context.QueryOptions; - string sItemID = options.GetAdditionalQueryOptionString("ItemID"); - if (String.IsNullOrEmpty(sItemID)) sItemID = "0"; - int ItemID = Convert.ToInt32(sItemID); - string SearchVal = options.GetAdditionalQueryOptionString("search"); - if (String.IsNullOrEmpty(SearchVal)) SearchVal = ""; - - return new QueryResult() - { - Items = ItemFluxesController.SelectPage(ItemID, SearchVal, options.SortColumnName.ToLower(), options.SortDirection.ToString().ToLower(), (int)options.PageIndex, (int)options.ItemsPerPage).ToList(), - TotalRecords = ItemFluxesController.SelectCount(ItemID, SearchVal) - }; - }) - ); - - MVCGridDefinitionTable.Add("ItemsFlux2SaveGrid", new MVCGridBuilder(gridDefaults, colDefaults) // aggiungo valori di default... .WithSorting(sorting: true, defaultSortColumn: "dtMov") //, defaultSortDirection: SortDirection.Dsc .WithQueryStringPrefix("IF2S") @@ -308,7 +216,7 @@ namespace StockManMVC .WithAllowChangeVisibility(false) //.WithHeaderText("") .WithHtmlEncoding(false) - .WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID, FluxItemID = i.ItemID })) + .WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID })) .WithValueTemplate(""); }) .WithRetrieveDataMethod((context) => diff --git a/StockManMVC/Controllers/ItemFluxesController.cs b/StockManMVC/Controllers/ItemFluxesController.cs index 63151d0..740e9c3 100644 --- a/StockManMVC/Controllers/ItemFluxesController.cs +++ b/StockManMVC/Controllers/ItemFluxesController.cs @@ -387,7 +387,7 @@ namespace StockManMVC.Controllers db.ItemFlux.Add(itemFlux); db.SaveChanges(); // rimando a pag esterna... - return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID, FluxItemID = itemFlux.ItemID }); + return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID }); //return RedirectToAction("Index"); } @@ -419,7 +419,7 @@ namespace StockManMVC.Controllers db.SaveChanges(); } // ritorno a dettaglio! - return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID, FluxItemID = itemFlux.ItemID }); + return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID }); } // GET: ItemFluxes/Edit/5 @@ -505,7 +505,7 @@ namespace StockManMVC.Controllers db.SaveChanges(); // rimando pag dettaglio... - return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID, FluxItemID = itemFlux.ItemID }); + return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID }); //return RedirectToAction("Index"); } ViewBag.LocationID = new SelectList(db.Location, "ID", "Descr", itemFlux.LocationID); @@ -553,7 +553,7 @@ namespace StockManMVC.Controllers db.ItemFlux.Remove(itemFlux); db.SaveChanges(); //return RedirectToAction("Index"); - return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID, FluxItemID = itemFlux.ItemID }); + return RedirectToAction("Details", "Items", new { ID = itemFlux.ItemID, StockItemID = itemFlux.ItemID }); } protected override void Dispose(bool disposing) diff --git a/StockManMVC/Controllers/ItemsController.cs b/StockManMVC/Controllers/ItemsController.cs index 26f1882..eb6cb97 100644 --- a/StockManMVC/Controllers/ItemsController.cs +++ b/StockManMVC/Controllers/ItemsController.cs @@ -176,7 +176,7 @@ namespace StockManMVC.Controllers // rimanda alla view principale da cui è stata fatta la chiamata... if (caller == "Items") { - return RedirectToAction("Details", "Items", new { ID = id, StockItemID = id, FluxItemID = id }); + return RedirectToAction("Details", "Items", new { ID = id, StockItemID = id }); } else { @@ -204,7 +204,7 @@ namespace StockManMVC.Controllers // rimanda alla view principale da cui è stata fatta la chiamata... if (caller == "Items") { - return RedirectToAction("Details", "Items", new { ID = id, StockItemID = id, FluxItemID = id }); + return RedirectToAction("Details", "Items", new { ID = id, StockItemID = id }); } else { @@ -376,7 +376,7 @@ namespace StockManMVC.Controllers { db.Entry(item).State = EntityState.Modified; db.SaveChanges(); - return RedirectToAction("Details", "Items", new { ID = item.ID, StockItemID = item.ID, FluxItemID = item.ID }); + return RedirectToAction("Details", "Items", new { ID = item.ID, StockItemID = item.ID }); } ViewBag.ItemFamilyID = new SelectList(db.ItemFamily, "ID", "Descr", item.ItemFamilyID); return View("Edit", item); diff --git a/StockManMVC/Views/ItemFluxes/CreatePrecompiled.cshtml b/StockManMVC/Views/ItemFluxes/CreatePrecompiled.cshtml index d85eef6..fb6adc3 100644 --- a/StockManMVC/Views/ItemFluxes/CreatePrecompiled.cshtml +++ b/StockManMVC/Views/ItemFluxes/CreatePrecompiled.cshtml @@ -90,7 +90,7 @@ diff --git a/StockManMVC/Views/ItemFluxes/Delete.cshtml b/StockManMVC/Views/ItemFluxes/Delete.cshtml index 837a88f..edb08da 100644 --- a/StockManMVC/Views/ItemFluxes/Delete.cshtml +++ b/StockManMVC/Views/ItemFluxes/Delete.cshtml @@ -111,7 +111,7 @@ } diff --git a/StockManMVC/Views/ItemFluxes/Edit.cshtml b/StockManMVC/Views/ItemFluxes/Edit.cshtml index e051dc2..82a950a 100644 --- a/StockManMVC/Views/ItemFluxes/Edit.cshtml +++ b/StockManMVC/Views/ItemFluxes/Edit.cshtml @@ -105,7 +105,7 @@ diff --git a/StockManMVC/Views/ItemFluxes/_CreatePrecompiled.cshtml b/StockManMVC/Views/ItemFluxes/_CreatePrecompiled.cshtml index 61dcaaf..9cc0a52 100644 --- a/StockManMVC/Views/ItemFluxes/_CreatePrecompiled.cshtml +++ b/StockManMVC/Views/ItemFluxes/_CreatePrecompiled.cshtml @@ -82,7 +82,7 @@ diff --git a/StockManMVC/Views/ItemFluxes/_ListByItem.cshtml b/StockManMVC/Views/ItemFluxes/_ListByItem.cshtml index 57a3901..a39a08e 100644 --- a/StockManMVC/Views/ItemFluxes/_ListByItem.cshtml +++ b/StockManMVC/Views/ItemFluxes/_ListByItem.cshtml @@ -78,7 +78,7 @@