diff --git a/StockManMVC/Models/Metadata.cs b/StockManMVC/Models/Metadata.cs index 2ff4b96..62f7652 100644 --- a/StockManMVC/Models/Metadata.cs +++ b/StockManMVC/Models/Metadata.cs @@ -135,12 +135,14 @@ namespace StockManMVC.Models public class vLocationValMetadata { - [Display(Name = "Valore Articoli")] [DisplayFormat(DataFormatString = "{0:C2}", ApplyFormatInEditMode = true)] public String TotVal; [Display(Name = "Tot num Articoli")] + public String NumArt; + + [Display(Name = "Giacenza (totale)")] public String TotCurr; [Display(Name = "Mov. aperti")] diff --git a/StockManMVC/Models/SMModel.Designer.cs b/StockManMVC/Models/SMModel.Designer.cs index 61b7291..334de74 100644 --- a/StockManMVC/Models/SMModel.Designer.cs +++ b/StockManMVC/Models/SMModel.Designer.cs @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'C:\Users\samuele\Documents\Visual Studio 2015\Projects\StockMan\StockManMVC\Models\SMModel.edmx'. +// T4 code generation is enabled for model 'C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\StockMan\StockManMVC\Models\SMModel.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. diff --git a/StockManMVC/Models/SMModel.edmx b/StockManMVC/Models/SMModel.edmx index b728b40..52a77e5 100644 --- a/StockManMVC/Models/SMModel.edmx +++ b/StockManMVC/Models/SMModel.edmx @@ -112,6 +112,7 @@ warning 6002: The table/view 'StockMan.dbo.vLocationVal' does not have a primary + @@ -267,6 +268,7 @@ warning 6002: The table/view 'StockMan.dbo.vLocationVal' does not have a primary SELECT [vLocationVal].[LocationID] AS [LocationID], [vLocationVal].[TotVal] AS [TotVal], + [vLocationVal].[NumArt] AS [NumArt], [vLocationVal].[TotCurr] AS [TotCurr], [vLocationVal].[TotPend] AS [TotPend] FROM [dbo].[vLocationVal] AS [vLocationVal] @@ -504,7 +506,7 @@ warning 6002: The table/view 'StockMan.dbo.vLocationVal' does not have a primary - + @@ -650,6 +652,7 @@ warning 6002: The table/view 'StockMan.dbo.vLocationVal' does not have a primary + @@ -790,6 +793,7 @@ warning 6002: The table/view 'StockMan.dbo.vLocationVal' does not have a primary + diff --git a/StockManMVC/Models/vLocationVal.cs b/StockManMVC/Models/vLocationVal.cs index 6756374..ea13565 100644 --- a/StockManMVC/Models/vLocationVal.cs +++ b/StockManMVC/Models/vLocationVal.cs @@ -18,6 +18,7 @@ namespace StockManMVC.Models public Nullable TotVal { get; set; } public Nullable TotCurr { get; set; } public Nullable TotPend { get; set; } + public Nullable NumArt { get; set; } public virtual Location Location { get; set; } } diff --git a/StockManMVC/Views/MagStatus/Index.cshtml b/StockManMVC/Views/MagStatus/Index.cshtml index 87fdfb1..a82ecb3 100644 --- a/StockManMVC/Views/MagStatus/Index.cshtml +++ b/StockManMVC/Views/MagStatus/Index.cshtml @@ -16,6 +16,9 @@ @Html.DisplayNameFor(model => model.Location.Descr) + + @Html.DisplayNameFor(model => model.NumArt) + @Html.DisplayNameFor(model => model.TotCurr) @@ -33,6 +36,9 @@ @Html.DisplayFor(modelItem => item.Location.Descr) + + @Html.DisplayFor(modelItem => item.NumArt) + @Html.DisplayFor(modelItem => item.TotCurr) diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll index 9600787..6fee4f9 100644 Binary files a/StockManMVC/bin/StockManMVC.dll and b/StockManMVC/bin/StockManMVC.dll differ