POLO-WEBAPP/VirtualTask
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Tecnici Delete: allineato tasto torna a lista con tasto elimina

Browse Source 
- Chiusure Edit: allineato tasto torna a lista con tasto elimina
- Chiusure Delete: allineato tasto torna a lista con tasto elimina
- Impianti Delete: allineato tasto torna a lista con tasto elimina
- Commesse Delete: allineato tasto torna a lista con tasto elimina
This commit is contained in:
michele 2025-05-15 14:37:41 +02:00
parent b7fafc0d53
commit ff00de3342
15 changed files with 132 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Controllers/ChiamateController.cs
View File

@ -181,7 +181,7 @@ namespace VirtualTask.Controllers
ViewBag.StatiChiamata = getStatiChiamata(null); ViewBag.StatiChiamata = getStatiChiamata(null);
//ViewBag.TipiChiamata = getTipiChiamata(); //ViewBag.TipiChiamata = getTipiChiamata();
ViewBag.CodiciSegnalazione = getCodiciSegnalazione(); ViewBag.CodiciSegnalazione = getCodiciSegnalazione(null);
ViewBag.Tecnici = getTecnici(null); ViewBag.Tecnici = getTecnici(null);
// Pre-seleziona impianto // Pre-seleziona impianto
@ -362,7 +362,7 @@ namespace VirtualTask.Controllers
ViewBag.Impianti = getImpianti(null); ViewBag.Impianti = getImpianti(null);
ViewBag.StatiChiamata = getStatiChiamata(null); ViewBag.StatiChiamata = getStatiChiamata(null);
ViewBag.CodiciSegnalazione = getCodiciSegnalazione(); ViewBag.CodiciSegnalazione = getCodiciSegnalazione(null);
ViewBag.Tecnici = getTecnici(null); ViewBag.Tecnici = getTecnici(null);
return View(chiamata); return View(chiamata);
} }
@ -651,36 +651,47 @@ namespace VirtualTask.Controllers
return selectItems; return selectItems;
} }
private List<SelectListItem> getCodiciSegnalazione() private List<SelectListItem> getCodiciSegnalazione(string codSegn)
{ {
SessionHelper helper = new SessionHelper(this);
token = helper.GetStringValue("tok");
apiUrl = helper.GetStringValue("apiUrl");
urlBase = apiUrl + "CodiciSegnalazioniVTList";
urlBase = urlBase + "?token=" + token;
Uri baseAddress = new Uri(urlBase);
client = new HttpClient();
client.BaseAddress = baseAddress;
List<SelectListItem> selectItems = new List<SelectListItem>(); List<SelectListItem> selectItems = new List<SelectListItem>();
List<CodiceSegnalazione> modelList = new List<CodiceSegnalazione>();
HttpResponseMessage response = client.GetAsync(baseAddress).Result;
if (response.IsSuccessStatusCode)
{
string data = response.Content.ReadAsStringAsync().Result;
modelList = JsonConvert.DeserializeObject<List<CodiceSegnalazione>>(data);
modelList = modelList.Where(x => x.DataObso == null).ToList();
//per gestire primo elemento tendina (deve essere vuoto)
SelectListItem listItemFirst = new SelectListItem();
listItemFirst.Value = string.Empty;
listItemFirst.Text = " - Cod. Segnalazione";
selectItems.Add(listItemFirst);
foreach (var role in modelList)
{
SelectListItem listItem = new SelectListItem(); SelectListItem listItem = new SelectListItem();
listItem.Value = "Intervento";
listItem.Text = "Intervento";
selectItems.Add(listItem);
listItem = new SelectListItem(); string s = role.cscodice + " - " + role.csdescr;
listItem.Value = "Collaudo"; listItem.Value = role.cscodice;
listItem.Text = "Collaudo"; listItem.Text = s;
if (role.cscodice != null && role.cscodice.Equals(codSegn))
{
listItem.Selected = true;
}
selectItems.Add(listItem); selectItems.Add(listItem);
}
listItem = new SelectListItem(); }
listItem.Value = "InterventoGar";
listItem.Text = "Intervento in garanzia";
selectItems.Add(listItem);
listItem = new SelectListItem();
listItem.Value = "InterventoMan";
listItem.Text = "Intervento in manutenzione";
selectItems.Add(listItem);
listItem = new SelectListItem();
listItem.Value = "InterventoCli";
listItem.Text = "Intervento a carico del cliente";
selectItems.Add(listItem);
return selectItems; return selectItems;
} }
private List<SelectListItem> getTecnici(string tecnico) private List<SelectListItem> getTecnici(string tecnico)
{ {

3
Controllers/Rapp_NewController.cs
View File

@ -82,7 +82,8 @@ namespace VirtualTask.Controllers
if (!string.IsNullOrEmpty(Codbuono)) if (!string.IsNullOrEmpty(Codbuono))
{ {
modelList = modelList.Where(x => x.seriale_rapportino.ToUpper().Contains(Codbuono)).ToList(); //modelList = modelList.Where(x => x.seriale_rapportino.ToUpper().Contains(Codbuono)).ToList();
modelList = modelList.Where(x => x.ser_buono.ToUpper().Contains(Codbuono)).ToList();
ViewData["Codbuono"] = Codbuono; ViewData["Codbuono"] = Codbuono;
} }
else else

48
Controllers/TimbratureController.cs
View File

@ -34,6 +34,7 @@ namespace VirtualTask.Controllers
public IActionResult Index(DateTime dataIni, DateTime dataFin, string commessa, string tecnico, int? page = 1) public IActionResult Index(DateTime dataIni, DateTime dataFin, string commessa, string tecnico, int? page = 1)
{ {
SessionHelper helper = new SessionHelper(this); SessionHelper helper = new SessionHelper(this);
token = helper.GetStringValue("tok"); token = helper.GetStringValue("tok");
if (string.IsNullOrEmpty(token)) if (string.IsNullOrEmpty(token))
@ -108,6 +109,9 @@ namespace VirtualTask.Controllers
.OrderByDescending(s => s.id) .OrderByDescending(s => s.id)
.ToPagedList(page ?? 1, pageSize); .ToPagedList(page ?? 1, pageSize);
ViewBag.Tecnici = GetTecnici();
return View(shortLinks); return View(shortLinks);
} }
else else
@ -163,6 +167,46 @@ namespace VirtualTask.Controllers
#region metodi interni #region metodi interni
private List<SelectListItem> GetTecnici()
{
SessionHelper helper = new SessionHelper(this);
token = helper.GetStringValue("tok");
apiUrl = helper.GetStringValue("apiUrl");
urlBase = apiUrl + "tecniciList";
urlBase = urlBase + "?token=" + token;
Uri baseAddress = new Uri(urlBase);
client = new HttpClient();
client.BaseAddress = baseAddress;
List<SelectListItem> selectItems = new List<SelectListItem>();
List<Tecnici> modelList = new List<Tecnici>();
HttpResponseMessage response = client.GetAsync(baseAddress).Result;
if (response.IsSuccessStatusCode)
{
string data = response.Content.ReadAsStringAsync().Result;
modelList = JsonConvert.DeserializeObject<List<Tecnici>>(data);
modelList = modelList.Where(x => x.tcdatobs == null).ToList();
//per gestire primo elemento tendina (deve essere vuoto)
SelectListItem listItemFirst = new SelectListItem();
listItemFirst.Value = string.Empty;
listItemFirst.Text = " - Tecnico";
selectItems.Add(listItemFirst);
foreach (var role in modelList)
{
SelectListItem listItem = new SelectListItem();
string s = role.tccodice + " - " + role.tcdescri;
listItem.Value = role.tccodice;
listItem.Text = s/*role.tcdescri*/;
selectItems.Add(listItem);
}
}
return selectItems;
}
private List<SelectListItem> GetCommesse() private List<SelectListItem> GetCommesse()
{ {
SessionHelper helper = new SessionHelper(this); SessionHelper helper = new SessionHelper(this);
@ -214,7 +258,7 @@ namespace VirtualTask.Controllers
SessionHelper helper = new SessionHelper(this); SessionHelper helper = new SessionHelper(this);
//16/09/2024 messo questo controllo perchè se faccio esporta senza aver fatto cerca va in errore quando crea file excel. //16/09/2024 messo questo controllo perchè se faccio esporta senza aver fatto cerca va in errore quando crea file excel.
if (tecnico.Equals("System.Collections.Generic.List`1[Microsoft.AspNetCore.Mvc.Rendering.SelectListItem]")) if (tecnico == null || tecnico.Equals("System.Collections.Generic.List`1[Microsoft.AspNetCore.Mvc.Rendering.SelectListItem]"))
{ {
tecnico = string.Empty; tecnico = string.Empty;
} }
@ -338,6 +382,8 @@ namespace VirtualTask.Controllers
} }
} }
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public IActionResult Error() public IActionResult Error()
{ {

1
Models/MagazziniVT.cs
View File

@ -7,6 +7,7 @@ namespace VirtualTask.Models
[Display(Name = "Azienda")] [Display(Name = "Azienda")]
public string? Azienda { get; set; } public string? Azienda { get; set; }
[Display(Name = "Cod. Magazzino")] [Display(Name = "Cod. Magazzino")]
[StringLength(5)]
public string? Mgcodmag { get; set; } public string? Mgcodmag { get; set; }
[Display(Name = "Descrizone")] [Display(Name = "Descrizone")]
public string? Mgdesmag { get; set; } public string? Mgdesmag { get; set; }

3
Models/Tecnici.cs
View File

@ -1,4 +1,5 @@
using System.ComponentModel; 
using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;

94
Views/Anag/Delete.cshtml
View File

@ -9,66 +9,36 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="row"> <div class="row">
<dt class="col-sm-2"> <div class="col-md-10">
@Html.DisplayNameFor(model => model.antipcon) <b>@Html.DisplayNameFor(model => model.antipcon)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayFor(model => model.antipcon)
</dt> </div>
<dd class="col-sm-10"> <div class="col-md-10">
@Html.DisplayFor(model => model.antipcon) <b>@Html.DisplayNameFor(model => model.ancodice)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayFor(model => model.ancodice)
</dd> </div>
<dt class="col-sm-2"> <div class="col-md-10">
@Html.DisplayNameFor(model => model.ancodice) <b>@Html.DisplayNameFor(model => model.an_email)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayFor(model => model.an_email)
</dt> </div>
<dd class="col-sm-10"> <div class="col-md-10">
@Html.DisplayFor(model => model.ancodice) <b>@Html.DisplayNameFor(model => model.ancodfis)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayFor(model => model.ancodfis)
</dd> </div>
<dt class="col-sm-2"> <div class="col-md-10">
@Html.DisplayNameFor(model => model.an_email) <b>@Html.DisplayNameFor(model => model.anpariva)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayFor(model => model.anpariva)
</dt> </div>
<dd class="col-sm-10"> <div class="col-md-10">
@Html.DisplayFor(model => model.an_email) <b>@Html.DisplayNameFor(model => model.anindiri)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayFor(model => model.anindiri)
</dd> </div>
<dt class="col-sm-2"> <div class="col-md-10">
@Html.DisplayNameFor(model => model.ancodfis) <b>@Html.DisplayNameFor(model => model.antelefo)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayFor(model => model.antelefo)
</dt> </div>
<dd class="col-sm-10"> <div class="col-md-10">
@Html.DisplayFor(model => model.ancodfis) <b>@Html.DisplayNameFor(model => model.annumcel)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayFor(model => model.annumcel)
</dd> </div>
<dt class="col-sm-2"> <div class="col-md-10">
@Html.DisplayNameFor(model => model.anpariva) <b>@Html.DisplayNameFor(model => model.an_empec)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayNameFor(model => model.an_empec)
</dt> </div>
<dd class="col-sm-10"> <div class="col-md-10">
@Html.DisplayFor(model => model.anpariva) <b>@Html.DisplayNameFor(model => model.andescri)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayFor(model => model.andescri)
</dd> </div>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.anindiri)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.anindiri)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.antelefo)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.antelefo)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.annumcel)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.annumcel)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.an_empec)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.an_empec)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.andescri)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.andescri)
</dd>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div> <div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
<form asp-action="DeleteConfirmed"> <form asp-action="DeleteConfirmed">
@ -76,9 +46,7 @@
<input type="hidden" id="id" value=@Html.DisplayFor(model => model.ancodice) name="id" /> <input type="hidden" id="id" value=@Html.DisplayFor(model => model.ancodice) name="id" />
<input type="hidden" id="antipcon" value="C" name="antipcon" /> <input type="hidden" id="antipcon" value="C" name="antipcon" />
<input type="hidden" id="ancodice" value=@Html.DisplayFor(model => model.ancodice) name="ancodice" /> <input type="hidden" id="ancodice" value=@Html.DisplayFor(model => model.ancodice) name="ancodice" />
<div> <a asp-action="Index" value="Torna alla lista" class="agy-btn submitForm">Torna alla lista</a>
<a asp-action="Index">Torna alla lista</a>
</div>
</form> </form>
</div> </div>
</div> </div>

