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

update tablet

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-04-14 10:53:24 +02:00
parent 74caa6513f
commit 8b13dde5bd
9 changed files with 57 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/MAPO.sqlite
BIN
View File
Binary file not shown.
.vs/MAPO/v15/.suo
BIN
View File
Binary file not shown.
MP-Site/Web.config
+19 -21
View File
@@ -69,6 +69,9 @@
<add key="authSenzaDominio" value="true" />
<add key="TcMaxFactor" value="2" />
<add key="chkIdxOdlEndProd" value="false" />
<!--charting-->
<add key="AutoCleanUpInterval" value="10" />
<add key="ChartImageHandler" value="storage=file;timeout=20;dir=c:\TempImageFiles\;" />
<!--DB 2008-->
<!--<add key="MoonProConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="PermessiConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer" />
@@ -78,14 +81,7 @@
<add key="MoonProConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Donati_MoonProLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16" />
<add key="PermessiConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Donati_MoonProLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16" />
<add key="UtenteCdcConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16" />
<add key="VocabolarioConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<!--DB TEST PROD-->
<!--<add key="MoonProConnectionString" value="Data Source=sql2012;Initial Catalog=Donati_MoonPro_prod2;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="PermessiConnectionString" value="Data Source=sql2012;Initial Catalog=Donati_MoonPro_prod2;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="UtenteCdcConnectionString" value="Data Source=sql2012;Initial Catalog=Donati_Anagrafica_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="VocabolarioConnectionString" value="Data Source=sql2012;Initial Catalog=Donati_Vocabolario_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />-->
<add key="AutoCleanUpInterval" value="10" />
<add key="ChartImageHandler" value="storage=file;timeout=20;dir=c:\TempImageFiles\;" />
<add key="VocabolarioConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Donati_VocabolarioLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16" />
</appSettings>
<connectionStrings>
<!--DB 2008-->
@@ -94,9 +90,6 @@
<!--DB 2016-->
<add name="MoonProConnectionString" connectionString="Data Source=WIN2016-SQL;Initial Catalog=Donati_MoonProLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=WIN2016-SQL;Initial Catalog=Donati_MoonProLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
<!--DB TEST PROD-->
<!--<add name="MoonProConnectionString" connectionString="Data Source=sql2012;Initial Catalog=Donati_MoonPro_prod2;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=sql2012;Initial Catalog=Donati_MoonPro_prod2;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />-->
</connectionStrings>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
@@ -130,8 +123,9 @@
<pages controlRenderingCompatibilityVersion="4.0">
<controls>
<add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" /></controls>
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
</controls>
</pages>
<httpHandlers>
<add path="ChartImg.axd" verb="GET,HEAD,POST" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false" />
@@ -139,11 +133,12 @@
<customErrors mode="Off" />
<!--<customErrors mode="RemoteOnly" defaultRedirect="unauthorized.aspx" />-->
<!--<customErrors mode="On" defaultRedirect="Default.aspx" />-->
<httpModules>
<httpModules>
<add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" />
<add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" />
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" />
</httpModules></system.web>
</httpModules>
</system.web>
<system.webServer>
<staticContent>
<!--aggiunto mimetype x scaricamento fonts aggiuntive-->
@@ -158,11 +153,12 @@
<remove name="ChartImageHandler" />
<add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
</handlers>
<modules>
<modules>
<add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" preCondition="managedHandler" />
<add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" preCondition="managedHandler" />
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler" />
</modules></system.webServer>
</modules>
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
@@ -173,13 +169,14 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<elmah>
<elmah>
<!--
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
more information on remote access and securing ELMAH.
-->
<security allowRemoteAccess="false" />
</elmah><location path="elmah.axd" inheritInChildApplications="false">
</elmah>
<location path="elmah.axd" inheritInChildApplications="false">
<system.web>
<httpHandlers>
<add verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" />
@@ -192,11 +189,12 @@
<allow roles="admin" />
<deny users="*" />
</authorization>
-->
-->
</system.web>
<system.webServer>
<handlers>
<add name="ELMAH" verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" preCondition="integratedMode" />
</handlers>
</system.webServer>
</location></configuration>
</location>
</configuration>
MP-Tablet/MP-Tablet.csproj
+1 -1
View File
@@ -673,7 +673,7 @@
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Steamware\SteamWareLib\SteamWare.csproj">
<ProjectReference Include="..\..\Steamware\SteamWareLib\SteamWare.csproj">
<Project>{2872dcfe-8b46-43b2-baa0-842a816a2dd5}</Project>
<Name>SteamWare</Name>
</ProjectReference>
MP-Tablet/Web.config
+15 -6
View File
@@ -88,17 +88,26 @@
<!--gestione approvazione ODL-->
<add key="oggettoChgTc" value="Richiesta modifica tempo ciclo da autorizzare"/>
<add key="corpoChgTc" value="E' stata inserita una richeista di modifica Tempo Ciclo in fase di attrezzaggio.{0}Per proseguire cliccare sul link seguente:{0}{0}{1}{0}{0}{0}{0}MoonPro@Steamware"/>
<!--stringhe connessione : prod / portatile-->
<!--Data Source=SQL-STEAM\SQL2012 / Data Source=10.74.82.215\SQL2012-->
<add key="MoonProConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer;"/>
<!--stringhe connessione SQL2012-->
<!--<add key="MoonProConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer;"/>
<add key="PermessiConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer;"/>
<add key="UtenteCdcConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer;"/>
<add key="VocabolarioConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer;"/>
<add key="DevicesConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer;"/>
<add key="DevicesConnectionString" value="Data Source=SQL-STEAM\SQL2012;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer;"/>-->
<!--stringhe connessione SQL2016-->
<add key="MoonProConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Donati_MoonProLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="PermessiConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Donati_MoonProLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="UtenteCdcConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Donati_AnagraficaLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="VocabolarioConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Donati_VocabolarioLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="DevicesConnectionString" value="Data Source=WIN2016-SQL;Initial Catalog=Donati_AnagraficaLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
</appSettings>
<connectionStrings>
<add name="MoonProConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer;" providerName="System.Data.SqlClient"/>
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer;" providerName="System.Data.SqlClient"/>
<!--stringhe connessione SQL2012-->
<!--<add name="MoonProConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer;" providerName="System.Data.SqlClient"/>
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer;" providerName="System.Data.SqlClient"/>-->
<!--stringhe connessione SQL2016-->
<add name="MoonProConnectionString" connectionString="Data Source=WIN2016-SQL;Initial Catalog=Donati_MoonProLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient"/>
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=WIN2016-SQL;Initial Catalog=Donati_MoonProLAV_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient"/>
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
MP-Tablet/WebUserControls/mod_dettTurni.ascx
+6 -6
View File
@@ -1,8 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettTurni.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_dettTurni" %>
<div>
<div style="width: 100px;">
<div style="width: 9em;">
<div>
<b>Turni Attivi</b>
<asp:DetailsView ID="dtView" runat="server" DataSourceID="odsTurni" AutoGenerateRows="False" DataKeyNames="IdxMacchina" Width="100px">
<asp:DetailsView ID="dtView" runat="server" DataSourceID="odsTurni" AutoGenerateRows="False" DataKeyNames="IdxMacchina" Width="100%">
<Fields>
<asp:TemplateField HeaderText="T1">
<ItemTemplate>
@@ -33,11 +33,11 @@
</SelectParameters>
</asp:ObjectDataSource>
</div>
<div style="width: 100px;">
<div class="semaforoVerde">
<div>
<div class="sVe">
Turno Aperto
</div>
<div class="semaforoSpento">
<div class="sGr">
Turno Chiuso
</div>
</div>
MP-Tablet/WebUserControls/mod_dettTurni.ascx.cs
+2 -9
View File
@@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using MapoDb;
using SteamWare;
namespace MoonProTablet.WebUserControls
{
@@ -28,7 +21,7 @@ namespace MoonProTablet.WebUserControls
/// <returns></returns>
public string coloreDaTurno(object turno)
{
string answ = "semaforoSpento";
string answ = "sGr";
bool aperto = false;
try
{
@@ -36,7 +29,7 @@ namespace MoonProTablet.WebUserControls
}
catch
{ }
if (aperto) answ = "semaforoVerde";
if (aperto) answ = "sVe";
return answ;
}
}
MP-Tablet/WebUserControls/mod_dettTurni.ascx.designer.cs
Generated
+11 -11
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <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 {
@@ -13,20 +13,20 @@ namespace MoonProTablet.WebUserControls {
public partial class mod_dettTurni {
/// <summary>
/// dtView control.
/// Controllo dtView.
/// </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::System.Web.UI.WebControls.DetailsView dtView;
/// <summary>
/// odsTurni control.
/// Controllo odsTurni.
/// </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::System.Web.UI.WebControls.ObjectDataSource odsTurni;
}
MP-Tablet/utility.cs
+3 -25
View File
@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using SteamWare;
using SteamWare;
using System;
namespace MoonProTablet
{
@@ -54,8 +51,6 @@ namespace MoonProTablet
string answ = "";
DateTime tempo = new DateTime();
double minuti = 0;
decimal ore = 0;
decimal gg = 0;
try
{
minuti = Convert.ToDouble(min);
@@ -63,30 +58,13 @@ namespace MoonProTablet
}
catch
{ }
#if false
if (minuti < memLayer.ML.confReadInt("maxMinuti"))
{
answ = string.Format("{0:0.##} min", minuti);
}
else if (minuti < memLayer.ML.confReadInt("maxOre"))
{
ore = Math.Floor(minuti / 60);
answ = string.Format("{0} h {1:0} min", ore, minuti - 60 * ore);
}
else
{
gg = Math.Floor(minuti / (24 * 60));
ore = (minuti - (24 * 60 * gg)) / 60;
answ = string.Format("{0} gg {1:0.##} h", gg, ore);
}
#endif
if (minuti < memLayer.ML.confReadInt("maxMinuti"))
{
answ = string.Format("{0}m {1}s", tempo.Minute, tempo.Second);
}
else if (minuti < memLayer.ML.confReadInt("maxOre"))
{
answ = string.Format("{0}h {1}m",tempo.Hour, tempo.Minute);
answ = string.Format("{0}h {1}m", tempo.Hour, tempo.Minute);
}
else
{