From 7d74b1f1d0f6baf9aaac4e92b4558e190c19ac65 Mon Sep 17 00:00:00 2001 From: michele Date: Mon, 5 May 2025 16:03:00 +0200 Subject: [PATCH] filtro data obsolescenza + crea chiamata da impianto --- Controllers/AziendaRifController.cs | 2 +- Controllers/ChiamateController.cs | 15 ++++++++++++--- Controllers/CommesseVTController.cs | 2 +- Controllers/DatiAziendaController.cs | 2 +- Controllers/Rapp_NewController.cs | 2 +- Views/Chiamate/Index.cshtml | 4 ++++ Views/DatiAzienda/Create.cshtml | 2 +- Views/DatiAzienda/Edit.cshtml | 2 +- Views/Impianti/Index.cshtml | 4 ++++ appsettings.json | 18 +++++++++--------- wwwroot/assets/images/icons8-aggiungi-50.png | Bin 0 -> 934 bytes 11 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 wwwroot/assets/images/icons8-aggiungi-50.png diff --git a/Controllers/AziendaRifController.cs b/Controllers/AziendaRifController.cs index e84456d..0470d6f 100644 --- a/Controllers/AziendaRifController.cs +++ b/Controllers/AziendaRifController.cs @@ -359,7 +359,7 @@ namespace VirtualTask.Controllers { string data = response.Content.ReadAsStringAsync().Result; modelList = JsonConvert.DeserializeObject>(data); - + modelList = modelList.Where(x => x.tcdatobs == null).ToList(); //per gestire primo elemento tendina (deve essere vuoto) SelectListItem listItemFirst = new SelectListItem(); diff --git a/Controllers/ChiamateController.cs b/Controllers/ChiamateController.cs index e078c20..98f056b 100644 --- a/Controllers/ChiamateController.cs +++ b/Controllers/ChiamateController.cs @@ -161,19 +161,27 @@ namespace VirtualTask.Controllers #region CREATE - public IActionResult Create() + public IActionResult Create(string id) { SessionHelper helper = new SessionHelper(this); admin = helper.GetStringValue("admin"); ViewBag.Admin = admin; ViewBag.Impianti = getImpianti(null); + ViewBag.StatiChiamata = getStatiChiamata(null); //ViewBag.TipiChiamata = getTipiChiamata(); ViewBag.CodiciSegnalazione = getCodiciSegnalazione(); ViewBag.Tecnici = getTecnici(null); - return View(); + // Pre-seleziona impianto + var model = new Chiamate(); + if (!string.IsNullOrEmpty(id)) + { + model.chcodimp = id; + } + + return View(model); } [HttpPost] @@ -515,6 +523,7 @@ namespace VirtualTask.Controllers { string data = response.Content.ReadAsStringAsync().Result; modelList = JsonConvert.DeserializeObject>(data); + modelList = modelList.Where(x => x.imfinatt == null).ToList(); //per gestire primo elemento tendina (deve essere vuoto) SelectListItem listItemFirt = new SelectListItem(); @@ -641,7 +650,7 @@ namespace VirtualTask.Controllers { string data = response.Content.ReadAsStringAsync().Result; modelList = JsonConvert.DeserializeObject>(data); - + modelList = modelList.Where(x => x.tcdatobs == null).ToList(); //per gestire primo elemento tendina (deve essere vuoto) SelectListItem listItemFirst = new SelectListItem(); diff --git a/Controllers/CommesseVTController.cs b/Controllers/CommesseVTController.cs index 0033a34..d10170c 100644 --- a/Controllers/CommesseVTController.cs +++ b/Controllers/CommesseVTController.cs @@ -372,7 +372,7 @@ namespace VirtualTask.Controllers { string data = response.Content.ReadAsStringAsync().Result; modelList = JsonConvert.DeserializeObject>(data); - + modelList = modelList.Where(x => x.imfinatt == null).ToList(); //per gestire primo elemento tendina (deve essere vuoto) SelectListItem listItemFirst = new SelectListItem(); diff --git a/Controllers/DatiAziendaController.cs b/Controllers/DatiAziendaController.cs index ebffa5f..dd9c122 100644 --- a/Controllers/DatiAziendaController.cs +++ b/Controllers/DatiAziendaController.cs @@ -443,7 +443,7 @@ namespace VirtualTask.Controllers { string data = response.Content.ReadAsStringAsync().Result; modelList = JsonConvert.DeserializeObject>(data); - + modelList = modelList.Where(x => x.tcdatobs == null).ToList(); //per gestire primo elemento tendina (deve essere vuoto) SelectListItem listItemFirst = new SelectListItem(); diff --git a/Controllers/Rapp_NewController.cs b/Controllers/Rapp_NewController.cs index bbadbd1..0faf750 100644 --- a/Controllers/Rapp_NewController.cs +++ b/Controllers/Rapp_NewController.cs @@ -418,7 +418,7 @@ namespace VirtualTask.Controllers { string data = response.Content.ReadAsStringAsync().Result; modelList = JsonConvert.DeserializeObject>(data); - + modelList = modelList.Where(x => x.tcdatobs == null).ToList(); //per gestire primo elemento tendina (deve essere vuoto) SelectListItem listItemFirst = new SelectListItem(); diff --git a/Views/Chiamate/Index.cshtml b/Views/Chiamate/Index.cshtml index 688a60f..5e48f71 100644 --- a/Views/Chiamate/Index.cshtml +++ b/Views/Chiamate/Index.cshtml @@ -76,6 +76,10 @@ + + Cliente + @Html.DropDownList("tecnico", ViewBag.Tecnici, null, new { @class = "agy-form-field require" }) + Tecnico @Html.DropDownList("tecnico", ViewBag.Tecnici, null, new { @class = "agy-form-field require" }) diff --git a/Views/DatiAzienda/Create.cshtml b/Views/DatiAzienda/Create.cshtml index 3d5fefe..5f693e7 100644 --- a/Views/DatiAzienda/Create.cshtml +++ b/Views/DatiAzienda/Create.cshtml @@ -40,7 +40,7 @@
 
- + Torna alla lista
diff --git a/Views/DatiAzienda/Edit.cshtml b/Views/DatiAzienda/Edit.cshtml index 8d06a1b..8ac4639 100644 --- a/Views/DatiAzienda/Edit.cshtml +++ b/Views/DatiAzienda/Edit.cshtml @@ -46,7 +46,7 @@
- + Torna alla lista
diff --git a/Views/Impianti/Index.cshtml b/Views/Impianti/Index.cshtml index 1eec986..22cb908 100644 --- a/Views/Impianti/Index.cshtml +++ b/Views/Impianti/Index.cshtml @@ -85,6 +85,10 @@ Elimina + | + + Elimina + } diff --git a/appsettings.json b/appsettings.json index dc6ebbf..2bd3353 100644 --- a/appsettings.json +++ b/appsettings.json @@ -8,10 +8,10 @@ "ApplicationInsights": { ////PRODUZIONE - "rootUrlApi": "https://api.poloinformatico.it:9000/api/Polo/", - "rootUrlApi2": "https://api.poloinformatico.it:9000/VIRTU/", - "rootWebLoghi": "C:\\ZAPIPOLO\\api_polo\\wwwroot\\VIRTU\\", - "rootUrl": "https://virtualtask.it/", + //"rootUrlApi": "https://api.poloinformatico.it:9000/api/Polo/", + //"rootUrlApi2": "https://api.poloinformatico.it:9000/VIRTU/", + //"rootWebLoghi": "C:\\ZAPIPOLO\\api_polo\\wwwroot\\VIRTU\\", + //"rootUrl": "https://virtualtask.it/", //TEST //"rootUrlApi": "http://testapi.poloinformatico.it:9001/api/Polo/", @@ -19,11 +19,11 @@ //"rootWebLoghi": "C:\\Users\\audif\\source\\repos\\VirtualTask\\wwwroot\\VIRTU\\", //"rootUrl": "https://localhost:7140/", - ////MICHELE: PUNTAMENTO A MIO PC PER FARE I TEST - //"rootUrlApi": "https://localhost:7068/api/Polo/", - //"rootUrlApi2": "https://localhost:7068//VIRTU/", - //"rootWebLoghi": "C:\\Users\\audif\\source\\repos\\VirtualTask\\wwwroot\\VIRTU\\", - //"rootUrl": "https://localhost:7068/", + //MICHELE: PUNTAMENTO A MIO PC PER FARE I TEST + "rootUrlApi": "https://localhost:7068/api/Polo/", + "rootUrlApi2": "https://localhost:7068//VIRTU/", + "rootWebLoghi": "C:\\Users\\audif\\source\\repos\\VirtualTask\\wwwroot\\VIRTU\\", + "rootUrl": "https://localhost:7068/", "mittenteMail": "info@virtualtask.it", "nomeMail": "Supporto Virtual Task", diff --git a/wwwroot/assets/images/icons8-aggiungi-50.png b/wwwroot/assets/images/icons8-aggiungi-50.png new file mode 100644 index 0000000000000000000000000000000000000000..5c1381525541e5fce7e741dc3cfcde7e5c8410df GIT binary patch literal 934 zcmV;X16lluP)3T_ax@tApHM+jfg6f94PHco zUVWU=lL-lbhXx5GY7pNK)Qf`1N#$U~n+pWZnu^~fow&2?&i3xk624@zkFKe%ny#*{ z{(4{&8y6{{3%Ci40kgnQU{#lW|EM;TIR!Kj6C{DNz$EYo$P{?}1}1<$AW;biwgZ=e zMaQTW-~n(|BePFWe4DNY{bz00fQPy#xc?h4q=!=$90wL016~2=fcgl!b^+&s*N(o= zKnEp+J*iQr!#BVYkNVqzw~qdiQjE?X8Ezf?0xkkueRsk?otJ>LGukb_l(%ZQGs-&q zDLoDVbLw+mHWYbi(N=P)GSu2RwJeEYh4Ab;8LOyGo(a zi3&>q1*h0xVwYo1V*z z7WZoD&^Kz7otB+&+U>iOq>}(LB9uEkuGn^z5v&uz#4hRCd%H920c+nM@hygwYNw#= z$S9P2o))h=I)hF*lTk%#<@I&(PHjrtwYnO0Xw)N_DTgNr%8r3by#bLBD?Y9*K%vCL zns%nWm2w~(>cz#{uI;YQ9)CD5)!6qB+MW(eHgrF+391}_0iVoF0WtTWH2?qr07*qo IM6N<$f`2TY#Q*>R literal 0 HcmV?d00001