Merge branch 'master' of 10.0.0.83:/usr/local/git/VirtualTask
This commit is contained in:
commit
62ff5f98ec
@ -26,7 +26,7 @@ namespace VirtualTask.Controllers
|
|||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
//seriale commessa
|
//seriale commessa
|
||||||
string _sercomm = "SER_COMMES";
|
string _sercomm = "SER_COMMES";
|
||||||
|
string time_sheet=string.Empty;
|
||||||
|
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
public AnagController(IConfiguration configuration)
|
public AnagController(IConfiguration configuration)
|
||||||
@ -52,6 +52,8 @@ namespace VirtualTask.Controllers
|
|||||||
apiUrl = helper.GetStringValue("apiUrl");
|
apiUrl = helper.GetStringValue("apiUrl");
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
urlBase = apiUrl+"anagraficheList";
|
urlBase = apiUrl+"anagraficheList";
|
||||||
urlBase = urlBase + "?token=" + token;
|
urlBase = urlBase + "?token=" + token;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
|
|||||||
@ -16,7 +16,7 @@ namespace VirtualTask.Controllers
|
|||||||
string tenant = string.Empty;
|
string tenant = string.Empty;
|
||||||
string errMes = string.Empty;
|
string errMes = string.Empty;
|
||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
|
string time_sheet=string.Empty;
|
||||||
|
|
||||||
HttpClient client;
|
HttpClient client;
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
@ -47,6 +47,8 @@ namespace VirtualTask.Controllers
|
|||||||
apiUrl = helper.GetStringValue("apiUrl");
|
apiUrl = helper.GetStringValue("apiUrl");
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
urlBase = apiUrl + "aziendeList";
|
urlBase = apiUrl + "aziendeList";
|
||||||
urlBase = urlBase + "?token=" + token;
|
urlBase = urlBase + "?token=" + token;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
|
|||||||
@ -19,7 +19,7 @@ namespace VirtualTask.Controllers
|
|||||||
string _serchiam = "SER_CHIAMA";
|
string _serchiam = "SER_CHIAMA";
|
||||||
string _numchiam = "NUM_CHIAMA";
|
string _numchiam = "NUM_CHIAMA";
|
||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
|
string time_sheet=string.Empty;
|
||||||
|
|
||||||
HttpClient client;
|
HttpClient client;
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
@ -46,6 +46,8 @@ namespace VirtualTask.Controllers
|
|||||||
apiUrl = helper.GetStringValue("apiUrl");
|
apiUrl = helper.GetStringValue("apiUrl");
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
urlBase = apiUrl + "chiamateListMngr";
|
urlBase = apiUrl + "chiamateListMngr";
|
||||||
urlBase = urlBase + "?token=" + token;
|
urlBase = urlBase + "?token=" + token;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
|
|||||||
@ -17,7 +17,7 @@ namespace VirtualTask.Controllers
|
|||||||
string tenant = string.Empty;
|
string tenant = string.Empty;
|
||||||
string errMes = string.Empty;
|
string errMes = string.Empty;
|
||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
|
string time_sheet=string.Empty;
|
||||||
|
|
||||||
HttpClient client;
|
HttpClient client;
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
@ -45,6 +45,8 @@ namespace VirtualTask.Controllers
|
|||||||
apiUrl = helper.GetStringValue("apiUrl");
|
apiUrl = helper.GetStringValue("apiUrl");
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
urlBase = apiUrl + "chiusureVtList";
|
urlBase = apiUrl + "chiusureVtList";
|
||||||
urlBase = urlBase + "?token=" + token;
|
urlBase = urlBase + "?token=" + token;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
|
|||||||
@ -18,7 +18,7 @@ namespace VirtualTask.Controllers
|
|||||||
string errMes = string.Empty;
|
string errMes = string.Empty;
|
||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
string _sercomm = "SER_COMMES";
|
string _sercomm = "SER_COMMES";
|
||||||
|
string time_sheet=string.Empty;
|
||||||
|
|
||||||
|
|
||||||
HttpClient client;
|
HttpClient client;
|
||||||
@ -49,6 +49,8 @@ namespace VirtualTask.Controllers
|
|||||||
apiUrl = helper.GetStringValue("apiUrl");
|
apiUrl = helper.GetStringValue("apiUrl");
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
urlBase = apiUrl + "commesseList";
|
urlBase = apiUrl + "commesseList";
|
||||||
urlBase = urlBase + "?token=" + token;
|
urlBase = urlBase + "?token=" + token;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
|
|||||||
@ -28,7 +28,7 @@ namespace VirtualTask.Controllers
|
|||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
//private readonly Microsoft.Extensions.Hosting.IHostingEnvironment _hostingEnvironment;
|
//private readonly Microsoft.Extensions.Hosting.IHostingEnvironment _hostingEnvironment;
|
||||||
|
string time_sheet=string.Empty;
|
||||||
public DatiAziendaController(IConfiguration configuration /*,Microsoft.Extensions.Hosting.IHostingEnvironment hostingEnvironment*/)
|
public DatiAziendaController(IConfiguration configuration /*,Microsoft.Extensions.Hosting.IHostingEnvironment hostingEnvironment*/)
|
||||||
{
|
{
|
||||||
client = new HttpClient();
|
client = new HttpClient();
|
||||||
@ -46,6 +46,8 @@ namespace VirtualTask.Controllers
|
|||||||
token = helper.GetStringValue("tok");
|
token = helper.GetStringValue("tok");
|
||||||
tenant = helper.GetStringValue("tenant");
|
tenant = helper.GetStringValue("tenant");
|
||||||
tenant2= helper.GetStringValue("tenant2");
|
tenant2= helper.GetStringValue("tenant2");
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
if (string.IsNullOrEmpty(token))
|
if (string.IsNullOrEmpty(token))
|
||||||
{
|
{
|
||||||
return RedirectToAction("Login2", "Login");
|
return RedirectToAction("Login2", "Login");
|
||||||
|
|||||||
@ -19,7 +19,7 @@ namespace VirtualTask.Controllers
|
|||||||
string tenant2 = string.Empty;
|
string tenant2 = string.Empty;
|
||||||
string errMes = string.Empty;
|
string errMes = string.Empty;
|
||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
|
string time_sheet=string.Empty;
|
||||||
HttpClient client;
|
HttpClient client;
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
|
|
||||||
@ -47,6 +47,8 @@ namespace VirtualTask.Controllers
|
|||||||
apiUrl = helper.GetStringValue("apiUrl");
|
apiUrl = helper.GetStringValue("apiUrl");
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
urlBase = apiUrl + "impiantiListMngr";
|
urlBase = apiUrl + "impiantiListMngr";
|
||||||
urlBase = urlBase + "?token=" + token;
|
urlBase = urlBase + "?token=" + token;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
|
|||||||
@ -17,7 +17,7 @@ namespace VirtualTask.Controllers
|
|||||||
string tenant = string.Empty;
|
string tenant = string.Empty;
|
||||||
string errMes = string.Empty;
|
string errMes = string.Empty;
|
||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
|
string time_sheet=string.Empty;
|
||||||
HttpClient client;
|
HttpClient client;
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
|
|
||||||
@ -43,6 +43,8 @@ namespace VirtualTask.Controllers
|
|||||||
apiUrl = helper.GetStringValue("apiUrl");
|
apiUrl = helper.GetStringValue("apiUrl");
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
urlBase = apiUrl + "progressiviList";
|
urlBase = apiUrl + "progressiviList";
|
||||||
urlBase = urlBase + "?token=" + token;
|
urlBase = urlBase + "?token=" + token;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
|
|||||||
@ -15,7 +15,7 @@ namespace VirtualTask.Controllers
|
|||||||
string token = string.Empty;
|
string token = string.Empty;
|
||||||
string errMes = string.Empty;
|
string errMes = string.Empty;
|
||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
|
string time_sheet = string.Empty;
|
||||||
|
|
||||||
HttpClient client;
|
HttpClient client;
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
@ -43,6 +43,8 @@ namespace VirtualTask.Controllers
|
|||||||
apiUrl = helper.GetStringValue("apiUrl");
|
apiUrl = helper.GetStringValue("apiUrl");
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
urlBase = apiUrl + "rappnewList";
|
urlBase = apiUrl + "rappnewList";
|
||||||
urlBase = urlBase + "?token=" + token;
|
urlBase = urlBase + "?token=" + token;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
|
|||||||
@ -21,7 +21,7 @@ namespace VirtualTask.Controllers
|
|||||||
string tenant = string.Empty;
|
string tenant = string.Empty;
|
||||||
string errMes = string.Empty;
|
string errMes = string.Empty;
|
||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
|
string time_sheet=string.Empty;
|
||||||
HttpClient client;
|
HttpClient client;
|
||||||
|
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
@ -56,6 +56,8 @@ namespace VirtualTask.Controllers
|
|||||||
apiUrl = helper.GetStringValue("apiUrl");
|
apiUrl = helper.GetStringValue("apiUrl");
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
urlBase = apiUrl + "rapportiniList";
|
urlBase = apiUrl + "rapportiniList";
|
||||||
urlBase = urlBase + "?token=" + token;
|
urlBase = urlBase + "?token=" + token;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
|
|||||||
@ -28,7 +28,7 @@ namespace VirtualTask.Controllers
|
|||||||
string errMes = string.Empty;
|
string errMes = string.Empty;
|
||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
string urlConfirm = string.Empty;
|
string urlConfirm = string.Empty;
|
||||||
|
string time_sheet=string.Empty;
|
||||||
|
|
||||||
HttpClient client;
|
HttpClient client;
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
@ -54,7 +54,8 @@ namespace VirtualTask.Controllers
|
|||||||
urlBase = apiUrl + "RegistrazioniList";
|
urlBase = apiUrl + "RegistrazioniList";
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
client = new HttpClient();
|
client = new HttpClient();
|
||||||
client.BaseAddress = baseAddress;
|
client.BaseAddress = baseAddress;
|
||||||
|
|||||||
@ -19,7 +19,7 @@ namespace VirtualTask.Controllers
|
|||||||
string tenant = string.Empty;
|
string tenant = string.Empty;
|
||||||
string errMes = string.Empty;
|
string errMes = string.Empty;
|
||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
|
string time_sheet=string.Empty;
|
||||||
HttpClient client;
|
HttpClient client;
|
||||||
|
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
@ -46,6 +46,8 @@ namespace VirtualTask.Controllers
|
|||||||
apiUrl = helper.GetStringValue("apiUrl");
|
apiUrl = helper.GetStringValue("apiUrl");
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
urlBase = apiUrl + "tecniciList";
|
urlBase = apiUrl + "tecniciList";
|
||||||
urlBase = urlBase + "?token=" + token;
|
urlBase = urlBase + "?token=" + token;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
|
|||||||
@ -16,7 +16,7 @@ namespace VirtualTask.Controllers
|
|||||||
string tenant = string.Empty;
|
string tenant = string.Empty;
|
||||||
string errMes = string.Empty;
|
string errMes = string.Empty;
|
||||||
string admin = string.Empty;
|
string admin = string.Empty;
|
||||||
|
string time_sheet=string.Empty;
|
||||||
HttpClient client;
|
HttpClient client;
|
||||||
|
|
||||||
private readonly IConfiguration _configuration;
|
private readonly IConfiguration _configuration;
|
||||||
@ -44,6 +44,8 @@ namespace VirtualTask.Controllers
|
|||||||
apiUrl = helper.GetStringValue("apiUrl");
|
apiUrl = helper.GetStringValue("apiUrl");
|
||||||
admin = helper.GetStringValue("admin");
|
admin = helper.GetStringValue("admin");
|
||||||
ViewBag.Admin = admin;
|
ViewBag.Admin = admin;
|
||||||
|
time_sheet = helper.GetStringValue("time_sheet");
|
||||||
|
ViewBag.TimeSheet = time_sheet;
|
||||||
urlBase = apiUrl + "timbratureList";
|
urlBase = apiUrl + "timbratureList";
|
||||||
urlBase = urlBase + "?token=" + token;
|
urlBase = urlBase + "?token=" + token;
|
||||||
Uri baseAddress = new Uri(urlBase);
|
Uri baseAddress = new Uri(urlBase);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user