Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIx errore tablet su controllo idxMacchina valido

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-10-04 09:00:45 +02:00
parent 78b8aae039
commit c8e85761f7
6 changed files with 99 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=615']) {
withEnv(['NEXT_BUILD_NUMBER=617']) {
// env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-Tablet/DettaglioMacchina.aspx
-1
View File
@@ -12,7 +12,6 @@
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
<uc4:mod_confProd ID="mod_confProd1" runat="server" />
</div>
<%--<div class="clearDiv ui-grid-a" data-role="content" data-theme="a">--%>
<div class="clearDiv" data-role="content" data-theme="a">
<div style="float: left; margin-right: 10px;">
<uc2:mod_dettaglioProd ID="mod_dettaglioProd2" runat="server" />
MP-Tablet/DettaglioMacchina.aspx.designer.cs
Generated
+20 -21
View File
@@ -1,51 +1,50 @@
//------------------------------------------------------------------------------
// <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 DettaglioMacchina {
/// <summary>
/// mod_dettMacchina1 control.
/// Controllo mod_dettMacchina1.
/// </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_dettMacchina mod_dettMacchina1;
/// <summary>
/// mod_confProd1 control.
/// Controllo mod_confProd1.
/// </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_confProd mod_confProd1;
/// <summary>
/// mod_dettaglioProd2 control.
/// Controllo mod_dettaglioProd2.
/// </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_dettaglioProd mod_dettaglioProd2;
/// <summary>
/// mod_dettTurni2 control.
/// Controllo mod_dettTurni2.
/// </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_dettTurni mod_dettTurni2;
}
MP-Tablet/Web.config
+3 -3
View File
@@ -92,9 +92,9 @@
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_MoonProLAV;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_MoonProLAV;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_MoonProLAV;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_AnagraficaLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_VocabolarioLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="DevicesConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_AnagraficaLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_AnagraficaLAV;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_VocabolarioLAV;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="DevicesConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_AnagraficaLAV;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
</appSettings>
<connectionStrings>
<add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=Donati_MoonProLAV;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
+75 -75
View File
@@ -4,81 +4,81 @@ using System.Web.UI;
namespace MoonProTablet.WebUserControls
{
public partial class mod_dettMacchina : System.Web.UI.UserControl
public partial class mod_dettMacchina : System.Web.UI.UserControl
{
/// <summary>
/// idx macchina selezionata
/// </summary>
public string idxMacchina
{
/// <summary>
/// idx macchina selezionata
/// </summary>
public string idxMacchina
{
get
{
return memLayer.ML.StringSessionObj("IdxMacchina");
}
set
{
memLayer.ML.setSessionVal("IdxMacchina", value);
}
}
/// <summary>
/// caricamento pagina
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
// controllo se ho dett macchina altrimenti ritorno a pagina generale...
if (idxMacchina !="")
{
Response.Redirect("~/MappaStato.aspx");
}
}
/// <summary>
/// url completo immagine
/// </summary>
/// <param name="url"></param>
/// <returns></returns>
public string ImgUrl(object url)
{
return string.Format("./images/macchine/{0}", url);
}
/// <summary>
/// fomratta durata in minuti/ore/gg a seconda del totale...
/// </summary>
/// <param name="minuti"></param>
/// <returns></returns>
public string formatDurata(object min)
{
return utility.formatDurata(min);
}
/// <summary>
/// fa update del controllo
/// </summary>
public void doUpdate()
{
ods.DataBind();
repLI.DataBind();
}
/// <summary>
/// timeout scaduto
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Timer1_Tick(object sender, EventArgs e)
{
doUpdate();
//ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "<script type='text/javascript'>$('div').trigger('create');</script>", false);
ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "<script type='text/javascript'>$('#dettMacch').trigger('create');</script>", false);
}
/// <summary>
/// determian se nascondere la visualizzaizone compelta (e mostrare solo nome macchina)
/// </summary>
/// <param name="full">mostra tutto (true) o solo header(false)</param>
public void detailLevel(bool full)
{
pnlFullDet.Visible = full;
pnlLessDet.Visible = !full;
}
get
{
return memLayer.ML.StringSessionObj("IdxMacchina");
}
set
{
memLayer.ML.setSessionVal("IdxMacchina", value);
}
}
/// <summary>
/// caricamento pagina
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
// controllo se ho dett macchina altrimenti ritorno a pagina generale...
if (idxMacchina == "")
{
Response.Redirect("~/MappaStato.aspx");
}
}
/// <summary>
/// url completo immagine
/// </summary>
/// <param name="url"></param>
/// <returns></returns>
public string ImgUrl(object url)
{
return string.Format("./images/macchine/{0}", url);
}
/// <summary>
/// fomratta durata in minuti/ore/gg a seconda del totale...
/// </summary>
/// <param name="minuti"></param>
/// <returns></returns>
public string formatDurata(object min)
{
return utility.formatDurata(min);
}
/// <summary>
/// fa update del controllo
/// </summary>
public void doUpdate()
{
ods.DataBind();
repLI.DataBind();
}
/// <summary>
/// timeout scaduto
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Timer1_Tick(object sender, EventArgs e)
{
doUpdate();
//ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "<script type='text/javascript'>$('div').trigger('create');</script>", false);
ScriptManager.RegisterStartupScript(Page, GetType(), "temp", "<script type='text/javascript'>$('#dettMacch').trigger('create');</script>", false);
}
/// <summary>
/// determian se nascondere la visualizzaizone compelta (e mostrare solo nome macchina)
/// </summary>
/// <param name="full">mostra tutto (true) o solo header(false)</param>
public void detailLevel(bool full)
{
pnlFullDet.Visible = full;
pnlLessDet.Visible = !full;
}
}
}
MP-Tablet/WebUserControls/mod_mappaStato.ascx
-1
View File
@@ -32,7 +32,6 @@
TypeName="MapoDb.DS_ProdTempiTableAdapters.MappaStatoExplTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="3001" Name="maxAgeSec" Type="Int32" />
<%--<asp:Parameter DefaultValue="10000" Name="maxAgeSec" Type="Int32" />--%>
</SelectParameters>
</asp:ObjectDataSource>
</ul>