FINALMENTE: Fix spostamento / EDIT...

This commit is contained in:
Samuele E. Locatelli
2017-06-10 09:50:58 +02:00
parent 5511491cd8
commit 7279795abb
24 changed files with 29240 additions and 50 deletions
Binary file not shown.
+2 -2
View File
@@ -163,7 +163,7 @@
</site>
<site name="WebSCR" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\WebSCR" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:62688:localhost" />
@@ -171,7 +171,7 @@
</site>
<site name="DataUploader" id="3">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\DataUploader" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\WebSCR\DataUploader" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:52172:localhost" />
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
d2fa2e673e9f8b4569aec155fc44f26874470cab
2d3c9427aa8165f65d239cfe8bd7f59fd44c28be
+10 -5
View File
@@ -11,10 +11,9 @@
function newRange(start, end) {
document.location = '<%= SteamWare.devicesAuthProxy.pagCorrente %>?Action=NEW&Data=<%= this.Data %>&codSquadra=<%= this.codSquadra %>&currDoc=<%= this.currDoc %>&matrOp=<%= this.matrOp %>&start=' + start + '&end=' + end;
}
<%--function move(start, end) {
document.location = '<%= SteamWare.devicesAuthProxy.pagCorrente %>?Action=MOVE&Data=<%= this.Data %>&codSquadra=<%= this.codSquadra %>&currDoc=<%= this.currDoc %>&matrOp=<%= this.matrOp %>&start=' + start + '&end=' + end;
<%--function move(id, newStart, newEnd) {
document.location = '<%= SteamWare.devicesAuthProxy.pagCorrente %>?Action=MOVE&start=' + newStart + '&end=' + newEnd + '&IdxImpegno=' + e.id();
}--%>
</script>
<asp:Label runat="server" ID="lblCodCli" Visible="false" />
@@ -41,12 +40,14 @@
EventClickJavaScript="eventClick(e)"
Theme="calendar_white"
EventMoveHandling="PostBack"
OnEventMove="DayPilotCalendar1_EventMove"
OnEventMove="DayPilotCalendar1_EventMove"
OnBeforeEventRender="DayPilotCalendar1_BeforeEventRender"
Width="95%"
HourFontSize="6"
DayFontSize="8pt"
EventFontSize="7pt" Days="5"></DayPilot:DayPilotCalendar>
EventFontSize="7pt" Days="5" EventMoveJavaScript="alert('Event with id ' + e.id() + ' was moved...');"
>
</DayPilot:DayPilotCalendar>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByDate" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.v_ImpegniCalTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="lblData" Name="Data" PropertyName="Text" Type="DateTime" />
@@ -54,3 +55,7 @@
</SelectParameters>
</asp:ObjectDataSource>
</div>
<%--EventMoveHandling="PostBack"
OnEventMove="DayPilotCalendar1_EventMove"--%>
+23 -25
View File
@@ -89,24 +89,33 @@ namespace WebSCR.WebUserControls
}
protected void DayPilotCalendar1_EventMove(object sender, DayPilot.Web.Ui.Events.EventMoveEventArgs e)
{
// controllo che sia presente matricola altrimenti NON lo permetto...
if (matrOp != "")
// controllo se sia EFFETTIVO spostamento (altrimenti è edit...)
if (e.NewStart == e.OldStart && e.NewEnd == e.OldEnd)
{
// sposto evento!
DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart, matrOp, DateTime.Now);
if (memLayer.ML.confReadBool("svuotaMatrOpMove"))
{
// rimuovo matrOp
memLayer.ML.emptySessionVal("matrOp");
errorMess = "spostamento effettuato";
}
doUpdate();
Response.Redirect(devicesAuthProxy.pagCorrente);
// rimando a edit!!!
Response.Redirect(string.Format("{0}?Action=EDIT&CodCliente={1}&Indir={2}&Data={3}&IdxImpegno={4}", devicesAuthProxy.pagCorrente, CodCliente, Indir, Data, e.Id));
}
else
{
errorMess = "Attenzione manca matricola! prego selezionare prima di effettuare spostamento.";
Response.Redirect(devicesAuthProxy.pagCorrente);
// controllo che sia presente matricola altrimenti NON lo permetto...
if (matrOp != "")
{
// sposto evento!
DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart, matrOp, DateTime.Now);
if (memLayer.ML.confReadBool("svuotaMatrOpMove"))
{
// rimuovo matrOp
memLayer.ML.emptySessionVal("matrOp");
errorMess = "spostamento effettuato";
}
doUpdate();
Response.Redirect(devicesAuthProxy.pagCorrente);
}
else
{
errorMess = "Attenzione manca matricola! prego selezionare prima di effettuare spostamento.";
Response.Redirect(devicesAuthProxy.pagCorrente);
}
}
}
/// <summary>
@@ -138,8 +147,6 @@ namespace WebSCR.WebUserControls
public void doUpdate()
{
//ods.DataBind();
//rblSquadre.SelectedIndex = -1;
DayPilotCalendar1.DataBind();
DayPilotCalendar1.Update();
reportEvent();
@@ -187,15 +194,6 @@ namespace WebSCR.WebUserControls
{
// this assumes your event object in Events collection has "color" field or property
e.BackgroundColor = (string)e.DataItem["CssColor"];
#if false
string tUser = "<i class=\"fa fa-user\"></i>";
e.Html = e.Html.Replace("6P", string.Format("{0}{0}{0}{0}{0}{0}", tUser));
e.Html = e.Html.Replace("5P", string.Format("{0}{0}{0}{0}{0}", tUser));
e.Html = e.Html.Replace("4P", string.Format("{0}{0}{0}{0}", tUser));
e.Html = e.Html.Replace("3P", string.Format("{0}{0}{0}", tUser));
e.Html = e.Html.Replace("2P", string.Format("{0}{0}", tUser));
e.Html = e.Html.Replace("1P", string.Format("{0}", tUser));
#endif
}
catch
{ }
+17 -17
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 WebSCR.WebUserControls {
@@ -13,38 +13,38 @@ namespace WebSCR.WebUserControls {
public partial class mod_giornata {
/// <summary>
/// lblCodCli control.
/// Controllo lblCodCli.
/// </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.Label lblCodCli;
/// <summary>
/// lblData control.
/// Controllo lblData.
/// </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.Label lblData;
/// <summary>
/// DayPilotCalendar1 control.
/// Controllo DayPilotCalendar1.
/// </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::DayPilot.Web.Ui.DayPilotCalendar DayPilotCalendar1;
/// <summary>
/// ods control.
/// Controllo ods.
/// </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 ods;
}
File diff suppressed because it is too large Load Diff
Binary file not shown.
@@ -27,3 +27,41 @@ C:\Users\samuele\documents\visual studio 2012\Projects\WebSCR\WebSCR\obj\Debug\W
C:\Users\samuele\documents\visual studio 2012\Projects\WebSCR\WebSCR\obj\Debug\WebSCR.dll
C:\Users\samuele\documents\visual studio 2012\Projects\WebSCR\WebSCR\obj\Debug\WebSCR.pdb
C:\Users\samuele\Documents\Visual Studio 2012\Projects\WebSCR\WebSCR\bin\DayPilot.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\NLog.config
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\WebSCR.dll.config
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\WebSCR.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\WebSCR.pdb
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\Antlr3.Runtime.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\DayPilot.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\Elmah.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\Microsoft.AspNet.FriendlyUrls.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\Microsoft.AspNet.Web.Optimization.WebForms.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\Microsoft.Web.Infrastructure.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\Microsoft.Web.RedisSessionStateProvider.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\Newtonsoft.Json.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\NLog.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\NLog.Web.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\StackExchange.Redis.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\StackExchange.Redis.StrongName.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\SteamWare.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\System.Web.Optimization.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\WebGrease.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\WebSCR_data.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\ICSharpCode.SharpZipLib.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\SteamWare.pdb
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\SteamWare.xml
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\SteamWare.dll.config
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\WebSCR_data.pdb
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\WebSCR_data.dll.config
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\Antlr3.Runtime.pdb
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\Microsoft.AspNet.FriendlyUrls.xml
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\Microsoft.Web.RedisSessionStateProvider.pdb
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\Newtonsoft.Json.xml
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\NLog.xml
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\NLog.Web.xml
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\StackExchange.Redis.xml
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\StackExchange.Redis.StrongName.xml
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\bin\System.Web.Optimization.xml
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\obj\Debug\WebSCR.csprojResolveAssemblyReference.cache
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\obj\Debug\WebSCR.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR\obj\Debug\WebSCR.pdb
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration xmlns="http://schemas.microsoft.com/.NetConfiguration/v2.0">
<configSections>
<sectionGroup name="microsoft.web" type="Microsoft.Web.Configuration.MicrosoftWebSectionGroup">
<section name="converters" type="Microsoft.Web.Configuration.ConvertersSection"/>
</sectionGroup>
<section name="microsoft.web.services2" type="Microsoft.Web.Services2.Configuration.WebServicesConfiguration, Microsoft.Web.Services2, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</configSections>
<appSettings>
<webServices>
<soapExtensionTypes>
<add type="Microsoft.Web.Services2.WebServicesExtension, Microsoft.Web.Services2, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" priority="1" group="0"/>
</soapExtensionTypes>
</webServices>
<add key="_logDir" value="./logs/"/>
<add key="_smtpCli" value="10.10.11.22"/>
</appSettings>
<microsoft.web>
<converters>
<add type="Microsoft.Web.Script.Serialization.Converters.DataSetConverter"/>
<add type="Microsoft.Web.Script.Serialization.Converters.DataRowConverter"/>
<add type="Microsoft.Web.Script.Serialization.Converters.DataTableConverter"/>
</converters>
</microsoft.web>
<!-- SteamWare -->
<connectionStrings>
<add name="SteamWare.Properties.Settings.loggerConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=Flamma_SC;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
<add name="SteamWare.Properties.Settings.SteamWare_VocabolarioConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=SteamWare_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
<add name="SteamWare.Properties.Settings.DS_AuthConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=SteamWare_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
<add name="SteamWare.Properties.Settings.AnagraficaBremboConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=AnagraficaBrembo;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
<add name="SteamWare.Properties.Settings.SteamWare_BremboConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=SteamWare_Brembo;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
<add name="SteamWare.Properties.Settings.Flamma_AnagraficaConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=Flamma_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
<add name="SteamWare.Properties.Settings.ETS_AnagraficaConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=SteamWare_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
<add name="SteamWare.Properties.Settings.ETS_AnagraficaConnectionString1" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=SteamWare_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
<add name="SteamWare.Properties.Settings.SEL_fatture_SteamWareConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=SEL_fatture_SteamWare;User ID=sa;Password=keyhammer;Encrypt=False;TrustServerCertificate=True" providerName="System.Data.SqlClient"/>
<add name="SteamWare.Properties.Settings.Equa_AnagraficaConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=Equa_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
<add name="SteamWare.Properties.Settings.DbConfConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GMW;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
<add name="SteamWare.Properties.Settings.GMWConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GMW;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
</connectionStrings>
<system.web>
<pages>
<controls>
<add namespace="Microsoft.Web.UI" assembly="Microsoft.Web.Atlas" tagPrefix="atlas"/>
<add namespace="Microsoft.Web.UI.Controls" assembly="Microsoft.Web.Atlas" tagPrefix="atlas"/>
</controls>
</pages>
<!-- ASMX is mapped to a new handler so that proxy javascripts can also be served. -->
<httpHandlers>
<remove verb="*" path="*.asmx"/>
<add verb="*" path="*.asmx" type="Microsoft.Web.Services.ScriptHandlerFactory" validate="false"/>
</httpHandlers>
<httpModules>
<add name="ScriptModule" type="Microsoft.Web.Services.ScriptModule"/>
</httpModules>
</system.web>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
File diff suppressed because it is too large Load Diff
Binary file not shown.
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
</configSections>
<connectionStrings>
<add name="WebSCR_data.Properties.Settings.WebSCRConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=WebSCR;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
</connectionStrings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
@@ -10,3 +10,18 @@ C:\Users\samuele\documents\visual studio 2012\Projects\WebSCR\WebSCR_data\bin\De
C:\Users\samuele\documents\visual studio 2012\Projects\WebSCR\WebSCR_data\obj\Debug\WebSCR_data.csprojResolveAssemblyReference.cache
C:\Users\samuele\documents\visual studio 2012\Projects\WebSCR\WebSCR_data\obj\Debug\WebSCR_data.dll
C:\Users\samuele\documents\visual studio 2012\Projects\WebSCR\WebSCR_data\obj\Debug\WebSCR_data.pdb
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\WebSCR_data.dll.config
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\WebSCR_data.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\WebSCR_data.pdb
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\SteamWare.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\ICSharpCode.SharpZipLib.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\StackExchange.Redis.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\Newtonsoft.Json.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\SteamWare.pdb
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\SteamWare.xml
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\SteamWare.dll.config
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\StackExchange.Redis.xml
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\bin\Debug\Newtonsoft.Json.xml
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\obj\Debug\WebSCR_data.csprojResolveAssemblyReference.cache
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\obj\Debug\WebSCR_data.dll
C:\Users\samuele.steamw\Documents\VisualStudioProject\WebSCR\WebSCR_data\obj\Debug\WebSCR_data.pdb