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

This commit is contained in:
Marco Audiffredi 2023-12-14 16:14:13 +01:00
commit 772888c884
7 changed files with 120 additions and 226 deletions

View File

@ -59,7 +59,8 @@ namespace VirtualTask.Controllers
if (!string.IsNullOrEmpty(searchString))
{
modelList = modelList.Where(s => s.descrizione_intervento.ToUpper().Contains(searchString.ToUpper())).ToList();
//modelList = modelList.Where(s => s.descrizione_intervento.ToUpper().Contains(searchString.ToUpper())).ToList();
modelList = modelList.Where(s => s.data_rapportino.ToString().Substring(0,10).Contains(searchString.ToUpper())).ToList();
ViewData["CurrentFilter"] = searchString;
}

View File

@ -30,7 +30,7 @@
<thead>
<tr>
@* <th>Seriale</th> *@
<th>Esercizio</th>
@* <th>Esercizio</th> *@
<th>Numero</th>
<th>Data</th>
<th>Impianto</th>
@ -46,14 +46,16 @@
@foreach (var item in Model)
{
<tr>
<td>
@* @Html.DisplayFor(modelItem => item.chserial) *@
@Html.HiddenFor(modelItem => item.chserial)
@Html.HiddenFor(modelItem => item.chcodese)
@* <td>
@Html.DisplayFor(modelItem => item.chserial)
@Html.HiddenFor(modelItem => item.chserial)
</td>
<td>
@Html.DisplayFor(modelItem => item.chcodese)
</td>
*@
<td>
@Html.DisplayFor(modelItem => item.numIntero)
</td>

View File

@ -6,7 +6,7 @@
<link href="~/Content/PagedList.css" rel="stylesheet" type="text/css" />
@{
ViewData["Title"] = "Tipi Intervento";
ViewData["Title"] = "Tipi Intervento (Codici di chiusura)";
Layout = "~/Views/Shared/_LayoutAreaRiservata.cshtml";
}
@ -19,14 +19,11 @@
</p>
@using (Html.BeginForm())
{
<div>
<div style="float:left;width:40%;padding:0 20px;">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per descrizione", @class = "agy-form-field require" })</div>
<div style="float:left;width:2%;">&nbsp;</div>
<div style="float:left;width:57%;"><input type="submit" value="Cerca" class="agy-btn submitForm" /></div>
</div>
}
<table class="table">
<thead>
@ -56,13 +53,6 @@
</td>
<td>
@* <!--
@Html.ActionLink("Modifica", "Edit", new { id=item.cccodice }) |
@Html.ActionLink("Modifica", "Edit",new { @style = "background-image:url('~/assets/images/icons8-modificare-64.png')" },null) |
@Html.ActionLink("Dettaglio", "Details", new { id=item.cccodice }) |
-->*@
<a href="@Url.Action("Edit", "Chiusure", new { id=item.cccodice })" title="Modifica" class="links">
<img alt="Modifica" src="@Url.Content("~/assets/images/icons8-modificare-64.png")" style="width:30px;height:30px;">
</a>
@ -74,7 +64,6 @@
<a href="@Url.Action("Delete", "Chiusure", new { id=item.cccodice })" title="Elimina" class="links">
<img alt="Elimina" src="@Url.Content("~/assets/images/icons8-elimina-50.png")" style="width:30px;height:30px;">
</a>
</td>
</tr>
}

View File