4
Views/Chiamate/Create.cshtml
View File

@ -75,7 +75,7 @@
@Html.HiddenFor(x => x.chcodese) @Html.HiddenFor(x => x.chcodese)
@Html.HiddenFor(x => x.chserial) @Html.HiddenFor(x => x.chserial)
@Html.HiddenFor(x => x.chnumero) @Html.HiddenFor(x => x.chnumero)
@Html.HiddenFor(x => x.chdata) @* @Html.HiddenFor(x => x.chdata) *@
@Html.HiddenFor(x => x.chora) @Html.HiddenFor(x => x.chora)
@Html.HiddenFor(x => x.chmin) @Html.HiddenFor(x => x.chmin)
@ -84,7 +84,7 @@
@Html.HiddenFor(x => x.chopchi) @Html.HiddenFor(x => x.chopchi)
@Html.HiddenFor(x => x.chaziimp) @Html.HiddenFor(x => x.chaziimp)
@Html.HiddenFor(x => x.chtmanut) @Html.HiddenFor(x => x.chtmanut)
@Html.HiddenFor(x => x.chdtapp) @* @Html.HiddenFor(x => x.chdtapp) *@
@Html.HiddenFor(x => x.chtipo) @Html.HiddenFor(x => x.chtipo)
</form> </form>

