From 6a97f55464c49e922bd59fa43298617176c36b34 Mon Sep 17 00:00:00 2001 From: michele Date: Wed, 13 Dec 2023 09:24:04 +0100 Subject: [PATCH] Michele: localizzazione + template --- Controllers/Rapp_NewController.cs | 3 +- Views/Chiamate/Index.cshtml | 10 +- Views/Chiusure/Index.cshtml | 13 +- Views/Rapp_New/Index.cshtml | 273 +++++++---------------- Views/Shared/_Layout2.cshtml | 14 +- Views/Shared/_LayoutAreaRiservata.cshtml | 17 +- Views/Shared/_LayoutPortale.cshtml | 16 +- 7 files changed, 120 insertions(+), 226 deletions(-) diff --git a/Controllers/Rapp_NewController.cs b/Controllers/Rapp_NewController.cs index bb603b9..6be792b 100644 --- a/Controllers/Rapp_NewController.cs +++ b/Controllers/Rapp_NewController.cs @@ -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; } diff --git a/Views/Chiamate/Index.cshtml b/Views/Chiamate/Index.cshtml index 1554e33..78edaeb 100644 --- a/Views/Chiamate/Index.cshtml +++ b/Views/Chiamate/Index.cshtml @@ -30,7 +30,7 @@ @* Seriale *@ - Esercizio + @* Esercizio *@ Numero Data Impianto @@ -46,14 +46,16 @@ @foreach (var item in Model) { - - @* @Html.DisplayFor(modelItem => item.chserial) *@ + @Html.HiddenFor(modelItem => item.chserial) + @Html.HiddenFor(modelItem => item.chcodese) + @* + @Html.DisplayFor(modelItem => item.chserial) @Html.HiddenFor(modelItem => item.chserial) @Html.DisplayFor(modelItem => item.chcodese) - + *@ @Html.DisplayFor(modelItem => item.numIntero) diff --git a/Views/Chiusure/Index.cshtml b/Views/Chiusure/Index.cshtml index 44a6687..e7fa7f5 100644 --- a/Views/Chiusure/Index.cshtml +++ b/Views/Chiusure/Index.cshtml @@ -6,7 +6,7 @@ @{ - ViewData["Title"] = "Tipi Intervento"; + ViewData["Title"] = "Tipi Intervento (Codici di chiusura)"; Layout = "~/Views/Shared/_LayoutAreaRiservata.cshtml"; } @@ -19,14 +19,11 @@

@using (Html.BeginForm()) { -
@Html.TextBox("SearchString", null, new { placeholder = "Cerca per descrizione", @class = "agy-form-field require" })
 
-
- } @@ -56,13 +53,6 @@ } diff --git a/Views/Rapp_New/Index.cshtml b/Views/Rapp_New/Index.cshtml index 7055f53..7b5ff77 100644 --- a/Views/Rapp_New/Index.cshtml +++ b/Views/Rapp_New/Index.cshtml @@ -25,7 +25,7 @@ {
-
@Html.TextBox("SearchString", null, new { placeholder = "Cerca per descrizione", @class = "agy-form-field require" })
+
@Html.TextBox("SearchString", null, new { placeholder = "Cerca per data rapportino", @class = "agy-form-field require" })
 
@@ -35,19 +35,19 @@
-@* *@ - Modifica @@ -74,7 +64,6 @@ Elimina -
- - - - - - - + @* *@ + @* *@ + @* *@ - - - - - + + @* *@ + @* *@ + @* *@ + @* *@ + @* *@ + @* *@ + @* *@ + @* @@ -56,13 +56,13 @@ - - - + *@ + + @* - + *@ - + @* @@ -94,7 +94,7 @@ - + *@ @@ -102,189 +102,76 @@ @foreach (var item in Model) { + @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) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Seriale rapportinoTipo rapportinoCodice impiantoSeriale chiamataSeriale commessaSeriale rapportinoTipo rapportinoAziendaData rapportinoCodice impianto desc. Intervento Cod. Tecnico
- @Html.DisplayFor(modelItem => item.seriale_rapportino) - - @Html.DisplayFor(modelItem => item.tipo_rapportino) - @Html.DisplayFor(modelItem => item.codice_impianto) + @Html.DisplayFor(modelItem => item.descrizione_intervento) - @Html.DisplayFor(modelItem => item.seriale_chiamata) - - @Html.DisplayFor(modelItem => item.seriale_commessa) - - @Html.DisplayFor(modelItem => item.data_rapportino) - - @Html.DisplayFor(modelItem => item.codice_chiusura_1) - @* Modifica diff --git a/Views/Shared/_Layout2.cshtml b/Views/Shared/_Layout2.cshtml index 9c9a2c9..2132224 100644 --- a/Views/Shared/_Layout2.cshtml +++ b/Views/Shared/_Layout2.cshtml @@ -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"; } @@ -72,7 +77,7 @@ Purchase:
Contatti:
@* +1 1234567890 *@ @@ -92,8 +97,9 @@ Purchase:
Dove trovarci
- Terni (TR) -
+
Roma (RO)
+
Perugia (PG)
+
Terni (TR)
diff --git a/Views/Shared/_LayoutAreaRiservata.cshtml b/Views/Shared/_LayoutAreaRiservata.cshtml index 6c3da69..c99a217 100644 --- a/Views/Shared/_LayoutAreaRiservata.cshtml +++ b/Views/Shared/_LayoutAreaRiservata.cshtml @@ -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"; } @@ -74,7 +77,7 @@ Purchase:
Contatti:
@* +1 1234567890 *@ @@ -94,7 +97,9 @@ Purchase:
Dove trovarci
- Terni (TR) +
Roma (RO)
+
Perugia (PG)
+
Terni (TR)
@@ -149,7 +154,7 @@ Purchase:
  • Tipi intervento
  • Clienti
  • Impianti
    • -
  • Schede intervento
    • +
  • Buono intervento
  • Chiamate
  • Progressivi
  • Dati Azienda
    • diff --git a/Views/Shared/_LayoutPortale.cshtml b/Views/Shared/_LayoutPortale.cshtml index 9163d4d..498875b 100644 --- a/Views/Shared/_LayoutPortale.cshtml +++ b/Views/Shared/_LayoutPortale.cshtml @@ -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"; }