POLO-WEBAPP/SoftwayWeb
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: POLO-WEBAPP:3935e3dd6187be818a2c5791b6da78b0855adda3
Branches Tags
POLO-WEBAPP:master
...
compare: POLO-WEBAPP:41a32fbd46e5b3e7858e36ee4f539eef25bcca7e
Branches Tags
POLO-WEBAPP:master

3 Commits
3935e3dd61 ... 41a32fbd46

Author SHA1 Message Date
michele
41a32fbd46 modifica colore messaggio 2024-11-12 15:55:27 +01:00
michele
e550fa1792 Merge branch 'master' of http://gitea.poloinformatico.it/POLO-WEBAPP/SoftwayWeb 2024-11-12 15:50:58 +01:00
michele
b91ee8e237 Impaginazionie della view + modifica messaggio da controller + modifica appsettings.json per gestione messaggi 2024-11-12 15:50:56 +01:00
3 changed files with 131 additions and 246 deletions
Show Stats Expand all files Collapse all files

24
Controllers/DestinazioniController.cs
View File

@ -16,16 +16,26 @@ namespace SoftwayWeb.Controllers
string urlBase = string.Empty;
string token = string.Empty;
string errMes = string.Empty;
string messAcc = string.Empty;
string messNew = string.Empty;
private readonly IConfiguration _configuration;
private readonly IConfiguration _mess1;
private readonly IConfiguration _mess2;
HttpClient client;
SessionHelper helper;
public DestinazioniController(IConfiguration configuration)
public DestinazioniController(IConfiguration configuration, IConfiguration mess1, IConfiguration mess2)
{
_configuration = configuration;
client = new HttpClient();
_mess1 = mess1;
_mess2 = mess2;
client = new HttpClient();
var key = _configuration["ApplicationInsights:rootUrlApi"];
var messA = _mess1["ApplicationInsights:messDestAccodo"];
var messN = _mess2["ApplicationInsights:messDestNew"];
apiUrl = key;
messAcc = messA;
messNew = messN;
}
public IActionResult Index(string id, string? codAutista, string? nomeAutista, DateTime dataGiro, string? codMezzo, string? desMezzo, int? page = 1)
@ -367,9 +377,6 @@ namespace SoftwayWeb.Controllers
List<Destinazioni_Out> modelList = new List<Destinazioni_Out>();
HttpResponseMessage response = client.GetAsync(baseAddress).Result;
if (response.IsSuccessStatusCode)
{
string dato = response.Content.ReadAsStringAsync().Result;
@ -380,12 +387,12 @@ namespace SoftwayWeb.Controllers
if (presenti != null && presenti.Count() > 0)
{
//giro già esistente.. accodo
mex = "Accodo";
mex = messAcc;
}
else
{
// giro non esistente.. ne creo uno nuovo
mex = "Creo nuovo";
mex = messNew;
}
ViewBag.Messaggio = mex;
}
@ -397,11 +404,8 @@ namespace SoftwayWeb.Controllers
}
return View(model);
//apiUrl = helper.GetStringValue("apiUrl");
}
[HttpPost]

345
Views/Destinazioni/ModificaDestinazioneStep1.cshtml
View File

