diff --git a/Controllers/ImpiantiController.cs b/Controllers/ImpiantiController.cs index ec8fd06..05b135c 100644 --- a/Controllers/ImpiantiController.cs +++ b/Controllers/ImpiantiController.cs @@ -15,7 +15,7 @@ namespace VirtualTask.Controllers string urlBase = string.Empty; string token = string.Empty; string tenant = string.Empty; - + string errMes = string.Empty; HttpClient client; public ImpiantiController() { @@ -46,27 +46,34 @@ namespace VirtualTask.Controllers string data = response.Content.ReadAsStringAsync().Result; modelList = JsonConvert.DeserializeObject>(data); modelList = modelList.Where(s => !string.IsNullOrEmpty(s.imcodimp)).ToList(); - } - if (!string.IsNullOrEmpty(searchString)) - { - modelList = modelList.Where(s => s.indirizzo.ToUpper().Contains(searchString.ToUpper())).ToList(); - ViewData["CurrentFilter"] = searchString; + if (!string.IsNullOrEmpty(searchString)) + { + modelList = modelList.Where(s => s.indirizzo.ToUpper().Contains(searchString.ToUpper())).ToList(); + ViewData["CurrentFilter"] = searchString; + } + else + ViewData["CurrentFilter"] = null; + + if (page != null && page < 1) + { + page = 1; + } + var pageSize = 10; + + var shortLinks = modelList + .OrderByDescending(s => s.imcodimp) + .ToPagedList(page ?? 1, pageSize); + + return View(shortLinks); } else - ViewData["CurrentFilter"] = null; - - if (page != null && page < 1) { - page = 1; + errMes = response.Content.ReadAsStringAsync().Result; + helper.SetStringValue("errMsg", errMes); + return RedirectToAction("Error"); } - var pageSize = 10; - var shortLinks = modelList - .OrderByDescending(s => s.imcodimp) - .ToPagedList(page ?? 1, pageSize); - - return View(shortLinks); } @@ -167,7 +174,7 @@ namespace VirtualTask.Controllers modelList = JsonConvert.DeserializeObject>(data); impianto = modelList.Where(x => x.imcodimp.Equals(id)).First(); } - + ViewBag.AllStockList = LoadStockitems(); return View(impianto); } diff --git a/Views/Impianti/Create.cshtml b/Views/Impianti/Create.cshtml index 0170b14..1e873ef 100644 --- a/Views/Impianti/Create.cshtml +++ b/Views/Impianti/Create.cshtml @@ -17,11 +17,7 @@ -@*
- - - -
*@ + @Html.HiddenFor(m => m.imcodazi)
@@ -87,15 +83,6 @@
- - - - - - - - - + + + + + + + + @section Scripts { @{await Html.RenderPartialAsync("_ValidationScriptsPartial");} } diff --git a/Views/Impianti/Index.cshtml b/Views/Impianti/Index.cshtml index c17630b..37a35f4 100644 --- a/Views/Impianti/Index.cshtml +++ b/Views/Impianti/Index.cshtml @@ -22,106 +22,27 @@ - - - + + + -@* - - - - - - - - *@ - + @foreach (var item in Model) { - string message = string.Empty; - if (!string.IsNullOrEmpty(item.imindiri1)) - message = message + item.imindiri1; - if (!string.IsNullOrEmpty(item.imindiri2)) - message = " "+message + item.imindiri2; - if (item.imindiri3!=null) - message = "," + message + Convert.ToString( item.imindiri3); + - - - - -@* - - - - - - - - *@ - - + + + + +
- Cod. Impianto - - Azienda - - Descrizione - Cod. ImpiantoAziendaDescrizione Indirizzo - @Html.DisplayNameFor(model => model.imindiri1) - - @Html.DisplayNameFor(model => model.imindiri2) - - @Html.DisplayNameFor(model => model.imindiri3) - - @Html.DisplayNameFor(model => model.imindiri4) - - @Html.DisplayNameFor(model => model.imindiri5) - - @Html.DisplayNameFor(model => model.imlocali) - - @Html.DisplayNameFor(model => model.imcodcap) - - @Html.DisplayNameFor(model => model.imcomune) - - @Html.DisplayNameFor(model => model.improvin) - - Cod. Cliente - Cod. Clienterr
- @Html.DisplayFor(modelItem => item.imcodimp) - - @Html.DisplayFor(modelItem => item.imcodazi) - - @Html.DisplayFor(modelItem => item.imdescri) - - @Html.DisplayFor(modelItem => item.indirizzo) - - @Html.DisplayFor(modelItem => item.imindiri1) - - @Html.DisplayFor(modelItem => item.imindiri2) - - @Html.DisplayFor(modelItem => item.imindiri3) - - @Html.DisplayFor(modelItem => item.imindiri4) - - @Html.DisplayFor(modelItem => item.imindiri5) - - @Html.DisplayFor(modelItem => item.imlocali) - - @Html.DisplayFor(modelItem => item.imcodcap) - - @Html.DisplayFor(modelItem => item.imcomune) - - @Html.DisplayFor(modelItem => item.improvin) - - @Html.DisplayFor(modelItem => item.imultcli) - @Html.DisplayFor(modelItem => item.imcodimp)@Html.DisplayFor(modelItem => item.imcodazi)@Html.DisplayFor(modelItem => item.imdescri)@Html.DisplayFor(modelItem => item.indirizzo)@Html.DisplayFor(modelItem => item.imultcli)pppp @Html.ActionLink("Edit", "Edit", new { id=item.imcodimp }) | @Html.ActionLink("Details", "Details", new { id=item.imcodimp }) |