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
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=665']) {
withEnv(['NEXT_BUILD_NUMBER=670']) {
// env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
-6
View File
@@ -1,6 +0,0 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobile.Master" AutoEventWireup="true" CodeBehind="HDTV.aspx.cs" Inherits="MoonProTablet.HDTV" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
contenuto 1920 x 1080 (circa) tipo mappa stato ma "rivisto" x avere 3 righe da 8 colonne
</asp:Content>
-12
View File
@@ -1,12 +0,0 @@
using System;
namespace MoonProTablet
{
public partial class HDTV : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
-17
View File
@@ -1,17 +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
{
public partial class HDTV
{
}
}
+8 -8
View File
@@ -218,7 +218,6 @@
<Content Include="fixODL.aspx" />
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="Global.asax" />
<Content Include="HDTV.aspx" />
<Content Include="images\addArancio.png" />
<Content Include="images\addBlu.png" />
<Content Include="images\edit_l.png" />
@@ -406,6 +405,7 @@
<Content Include="Scripts\WebForms\WebParts.js" />
<Content Include="Scripts\WebForms\WebUIValidation.js" />
<Content Include="StoricoTC.aspx" />
<Content Include="Test.aspx" />
<Content Include="Turni.aspx" />
<Content Include="ViewSwitcher.ascx" />
<Content Include="Web.config">
@@ -522,13 +522,6 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="HDTV.aspx.cs">
<DependentUpon>HDTV.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="HDTV.aspx.designer.cs">
<DependentUpon>HDTV.aspx</DependentUpon>
</Compile>
<Compile Include="Logout.aspx.cs">
<DependentUpon>Logout.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -572,6 +565,13 @@
<Compile Include="StoricoTC.aspx.designer.cs">
<DependentUpon>StoricoTC.aspx</DependentUpon>
</Compile>
<Compile Include="Test.aspx.cs">
<DependentUpon>Test.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Test.aspx.designer.cs">
<DependentUpon>Test.aspx</DependentUpon>
</Compile>
<Compile Include="Turni.aspx.cs">
<DependentUpon>Turni.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
+1 -1
View File
@@ -1,6 +1,6 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="MappaStato.aspx.cs" Inherits="MoonProTablet.MappaStato" %>
<%@ Register Src="WebUserControls/mod_mappaStato.ascx" TagName="mod_mappaStato" TagPrefix="uc1" %>
<%@ Register Src="~/WebUserControls/mod_mappaStato.ascx" TagName="mod_mappaStato" TagPrefix="uc1" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-fluid my-3" role="main">
+1 -3
View File
@@ -1,9 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobile.Master" AutoEventWireup="true" CodeBehind="RepProd_GG.aspx.cs" Inherits="MoonProTablet.RepProd_GG" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="RepProd_GG.aspx.cs" Inherits="MoonProTablet.RepProd_GG" %>
<%@ Register Src="~/WebUserControls/mod_RepProd_GG.ascx" TagPrefix="uc1" TagName="mod_RepProd_GG" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="clearDiv" data-role="content" data-theme="a">
<uc1:mod_RepProd_GG runat="server" id="mod_RepProd_GG" />
+11 -12
View File
@@ -1,24 +1,23 @@
//------------------------------------------------------------------------------
// <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
{
namespace MoonProTablet {
public partial class RepProd_GG {
/// <summary>
/// mod_RepProd_GG control.
/// Controllo mod_RepProd_GG.
/// </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_RepProd_GG mod_RepProd_GG;
}
+27
View File
@@ -0,0 +1,27 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Test.aspx.cs" Inherits="MoonProTablet.Test" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
<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>
<button data-toggle="collapse" data-target="#demo">Collapsible</button>
<div id="demo" class="collapse">
Lorem ipsum dolor text....
</div>
</div>
</form>
</body>
</html>
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MoonProTablet
{
public partial class Test : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
+24
View File
@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MoonProTablet {
public partial class Test {
/// <summary>
/// Controllo form1.
/// </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.HtmlControls.HtmlForm form1;
}
}
@@ -1,69 +0,0 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="jQueryMobile.master.cs" Inherits="MoonProTablet.WebMasterPages.jQueryMobile" %>
<%@ Register Src="~/WebUserControls/mod_title.ascx" TagName="mod_title" TagPrefix="uc1" %>
<%@ Register Src="~/WebUserControls/mod_footer.ascx" TagName="mod_footer" TagPrefix="uc2" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head id="Head1" runat="server">
<%--<meta name="viewport" content="width=device-width, initial-scale=1" />--%>
<title>
<asp:ContentPlaceHolder ID="TitleContent" runat="server" />
</title>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jquerymobile") %>
</asp:PlaceHolder>
<webopt:BundleReference runat="server" Path="~/Content/css" />
<%--<webopt:bundlereference ID="brJqueryUi" runat="server" Path="~/Content/themes/base/css" />--%>
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<%--<link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300' rel='stylesheet' type='text/css'>--%>
<script type="text/javascript">
$(document).ready(function () {
// disabilitiamo la navigaizione Ajax
$.mobile.ajaxEnabled = false;
});
// $(document).bind("mobileinit", function () {
// $.mobile.ajaxLinksEnabled = false;
// $.mobile.ajaxEnabled = false;
// });
</script>
</head>
<body class="ui-mobile-viewport ui-overlay-a">
<form id="form1" runat="server">
<%--<asp:ScriptManager ID="sm" runat="server">
</asp:ScriptManager>--%>
<asp:ScriptManager ID="ScriptManager1" runat="server">
<Scripts>
<%--Framework Scripts--%>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
<asp:ScriptReference Name="WebFormsBundle" />
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<div data-role="page" data-theme="a" class="my-page">
<div data-role="header" data-position="fixed">
<uc1:mod_title ID="mod_title1" runat="server" />
</div>
<div data-role="content">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
</div>
<div data-role="footer" data-position="fixed">
<uc2:mod_footer ID="mod_footer1" runat="server" />
</div>
</div>
</form>
</body>
</html>
@@ -1,12 +0,0 @@
using System;
namespace MoonProTablet.WebMasterPages
{
public partial class jQueryMobile : System.Web.UI.MasterPage
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
@@ -1,46 +0,0 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="jQueryMobileNoCookie.master.cs" Inherits="MoonProTablet.WebMasterPages.jQueryMobileNoCookie" %>
<%@ Register Src="../WebUserControls/mod_footer.ascx" TagName="mod_footer" TagPrefix="uc1" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head id="Head1" runat="server">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>
<asp:ContentPlaceHolder ID="TitleContent" runat="server" />
</title>
<%--dopo 60 sec ricarica la default--%>
<meta http-equiv="refresh" content="60;URL=default.aspx">
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jquerymobile") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="Bundlereference1" runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<script type="text/javascript">
$(document).ready(function () {
// disabilitiamo la navigaizione Ajax
$.mobile.ajaxEnabled = false;
});
</script>
</head>
<body>
<form id="form1" runat="server">
<div data-role="page">
<div data-role="header" data-position="fixed">
<h1>Registrazione Device
</h1>
</div>
<div data-role="content">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
</div>
<div data-role="footer" class="ui-bar" data-position="fixed">
Device non riconosciuto
</div>
</div>
</form>
</body>
</html>
@@ -1,12 +0,0 @@
using System;
namespace MoonProTablet.WebMasterPages
{
public partial class jQueryMobileNoCookie : System.Web.UI.MasterPage
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
@@ -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.WebMasterPages
{
public partial class jQueryMobileNoCookie {
/// <summary>
/// Head1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// TitleContent 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.ContentPlaceHolder TitleContent;
/// <summary>
/// PlaceHolder1 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.PlaceHolder PlaceHolder1;
/// <summary>
/// Bundlereference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference Bundlereference1;
/// <summary>
/// form1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// MainContent 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.ContentPlaceHolder MainContent;
}
}
@@ -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;
}
}
+59 -59
View File
@@ -1,69 +1,69 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobile.Master" AutoEventWireup="true" CodeBehind="fixODL.aspx.cs" Inherits="MoonProTablet.fixODL" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="fixODL.aspx.cs" Inherits="MoonProTablet.fixODL" %>
<%@ Register Src="WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %>
<%@ Register Src="~/WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
<div class="ui-grid-a">
<div class="ui-block-a">
<h2>Riassegnazione ODL</h2>
Ultimi ODL lavorati:
<div class="container my-3" role="main">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
<div class="ui-grid-a">
<div class="ui-block-a">
<h2>Riassegnazione ODL</h2>
Ultimi ODL lavorati:
</div>
<div class="ui-block-b">
<asp:LinkButton runat="server" ID="lbtSetODL" data-role="button" data-iconpos="bottom" data-icon="plus" data-theme="e" OnClick="lbtSetODL_Click">Imposta ODL</asp:LinkButton>
</div>
</div>
<div class="ui-block-b">
<asp:LinkButton runat="server" ID="lbtSetODL" data-role="button" data-iconpos="bottom" data-icon="plus" data-theme="e" OnClick="lbtSetODL_Click">Imposta ODL</asp:LinkButton>
</div>
</div>
<div class="ui-grid-solo">
<div class="ui-block-a">
<asp:GridView ID="grViewLastODL" runat="server" AutoGenerateColumns="False" BackColor="LightGoldenrodYellow" BorderColor="Tan" BorderWidth="1px" CellPadding="2" DataKeyNames="IdxODL" DataSourceID="odsLastODL" ForeColor="Black" GridLines="None" AllowPaging="True" PageSize="5">
<AlternatingRowStyle BackColor="PaleGoldenrod" />
<Columns>
<asp:BoundField DataField="IdxODL" HeaderText="ODL" InsertVisible="False" ReadOnly="True" SortExpression="IdxODL" />
<asp:BoundField DataField="CodArticolo" HeaderText="Articolo" SortExpression="CodArticolo" />
<asp:BoundField DataField="NumPezzi" HeaderText="# Pezzi" SortExpression="NumPezzi" />
<asp:BoundField DataField="TCAssegnato" HeaderText="TC" SortExpression="TCAssegnato" DataFormatString="{0:N2}" />
<%--<asp:BoundField DataField="DescArticolo" HeaderText="DescArticolo" SortExpression="DescArticolo" />--%>
<asp:TemplateField HeaderText="Periodo" SortExpression="DataInizio">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("DataFine") %>' ForeColor="DarkBlue" /><br />
<asp:Label ID="Label1" runat="server" Text='<%# Eval("DataInizio") %>' ForeColor="DarkGreen" /><br />
</ItemTemplate>
<ItemStyle Font-Size="0.8em" />
</asp:TemplateField>
<asp:BoundField DataField="Note" HeaderText="Note" SortExpression="Note" ItemStyle-Font-Size="0.7em">
<ItemStyle Font-Size="0.7em"></ItemStyle>
</asp:BoundField>
<asp:BoundField DataField="PzPallet" HeaderText="PzPallet" SortExpression="PzPallet" />
</Columns>
<FooterStyle BackColor="Tan" />
<HeaderStyle BackColor="Tan" Font-Bold="True" />
<PagerStyle BackColor="PaleGoldenrod" ForeColor="DarkSlateBlue" HorizontalAlign="Center" />
<SelectedRowStyle BackColor="DarkSlateBlue" ForeColor="GhostWhite" />
<SortedAscendingCellStyle BackColor="#FAFAE7" />
<SortedAscendingHeaderStyle BackColor="#DAC09E" />
<SortedDescendingCellStyle BackColor="#E1DB9C" />
<SortedDescendingHeaderStyle BackColor="#C2A47B" />
</asp:GridView>
<asp:ObjectDataSource ID="odsLastODL" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMacchinaPeriodo" TypeName="MapoDb.DS_ProdTempiTableAdapters.ODLTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="0" Name="IdxMacchina" SessionField="IdxMacchina" Type="String" />
<asp:ControlParameter ControlID="hfDataFrom" Name="dataFrom" PropertyName="Value" Type="DateTime" />
<asp:ControlParameter ControlID="hfDataTo" Name="dataTo" PropertyName="Value" Type="DateTime" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfDataFrom" />
<asp:HiddenField runat="server" ID="hfDataTo" />
</div>
</div>
<div class="clearDiv" data-role="content" data-theme="a">
<div class="ui-grid-solo">
<div class="ui-block-a">
<asp:GridView ID="grViewLastODL" runat="server" AutoGenerateColumns="False" BackColor="LightGoldenrodYellow" BorderColor="Tan" BorderWidth="1px" CellPadding="2" DataKeyNames="IdxODL" DataSourceID="odsLastODL" ForeColor="Black" GridLines="None" AllowPaging="True" PageSize="5">
<AlternatingRowStyle BackColor="PaleGoldenrod" />
<Columns>
<asp:BoundField DataField="IdxODL" HeaderText="ODL" InsertVisible="False" ReadOnly="True" SortExpression="IdxODL" />
<asp:BoundField DataField="CodArticolo" HeaderText="Articolo" SortExpression="CodArticolo" />
<asp:BoundField DataField="NumPezzi" HeaderText="# Pezzi" SortExpression="NumPezzi" />
<asp:BoundField DataField="TCAssegnato" HeaderText="TC" SortExpression="TCAssegnato" DataFormatString="{0:N2}" />
<%--<asp:BoundField DataField="DescArticolo" HeaderText="DescArticolo" SortExpression="DescArticolo" />--%>
<asp:TemplateField HeaderText="Periodo" SortExpression="DataInizio">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("DataFine") %>' ForeColor="DarkBlue" /><br />
<asp:Label ID="Label1" runat="server" Text='<%# Eval("DataInizio") %>' ForeColor="DarkGreen" /><br />
</ItemTemplate>
<ItemStyle Font-Size="0.8em" />
</asp:TemplateField>
<asp:BoundField DataField="Note" HeaderText="Note" SortExpression="Note" ItemStyle-Font-Size="0.7em">
<ItemStyle Font-Size="0.7em"></ItemStyle>
</asp:BoundField>
<asp:BoundField DataField="PzPallet" HeaderText="PzPallet" SortExpression="PzPallet" />
</Columns>
<FooterStyle BackColor="Tan" />
<HeaderStyle BackColor="Tan" Font-Bold="True" />
<PagerStyle BackColor="PaleGoldenrod" ForeColor="DarkSlateBlue" HorizontalAlign="Center" />
<SelectedRowStyle BackColor="DarkSlateBlue" ForeColor="GhostWhite" />
<SortedAscendingCellStyle BackColor="#FAFAE7" />
<SortedAscendingHeaderStyle BackColor="#DAC09E" />
<SortedDescendingCellStyle BackColor="#E1DB9C" />
<SortedDescendingHeaderStyle BackColor="#C2A47B" />
</asp:GridView>
<asp:ObjectDataSource ID="odsLastODL" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMacchinaPeriodo" TypeName="MapoDb.DS_ProdTempiTableAdapters.ODLTableAdapter">
<SelectParameters>
<asp:SessionParameter DefaultValue="0" Name="IdxMacchina" SessionField="IdxMacchina" Type="String" />
<asp:ControlParameter ControlID="hfDataFrom" Name="dataFrom" PropertyName="Value" Type="DateTime" />
<asp:ControlParameter ControlID="hfDataTo" Name="dataTo" PropertyName="Value" Type="DateTime" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfDataFrom" />
<asp:HiddenField runat="server" ID="hfDataTo" />
</div>
</div>
<div class="clearDiv" data-role="content" data-theme="a">
<div class="ui-grid-solo">
<div class="ui-block-a">
<asp:DropDownList runat="server" ID="ddlODL" DataSourceID="odsOdlAvail" DataTextField="label" DataValueField="value" OnSelectedIndexChanged="ddlODL_SelectedIndexChanged" AutoPostBack="True">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsOdlAvail" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getUnused" TypeName="MapoDb.DS_UtilityTableAdapters.v_selODLTableAdapter"></asp:ObjectDataSource>
<asp:DropDownList runat="server" ID="ddlODL" DataSourceID="odsOdlAvail" DataTextField="label" DataValueField="value" OnSelectedIndexChanged="ddlODL_SelectedIndexChanged" AutoPostBack="True">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsOdlAvail" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getUnused" TypeName="MapoDb.DS_UtilityTableAdapters.v_selODLTableAdapter"></asp:ObjectDataSource>
</div>
</div>
</div>
</div>
+2 -3
View File
@@ -1,7 +1,6 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobileNoCookie.Master" AutoEventWireup="true" CodeBehind="regNewDevice.aspx.cs" Inherits="MoonProTablet.regNewDevice" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="regNewDevice.aspx.cs" Inherits="MoonProTablet.regNewDevice" %>
<%@ Register src="WebUserControls/mod_regNewDevice.ascx" tagname="mod_regNewDevice" tagprefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<uc1:mod_regNewDevice ID="mod_regNewDevice1" runat="server" />
</asp:Content>
+11 -12
View File
@@ -1,24 +1,23 @@
//------------------------------------------------------------------------------
// <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
{
namespace MoonProTablet {
public partial class regNewDevice {
/// <summary>
/// mod_regNewDevice1 control.
/// Controllo mod_regNewDevice1.
/// </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_regNewDevice mod_regNewDevice1;
}