@ -25,7 +25,7 @@
{
<div>
<div style="float:left;width:40%;padding:0 20px;">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per descrizione", @class = "agy-form-field require" })</div>
<div style="float:left;width:40%;padding:0 20px;">@Html.TextBox("SearchString", null, new { placeholder = "Cerca per data rapportino", @class = "agy-form-field require" })</div>
<div style="float:left;width:2%;">&nbsp;</div>
<div style="float:left;width:57%;"><input type="submit" value="Cerca" class="agy-btn submitForm" /></div>
@ -35,19 +35,19 @@
<table class="table">
<thead>
<tr>
<th>Seriale rapportino</th>
<th>Tipo rapportino</th>
<th hidden>Azienda</th>
<th>Codice impianto</th>
<th hidden>Az. chiamata</th>
<th>Seriale chiamata</th>
<th>Seriale commessa</th>
@* <th>Seriale rapportino</th> *@
@* <th>Tipo rapportino</th> *@
@* <th>Azienda</th> *@
<th>Data rapportino</th>
<th hidden>Ora inizio</th>
<th hidden>Minuto inzio</th>
<th hidden>Ora fine</th>
<th hidden>Minuto fine</th>
<th hidden>Codice chiusura 1</th>
<th>Codice impianto</th>
@* <th hidden>Az. chiamata</th> *@
@* <th hidden>Seriale chiamata</th> *@
@* <th hidden>Seriale commessa</th> *@
@* <th hidden>Ora inizio</th> *@
@* <th hidden>Minuto inzio</th> *@
@* <th hidden>Ora fine</th> *@
@* <th hidden>Minuto fine</th> *@
@* <th hidden>Codice chiusura 1</th>
<th hidden>Codice chiusura 2</th>
<th hidden>Codice chiusura 3</th>
<th hidden>Codice chiusura 4</th>
@ -56,13 +56,13 @@
<th hidden>Codice chiusura 7</th>
<th hidden>Codice chiusura 8</th>
<th hidden>Codice chiusura 9</th>
<th hidden>Codice chiusura 10</th>
<th hidden>desc. Intervento</th>
<th hidden>Stato</th>
<th hidden>Codice chiusura 10</th>*@
<th>desc. Intervento</th>
@* <th hidden>Stato</th>
<th hidden>Generato</th>
<th hidden>Az. Tecnico</th>
<th hidden>Az. Tecnico</th> *@
<th>Cod. Tecnico</th>
<th hidden>Rifiutata</th>
@* <th hidden>Rifiutata</th>
<th hidden>Firma</th>
<th hidden>Incarico</th>
<th hidden>Data validità</th>
@ -94,7 +94,7 @@
<th hidden>Foto 7</th>
<th hidden>Foto 8</th>
<th hidden>Foto 9</th>
<th hidden>Foto 10</th>
<th hidden>Foto 10</th> *@
<th></th>
</tr>
</thead>
@ -102,189 +102,76 @@
@foreach (var item in Model)
{
<tr>
@Html.HiddenFor(modelItem => item.seriale_rapportino)
@Html.HiddenFor(modelItem => item.tipo_rapportino)
@Html.HiddenFor(modelItem => item.azienda_impianto)
@Html.HiddenFor(modelItem => item.azienda_chiamata)
@Html.HiddenFor(modelItem => item.seriale_chiamata)
@Html.HiddenFor(modelItem => item.ora_ini_rapportino)
@Html.HiddenFor(modelItem => item.min_ini_rapportino)
@Html.HiddenFor(modelItem => item.ora_fin_rapportino)
@Html.HiddenFor(modelItem => item.min_fin_rapportino)
@Html.HiddenFor(modelItem => item.codice_chiusura_1)
@Html.HiddenFor(modelItem => item.codice_chiusura_2)
@Html.HiddenFor(modelItem => item.codice_chiusura_3)
@Html.HiddenFor(modelItem => item.codice_chiusura_4)
@Html.HiddenFor(modelItem => item.codice_chiusura_5)
@Html.HiddenFor(modelItem => item.codice_chiusura_6)
@Html.HiddenFor(modelItem => item.codice_chiusura_7)
@Html.HiddenFor(modelItem => item.codice_chiusura_8)
@Html.HiddenFor(modelItem => item.codice_chiusura_9)
@Html.HiddenFor(modelItem => item.codice_chiusura_10)
@Html.HiddenFor(modelItem => item.descrizione_intervento)
@Html.HiddenFor(modelItem => item.stato_finale)
@Html.HiddenFor(modelItem => item.generato)
@Html.HiddenFor(modelItem => item.azienda_tecnico)
@Html.HiddenFor(modelItem => item.rifiutata)
@Html.HiddenFor(modelItem => item.rifiutata)
@Html.HiddenFor(modelItem => item.firma)
@Html.HiddenFor(modelItem => item.incarico)
@Html.HiddenFor(modelItem => item.data_validita)
@Html.HiddenFor(modelItem => item.immagine)
@Html.HiddenFor(modelItem => item.ser_buono)
@Html.HiddenFor(modelItem => item.data_effettiva)
@Html.HiddenFor(modelItem => item.codice_intervento)
@Html.HiddenFor(modelItem => item.difetti_riscontrati)
@Html.HiddenFor(modelItem => item.lavoro_eseguito)
@Html.HiddenFor(modelItem => item.esito_intervento)
@Html.HiddenFor(modelItem => item.note_intervento)
@Html.HiddenFor(modelItem => item.nuovo_contratto)
@Html.HiddenFor(modelItem => item.ore_lavoro)
@Html.HiddenFor(modelItem => item.causale)
@Html.HiddenFor(modelItem => item.materiale)
@Html.HiddenFor(modelItem => item.diritto_chiamata)
@Html.HiddenFor(modelItem => item.manodopera)
@Html.HiddenFor(modelItem => item.spese_viaggio)
@Html.HiddenFor(modelItem => item.pagamento)
@Html.HiddenFor(modelItem => item.anticipo)
@Html.HiddenFor(modelItem => item.totale)
@Html.HiddenFor(modelItem => item.note_pagamento)
@Html.HiddenFor(modelItem => item.tipo_intervento)
@Html.HiddenFor(modelItem => item.rafoto)
@Html.HiddenFor(modelItem => item.rafoto2)
@Html.HiddenFor(modelItem => item.rafoto3)
@Html.HiddenFor(modelItem => item.rafoto4)
@Html.HiddenFor(modelItem => item.rafoto5)
@Html.HiddenFor(modelItem => item.rafoto6)
@Html.HiddenFor(modelItem => item.rafoto7)
@Html.HiddenFor(modelItem => item.rafoto8)
@Html.HiddenFor(modelItem => item.rafoto9)
@Html.DisplayFor(modelItem => item.rafoto10)
<td>
@Html.DisplayFor(modelItem => item.seriale_rapportino)
</td>
<td>
@Html.DisplayFor(modelItem => item.tipo_rapportino)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.azienda_impianto)
@Html.DisplayFor(modelItem => item.data_rapportino)
</td>
<td>
@Html.DisplayFor(modelItem => item.codice_impianto)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.azienda_chiamata)
<td>
@Html.DisplayFor(modelItem => item.descrizione_intervento)
</td>
<td>
@Html.DisplayFor(modelItem => item.seriale_chiamata)
</td>
<td>
@Html.DisplayFor(modelItem => item.seriale_commessa)
</td>
<td>
@Html.DisplayFor(modelItem => item.data_rapportino)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.ora_ini_rapportino)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.min_ini_rapportino)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.ora_fin_rapportino)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.min_fin_rapportino)
</td>
<td>
@Html.DisplayFor(modelItem => item.codice_chiusura_1)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.codice_chiusura_2)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.codice_chiusura_3)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.codice_chiusura_4)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.codice_chiusura_5)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.codice_chiusura_6)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.codice_chiusura_7)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.codice_chiusura_8)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.codice_chiusura_9)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.codice_chiusura_10)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.descrizione_intervento)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.stato_finale)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.generato)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.azienda_tecnico)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.codice_tecnico)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.rifiutata)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.firma)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.incarico)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.data_validita)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.immagine)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.ser_buono)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.data_effettiva)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.codice_intervento)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.difetti_riscontrati)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.lavoro_eseguito)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.esito_intervento)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.note_intervento)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.nuovo_contratto)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.ore_lavoro)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.causale)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.materiale)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.diritto_chiamata)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.manodopera)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.spese_viaggio)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.pagamento)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.anticipo)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.totale)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.note_pagamento)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.tipo_intervento)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.rafoto)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.rafoto2)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.rafoto3)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.rafoto4)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.rafoto5)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.rafoto6)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.rafoto7)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.rafoto8)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.rafoto9)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.rafoto10)
</td>
<td>
@* <a href="@Url.Action("Edit", "Rapp_New", new { id=item.seriale_rapportino })" title="Modifica" class="links">
<img alt="Modifica" src="@Url.Content("~/assets/images/icons8-modificare-64.png")" style="width:30px;height:30px;">

