diff --git a/SiteSelector/bin/SiteSelector.dll b/SiteSelector/bin/SiteSelector.dll index 538874d..1f88c8e 100644 Binary files a/SiteSelector/bin/SiteSelector.dll and b/SiteSelector/bin/SiteSelector.dll differ 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 @@