@ -7,243 +7,122 @@
messaggio = ViewBag.Messaggio;
}
<h1>messaggio di uscita: @messaggio</h1>
<h1 style="color:red">@* messaggio di uscita: *@ N.B: @messaggio</h1>
<div>
<h4>Destinazioni_Out</h4>
<hr />
<form asp-action="ModificaDestinazionePost">
<div class="row">
<div class="col-xl">
<div class="card mb-4">
<div class="card-header d-flex justify-content-between align-items-center">
<h5 class="mb-0">Destinazione</h5> <small class="text-muted float-end"></small>
</div>
<div class="card-body">
<form asp-action="ModificaDestinazionePost">
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.DataCarico)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.DataCarico)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.Committente)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.CodCommittente) - @Html.DisplayFor(model => model.Committente)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.Sede)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.CodSede) - @Html.DisplayFor(model => model.Sede)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.IndirizzoSede)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.IndirizzoSede)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.DescAutomezzo)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.CodAutomezzo) - @Html.DisplayFor(model => model.DescAutomezzo)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.Autista)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.CodAutista) - @Html.DisplayFor(model => model.Autista)</div>
</div>
<dl class="row">
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.CodAutomezzo)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.CodAutomezzo)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.DescAutomezzo)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.DescAutomezzo)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Brserial)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Brserial)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.DataCarico)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.DataCarico)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.CodCommittente)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.CodCommittente)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Committente)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Committente)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.CodAutista)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.CodAutista)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Autista)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Autista)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.CodSede)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.CodSede)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Sede)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Sede)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.IndirizzoSede)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.IndirizzoSede)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Cproword)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Cproword)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Cprownum)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Cprownum)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Brmerce)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Brmerce)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Brnote)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Brnote)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.ImportoDaRitirare)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.ImportoDaRitirare)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.ItemList)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.ItemList)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.serialeGiro)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.serialeGiro)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Casse)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Casse)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Trasf)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Trasf)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Colli)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Colli)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.num_cons)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.num_cons)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Uova)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Uova)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Cist)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Cist)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Note)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Note)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Seq)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Seq)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Prog)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Prog)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.Pisergir)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.Pisergir)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.CodAutomezzoOld)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.CodAutomezzoOld)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.CodAutistaOld)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.CodAutistaOld)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.AutistaOld)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.AutistaOld)
</dd>
<dt class = "col-sm-2">
@Html.DisplayNameFor(model => model.DescAutomezzoOld)
</dt>
<dd class = "col-sm-10">
@Html.DisplayFor(model => model.DescAutomezzoOld)
</dd>
</dl>
@Html.HiddenFor(model => model.DescAutomezzo)
@Html.HiddenFor(model => model.Brserial)
@Html.HiddenFor(model => model.DataCarico)
@Html.HiddenFor(model => model.CodCommittente)
@Html.HiddenFor(model => model.Committente)
@Html.HiddenFor(model => model.Autista)
@Html.HiddenFor(model => model.DescAutomezzo)
@Html.HiddenFor(model => model.Brserial)
@Html.HiddenFor(model => model.DataCarico)
@Html.HiddenFor(model => model.CodCommittente)
@Html.HiddenFor(model => model.Committente)
@Html.HiddenFor(model => model.Autista)
@Html.HiddenFor(model => model.CodSede)
@Html.HiddenFor(model => model.Sede)
@Html.HiddenFor(model => model.IndirizzoSede)
@Html.HiddenFor(model => model.Cproword)
@Html.HiddenFor(model => model.Cprownum)
@Html.HiddenFor(model => model.Brmerce)
@Html.HiddenFor(model => model.Brnote)
@Html.HiddenFor(model => model.ImportoDaRitirare)
@Html.HiddenFor(model => model.ItemList)
@Html.HiddenFor(model => model.serialeGiro)
@Html.HiddenFor(model => model.Casse)
@Html.HiddenFor(model => model.Trasf)
@Html.HiddenFor(model => model.Colli)
@Html.HiddenFor(model => model.num_cons)
@Html.HiddenFor(model => model.Uova)
@Html.HiddenFor(model => model.Cist)
@Html.HiddenFor(model => model.Note)
@Html.HiddenFor(model => model.Seq)
@Html.HiddenFor(model => model.Prog)
@Html.HiddenFor(model => model.CodSede)
@Html.HiddenFor(model => model.Sede)
@Html.HiddenFor(model => model.IndirizzoSede)
@Html.HiddenFor(model => model.Cproword)
@Html.HiddenFor(model => model.Cprownum)
@Html.HiddenFor(model => model.Brmerce)
@Html.HiddenFor(model => model.Brnote)
@Html.HiddenFor(model => model.ImportoDaRitirare)
@Html.HiddenFor(model => model.ItemList)
@Html.HiddenFor(model => model.serialeGiro)
@Html.HiddenFor(model => model.Casse)
@Html.HiddenFor(model => model.Trasf)
@Html.HiddenFor(model => model.Colli)
@Html.HiddenFor(model => model.num_cons)
@Html.HiddenFor(model => model.Uova)
@Html.HiddenFor(model => model.Cist)
@Html.HiddenFor(model => model.Note)
@Html.HiddenFor(model => model.Seq)
@Html.HiddenFor(model => model.Prog)
@Html.HiddenFor(model => model.CodAutistaOld)
@Html.HiddenFor(model => model.CodAutomezzoOld)
@Html.HiddenFor(model => model.AutistaOld)
@Html.HiddenFor(model => model.DescAutomezzoOld)
@Html.HiddenFor(model => model.CodAutistaOld)
@Html.HiddenFor(model => model.CodAutomezzoOld)
@Html.HiddenFor(model => model.AutistaOld)
@Html.HiddenFor(model => model.DescAutomezzoOld)
@Html.HiddenFor(model => model.CodAutista)
@Html.HiddenFor(model => model.CodAutomezzo)
<button type="submit" class="btn btn-primary">Salva</button>
</form>
<button type="submit" class="btn btn-primary">Salva</button>
</form>
</div>
</div>
</div>
<div class="col-xl">
<div class="card mb-4">
<div class="card-header d-flex justify-content-between align-items-center">
<h5 class="mb-0">Dettaglio trasporto</h5> <small class="text-muted float-end"></small>
</div>
<div class="card-body">
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.Casse)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.Casse)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.Trasf)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.Trasf)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.Colli)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.Colli)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.num_cons)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.num_cons)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.Uova)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.Uova)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.Cist)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.Cist)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.Seq)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.Seq)</div>
</div>
<div class="mb-3">
<label class="form-label" for="basic-default-fullname"><b>@Html.DisplayNameFor(model => model.Prog)</b> </label>
<div class="form-text">@Html.DisplayFor(model => model.Prog)</div>
</div>
</div>
</div>
</div>
</div>
<div>
<a asp-action="ModificaDestinazione" asp-controller="Destinazioni" asp-route-serial="@Model.Brserial" class="btn btn-primary">Torna indietro</a>
</div>

4
appsettings.json
View File

@ -6,8 +6,10 @@
}
},
"ApplicationInsights": {
"rootUrlApi": "https://api.poloinformatico.it:8000/api/"
"rootUrlApi": "https://api.poloinformatico.it:8000/api/",
//"rootUrlApi": "https://localhost:7126/api/"
"messDestAccodo": "La seguente destinazione verrà aggiunta ad un giro esistente",
"messDestNew": "Verrà creato un nuovo giro per la seguente destinazione"
},