View File

@ -1,6 +1,11 @@
@{
string location = string.Empty;
location = @"https://www.google.com/maps/dir/Polo+Informatico,+Via+Curio+Fornaci,+Terni,+TR//@42.5682046,12.5716686,13z/data=!4m8!4m7!1m5!1m1!1s0x132ee4b0d0b5464b:0xfe6f167f10da0915!2m2!1d12.612868!2d42.5681488!1m0?hl=it&entry=ttu";
string locationTr = string.Empty;
string locationPg = string.Empty;
string locationRm = string.Empty;
locationTr = @"https://www.google.com/maps/dir/Polo+Informatico,+Via+Curio+Fornaci,+Terni,+TR//@42.5682046,12.5716686,13z/data=!4m8!4m7!1m5!1m1!1s0x132ee4b0d0b5464b:0xfe6f167f10da0915!2m2!1d12.612868!2d42.5681488!1m0?hl=it&entry=ttu";
locationPg = @"https://www.google.com/maps/dir/Polo+Informatico,+Via+Adalberto+Migliorati,+Perugia,+PG//@43.0707354,12.3267502,16.25z/data=!4m8!4m7!1m5!1m1!1s0x132ea0273e872527:0x38a8a69c342cf3e4!2m2!1d12.3318154!2d43.0721535!1m0?entry=ttu";
locationRm = @"https://www.google.com/maps/dir/Via+del+Serafico,+90,+00142+Roma+RM//@41.8309813,12.4753342,14z/data=!4m8!4m7!1m5!1m1!1s0x13258a552865707b:0x7db7d14e57c069f7!2m2!1d12.4866518!2d41.829886!1m0?hl=it&entry=ttu";
}
<!DOCTYPE html>
@ -72,7 +77,7 @@ Purchase:
<h6>Contatti:</h6>
@* <a href="javascript:void(0);">+1 1234567890</a> *@
<div>
<a href="javascript:void(0);">T:0744 7521 r. a</a>
<a href="javascript:void(0);">T:0744 7521 r.a.</a>
</div>
</div>
</li>
@ -92,8 +97,9 @@ Purchase:
</div>
<div class="info-data">
<h6>Dove trovarci</h6>
<a href=@location target="_blank">Terni (TR)</a>
</div>
<h6><a href=@locationRm target="_blank">Roma (RO)</a></h6>
<h6><a href=@locationPg target="_blank">Perugia (PG)</a></h6>
<h6><a href=@locationTr target="_blank">Terni (TR)</a></h6>
</div>
</li>
</ul>