3
Views/Chiamate/Delete.cshtml
View File

@ -53,10 +53,7 @@
<form asp-action="DeleteConfirmed"> <form asp-action="DeleteConfirmed">
<input type="submit" value="Elimina" class="agy-btn submitForm" /> <input type="submit" value="Elimina" class="agy-btn submitForm" />
<input type="hidden" id="id" value=@Html.DisplayFor(model => model.chserial) name="id" /> <input type="hidden" id="id" value=@Html.DisplayFor(model => model.chserial) name="id" />
@*<a asp-action="Index">Torna alla lista</a>*@
<a asp-action="Index" value="Torna alla lista" class="agy-btn submitForm">Torna alla lista</a> <a asp-action="Index" value="Torna alla lista" class="agy-btn submitForm">Torna alla lista</a>
</form> </form>
</div> </div>
</div> </div>

4
Views/Chiusure/Delete.cshtml
View File

@ -30,9 +30,7 @@
<form asp-action="DeleteConfirmed"> <form asp-action="DeleteConfirmed">
<input type="submit" value="Elimina" class="agy-btn submitForm" /> <input type="submit" value="Elimina" class="agy-btn submitForm" />
<input type="hidden" id="id" value=@Html.DisplayFor(model => model.cccodice) name="id" /> <input type="hidden" id="id" value=@Html.DisplayFor(model => model.cccodice) name="id" />
<div> <a asp-action="Index" value="Torna alla lista" class="agy-btn submitForm">Torna alla lista</a>
<a asp-action="Index">Torna alla lista</a>
</div>
</form> </form>
</div> </div>
</div> </div>

