diff --git a/Controllers/ChiamateController.cs b/Controllers/ChiamateController.cs index 7bd7b90..0b52816 100644 --- a/Controllers/ChiamateController.cs +++ b/Controllers/ChiamateController.cs @@ -66,14 +66,14 @@ namespace VirtualTask.Controllers if (!string.IsNullOrEmpty(cliente)) { - modelList = modelList.Where(s => s.ancodice != null && s.ancodice.Contains(cliente)).ToList(); + modelList = modelList.Where(s => s.andescri != null && s.andescri.ToUpper().Contains(cliente.ToUpper())).ToList(); - ViewData["CurrentFilter"] = cliente; + ViewData["ClienteFilter"] = cliente; ViewBag.Clienti = cliente; } else - ViewData["CurrentFilter"] = null; + ViewData["ClienteFilter"] = null; if (!string.IsNullOrEmpty(impianto)) { diff --git a/Controllers/ImpiantiController.cs b/Controllers/ImpiantiController.cs index 74d7655..66d21fd 100644 --- a/Controllers/ImpiantiController.cs +++ b/Controllers/ImpiantiController.cs @@ -33,7 +33,7 @@ namespace VirtualTask.Controllers #region INDEX - public IActionResult Index(string searchString, string cliente, int? page = 1) + public IActionResult Index(string searchString, string searchCliente, int? page = 1) { SessionHelper helper = new SessionHelper(this); token = helper.GetStringValue("tok"); @@ -71,11 +71,13 @@ namespace VirtualTask.Controllers else ViewData["CurrentFilter"] = null; - if (!string.IsNullOrEmpty(cliente)) + + + if (!string.IsNullOrEmpty(searchCliente)) { - modelList = modelList.Where(x => x.imultcli != null && x.imultcli.Contains(cliente)).ToList(); - ViewData["CurrentFilterCli"] = cliente; - ViewBag.Cliente = cliente; + modelList = modelList.Where(x => x.descCliente != null && x.descCliente.ToUpper().Contains(searchCliente.ToUpper())).ToList(); + ViewData["CurrentFilterCli"] = searchCliente; + //ViewBag.Cliente = cliente; } else ViewData["CurrentFilterCli"] = null; diff --git a/Views/Anag/Details.cshtml b/Views/Anag/Details.cshtml index 92549ae..1535d61 100644 --- a/Views/Anag/Details.cshtml +++ b/Views/Anag/Details.cshtml @@ -7,40 +7,115 @@
-
-
-
- @Html.DisplayNameFor(model => model.ancodice)   @Html.DisplayFor(model => model.ancodice) -
-
- @Html.DisplayNameFor(model => model.andescri)   @Html.DisplayFor(model => model.andescri) -
-
- @Html.DisplayNameFor(model => model.ancodfis)   @Html.DisplayFor(model => model.ancodfis) -
-
- @Html.DisplayNameFor(model => model.anpariva)   @Html.DisplayFor(model => model.anpariva) -
-
- @Html.DisplayNameFor(model => model.anindiri)   @Html.DisplayFor(model => model.anindiri) -
-
- @Html.DisplayNameFor(model => model.antelefo)   @Html.DisplayFor(model => model.antelefo) -
-
- @Html.DisplayNameFor(model => model.an_email)   @Html.DisplayFor(model => model.an_email) -
-
- @Html.DisplayNameFor(model => model.an_empec)   @Html.DisplayFor(model => model.an_empec) -
-
-
- Torna alla lista - @* *@ -
-
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
+ @Html.DisplayNameFor(model => model.ancodice) + @Html.DisplayFor(model => model.ancodice)
+ @Html.DisplayNameFor(model => model.andescri) + @Html.DisplayFor(model => model.andescri)
+ @Html.DisplayNameFor(model => model.ancodfis) + @Html.DisplayFor(model => model.ancodfis)
+ @Html.DisplayNameFor(model => model.anpariva) + @Html.DisplayFor(model => model.anpariva)
+ @Html.DisplayNameFor(model => model.anindiri) + @Html.DisplayFor(model => model.anindiri)
+ @Html.DisplayNameFor(model => model.antelefo) + @Html.DisplayFor(model => model.antelefo)
+ @Html.DisplayNameFor(model => model.an_email) + @Html.DisplayFor(model => model.an_email)
+ @Html.DisplayNameFor(model => model.an_empec) + @Html.DisplayFor(model => model.an_empec)
+
+
+ Torna alla lista
+ +@* @model VirtualTask.Models.Anag *@ + +@* @{ *@ +@* ViewData["Title"] = "Dettaglio cliente"; *@ +@* Layout = "~/Views/Shared/_LayoutAreaRiservata.cshtml"; *@ +@* } *@ + +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.ancodice)   @Html.DisplayFor(model => model.ancodice) *@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.andescri)   @Html.DisplayFor(model => model.andescri) *@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.ancodfis)   @Html.DisplayFor(model => model.ancodfis) *@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.anpariva)   @Html.DisplayFor(model => model.anpariva) *@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.anindiri)   @Html.DisplayFor(model => model.anindiri) *@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.antelefo)   @Html.DisplayFor(model => model.antelefo) *@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.an_email)   @Html.DisplayFor(model => model.an_email) *@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.an_empec)   @Html.DisplayFor(model => model.an_empec) *@ +@*
*@ +@*
*@ +@*
*@ +@* Torna alla lista *@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ + diff --git a/Views/Anag/Edit.cshtml b/Views/Anag/Edit.cshtml index fbab174..886d804 100644 --- a/Views/Anag/Edit.cshtml +++ b/Views/Anag/Edit.cshtml @@ -7,81 +7,96 @@
-
-
-
-
+ +
- @Html.HiddenFor(x => x.antipcon) - @Html.HiddenFor(x => x.andtobso) - @Html.HiddenFor(x => x.annumlis) -
 
