diff --git a/Controllers/ChiamateController.cs b/Controllers/ChiamateController.cs index e55bd42..2f83eae 100644 --- a/Controllers/ChiamateController.cs +++ b/Controllers/ChiamateController.cs @@ -77,7 +77,7 @@ namespace VirtualTask.Controllers var pageSize = 10; var shortLinks = modelList - .OrderByDescending(s => s.chcodimp) + .OrderByDescending(s => s.chnumero) .ToPagedList(page ?? 1, pageSize); return View(shortLinks); diff --git a/Controllers/DatiAziendaController.cs b/Controllers/DatiAziendaController.cs index e92010d..9ff3385 100644 --- a/Controllers/DatiAziendaController.cs +++ b/Controllers/DatiAziendaController.cs @@ -44,7 +44,8 @@ namespace VirtualTask.Controllers { SessionHelper helper = new SessionHelper(this); token = helper.GetStringValue("tok"); - + tenant = helper.GetStringValue("tenant"); + tenant2= helper.GetStringValue("tenant2"); if (string.IsNullOrEmpty(token)) { return RedirectToAction("Login2", "Login"); diff --git a/Controllers/ImpiantiController.cs b/Controllers/ImpiantiController.cs index 34e13e3..07672a5 100644 --- a/Controllers/ImpiantiController.cs +++ b/Controllers/ImpiantiController.cs @@ -16,6 +16,7 @@ namespace VirtualTask.Controllers string urlBase = string.Empty; string token = string.Empty; string tenant = string.Empty; + string tenant2 = string.Empty; string errMes = string.Empty; string admin = string.Empty; @@ -36,7 +37,8 @@ namespace VirtualTask.Controllers { SessionHelper helper = new SessionHelper(this); token = helper.GetStringValue("tok"); - + tenant = helper.GetStringValue("tenant"); + tenant2 = helper.GetStringValue("tenant2"); if (string.IsNullOrEmpty(token)) { return RedirectToAction("Login2", "Login"); @@ -57,7 +59,7 @@ namespace VirtualTask.Controllers { string data = response.Content.ReadAsStringAsync().Result; modelList = JsonConvert.DeserializeObject>(data); - modelList = modelList.Where(s => !string.IsNullOrEmpty(s.imcodimp)).ToList(); + modelList = modelList.Where(s => !string.IsNullOrEmpty(s.imcodimp) && s.imcodazi.Equals(tenant2)).ToList(); if (!string.IsNullOrEmpty(searchString)) { diff --git a/Views/DatiAzienda/Index.cshtml b/Views/DatiAzienda/Index.cshtml index d2a66f0..f50cf65 100644 --- a/Views/DatiAzienda/Index.cshtml +++ b/Views/DatiAzienda/Index.cshtml @@ -7,12 +7,13 @@ -

- Create New -

+
+

+ Crea un nuovo elemento +

diff --git a/wwwroot/assets/images/icons8-nuovo-50.png b/wwwroot/assets/images/icons8-nuovo-50.png index 4d27159..aca10a4 100644 Binary files a/wwwroot/assets/images/icons8-nuovo-50.png and b/wwwroot/assets/images/icons8-nuovo-50.png differ diff --git a/wwwroot/assets/images/icons8-nuovo-50_old.png b/wwwroot/assets/images/icons8-nuovo-50_old.png new file mode 100644 index 0000000..4d27159 Binary files /dev/null and b/wwwroot/assets/images/icons8-nuovo-50_old.png differ