View File

@ -1,8 +1,11 @@
@{
string admin = ViewBag.Admin;
string location = string.Empty;
location = @"https://www.google.com/maps/dir/Polo+Informatico,+Via+Curio+Fornaci,+Terni,+TR//@42.5682046,12.5716686,13z/data=!4m8!4m7!1m5!1m1!1s0x132ee4b0d0b5464b:0xfe6f167f10da0915!2m2!1d12.612868!2d42.5681488!1m0?hl=it&entry=ttu";
string locationTr = string.Empty;
string locationPg = string.Empty;
string locationRm = string.Empty;
locationTr = @"https://www.google.com/maps/dir/Polo+Informatico,+Via+Curio+Fornaci,+Terni,+TR//@42.5682046,12.5716686,13z/data=!4m8!4m7!1m5!1m1!1s0x132ee4b0d0b5464b:0xfe6f167f10da0915!2m2!1d12.612868!2d42.5681488!1m0?hl=it&entry=ttu";
locationPg = @"https://www.google.com/maps/dir/Polo+Informatico,+Via+Adalberto+Migliorati,+Perugia,+PG//@43.0707354,12.3267502,16.25z/data=!4m8!4m7!1m5!1m1!1s0x132ea0273e872527:0x38a8a69c342cf3e4!2m2!1d12.3318154!2d43.0721535!1m0?entry=ttu";
locationRm = @"https://www.google.com/maps/dir/Via+del+Serafico,+90,+00142+Roma+RM//@41.8309813,12.4753342,14z/data=!4m8!4m7!1m5!1m1!1s0x13258a552865707b:0x7db7d14e57c069f7!2m2!1d12.4866518!2d41.829886!1m0?hl=it&entry=ttu";
}
<!DOCTYPE html>
@ -74,7 +77,7 @@ Purchase:
<h6>Contatti:</h6>
@* <a href="javascript:void(0);">+1 1234567890</a> *@
<div>
<a href="javascript:void(0);">T:0744 7521 r. a</a>
<a href="javascript:void(0);">T:0744 7521 r.a.</a>
</div>
</div>
</li>
@ -94,7 +97,9 @@ Purchase:
</div>
<div class="info-data">
<h6>Dove trovarci</h6>
<a href=@location target="_blank">Terni (TR)</a>
<h6><a href=@locationRm target="_blank">Roma (RO)</a></h6>
<h6><a href=@locationPg target="_blank">Perugia (PG)</a></h6>
<h6><a href=@locationTr target="_blank">Terni (TR)</a></h6>
</div>
</li>
</ul>
@ -149,7 +154,7 @@ Purchase:
<li><a asp-area="" asp-controller="Chiusure" asp-action="Index">Tipi intervento</a></li>
<li><a asp-area="" asp-controller="Anag" asp-action="Index">Clienti</a></li>
<li><a asp-area="" asp-controller="Impianti" asp-action="Index">Impianti</a></li>
<li><a asp-area="" asp-controller="Rapp_New" asp-action="Index">Schede intervento</a></li>
<li><a asp-area="" asp-controller="Rapp_New" asp-action="Index">Buono intervento</a></li>
<li><a asp-area="" asp-controller="Chiamate" asp-action="Index">Chiamate</a></li>
<li><a asp-area="" asp-controller="Progressivi" asp-action="Index">Progressivi</a></li>
<li><a asp-area="" asp-controller="AziendaRif" asp-action="Index">Dati Azienda</a></li>