-
-
- @**@ - @Html.HiddenFor(x => x.ancodice) - @Html.DisplayFor(model => model.ancodice) - -
-
 
-
-
- - -
-
 
-
-
- - -
-
 
-
-
- - -
-
 
-
-
- - -
-
 
-
-
- - -
-
 
-
-
- - -
-
 
-
-
- - -
-
 
-
-
- - -
-
 
-
- - Torna alla lista -
-
+ @Html.HiddenFor(x => x.antipcon) + @Html.HiddenFor(x => x.andtobso) + @Html.HiddenFor(x => x.annumlis) + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
@Html.DisplayNameFor(m => m.ancodice) + @Html.HiddenFor(m => m.ancodice) + @Html.DisplayFor(m => m.ancodice) + +
@Html.DisplayNameFor(m => m.andescri) + + +
@Html.DisplayNameFor(m => m.ancodfis) + + +
@Html.DisplayNameFor(m => m.anpariva) + + +
@Html.DisplayNameFor(m => m.anindiri) + + +
@Html.DisplayNameFor(m => m.antelefo) + + +
@Html.DisplayNameFor(m => m.annumcel) + + +
@Html.DisplayNameFor(m => m.an_email) + + +
@Html.DisplayNameFor(m => m.an_empec) + + +
-
-
- @* Torna alla lista *@ -
+ +
+ + Torna alla lista +
+ + @section Scripts { @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); @@ -89,3 +104,94 @@ }
+ + +@* @model VirtualTask.Models.Anag *@ + +@* @{ *@ +@* ViewData["Title"] = "Modifica cliente"; *@ +@* Layout = "~/Views/Shared/_LayoutAreaRiservata.cshtml"; *@ +@* } *@ + +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ + +@* @Html.HiddenFor(x => x.antipcon) *@ +@* @Html.HiddenFor(x => x.andtobso) *@ +@* @Html.HiddenFor(x => x.annumlis) *@ +@*
 
