Continuata pulizia JQM (ed eliminazione)

RegNewDevice, HDTV, RepProd, FixODL
This commit is contained in:
Samuele E. Locatelli
2018-03-01 11:46:36 +01:00
parent 090b6ad272
commit 840d4c69a6
27 changed files with 242 additions and 504 deletions
@@ -1,35 +1,45 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_enrollByAuthKey.ascx.cs"
Inherits="MoonProTablet.WebUserControls.mod_enrollByAuthKey" %>
<h3>
Registrazione Con AuthKey Personale</h3>
<label for="ddlIdxDipendente">
Selezionare Operatore:</label>
<asp:DropDownList ID="ddlIdxDipendente" runat="server" DataSourceID="odsOperatori"
DataTextField="label" DataValueField="value">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsOperatori" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="GetData" TypeName="MapoDb.DS_UtilityTableAdapters.v_selOperatoriTableAdapter">
</asp:ObjectDataSource>
<br />
<label for="UserAuthKey">
UserAuthKey:</label>
<asp:TextBox runat="server" ID="txtUserAuthKey" TextMode="Password" />
<br />
<asp:Label runat="server" ID="lblWarning" Visible="false" />
<div class="ui-grid-a">
<div class="ui-block-a">
<asp:Button runat="server" ID="btnConferma" Text="Salva" data-theme="b" OnClick="btnConferma_Click" />
Inherits="MoonProTablet.WebUserControls.mod_enrollByAuthKey" %>
<div class="row">
<div class="col-12 text-center">
<h4>Registrazione Dispositivo</h4>
</div>
<div class="col-12 mb-3">
<label for="ddlIdxDipendente">
Selezionare Operatore:</label>
<asp:DropDownList ID="ddlIdxDipendente" runat="server" DataSourceID="odsOperatori" CssClass="form-control form-control-sm btn-secondary"
DataTextField="label" DataValueField="value">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsOperatori" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="GetData" TypeName="MapoDb.DS_UtilityTableAdapters.v_selOperatoriTableAdapter"></asp:ObjectDataSource>
</div>
<div class="col-12">
<label for="UserAuthKey">
UserAuthKey:</label>
<asp:TextBox runat="server" ID="txtUserAuthKey" TextMode="Password" CssClass="form-control form-control-sm" />
</div>
<div class="col-12 mb-3">
<asp:Label runat="server" ID="lblWarning" Visible="false" />
</div>
<div class="col-6">
<asp:Button runat="server" ID="btnConferma" Text="Salva" OnClick="btnConferma_Click" CssClass="btn btn-block btn-primary" />
</div>
<div class="col-6">
<asp:Button runat="server" ID="btnAnnulla" Text="Annulla" CausesValidation="false" CssClass="btn btn-block btn-warning"
OnClick="btnAnnulla_Click" />
</div>
<div class="col-12 my-4">
<a href="#moreInfo" class="btn btn-secondary btn-sm" data-toggle="collapse">...more info
</a>
<div id="moreInfo" class="collapse">
Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey personale (da richiedere all'admin se non nota).
</div>
<div class="ui-block-b">
<asp:Button runat="server" ID="btnAnnulla" Text="Annulla" data-theme="e" CausesValidation="false"
OnClick="btnAnnulla_Click" />
</div>
</div>
<div data-role="content">
<div data-role="collapsible" data-iconpos="right" data-theme="a" data-content-theme="a">
<h3>
Spiegazione</h3>
Questa funzione permette di inserire un devices tra quelli gestiti tramite la AuthKey
personale (da richiedere all'admin se non nota).
<a data-toggle="collapse" data-target="#demo">Collapsible</a>
<div id="demo" class="collapse">
Lorem ipsum dolor text....
</div>
</div>
</div>
@@ -1,70 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls
{
public partial class mod_enrollByAuthKey {
/// <summary>
/// ddlIdxDipendente control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlIdxDipendente;
/// <summary>
/// odsOperatori control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsOperatori;
/// <summary>
/// txtUserAuthKey control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtUserAuthKey;
/// <summary>
/// lblWarning control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblWarning;
/// <summary>
/// btnConferma control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnConferma;
/// <summary>
/// btnAnnulla control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnAnnulla;
}
}
@@ -1,11 +1,11 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_regNewDevice.ascx.cs"
Inherits="MoonProTablet.WebUserControls.mod_regNewDevice" %>
<%@ Register Src="mod_enrollByAuthKey.ascx" TagName="mod_enrollByAuthKey" TagPrefix="uc1" %>
<%@ Register Src="mod_enrollByJumperAuthKey.ascx" TagName="mod_enrollByJumperAuthKey"
TagPrefix="uc2" %>
<div data-role="content">
<div data-role="collapsible" data-iconpos="right" data-theme="a" data-content-theme="a">
<uc1:mod_enrollByAuthKey ID="mod_enrollByAuthKey1" runat="server" />
</div>
Inherits="MoonProTablet.WebUserControls.mod_regNewDevice" %>
<%@ Register Src="~/WebUserControls/mod_enrollByAuthKey.ascx" TagPrefix="uc2" TagName="mod_enrollByAuthKey" %>
<%@ Register Src="~/WebUserControls/mod_enrollByJumperAuthKey.ascx" TagPrefix="uc1" TagName="mod_enrollByJumperAuthKey" %>
<div class="row">
<div class="col-12">
<uc2:mod_enrollByAuthKey runat="server" ID="mod_enrollByAuthKey" />
<uc1:mod_enrollByJumperAuthKey runat="server" ID="mod_enrollByJumperAuthKey" />
</div>
</div>
<uc2:mod_enrollByJumperAuthKey ID="mod_enrollByJumperAuthKey1" runat="server" />
@@ -2,20 +2,20 @@
namespace MoonProTablet.WebUserControls
{
public partial class mod_regNewDevice : System.Web.UI.UserControl
public partial class mod_regNewDevice : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
protected void Page_Load(object sender, EventArgs e)
{
/*************************************************************************
* REGISTRAZIONE nuovi devices
*
* ci sono tre modalità
* - idxDipendente + authKey (manuale)
* - con richiesta reset ed invio authKey (generazione pwd casuale da email dipendente + dataora in MD5, INSERENDO EMAIL e cercando se esista...)
* - con "rimbalzo" su ~/jumper.aspx?UserAuthkey={0}&idxDipendente={1}... poi messe in session x cui autosetup
*
* ***********************************************************************/
}
/*************************************************************************
* REGISTRAZIONE nuovi devices
*
* ci sono tre modalità
* - idxDipendente + authKey (manuale)
* - con richiesta reset ed invio authKey (generazione pwd casuale da email dipendente + dataora in MD5, INSERENDO EMAIL e cercando se esista...)
* - con "rimbalzo" su ~/jumper.aspx?UserAuthkey={0}&idxDipendente={1}... poi messe in session x cui autosetup
*
* ***********************************************************************/
}
}
}
+16 -17
View File
@@ -1,34 +1,33 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls
{
namespace MoonProTablet.WebUserControls {
public partial class mod_regNewDevice {
/// <summary>
/// mod_enrollByAuthKey1 control.
/// Controllo mod_enrollByAuthKey.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_enrollByAuthKey mod_enrollByAuthKey1;
protected global::MoonProTablet.WebUserControls.mod_enrollByAuthKey mod_enrollByAuthKey;
/// <summary>
/// mod_enrollByJumperAuthKey1 control.
/// Controllo mod_enrollByJumperAuthKey.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_enrollByJumperAuthKey mod_enrollByJumperAuthKey1;
protected global::MoonProTablet.WebUserControls.mod_enrollByJumperAuthKey mod_enrollByJumperAuthKey;
}
}
-3
View File
@@ -32,6 +32,3 @@
</div>
</div>
</nav>
<!-- timer refresh intera pagina: 1 minuti, 0'000 ms -->
<asp:Timer ID="Timer1" runat="server" Interval="60000" OnTick="Timer1_Tick">
</asp:Timer>
@@ -137,14 +137,6 @@ namespace MoonProTablet.WebUserControls
}
}
/// <summary>
/// evento timer
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Timer1_Tick(object sender, EventArgs e)
{
}
/// <summary>
/// Path locale dove scaricare gli installer
/// </summary>
protected string localDownloadPath
-9
View File
@@ -56,14 +56,5 @@ namespace MoonProTablet.WebUserControls {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblIpData;
/// <summary>
/// Controllo Timer1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.Timer Timer1;
}
}