View File

@ -1,7 +1,10 @@
@{
string location = string.Empty;
location = @"https://www.google.com/maps/dir/Polo+Informatico,+Via+Curio+Fornaci,+Terni,+TR//@42.5682046,12.5716686,13z/data=!4m8!4m7!1m5!1m1!1s0x132ee4b0d0b5464b:0xfe6f167f10da0915!2m2!1d12.612868!2d42.5681488!1m0?hl=it&entry=ttu";
string locationTr = string.Empty;
string locationPg = string.Empty;
string locationRm = string.Empty;
locationTr = @"https://www.google.com/maps/dir/Polo+Informatico,+Via+Curio+Fornaci,+Terni,+TR//@42.5682046,12.5716686,13z/data=!4m8!4m7!1m5!1m1!1s0x132ee4b0d0b5464b:0xfe6f167f10da0915!2m2!1d12.612868!2d42.5681488!1m0?hl=it&entry=ttu";
locationPg = @"https://www.google.com/maps/dir/Polo+Informatico,+Via+Adalberto+Migliorati,+Perugia,+PG//@43.0707354,12.3267502,16.25z/data=!4m8!4m7!1m5!1m1!1s0x132ea0273e872527:0x38a8a69c342cf3e4!2m2!1d12.3318154!2d43.0721535!1m0?entry=ttu";
locationRm = @"https://www.google.com/maps/dir/Via+del+Serafico,+90,+00142+Roma+RM//@41.8309813,12.4753342,14z/data=!4m8!4m7!1m5!1m1!1s0x13258a552865707b:0x7db7d14e57c069f7!2m2!1d12.4866518!2d41.829886!1m0?hl=it&entry=ttu";
}
<!DOCTYPE html>
<!--
@ -73,7 +76,7 @@ Purchase:
<h6>Contatti:</h6>
@* <a href="javascript:void(0);">+1 1234567890</a> *@
<div>
<a href="javascript:void(0);">T:0744 7521 r. a</a>
<a href="javascript:void(0);">T:0744 7521 r.a.</a>
</div>
</div>
</li>
@ -94,8 +97,9 @@ Purchase:
<div class="info-data">
<h6>Dove trovarci</h6>
@* <a href="javascript:void(0);">Terni (TR)</a> *@
<a href=@location target="_blank">Terni (TR)</a>
</div>
<h6><a href=@locationRm target="_blank">Roma (RO)</a></h6>
<h6><a href=@locationPg target="_blank">Perugia (PG)</a></h6>
<h6><a href=@locationTr target="_blank">Terni (TR)</a></h6>
</div>
</li>
</ul>