*@ +@*
*@ +@*
*@ +@* @Html.HiddenFor(x => x.ancodice) *@ +@* @Html.DisplayFor(model => model.ancodice) *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@* *@ +@* Torna alla lista *@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@* @section Scripts { *@ +@* @{ *@ +@* await Html.RenderPartialAsync("_ValidationScriptsPartial"); *@ +@* } *@ +@* } *@ +@*
*@ +@*
*@ diff --git a/Views/Articoli/Details.cshtml b/Views/Articoli/Details.cshtml index c0adec3..d2e584f 100644 --- a/Views/Articoli/Details.cshtml +++ b/Views/Articoli/Details.cshtml @@ -7,41 +7,116 @@
-
-
-
- @Html.DisplayNameFor(model => model.SlCodice) @Html.DisplayFor(model => model.SlCodice) -
-
- @Html.DisplayNameFor(model => model.ArDesArt) @Html.DisplayFor(model => model.ArDesArt) -
-
- @Html.DisplayNameFor(model => model.SlCodMag) @Html.DisplayFor(model => model.SlCodMag) -
-
- @Html.DisplayNameFor(model => model.SlQtAper) @Html.DisplayFor(model => model.SlQtAper) -
-
- @Html.DisplayNameFor(model => model.LiPrezzo) @Html.DisplayFor(model => model.LiPrezzo) -
- @Html.HiddenFor(model => model.Azienda) - @Html.HiddenFor(model => model.AmCodice) - @Html.HiddenFor(model => model.LoCodice) - @Html.HiddenFor(model => model.LiCodLis) - @Html.HiddenFor(model => model.LiCodArt) - @Html.HiddenFor(model => model.LiDatAtt) - @Html.HiddenFor(model => model.LiQuanti) - @Html.HiddenFor(model => model.LiScont1) - @Html.HiddenFor(model => model.LiScont2) - @Html.HiddenFor(model => model.LiScont3) - @Html.HiddenFor(model => model.LiScont4) - @Html.HiddenFor(model => model.Gest_Matr) - @Html.HiddenFor(model => model.Gest_Lotti) - @Html.HiddenFor(model => model.Desc_sup) - -
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
+ @Html.DisplayNameFor(model => model.SlCodice) + @Html.DisplayFor(model => model.SlCodice)
+ @Html.DisplayNameFor(model => model.ArDesArt) + @Html.DisplayFor(model => model.ArDesArt)
+ @Html.DisplayNameFor(model => model.SlCodMag) + @Html.DisplayFor(model => model.SlCodMag)
+ @Html.DisplayNameFor(model => model.SlQtAper) + @Html.DisplayFor(model => model.SlQtAper)
+ @Html.DisplayNameFor(model => model.LiPrezzo) + @Html.DisplayFor(model => model.LiPrezzo)
+
+ + @* Hidden fields *@ + @Html.HiddenFor(model => model.Azienda) + @Html.HiddenFor(model => model.AmCodice) + @Html.HiddenFor(model => model.LoCodice) + @Html.HiddenFor(model => model.LiCodLis) + @Html.HiddenFor(model => model.LiCodArt) + @Html.HiddenFor(model => model.LiDatAtt) + @Html.HiddenFor(model => model.LiQuanti) + @Html.HiddenFor(model => model.LiScont1) + @Html.HiddenFor(model => model.LiScont2) + @Html.HiddenFor(model => model.LiScont3) + @Html.HiddenFor(model => model.LiScont4) + @Html.HiddenFor(model => model.Gest_Matr) + @Html.HiddenFor(model => model.Gest_Lotti) + @Html.HiddenFor(model => model.Desc_sup) + +
+ + +@* @model VirtualTask.Models.Articoli *@ + +@* @{ *@ +@* ViewData["Title"] = "Dettaglio articolo"; *@ +@* Layout = "~/Views/Shared/_LayoutAreaRiservata.cshtml"; *@ +@* } *@ + +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.SlCodice) @Html.DisplayFor(model => model.SlCodice) *@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.ArDesArt) @Html.DisplayFor(model => model.ArDesArt) *@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.SlCodMag) @Html.DisplayFor(model => model.SlCodMag) *@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.SlQtAper) @Html.DisplayFor(model => model.SlQtAper) *@ +@*
*@ +@*
*@ +@* @Html.DisplayNameFor(model => model.LiPrezzo) @Html.DisplayFor(model => model.LiPrezzo) *@ +@*
*@ +@* @Html.HiddenFor(model => model.Azienda) *@ +@* @Html.HiddenFor(model => model.AmCodice) *@ +@* @Html.HiddenFor(model => model.LoCodice) *@ +@* @Html.HiddenFor(model => model.LiCodLis) *@ +@* @Html.HiddenFor(model => model.LiCodArt) *@ +@* @Html.HiddenFor(model => model.LiDatAtt) *@ +@* @Html.HiddenFor(model => model.LiQuanti) *@ +@* @Html.HiddenFor(model => model.LiScont1) *@ +@* @Html.HiddenFor(model => model.LiScont2) *@ +@* @Html.HiddenFor(model => model.LiScont3) *@ +@* @Html.HiddenFor(model => model.LiScont4) *@ +@* @Html.HiddenFor(model => model.Gest_Matr) *@ +@* @Html.HiddenFor(model => model.Gest_Lotti) *@ +@* @Html.HiddenFor(model => model.Desc_sup) *@ +@*
*@ +@* Torna alla lista *@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ diff --git a/Views/Articoli/Edit.cshtml b/Views/Articoli/Edit.cshtml index fd6da9b..4372c6c 100644 --- a/Views/Articoli/Edit.cshtml +++ b/Views/Articoli/Edit.cshtml @@ -7,65 +7,151 @@
-
-
-
-
-
 
