diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index 0700253..4bb94c2 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -162,7 +162,7 @@ - + diff --git a/StockManMVC/App_Start/MVCGridConfig.cs b/StockManMVC/App_Start/MVCGridConfig.cs index 34e337f..b791d71 100644 --- a/StockManMVC/App_Start/MVCGridConfig.cs +++ b/StockManMVC/App_Start/MVCGridConfig.cs @@ -184,7 +184,7 @@ namespace StockManMVC cols.Add("Tipo").WithColumnName("Tipo") .WithVisibility(false, true) .WithHeaderText("Tipo") - .WithValueExpression(i => i.MovType.Descr); + .WithValueExpression(i => i.MovTypeID); cols.Add("Qta").WithColumnName("Qta") .WithVisibility(true, false) .WithHeaderText("Qta") diff --git a/StockManMVC/Controllers/MagStatusController.cs b/StockManMVC/Controllers/MagStatusController.cs index a4422d8..a7c4495 100644 --- a/StockManMVC/Controllers/MagStatusController.cs +++ b/StockManMVC/Controllers/MagStatusController.cs @@ -47,7 +47,7 @@ namespace StockManMVC.Controllers } - public ActionResult Move(int ID, string LocationID, string LocationIDTo) + public ActionResult Move(int ID, string LocationID, string LocationIDTo, int QtyConf) { // recupero operatore... IEnumerable listOper = OperatorsController.Select(User.Identity.Name); diff --git a/StockManMVC/Views/Items/Details.cshtml b/StockManMVC/Views/Items/Details.cshtml index 0b06c5e..2a6da52 100644 --- a/StockManMVC/Views/Items/Details.cshtml +++ b/StockManMVC/Views/Items/Details.cshtml @@ -129,7 +129,27 @@ Movimenti (data indica movimenti confermati o da registrare)
- @Html.Partial("_MVCGridToolbar", new StockManMVC.Models.MVCGridToolbarModel() + @*
+ + + + +
*@ + + @* + + ALL/none + *@ + + @Html.Partial("_MVCGridToolbar", new StockManMVC.Models.MVCGridToolbarModel() { MVCGridName = "FluxItemsGrid", PageSize = true, @@ -137,8 +157,8 @@ Export = false, GlobalSearch = true }) - @Html.MVCGrid("FluxItemsGrid") -
+ @Html.MVCGrid("FluxItemsGrid") + diff --git a/StockManMVC/Views/MagStatus/_StockByLocation.cshtml b/StockManMVC/Views/MagStatus/_StockByLocation.cshtml index 23ecae7..71b81e7 100644 --- a/StockManMVC/Views/MagStatus/_StockByLocation.cshtml +++ b/StockManMVC/Views/MagStatus/_StockByLocation.cshtml @@ -31,8 +31,16 @@ @Html.DisplayFor(modelItem => item.Item.Descr) - @Html.DisplayFor(modelItem => item.QtyConf) + @if (ViewBag.ShowMove) + { + @Html.EditorFor(modelItem => item.QtyConf, new { htmlAttributes = new { min = 0, max = item.QtyConf, @onchange = "this.form.submit();" } }) + } + else + { + @Html.DisplayFor(modelItem => item.QtyConf) + } + @* @Html.DisplayFor(modelItem => item.Note) *@ @@ -42,7 +50,7 @@ @if (ViewBag.ShowMove) { - Sposta + Sposta @*@Html.ActionLink("Sposta ", "Move", new { @class = "btn btn-info", id = item.ID, LocationID = ViewBag.LocationId, LocationIDTo = ViewBag.LocationIdTo });*@ } diff --git a/StockManMVC/Web.config b/StockManMVC/Web.config index 0b12bbb..04a1f31 100644 --- a/StockManMVC/Web.config +++ b/StockManMVC/Web.config @@ -87,9 +87,9 @@ - + - + diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll index ef7dae1..86e88d7 100644 Binary files a/StockManMVC/bin/StockManMVC.dll and b/StockManMVC/bin/StockManMVC.dll differ diff --git a/StockManMVC/bin/StockManMVC.dll.config b/StockManMVC/bin/StockManMVC.dll.config index 0b12bbb..04a1f31 100644 --- a/StockManMVC/bin/StockManMVC.dll.config +++ b/StockManMVC/bin/StockManMVC.dll.config @@ -87,9 +87,9 @@ - + - +