diff --git a/Controllers/Rapp_NewController.cs b/Controllers/Rapp_NewController.cs index d082e2f..4c9d4bb 100644 --- a/Controllers/Rapp_NewController.cs +++ b/Controllers/Rapp_NewController.cs @@ -63,15 +63,13 @@ namespace VirtualTask.Controllers if (dataIni.Date != DateTime.MinValue) { modelList = modelList.Where(x => x.data_rapportino.Date >= dataIni.Date).ToList(); - ViewData["dataIni"] = dataIni; - //ViewData["dataFin"] = dataFin; } else { ViewData["dataIni"] = null; - } + if (dataFin.Date != DateTime.MinValue) { modelList = modelList.Where(x => x.data_rapportino.Date <= dataFin.Date).ToList(); @@ -80,7 +78,6 @@ namespace VirtualTask.Controllers else { ViewData["dataFin"] = null; - } if (!string.IsNullOrEmpty(Codbuono)) diff --git a/Controllers/RapportiniController.cs b/Controllers/RapportiniController.cs index edd7b3d..93e7a2e 100644 --- a/Controllers/RapportiniController.cs +++ b/Controllers/RapportiniController.cs @@ -78,36 +78,29 @@ namespace VirtualTask.Controllers { modelList = modelList.Where(s => s.codice_impianto.Contains(impianto)).ToList(); - ViewData["CurrentFilter"] = impianto; + ViewData["impianto"] = impianto; ViewBag.Impianto = impianto; } else - ViewData["CurrentFilter"] = null; - - + ViewData["impianto"] = null; if (dataIni.Date != DateTime.MinValue) { modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date).ToList(); + ViewData["dataIni"] = dataIni; + } + else + ViewData["dataIni"] = null; + if (dataFin.Date != DateTime.MinValue) { modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date <= dataFin.Date).ToList(); + ViewData["dataFin"] = dataFin; } - - - //if (!dataFin.ToString().Substring(0, 10).Equals("01/01/0001")) - //{ - // modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date && x.data_rapportino.GetValueOrDefault().Date <= dataFin.Date).ToList(); - //} - //else - //{ - // modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date).ToList(); - //} - - - + else + ViewData["dataFin"] = null; if (page != null && page < 1) { diff --git a/Controllers/TimbratureController.cs b/Controllers/TimbratureController.cs index c4e0e70..73d4f23 100644 --- a/Controllers/TimbratureController.cs +++ b/Controllers/TimbratureController.cs @@ -66,27 +66,36 @@ namespace VirtualTask.Controllers if (dataIni.Date != DateTime.MinValue) { modelList = modelList.Where(x => x.data_timbratura.GetValueOrDefault().Date >= dataIni.Date).ToList(); + ViewData["dataIni"] = dataIni; + } + else + ViewData["dataIni"] = null; + if (dataFin.Date != DateTime.MinValue) { modelList = modelList.Where(x => x.data_timbratura.GetValueOrDefault().Date <= dataFin.Date).ToList(); + ViewData["dataFin"] = dataFin; } + else + ViewData["dataFin"] = null; if (!string.IsNullOrEmpty(commessa)) { modelList = modelList.Where(s => s.commessa.Contains(commessa)).ToList(); - // ViewData["CurrentFilter"] = commessa; - - //ViewBag.Timbrature = commessa; + ViewData["commessa"] = commessa; } else - //ViewData["CurrentFilter"] = null; + ViewData["commessa"] = null; if (!string.IsNullOrEmpty(tecnico)) { modelList = modelList.Where(s => s.tecnico.ToLower().Contains(tecnico.ToLower())).ToList(); + ViewData["tecnico"] = tecnico; } + else + ViewData["tecnico"] = null; if (page != null && page < 1) { diff --git a/Views/Anag/Index.cshtml b/Views/Anag/Index.cshtml index 65e876d..83cdaae 100644 --- a/Views/Anag/Index.cshtml +++ b/Views/Anag/Index.cshtml @@ -19,58 +19,87 @@

@using (Html.BeginForm()) { - -
+
+
Ricerca
+
+ + + + + + + +
+ @Html.TextBox("SearchString", null, new { placeholder = "Cerca per Rag. Sociale", @class = "agy-form-field require" }) + +   + +
+
+
+ @*
@Html.TextBox("SearchString", null, new { placeholder = "Cerca per Rag. Sociale", @class = "agy-form-field require" })
 
-
+
*@ } - - - - - - - - - - - @foreach (var item in Model) - { - - - - - - - - } - -
CodiceRag. SocialeCodice FiscalePartita Iva
- @Html.DisplayFor(modelItem => item.ancodice) - - @Html.DisplayFor(modelItem => item.andescri) - - @Html.DisplayFor(modelItem => item.ancodfis) - - @Html.DisplayFor(modelItem => item.anpariva) - - - Modifica - - | - - Dettaglio - - | - - Elimina - -
+
+   +
+ +
+
Clienti
+
+ + + + + + + + + + + + @foreach (var item in Model) + { + + + + + + + + + } + +
CodiceRag. SocialeCodice FiscalePartita Iva
+ @Html.DisplayFor(modelItem => item.ancodice) + + @Html.DisplayFor(modelItem => item.andescri) + + @Html.DisplayFor(modelItem => item.ancodfis) + + @Html.DisplayFor(modelItem => item.anpariva) + + + Modifica + + | + + Dettaglio + + | + + Elimina + +
+
+
+