-
-
- - -
-
 
-
-
- - -
-
 
-
-
- @Html.DropDownListFor(x => x.SlCodMag, (IEnumerable)ViewBag.Magazzini, new { @class = "agy-form-field require" }) - -
-
 
-
-
- - -
-
 
-
-
- - -
-
 
-
- - Torna alla lista -
- @Html.HiddenFor(x => x.Azienda) - @Html.HiddenFor(model => model.AmCodice) - @Html.HiddenFor(model => model.LoCodice) - @Html.HiddenFor(model => model.LiCodLis) - @Html.HiddenFor(model => model.LiCodArt) - @Html.HiddenFor(model => model.LiDatAtt) - @Html.HiddenFor(model => model.LiQuanti) - @Html.HiddenFor(model => model.LiScont1) - @Html.HiddenFor(model => model.LiScont2) - @Html.HiddenFor(model => model.LiScont3) - @Html.HiddenFor(model => model.LiScont4) - @Html.HiddenFor(model => model.Gest_Matr) - @Html.HiddenFor(model => model.Gest_Lotti) - @Html.HiddenFor(model => model.Desc_sup) -
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
@Html.DisplayNameFor(m => m.SlCodice) + + +
@Html.DisplayNameFor(m => m.ArDesArt) + + +
@Html.DisplayNameFor(m => m.SlCodMag) + @Html.DropDownListFor(x => x.SlCodMag, (IEnumerable)ViewBag.Magazzini, new { @class = "agy-form-field require" }) + +
@Html.DisplayNameFor(m => m.SlQtAper) + + +
@Html.DisplayNameFor(m => m.LiPrezzo) + + +
-
+ +
+ + Torna alla lista +
+ + @* Campi nascosti *@ + @Html.HiddenFor(x => x.Azienda) + @Html.HiddenFor(x => x.AmCodice) + @Html.HiddenFor(x => x.LoCodice) + @Html.HiddenFor(x => x.LiCodLis) + @Html.HiddenFor(x => x.LiCodArt) + @Html.HiddenFor(x => x.LiDatAtt) + @Html.HiddenFor(x => x.LiQuanti) + @Html.HiddenFor(x => x.LiScont1) + @Html.HiddenFor(x => x.LiScont2) + @Html.HiddenFor(x => x.LiScont3) + @Html.HiddenFor(x => x.LiScont4) + @Html.HiddenFor(x => x.Gest_Matr) + @Html.HiddenFor(x => x.Gest_Lotti) + @Html.HiddenFor(x => x.Desc_sup) + +
+ +@* @model VirtualTask.Models.Articoli *@ + +@* @{ *@ +@* ViewData["Title"] = "Modifica articolo"; *@ +@* Layout = "~/Views/Shared/_LayoutAreaRiservata.cshtml"; *@ +@* } *@ + +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* @Html.DropDownListFor(x => x.SlCodMag, (IEnumerable)ViewBag.Magazzini, new { @class = "agy-form-field require" }) *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@*
*@ +@* *@ +@* *@ +@*
*@ +@*
 
*@ +@*
*@ +@* *@ +@* Torna alla lista *@ +@*
*@ +@* @Html.HiddenFor(x => x.Azienda) *@ +@* @Html.HiddenFor(model => model.AmCodice) *@ +@* @Html.HiddenFor(model => model.LoCodice) *@ +@* @Html.HiddenFor(model => model.LiCodLis) *@ +@* @Html.HiddenFor(model => model.LiCodArt) *@ +@* @Html.HiddenFor(model => model.LiDatAtt) *@ +@* @Html.HiddenFor(model => model.LiQuanti) *@ +@* @Html.HiddenFor(model => model.LiScont1) *@ +@* @Html.HiddenFor(model => model.LiScont2) *@ +@* @Html.HiddenFor(model => model.LiScont3) *@ +@* @Html.HiddenFor(model => model.LiScont4) *@ +@* @Html.HiddenFor(model => model.Gest_Matr) *@ +@* @Html.HiddenFor(model => model.Gest_Lotti) *@ +@* @Html.HiddenFor(model => model.Desc_sup) *@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ +@*
*@ + @*