diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index 3679a11..e4e44f8 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -170,7 +170,7 @@ - + diff --git a/StockManMVC/App_Start/MVCGridConfig.cs b/StockManMVC/App_Start/MVCGridConfig.cs index bef5376..3b66b12 100644 --- a/StockManMVC/App_Start/MVCGridConfig.cs +++ b/StockManMVC/App_Start/MVCGridConfig.cs @@ -52,13 +52,13 @@ namespace StockManMVC { //Add your columns here cols.Add("ViewLink").WithColumnName("ViewLink") + .WithHeaderText("") .WithSorting(false) .WithVisibility(true, false) .WithAllowChangeVisibility(false) - //.WithHeaderText("") .WithHtmlEncoding(false) .WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ID, StockItemID = i.ID, FluxItemID = i.ID })) - .WithValueTemplate(""); + .WithValueTemplate(""); cols.Add("Family").WithColumnName("Family") .WithVisibility(true, false) .WithAllowChangeVisibility(false) @@ -105,14 +105,14 @@ namespace StockManMVC .WithHeaderText("") .WithHtmlEncoding(false) .WithValueExpression((i, c) => c.UrlHelper.Action("Duplicate", "Items", new { id = i.ID })) - .WithValueTemplate(""); + .WithValueTemplate(""); cols.Add("EditLink").WithColumnName("EditLink") .WithSorting(false) .WithVisibility(true, false) .WithHeaderText("") .WithHtmlEncoding(false) .WithValueExpression((i, c) => c.UrlHelper.Action("Edit", "Items", new { id = i.ID, mode="full" })) - .WithValueTemplate(""); + .WithValueTemplate(""); }) .WithRetrieveDataMethod((context) => { @@ -262,7 +262,7 @@ namespace StockManMVC .WithHeaderText("") .WithHtmlEncoding(false) .WithValueExpression((i, c) => c.UrlHelper.Action("Consolidate", "Items", new { id = i.ItemID, caller = "vIF2S" })) - .WithValueTemplate(""); + .WithValueTemplate(""); cols.Add("FamilyID").WithColumnName("FamilyID") .WithVisibility(true, false) .WithHeaderText("Famiglia") @@ -298,10 +298,10 @@ namespace StockManMVC .WithSorting(false) .WithVisibility(true, false) .WithAllowChangeVisibility(false) - //.WithHeaderText("") + //.WithHeaderText("") .WithHtmlEncoding(false) .WithValueExpression((i, c) => c.UrlHelper.Action("Details", "Items", new { id = i.ItemID, StockItemID = i.ItemID, FluxItemID = i.ItemID })) - .WithValueTemplate(""); + .WithValueTemplate(""); }) .WithRetrieveDataMethod((context) => { diff --git a/StockManMVC/Views/ItemFamilies/Index.cshtml b/StockManMVC/Views/ItemFamilies/Index.cshtml index 5e5b955..4303a02 100644 --- a/StockManMVC/Views/ItemFamilies/Index.cshtml +++ b/StockManMVC/Views/ItemFamilies/Index.cshtml @@ -41,7 +41,7 @@ if (item.NumItems > 0) { delStyle = "disabled invisible"; } - + @Html.DisplayFor(modelItem => item.ID) @@ -53,8 +53,8 @@ @Html.DisplayFor(modelItem => item.NumItems) - - + + } diff --git a/StockManMVC/Views/Items/Index.cshtml b/StockManMVC/Views/Items/Index.cshtml index d7932a2..b6020c0 100644 --- a/StockManMVC/Views/Items/Index.cshtml +++ b/StockManMVC/Views/Items/Index.cshtml @@ -3,24 +3,10 @@ @{ ViewBag.Title = "Articoli"; string mainCss = "col-sm-12"; - //bool hasDetail = false; - //if (ViewBag.ItemID != 0) - //{ - // hasDetail = true; - // mainCss = "col-sm-8"; - //} } @using MVCGrid.Web
- @*@if (hasDetail) - { -
- Dettagli -
- stock attuale -
- }*@
@@ -30,7 +16,6 @@ Anagrafica Articoli
- @*@Html.ActionLink("Create New", "Create")*@ Aggiunta Nuovo articolo diff --git a/StockManMVC/Views/LocTypes/Index.cshtml b/StockManMVC/Views/LocTypes/Index.cshtml index 27619bd..00d6372 100644 --- a/StockManMVC/Views/LocTypes/Index.cshtml +++ b/StockManMVC/Views/LocTypes/Index.cshtml @@ -54,8 +54,8 @@ @Html.DisplayFor(modelItem => item.IsFor) - - + + } diff --git a/StockManMVC/Views/Locations/_ListByType.cshtml b/StockManMVC/Views/Locations/_ListByType.cshtml index 4db30a5..8767ce1 100644 --- a/StockManMVC/Views/Locations/_ListByType.cshtml +++ b/StockManMVC/Views/Locations/_ListByType.cshtml @@ -23,8 +23,8 @@ @Html.DisplayFor(modelItem => item.LocType.Descr) - - + + } diff --git a/StockManMVC/Views/MagStatus/Index.cshtml b/StockManMVC/Views/MagStatus/Index.cshtml index a4311b6..9525f38 100644 --- a/StockManMVC/Views/MagStatus/Index.cshtml +++ b/StockManMVC/Views/MagStatus/Index.cshtml @@ -35,7 +35,7 @@ { - + @Html.DisplayFor(modelItem => item.Location.Descr) @@ -53,7 +53,7 @@ @Html.DisplayFor(modelItem => item.TotVal) - + diff --git a/StockManMVC/Views/MagStatus/_StockByLocation.cshtml b/StockManMVC/Views/MagStatus/_StockByLocation.cshtml index 9e30fff..f991452 100644 --- a/StockManMVC/Views/MagStatus/_StockByLocation.cshtml +++ b/StockManMVC/Views/MagStatus/_StockByLocation.cshtml @@ -5,8 +5,9 @@
@* Inject form here *@
- +
+ @@ -21,6 +22,11 @@ @foreach (var item in Model) { + @@ -35,7 +41,7 @@ { ViewBag.id = item.ID; @*Sposta *@ - + } diff --git a/StockManMVC/Views/MovTypes/Index.cshtml b/StockManMVC/Views/MovTypes/Index.cshtml index 7f99682..125f9f2 100644 --- a/StockManMVC/Views/MovTypes/Index.cshtml +++ b/StockManMVC/Views/MovTypes/Index.cshtml @@ -37,8 +37,8 @@ @Html.DisplayFor(modelItem => item.Descr) } diff --git a/StockManMVC/Views/Operators/Index.cshtml b/StockManMVC/Views/Operators/Index.cshtml index ac21cbb..4ed7d46 100644 --- a/StockManMVC/Views/Operators/Index.cshtml +++ b/StockManMVC/Views/Operators/Index.cshtml @@ -49,8 +49,8 @@ @Html.DisplayFor(modelItem => item.FirstName) } diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll index c1b0832..93b820a 100644 Binary files a/StockManMVC/bin/StockManMVC.dll and b/StockManMVC/bin/StockManMVC.dll differ
@Html.DisplayNameFor(model => model.Item.Descr)
+ + + + @Html.DisplayFor(modelItem => item.Item.Descr)
- - + +
- - + +