5
Views/Chiusure/Edit.cshtml
View File

@ -41,6 +41,7 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div> <div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
<div class="form-group"> <div class="form-group">
<input type="submit" value="Salva" class="agy-btn submitForm" /> <input type="submit" value="Salva" class="agy-btn submitForm" />
<a asp-action="Index" value="Torna alla lista" class="agy-btn submitForm">Torna alla lista</a>
</div> </div>
@Html.HiddenFor(x => x.cccodazi) @Html.HiddenFor(x => x.cccodazi)
@Html.HiddenFor(x => x.ccflfatt) @Html.HiddenFor(x => x.ccflfatt)
@ -65,10 +66,6 @@
</form> </form>
</div> </div>
</div> </div>
<div>
<a asp-action="Index">Torna alla lista</a>
</div>
@section Scripts { @section Scripts {
@{ @{
await Html.RenderPartialAsync("_ValidationScriptsPartial"); await Html.RenderPartialAsync("_ValidationScriptsPartial");

8
Views/CommesseVT/Delete.cshtml
View File

@ -43,15 +43,11 @@
<div class="col-md-10"> <div class="col-md-10">
<b>@Html.DisplayNameFor(model => model.lacodimp)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayFor(model => model.lacodimp) <b>@Html.DisplayNameFor(model => model.lacodimp)</b>&nbsp;&nbsp;&nbsp;@Html.DisplayFor(model => model.lacodimp)
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div> <div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
<input type="submit" value="Elimina" class="agy-btn submitForm" /> <input type="submit" value="Elimina" class="agy-btn submitForm" />
<a asp-action="Index" value="Torna alla lista" class="agy-btn submitForm">Torna alla lista</a>
<div>
<a asp-action="Index">Torna alla lista</a>
</div>
</form> </form>
</div> </div>
</div> </div>

6
Views/CommesseVT/Index.cshtml
View File

@ -27,7 +27,7 @@
<tbody class="table-border-bottom-0"> <tbody class="table-border-bottom-0">
<tr> <tr>
<td> <td>
<span class="fw-medium">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per commessa", @class = "agy-form-field require"})</span> <span class="fw-medium">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per Cliente", @class = "agy-form-field require"})</span>
</td> </td>
<td> <td>
<i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i> <i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i>
@ -63,8 +63,8 @@
<tr> <tr>
<th hidden>Seriale Commessa</th> <th hidden>Seriale Commessa</th>
<th hidden>Azienda</th> <th hidden>Azienda</th>
<th>Cod. Commessa</th> <th>Codice Commessa</th>
<th>Descrizione Commessa</th> <th>Descrizione</th>
<th hidden>Fine validita Commessa</th> <th hidden>Fine validita Commessa</th>
<th hidden>Tipo</th> <th hidden>Tipo</th>
<th>Cod. Cliente</th> <th>Cod. Cliente</th>

4
Views/Impianti/Delete.cshtml
View File

@ -59,9 +59,7 @@
<form asp-action="DeleteConfirmed"> <form asp-action="DeleteConfirmed">
<input type="submit" value="Elimina" class="agy-btn submitForm" /> <input type="submit" value="Elimina" class="agy-btn submitForm" />
<input type="hidden" id="id" value=@Html.DisplayFor(model => model.imcodimp) name="id" /> <input type="hidden" id="id" value=@Html.DisplayFor(model => model.imcodimp) name="id" />
<div> <a asp-action="Index" value="Torna alla lista" class="agy-btn submitForm">Torna alla lista</a>
<a asp-action="Index">Torna alla lista</a>
</div>
</form> </form>
</div> </div>
</div> </div>

4
Views/Tecnici/Delete.cshtml
View File

@ -46,9 +46,7 @@
<form asp-action="DeleteConfirmed"> <form asp-action="DeleteConfirmed">
<input type="submit" value="Elimina" class="agy-btn submitForm" /> <input type="submit" value="Elimina" class="agy-btn submitForm" />
<input type="hidden" id="id" value=@Html.DisplayFor(model => model.tccodice) name="id" /> <input type="hidden" id="id" value=@Html.DisplayFor(model => model.tccodice) name="id" />
<div> <a asp-action="Index" value="Torna alla lista" class="agy-btn submitForm">Torna alla lista</a>
<a asp-action="Index">Torna alla lista</a>
</div>
</form> </form>
</div> </div>
</div> </div>

2
Views/Timbrature/Index.cshtml
View File

@ -41,7 +41,7 @@
</td> </td>
<td> <td>
<i class="bx bxl-angular bx-sm text-black me-3">Tecnico:</i> <i class="bx bxl-angular bx-sm text-black me-3">Tecnico:</i>
<span class="fw-medium">@Html.TextBox("tecnico", null, new { placeholder = "", @class = "agy-form-field require" })</span> <span class="fw-medium">@Html.DropDownList("tecnico", ViewBag.Tecnici, null, new { @class = "agy-form-field require" })</span>
</td> </td>
<td> <td>
<i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i> <i class="bx bxl-angular bx-sm text-black me-3">&nbsp;</i>