diff --git a/GPW_Commesse/GPW_Commesse.csproj.user b/GPW_Commesse/GPW_Commesse.csproj.user
index f746a5c..ed8f186 100644
--- a/GPW_Commesse/GPW_Commesse.csproj.user
+++ b/GPW_Commesse/GPW_Commesse.csproj.user
@@ -6,7 +6,7 @@
enabled
false
ShowAllFiles
- IIS02
+ C:\Users\samuele\source\repos\GPW\GPW_Commesse\Properties\PublishProfiles\IISDEV.pubxml
diff --git a/GPW_Commesse/Properties/PublishProfiles/IISDEV.pubxml b/GPW_Commesse/Properties/PublishProfiles/IISDEV.pubxml
index bbe26de..659747e 100644
--- a/GPW_Commesse/Properties/PublishProfiles/IISDEV.pubxml
+++ b/GPW_Commesse/Properties/PublishProfiles/IISDEV.pubxml
@@ -26,6 +26,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt
+
+
+
+
+
+
+
Release
@@ -40,6 +50,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
DonotMerge
+
False
diff --git a/GPW_Commesse/Properties/PublishProfiles/IISDEV.pubxml.user b/GPW_Commesse/Properties/PublishProfiles/IISDEV.pubxml.user
index 3e399a5..698d3e7 100644
--- a/GPW_Commesse/Properties/PublishProfiles/IISDEV.pubxml.user
+++ b/GPW_Commesse/Properties/PublishProfiles/IISDEV.pubxml.user
@@ -9,6 +9,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
Any CPU
- AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAAAfzRDxm3RWtMnQW8dF8T+eAAAAAASAAACgAAAAEAAAAILouDWF/BRhWGHI/pZRVI0YAAAAKmH9LnVNFsewQIo0Hkk8L/OzH3jFB7WwFAAAALKoQaTWums2r8sZR6QsPyfIPWBh
+ AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA+11nhJeDSkeTlSej+COD3AAAAAACAAAAAAADZgAAwAAAABAAAADXbkzTxoDkLFu60NJZ0cUCAAAAAASAAACgAAAAEAAAAK+HYji/3jh99ujo4MtGHK4YAAAAo4hN2CGpeTs8CKzP4iBOvxqlw3PDq79SFAAAALBl2XE5MW+92s7BZPtlG+i/BQ2u
\ No newline at end of file
diff --git a/GPW_Commesse/Web.config b/GPW_Commesse/Web.config
index dc6f648..ffe5ab1 100644
--- a/GPW_Commesse/Web.config
+++ b/GPW_Commesse/Web.config
@@ -54,8 +54,6 @@
-
@@ -78,19 +76,8 @@
-
-
-
@@ -151,206 +138,206 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,4 +449,4 @@
-->
-
+
\ No newline at end of file
diff --git a/GPW_Commesse/WebUserControls/cmp_chart.ascx b/GPW_Commesse/WebUserControls/cmp_chart.ascx
index 2cfe5ba..e88cb7b 100644
--- a/GPW_Commesse/WebUserControls/cmp_chart.ascx
+++ b/GPW_Commesse/WebUserControls/cmp_chart.ascx
@@ -158,25 +158,11 @@
});
}
-<%-- function redrawAll() {
- var idxDip =<%=hfIdxDip.Value %>;
- var dataReq ="<%=hfData.Value %>";
- var numReq = <%=ddlMaxNum.SelectedValue%>;
- plotTS(idxDip, dataReq, numReq);
- plotHist(idxDip, dataReq, numReq);
- //console.log('R idxDip: ' + idxDip);
- //console.log('R dataReq: ' + dataReq);
- //console.log('R numReq: ' + numReq);
- }--%>
-
function forceRedrawAll(numReq) {
var idxDip =<%=hfIdxDip.Value %>;
var dataReq ="<%=hfData.Value %>";
plotTS(idxDip, dataReq, numReq);
plotHist(idxDip, dataReq, numReq);
- //console.log('FR idxDip: ' + idxDip);
- //console.log('FR dataReq: ' + dataReq);
- //console.log('FR numReq: ' + numReq);
}
diff --git a/GPW_Commesse/WebUserControls/mod_login.ascx.cs b/GPW_Commesse/WebUserControls/mod_login.ascx.cs
index 9cacae7..5361042 100644
--- a/GPW_Commesse/WebUserControls/mod_login.ascx.cs
+++ b/GPW_Commesse/WebUserControls/mod_login.ascx.cs
@@ -15,39 +15,40 @@ using SteamWare;
///
public partial class mod_login : ApplicationUserControl
{
- #region area protected/private
-
- #region area proprietà
+ #region Private Fields
private SteamWare.loginMode _isForceUser = SteamWare.loginMode.normale;
- #endregion
+ #endregion Private Fields
- #region area metodi
+ #region Public Events
+
+ public event EventHandler Login_Error;
+
+ public event EventHandler Login_ok;
+
+ #endregion Public Events
+
+ #region Public Properties
///
- /// imposta la modalità di login tra normale / forceUser
+ /// modalità funzionamento controllo tra normale (ActiveDirectory e user auth di default) e forceUser
///
- private void setLoginMode()
+ public SteamWare.loginMode modoLogin
{
- if (_isForceUser == SteamWare.loginMode.forceUser)
+ get
{
- pnlForceUser.Visible = true;
+ return _isForceUser;
}
- else
+ set
{
- pnlForceUser.Visible = false;
+ _isForceUser = value;
}
}
- protected override void traduciObj()
- {
- lblPwd.Text = user_std.UtSn.Traduci("lblPwd");
- lblUser.Text = user_std.UtSn.Traduci("lblUser");
- lblDominio.Text = user_std.UtSn.Traduci("lblDominio");
- lblTitolo.Text = user_std.UtSn.Traduci("ForzaUtente");
- btnOk.Text = user_std.UtSn.Traduci("btnCommit");
- }
+ #endregion Public Properties
+
+ #region Private Methods
///
/// prova a verificare se l'utente sia ok x AD credentials
@@ -182,50 +183,35 @@ public partial class mod_login : ApplicationUserControl
}
}
+ ///
+ /// imposta la modalità di login tra normale / forceUser
+ ///
+ private void setLoginMode()
+ {
+ if (_isForceUser == SteamWare.loginMode.forceUser)
+ {
+ pnlForceUser.Visible = true;
+ }
+ else
+ {
+ pnlForceUser.Visible = false;
+ }
+ }
+
+ #endregion Private Methods
+
+ #region Protected Methods
+
protected void btnOk_Click(object sender, EventArgs e)
{
ForceUserIdentity();
}
- #endregion
-
- #endregion
-
- #region area public
-
- #region eventi pubblici esposti
-
- public event EventHandler Login_ok;
- public event EventHandler Login_Error;
-
- #endregion
-
- #region area proprietà
-
- ///
- /// modalità funzionamento controllo tra normale (ActiveDirectory e user auth di default) e forceUser
- ///
- public SteamWare.loginMode modoLogin
- {
- get
- {
- return _isForceUser;
- }
- set
- {
- _isForceUser = value;
- }
- }
-
- #endregion
-
-
///
/// avvio pagina
///
protected override void Page_Load(object sender, EventArgs e)
{
- base.Page_Load(sender, e);
//carico da web.config i default values
loadDefaultsWebConfig();
// procedo...
@@ -237,5 +223,14 @@ public partial class mod_login : ApplicationUserControl
}
}
- #endregion
-}
+ protected override void traduciObj()
+ {
+ lblPwd.Text = user_std.UtSn.Traduci("lblPwd");
+ lblUser.Text = user_std.UtSn.Traduci("lblUser");
+ lblDominio.Text = user_std.UtSn.Traduci("lblDominio");
+ lblTitolo.Text = user_std.UtSn.Traduci("ForzaUtente");
+ btnOk.Text = user_std.UtSn.Traduci("btnCommit");
+ }
+
+ #endregion Protected Methods
+}
\ No newline at end of file