diff --git a/StockManMVC/App_Start/MVCGridConfig.cs b/StockManMVC/App_Start/MVCGridConfig.cs index a57fced..addaa46 100644 --- a/StockManMVC/App_Start/MVCGridConfig.cs +++ b/StockManMVC/App_Start/MVCGridConfig.cs @@ -165,11 +165,11 @@ namespace StockManMVC .WithVisibility(true, false) .WithHeaderText("data") .WithValueExpression(i => i.dtMov.ToShortDateString()); - cols.Add("LocationID").WithColumnName("LocationID") + cols.Add("Posizione").WithColumnName("Posizione") .WithVisibility(true, false) .WithHeaderText("Posizione") .WithValueExpression(i => i.Location.Descr); - cols.Add("MovType").WithColumnName("MovType") + cols.Add("Tipo").WithColumnName("Tipo") .WithVisibility(true, false) .WithHeaderText("Tipo") .WithValueExpression(i => i.MovType.Descr); @@ -177,13 +177,13 @@ namespace StockManMVC .WithVisibility(true, false) .WithHeaderText("Qta") .WithValueExpression(i => i.Qta.ToString()); - cols.Add("ExtLocationID").WithColumnName("ExtLocationID") + cols.Add("Riferimento").WithColumnName("Riferimento") .WithVisibility(true, false) .WithHeaderText("Riferimento") .WithValueExpression(i => i.ExtLocationID); - cols.Add("OperatorID").WithColumnName("OperatorID") + cols.Add("Operatore").WithColumnName("Operatore") .WithVisibility(true, false) - .WithHeaderText("OperatorID") + .WithHeaderText("Operatore") .WithValueExpression(i => i.Operator.LastName + ", " + i.Operator.FirstName); cols.Add("Note").WithColumnName("Note") .WithVisibility(true, false) diff --git a/StockManMVC/Controllers/ItemFluxesController.cs b/StockManMVC/Controllers/ItemFluxesController.cs index 3f0d2e1..bf4c715 100644 --- a/StockManMVC/Controllers/ItemFluxesController.cs +++ b/StockManMVC/Controllers/ItemFluxesController.cs @@ -61,6 +61,46 @@ namespace StockManMVC.Controllers answ = answ.OrderBy(x => x.Note); } break; + case "Posizione": + if (Sort == "dsc") + { + answ = answ.OrderByDescending(x => x.Location.Descr); + } + else + { + answ = answ.OrderBy(x => x.Location.Descr); + } + break; + case "Tipo": + if (Sort == "dsc") + { + answ = answ.OrderByDescending(x => x.MovType.Descr); + } + else + { + answ = answ.OrderBy(x => x.MovType.Descr); + } + break; + case "Riferimento": + if (Sort == "dsc") + { + answ = answ.OrderByDescending(x => x.Location1.Descr); + } + else + { + answ = answ.OrderBy(x => x.Location1.Descr); + } + break; + case "Operatore": + if (Sort == "dsc") + { + answ = answ.OrderByDescending(x => x.Operator.LastName); + } + else + { + answ = answ.OrderBy(x => x.Operator.LastName); + } + break; case "dtMov": default: if (Sort == "dsc") diff --git a/StockManMVC/bin/StockManMVC.dll b/StockManMVC/bin/StockManMVC.dll index dafea2b..e122443 100644 Binary files a/StockManMVC/bin/StockManMVC.dll and b/StockManMVC/bin/StockManMVC.dll differ