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

This commit is contained in:
Marco Audiffredi 2024-05-20 15:43:15 +02:00
commit a012c57b2b
2 changed files with 36 additions and 19 deletions

View File

@ -1039,18 +1039,7 @@ Purchase:
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
<div class="agy-partners-container mb-30 text-center"> <div class="agy-partners-container mb-30 text-center">
<img src="~/assets/images/Immagine2.png" alt="agency" /> <img src="~/assets/images/virtualTaskTS.png" alt="agency" />
</div>
</div>
<div class="swiper-slide">
<div class="agy-partners-container mb-30 text-center">
<img src="~/assets/images/Immagine3.png" alt="agency" />
</div>
</div>
<div class="swiper-slide">
<div class="agy-partners-container mb-30 text-center">
<img src="~/assets/images/Immagine1.png" alt="agency" />
</div> </div>
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
@ -1068,6 +1057,11 @@ Purchase:
<img src="~/assets/images/Immagine1.png" alt="agency" /> <img src="~/assets/images/Immagine1.png" alt="agency" />
</div> </div>
</div> </div>
<div class="swiper-slide">
<div class="agy-partners-container mb-30 text-center">
<img src="~/assets/images/virtualTaskTS.png" alt="agency" />
</div>
</div>
<div class="swiper-slide"> <div class="swiper-slide">
<div class="agy-partners-container mb-30 text-center"> <div class="agy-partners-container mb-30 text-center">
<img src="~/assets/images/Immagine2.png" alt="agency" /> <img src="~/assets/images/Immagine2.png" alt="agency" />
@ -1083,6 +1077,31 @@ Purchase:
<img src="~/assets/images/Immagine1.png" alt="agency" /> <img src="~/assets/images/Immagine1.png" alt="agency" />
</div> </div>
</div> </div>
<div class="swiper-slide">
<div class="agy-partners-container mb-30 text-center">
<img src="~/assets/images/virtualTaskTS.png" alt="agency" />
</div>
</div>
<div class="swiper-slide">
<div class="agy-partners-container mb-30 text-center">
<img src="~/assets/images/Immagine2.png" alt="agency" />
</div>
</div>
<div class="swiper-slide">
<div class="agy-partners-container mb-30 text-center">
<img src="~/assets/images/Immagine3.png" alt="agency" />
</div>
</div>
<div class="swiper-slide">
<div class="agy-partners-container mb-30 text-center">
<img src="~/assets/images/Immagine1.png" alt="agency" />
</div>
</div>
<div class="swiper-slide">
<div class="agy-partners-container mb-30 text-center">
<img src="~/assets/images/virtualTaskTS.png" alt="agency" />
</div>
</div>
<div class="swiper-slide"> <div class="swiper-slide">
<div class="agy-partners-container mb-30 text-center"> <div class="agy-partners-container mb-30 text-center">
<img src="~/assets/images/Immagine2.png" alt="agency" /> <img src="~/assets/images/Immagine2.png" alt="agency" />

View File

@ -19,18 +19,14 @@
<div> <div>
<div style="float:left;width:40%;padding:0 20px;"> <div style="float:left;width:40%;padding:0 20px;">
<th><b>Data timbratura:</b></th> <th><b>Data timbratura:</b></th>
@* @Html.TextBox("dataTimb", ViewBag.Timbrature, null, new { @class = "agy-form-field require" }) *@
@Html.TextBox("dataTimb", null, new { type = "date", @class = "agy-form-field require" }) @Html.TextBox("dataTimb", null, new { type = "date", @class = "agy-form-field require" })
@* <div style="float:left;width:40%;padding:0 20px;"> *@
<th><b>Commessa:</b></th> <th><b>Commessa:</b></th>
@Html.TextBox("commessa", ViewBag.Timbrature, null, new { @class = "agy-form-field require" }) @Html.TextBox("commessa", ViewBag.Timbrature, null, new { @class = "agy-form-field require" })
@* </div> *@
@* <div style="float:left;width:40%;padding:0 20px;"> *@
<th><b>Tecnico:</b></th> <th><b>Tecnico:</b></th>
@Html.TextBox("tecnico", ViewBag.Timbrature, null, new { @class = "agy-form-field require" }) @Html.TextBox("tecnico", ViewBag.Timbrature, null, new { @class = "agy-form-field require" })
@* </div> *@
<div style="float:left;width:57%;"><input type="submit" value="Cerca" class="agy-btn submitForm" /></div> <div style="float:left;width:57%;"><input type="submit" value="Cerca" class="agy-btn submitForm" /></div>
</div> </div>
@ -61,7 +57,7 @@
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th>Id</th>
<th>Data timbratura</th> <th>Data timbratura</th>
<th>Ora inizio</th> <th>Ora inizio</th>
<th>Minuti inizio</th> <th>Minuti inizio</th>
@ -72,6 +68,7 @@
<th>Totale ore</th> <th>Totale ore</th>
<th>Giorno sett.</th> <th>Giorno sett.</th>
<th>Tecnico</th> <th>Tecnico</th>
<th hidden>Id</th>
<th hidden>Azienda</th> <th hidden>Azienda</th>
<th hidden>Note</th> <th hidden>Note</th>
</tr> </tr>
@ -80,7 +77,7 @@
@foreach (var item in Model) @foreach (var item in Model)
{ {
<tr> <tr>
<td>@Html.DisplayFor(modelItem => item.id)</td>
<td>@Html.DisplayFor(modelItem => item.data_timbratura)</td> <td>@Html.DisplayFor(modelItem => item.data_timbratura)</td>
<td>@Html.DisplayFor(modelItem => item.ora_ini)</td> <td>@Html.DisplayFor(modelItem => item.ora_ini)</td>
<td>@Html.DisplayFor(modelItem => item.min_ini)</td> <td>@Html.DisplayFor(modelItem => item.min_ini)</td>
@ -91,6 +88,7 @@
<td>@Html.DisplayFor(modelItem => item.tot_ore)</td> <td>@Html.DisplayFor(modelItem => item.tot_ore)</td>
<td>@Html.DisplayFor(modelItem => item.giorno)</td> <td>@Html.DisplayFor(modelItem => item.giorno)</td>
<td>@Html.DisplayFor(modelItem => item.tecnico)</td> <td>@Html.DisplayFor(modelItem => item.tecnico)</td>
<td>@Html.HiddenFor(modelItem => item.id)</td>
<td>@Html.HiddenFor(modelItem => item.azienda)</td> <td>@Html.HiddenFor(modelItem => item.azienda)</td>
<td>@Html.HiddenFor(modelItem => item.cpccchk)</td> <td>@Html.HiddenFor(modelItem => item.cpccchk)</td>
<td>@Html.HiddenFor(modelItem => item.note)</td> <td>@Html.HiddenFor(modelItem => item.note)</td>