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

Merge branch 'master' of 10.0.0.83:/usr/local/git/VirtualTask

Browse Source
This commit is contained in:
michele 2023-12-27 12:34:49 +01:00
commit 17db3fbd41
8 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controllers/ImpiantiController.cs
View File

@ -59,7 +59,7 @@ namespace VirtualTask.Controllers
{
string data = response.Content.ReadAsStringAsync().Result;
modelList = JsonConvert.DeserializeObject<List<Impianto>>(data);
modelList = modelList.Where(s => !string.IsNullOrEmpty(s.imcodimp) && s.imcodazi.Equals(tenant2)).ToList();
modelList = modelList.Where(s => !string.IsNullOrEmpty(s.imcodimp) && s.imcodazi.Equals(tenant2) && s.imfinatt==null).ToList();
if (!string.IsNullOrEmpty(searchString))
{

3
Models/Chiamate.cs
View File

@ -14,7 +14,7 @@ namespace VirtualTask.Models
[Display(Name = "Seriale")]
public string? chserial { get; set; }
[Display(Name = "Codice esercizio")]
[Display(Name = "Anno esercizio")]
public string? chcodese { get; set; }
[Display(Name = "Tipo")]
@ -26,6 +26,7 @@ namespace VirtualTask.Models
[Display(Name = "Data")]
[DisplayFormat(DataFormatString = "{0:dd/MM/yyyy}")]
public DateTime? chdata { get; set; }
[Display(Name = "Cod. Impianto")]

2
Models/Impianto.cs
View File

@ -101,5 +101,7 @@ namespace VirtualTask.Models
}
}
public DateTime? imfinatt { get; set; }
}
}

5
Views/Chiamate/Create.cshtml
View File

@ -60,6 +60,7 @@
</div>
<div class="form-group">
<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>
@Html.HiddenFor(x => x.chcodazi)
@Html.HiddenFor(x => x.chserial)
@ -81,9 +82,7 @@
</form>
</div>
</div>
<div>
<a asp-action="Index">Torna alla lista</a>
</div>
@section Scripts {
@{

9
Views/Chiamate/Delete.cshtml
View File

@ -49,13 +49,16 @@
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
<div class="col-md-10">
<form asp-action="DeleteConfirmed">
<input type="submit" value="Elimina" class="agy-btn submitForm" />
<input type="hidden" id="id" value=@Html.DisplayFor(model => model.chserial) name="id" />
<div>
<a asp-action="Index">Torna alla lista</a>
</div>
@*<a asp-action="Index">Torna alla lista</a>*@
<a asp-action="Index" value="Torna alla lista" class="agy-btn submitForm">Torna alla lista</a>
</form>
</div>
</div>
</div>
</div>

10
Views/Chiamate/Edit.cshtml
View File

@ -27,7 +27,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
<div class="form-group">
<h5><label asp-for="chcodese" class="agy-client-quote"></label></h5>
<input asp-for="chcodese" class="agy-form-field require" placeholder="Esercizio" />
@Html.HiddenFor(x => x.chcodese)
@Html.DisplayFor(model => model.chcodese)
<span asp-validation-for="chcodese" class="text-danger"></span>
</div>
@Html.HiddenFor(x => x.chtipo)
@ -40,7 +41,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
<div class="form-group">
<h5><label asp-for="chdata" class="agy-client-quote"></label></h5>
<input asp-for="chdata" class="agy-form-field require" placeholder="Data" />
<input asp-for="chdata" class="agy-form-field require" placeholder="Data" />
<span asp-validation-for="chdata" class="text-danger"></span>
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
@ -89,6 +91,7 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
<div class="form-group">
<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>
@Html.HiddenFor(x => x.chora)
@ -141,7 +144,8 @@
</div>
<div>
<a asp-action="Index">Torna alla lista</a>
@* <a asp-action="Index">Torna alla lista</a>*@
</div>
@section Scripts {
@{

27
Views/Chiamate/Index.cshtml
View File

@ -92,18 +92,29 @@
}
<td>
<a href="@Url.Action("Edit", "Chiamate", new { id=item.chserial })" title="Modifica" class="links">
<img alt="Modifica" src="@Url.Content("~/assets/images/icons8-modificare-64.png")" style="width:30px;height:30px;">
</a>
|
@{
string _url_edit = @Url.Action("Edit", "Chiamate", new { id = item.chserial });
if (string.IsNullOrEmpty(item.ic) || string.IsNullOrEmpty(item.ser_buono_chiu))
{
<a href="@_url_edit" title="Modifica" class="links">
<img alt="Modifica" src="~/assets/images/icons8-modificare-64.png" style="width:30px;height:30px;">
</a>
}
}
<a href="@Url.Action("Details", "Chiamate", new { id=item.chserial })" title="Dettaglio" class="links" >
<img alt="Dettaglio" src="@Url.Content("~/assets/images/icons8-visualizza-file-64.png")" style="width:30px;height:30px;">
</a>
|
<a href="@Url.Action("Delete", "Chiamate", new { id=item.chserial })" title="Elimina" class="links" >
<img alt="Elimina" src="@Url.Content("~/assets/images/icons8-elimina-50.png")" style="width:30px;height:30px;">
</a>
@{
string _url_del = @Url.Action("Delete", "Chiamate", new { id = item.chserial });
if (string.IsNullOrEmpty(item.ic) || string.IsNullOrEmpty(item.ser_buono_chiu))
{
<a href="@_url_del" title="Elimina" class="links">
<img alt="Elimina" src="~/assets/images/icons8-elimina-50.png" style="width:30px;height:30px;">
</a>
}
}
</td>
</tr>
}

2
appsettings.json
View File

@ -13,7 +13,7 @@
//TEST
"rootUrlApi": "http://testapi.poloinformatico.it:9001/api/Polo/",
"rootWebLoghi": "C:\\SORGENTI\\_publish\\wwwroot\\VIRTU\\",
"rootWebLoghi": "C:\\SORGENTI\\ApiPolo\\ApiPolo\\wwwroot\\VIRTU\\",
"rootUrlApi2": "http://testapi.poloinformatico.it:9001/VIRTU/",
"mittenteMail": "info@virtualtask.it",