diff --git a/Controllers/ChiamateController.cs b/Controllers/ChiamateController.cs index 0713ee4..c42a670 100644 --- a/Controllers/ChiamateController.cs +++ b/Controllers/ChiamateController.cs @@ -388,6 +388,14 @@ namespace VirtualTask.Controllers { string data = response.Content.ReadAsStringAsync().Result; modelList = JsonConvert.DeserializeObject>(data); + + //per gestire primo elemento tendina (deve essere vuoto) + SelectListItem listItemFirt = new SelectListItem(); + + listItemFirt.Value = string.Empty; + listItemFirt.Text = " - Impianto"; + selectItems.Add(listItemFirt); + foreach (var role in modelList) { SelectListItem listItem = new SelectListItem(); @@ -479,7 +487,7 @@ namespace VirtualTask.Controllers SelectListItem listItemFirst = new SelectListItem(); listItemFirst.Value = string.Empty; - listItemFirst.Text = ""; + listItemFirst.Text = " - Tecnico"; selectItems.Add(listItemFirst); foreach (var role in modelList) diff --git a/Controllers/TecniciController.cs b/Controllers/TecniciController.cs index 8fde3de..dd4f922 100644 --- a/Controllers/TecniciController.cs +++ b/Controllers/TecniciController.cs @@ -261,8 +261,13 @@ namespace VirtualTask.Controllers { return RedirectToAction("Index"); } - - return View(tecnico); + else + { + errMes = response.Content.ReadAsStringAsync().Result; + helper.SetStringValue("errMsg", errMes); + return RedirectToAction("Error"); + } + //return View(tecnico); } #endregion EDIT diff --git a/Views/Chiamate/Create.cshtml b/Views/Chiamate/Create.cshtml index 1a0c11b..75699e0 100644 --- a/Views/Chiamate/Create.cshtml +++ b/Views/Chiamate/Create.cshtml @@ -15,18 +15,19 @@
- + @* *@ @Html.DropDownListFor(x => x.chcodimp,(IEnumerable)ViewBag.Impianti, new {@class = "form-control"})
 
- + @* *@ @Html.DropDownListFor(x => x.chtchiam,(IEnumerable)ViewBag.Tecnici, new {@class = "form-control"})
+
 
- + @* *@ @Html.DropDownListFor(x => x.chstato,(IEnumerable)ViewBag.StatiChiamata, new {@class = "form-control"})
@@ -46,7 +47,7 @@
 
- + @* *@ @Html.DropDownListFor(x => x.chcodseg,(IEnumerable)ViewBag.CodiciSegnalazione, new {@class = "form-control"})
diff --git a/Views/Chiamate/Edit.cshtml b/Views/Chiamate/Edit.cshtml index 9007faa..97ad74d 100644 --- a/Views/Chiamate/Edit.cshtml +++ b/Views/Chiamate/Edit.cshtml @@ -24,54 +24,64 @@ @Html.DisplayFor(model => model.chserial) +
 
- + @* *@
@Html.HiddenFor(x => x.chtipo) +
 
- + @* *@
+
 
- + @* *@
+
 
- + @* *@ @Html.DropDownListFor(x => x.chcodimp,(IEnumerable)ViewBag.Impianti, new {@class = "form-control"})
+
 
- + @* *@ @Html.DropDownListFor(x => x.chtchiam,(IEnumerable)ViewBag.Tecnici, new {@class = "form-control"})
+
 
- + @* *@ @Html.DropDownListFor(x => x.chstato,(IEnumerable)ViewBag.StatiChiamata, new {@class = "form-control"})
+
 
- + @* *@
+
 
- + @* *@
+
 
- + @* *@ @Html.DropDownListFor(x => x.chcodseg,(IEnumerable)ViewBag.CodiciSegnalazione, new {@class = "form-control"})
+
 
- + @* *@
diff --git a/Views/Chiusure/Edit.cshtml b/Views/Chiusure/Edit.cshtml index 2a699e6..4bce09a 100644 --- a/Views/Chiusure/Edit.cshtml +++ b/Views/Chiusure/Edit.cshtml @@ -24,14 +24,16 @@ @Html.DisplayFor(model => model.cccodice) +
 
- + @* *@ @* *@
+
 
- + @* *@ @* *@ diff --git a/Views/Impianti/Edit.cshtml b/Views/Impianti/Edit.cshtml index 64f5371..6bfda21 100644 --- a/Views/Impianti/Edit.cshtml +++ b/Views/Impianti/Edit.cshtml @@ -24,73 +24,85 @@
@Html.HiddenFor(x => x.imcodazi) +
 
- + @* *@ @* *@
+
 
- + @* *@ @* *@
+
 
- + @* *@ @* *@
+
 
- + @* *@ @* *@
+
 
- + @* *@ @* *@
+
 
- + @* *@ @* *@
+
 
- + @* *@ @* *@
+
 
- + @* *@ @* *@
+
 
- + @* *@ @* *@
+
 
- + @* *@ @* *@
+
 
- + @* *@ @Html.DropDownListFor(x =>x.imultcli,(IEnumerable)ViewBag.AllStockList,new {@class = "form-control"})
+
 
- + @* *@ @* *@ diff --git a/Views/Progressivi/Edit.cshtml b/Views/Progressivi/Edit.cshtml index f26b0d0..1719e2f 100644 --- a/Views/Progressivi/Edit.cshtml +++ b/Views/Progressivi/Edit.cshtml @@ -15,20 +15,20 @@
 
- - + @* *@ +
 
- - + @* *@ +
 
- - + @* *@ +
 
diff --git a/Views/Tecnici/Create.cshtml b/Views/Tecnici/Create.cshtml index 25d284c..ba24d1a 100644 --- a/Views/Tecnici/Create.cshtml +++ b/Views/Tecnici/Create.cshtml @@ -58,9 +58,9 @@
-
 
- @*
 
*@ + +
 
diff --git a/Views/Tecnici/Index.cshtml b/Views/Tecnici/Index.cshtml index c1cd931..00babe4 100644 --- a/Views/Tecnici/Index.cshtml +++ b/Views/Tecnici/Index.cshtml @@ -61,7 +61,7 @@ @Html.DisplayFor(modelItem => item.tcpwd) - @Html.DisplayFor(modelItem => item.tccost) + @Html.DisplayFor(modelItem => item.tccoor) @Html.DisplayFor(modelItem => item.tccono)