luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stable testing remote / local

Browse source
This commit is contained in:
Luc 2021-04-22 16:52:44 +02:00
parent c7a7eb303c
commit 7dfb508954
15 changed files with 114 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
EpdBase/EpdBase.cpp
View file

@ -419,7 +419,7 @@ WORD EpdBase::Epd2U::DeIssue()
Sleep(1000);// Versie < .. Commit & Sleep
}
if (CommitRV) { EndSession(0x16, 12); Commit(); }// Continuous high tone for 1.2 seconds
if (CommitRV) { EndSession(EndSessionControl, 12); Commit(); }// Continuous high tone for 1.2 seconds
else
{
FlushBuffers(port);
@ -455,7 +455,8 @@ WORD EpdBase::Epd2U::Issue()
}
if (OKRV) {
EndSession(0x16, 12);
EndSession(EndSessionControl, 12);
Commit();
} // Continuous high tone for 1.2 seconds
else

4
EpdBase/EpdBase.h
View file

@ -16,7 +16,9 @@ namespace EpdBase
DWORD DeviceIDs[10];
DWORD CurrentDeviceID;
WORD AlarmCtrl = 0b01111110;
//WORD AlarmCtrl = 0b01111110;
WORD AlarmCtrl = 0b01111010; // NO sound
WORD EndSessionControl = 0b00010010;
BYTE displayConfig[56] = { 0,0,1,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };

4
EpdBaseClr/EpdBaseClr.cpp
View file

@ -107,7 +107,7 @@ int EpdBaseClr::Epd2::GetStatus()
HardVersion = epd->HardVersion;
SoftVersion = epd->SoftVersion;
FunctionFlags = epd->FunctionFlags;
CountsClock = epd->EpdClock;
DecodeStatus();
return StatusRV;
}
@ -257,6 +257,7 @@ int EpdBaseClr::Epd2::ReadTresholds()
FB = epd->FB;
HG = epd->HG;
return rv;
}
@ -271,6 +272,7 @@ int EpdBaseClr::Epd2::ReadExtraStatus()
D3 = epd->D3 - epd->BaseD3;
D4 = epd->D4 - epd->BaseD4;
CountsClock = epd->CountsClock;
CountsClockBase = epd->BaseCountsClock;
return rv;
}

2
EpdBaseClr/EpdBaseClr.h
View file

@ -75,7 +75,7 @@ namespace EpdBaseClr {
int HG;
int QualityData;
unsigned int D1, D2, D3, D4, CountsClock;
unsigned int D1, D2, D3, D4, CountsClock, CountsClockBase;
int epdType;
int alarmStatus ;

27
RegisterBAdge/RegisterBAdge.csproj
View file

@ -14,6 +14,21 @@
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@ -97,5 +112,17 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

12
eDosStation/DataInterface.cs
View file

@ -164,7 +164,7 @@ namespace eDosStation
pa = new System.Data.SqlClient.SqlParameter("Inst_CODE", SqlDbType.Int, 4); VisitInitCommand.Parameters.Add(pa);
pa = new System.Data.SqlClient.SqlParameter("EPD_InternalID", SqlDbType.Int, 4); VisitInitCommand.Parameters.Add(pa);
pa = new System.Data.SqlClient.SqlParameter("isBG", SqlDbType.Bit, 4); VisitInitCommand.Parameters.Add(pa);
pa = new System.Data.SqlClient.SqlParameter("ENTRY_EPD_CLOCK", SqlDbType.Int, 4); VisitInitCommand.Parameters.Add(pa);
pa = new System.Data.SqlClient.SqlParameter("ENTRY_EPD_CLOCK", SqlDbType.Decimal, 9); VisitInitCommand.Parameters.Add(pa);
pa = new System.Data.SqlClient.SqlParameter("EPDVisitID", SqlDbType.Int, 4); pa.Direction = ParameterDirection.Output; VisitInitCommand.Parameters.Add(pa);
VisitExitCommand = new SqlCommand("VisitExit", localConnection);
@ -197,7 +197,9 @@ namespace eDosStation
pa = new System.Data.SqlClient.SqlParameter("otherAlarms", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
pa = new System.Data.SqlClient.SqlParameter("errorStatus", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
pa = new System.Data.SqlClient.SqlParameter("operatingStatus", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
pa = new System.Data.SqlClient.SqlParameter("EXIT_EPD_CLOCK", SqlDbType.Int, 4); VisitExitCommand.Parameters.Add(pa);
pa = new System.Data.SqlClient.SqlParameter("ENTRY_EPD_CLOCK", SqlDbType.Decimal, 9); VisitExitCommand.Parameters.Add(pa);
pa = new System.Data.SqlClient.SqlParameter("EXIT_EPD_CLOCK", SqlDbType.Decimal, 9); VisitExitCommand.Parameters.Add(pa);
pa = new System.Data.SqlClient.SqlParameter("PersID", SqlDbType.Int, 4); VisitExitCommand.Parameters.Add(pa);
}
public void VisitExit(int EpdVisitID, EpdBaseClr.Epd2 ep)
@ -242,8 +244,14 @@ namespace eDosStation
VisitExitCommand.Parameters["otherAlarms"].Value = ep.otherAlarms;
VisitExitCommand.Parameters["errorStatus"].Value = ep.errorStatus;
VisitExitCommand.Parameters["operatingStatus"].Value = ep.operatingStatus;
VisitExitCommand.Parameters["ENTRY_EPD_CLOCK"].Value = ep.CountsClockBase;
VisitExitCommand.Parameters["EXIT_EPD_CLOCK"].Value = ep.CountsClock;
if (int.TryParse(ep.WearerName, out int WearerPersID))
VisitExitCommand.Parameters["PersID"].Value = WearerPersID;
else
VisitExitCommand.Parameters["PersID"].Value = DBNull.Value;
checkCon(true);
VisitExitCommand.Connection = localConnection;
VisitExitCommand.ExecuteNonQuery();

1
eDosStation/EpdExit.xaml.cs
View file

@ -52,7 +52,6 @@ namespace eDosStation
private void LoadDoses()
{
if (dispatcherTimer == null)
{
dispatcherTimer = new DispatcherTimer();

45
eDosStation/eDosStation.csproj
View file

@ -89,10 +89,31 @@
<ManifestTimestampUrl>http://timestamp.digicert.com</ManifestTimestampUrl>
</PropertyGroup>
<ItemGroup>
<Reference Include="SharpDX, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.2.5.0\lib\net40\SharpDX.dll</HintPath>
</Reference>
<Reference Include="SharpDX.D3DCompiler, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.D3DCompiler.2.5.0\lib\net40\SharpDX.D3DCompiler.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Direct2D1, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Direct2D1.2.5.0\lib\net40\SharpDX.Direct2D1.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Direct3D10, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Direct3D10.2.5.0\lib\net40\SharpDX.Direct3D10.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Direct3D9, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.Direct3D9.2.5.0\lib\net40\SharpDX.Direct3D9.dll</HintPath>
</Reference>
<Reference Include="SharpDX.DXGI, Version=2.5.0.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.DXGI.2.5.0\lib\net40\SharpDX.DXGI.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Management" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
@ -102,25 +123,17 @@
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="Telerik.Windows.Controls, Version=2019.1.116.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
<HintPath>..\lib\RCWPF\2019.1.116.45\Telerik.Windows.Controls.dll</HintPath>
<Private>True</Private>
<Reference Include="Telerik.Windows.Controls, Version=2021.1.325.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
<HintPath>..\packages\Telerik.Windows.Controls.for.Wpf.Xaml.2021.1.325\lib\net45\Telerik.Windows.Controls.dll</HintPath>
</Reference>
<Reference Include="Telerik.Windows.Controls.Data, Version=2019.1.116.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
<HintPath>..\lib\RCWPF\2019.1.116.45\Telerik.Windows.Controls.Data.dll</HintPath>
<Private>True</Private>
<Reference Include="Telerik.Windows.Controls.GridView, Version=2021.1.325.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
<HintPath>..\packages\Telerik.Windows.Controls.GridView.for.Wpf.Xaml.2021.1.325\lib\net45\Telerik.Windows.Controls.GridView.dll</HintPath>
</Reference>
<Reference Include="Telerik.Windows.Controls.GridView, Version=2019.1.116.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
<HintPath>..\lib\RCWPF\2019.1.116.45\Telerik.Windows.Controls.GridView.dll</HintPath>
<Private>True</Private>
<Reference Include="Telerik.Windows.Controls.Input, Version=2021.1.325.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
<HintPath>..\packages\Telerik.Windows.Controls.Input.for.Wpf.Xaml.2021.1.325\lib\net45\Telerik.Windows.Controls.Input.dll</HintPath>
</Reference>
<Reference Include="Telerik.Windows.Controls.Input, Version=2019.1.116.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
<HintPath>..\lib\RCWPF\2019.1.116.45\Telerik.Windows.Controls.Input.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Telerik.Windows.Data, Version=2019.1.116.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
<HintPath>..\lib\RCWPF\2019.1.116.45\Telerik.Windows.Data.dll</HintPath>
<Private>True</Private>
<Reference Include="Telerik.Windows.Data, Version=2021.1.325.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
<HintPath>..\packages\Telerik.Windows.Data.for.Wpf.Xaml.2021.1.325\lib\net45\Telerik.Windows.Data.dll</HintPath>
</Reference>
<Reference Include="UIAutomationProvider">
<Private>False</Private>

10
eDosStation/packages.config
View file

@ -2,4 +2,14 @@
<packages>
<package id="LSWDesfirePublic" version="1.2.6" targetFramework="net48" />
<package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net472" developmentDependency="true" />
<package id="SharpDX" version="2.5.0" targetFramework="net48" />
<package id="SharpDX.D3DCompiler" version="2.5.0" targetFramework="net48" />
<package id="SharpDX.Direct2D1" version="2.5.0" targetFramework="net48" />
<package id="SharpDX.Direct3D10" version="2.5.0" targetFramework="net48" />
<package id="SharpDX.Direct3D9" version="2.5.0" targetFramework="net48" />
<package id="SharpDX.DXGI" version="2.5.0" targetFramework="net48" />
<package id="Telerik.Windows.Controls.for.Wpf.Xaml" version="2021.1.325" targetFramework="net48" />
<package id="Telerik.Windows.Controls.GridView.for.Wpf.Xaml" version="2021.1.325" targetFramework="net48" />
<package id="Telerik.Windows.Controls.Input.for.Wpf.Xaml" version="2021.1.325" targetFramework="net48" />
<package id="Telerik.Windows.Data.for.Wpf.Xaml" version="2021.1.325" targetFramework="net48" />
</packages>

3
syncEdosLocal/App.Debug.config
View file

@ -2,9 +2,10 @@
<!--For more information on using transformations see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<connectionStrings>
<add name="eDosConnectionString" connectionString="Data Source=HPHDB;Initial Catalog=eDos;Integrated Security=True;Application Name=SyncDB" xdt:Transform="Replace" xdt:Locator="Match(name)"/>
<add name="eDosConnectionString" connectionString="Data Source=eDos;Initial Catalog=eDos;Integrated Security=True;Application Name=SyncDB" xdt:Transform="Replace" xdt:Locator="Match(name)"/>
</connectionStrings>
<appSettings>
<add key="smtpServer" value="127.0.0.1" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="smtpFrom" value="lvandenb@sckcen.be" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
</appSettings>
</configuration>

10
syncEdosLocal/App.config
View file

@ -3,13 +3,13 @@
<configSections>
</configSections>
<connectionStrings>
<add name="eDosConnectionString" connectionString="Data Source=HPHDB;Initial Catalog=eDos;Integrated Security=True;Application Name=SyncDB" />
<add name="LocalConnectionString" connectionString="Data Source=HPHDB;Initial Catalog=eDosLocal;Integrated Security=True;Application Name=SyncDB" />
<add name="eDosConnectionString" connectionString="Data Source=eDos;Initial Catalog=eDos;Integrated Security=True;Application Name=SyncDB" />
<add name="LocalConnectionString" connectionString="Data Source=eDosLocal;Initial Catalog=eDosLocal;Integrated Security=True;Application Name=SyncDB" />
<add name="syncEdosLocal.Properties.Settings.eDosLocalConnectionString"
connectionString="Data Source=hphdb;Initial Catalog=eDosLocal;Integrated Security=True"
connectionString="Data Source=eDosLocal;Initial Catalog=eDosLocal;Integrated Security=True"
providerName="System.Data.SqlClient" />
<add name="syncEdosLocal.Properties.Settings.eDosConnectionString"
connectionString="Data Source=hphdb;Initial Catalog=eDos;Integrated Security=True"
connectionString="Data Source=eDos;Initial Catalog=eDos;Integrated Security=True"
providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>
@ -17,6 +17,6 @@
</startup>
<appSettings>
<add key="smtpFrom" value="lvandenb@sckcen.be"/>
<add key="smtpServer" value="10.2.12.200"/>
<add key="smtpServer" value="smtp.sckcen.be"/>
</appSettings>
</configuration>

9
syncEdosLocal/DataSet1.Designer.cs generated
View file

@ -4568,6 +4568,7 @@ namespace syncEdosLocal.DataSet1TableAdapters {
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = "export.VisitsUpdate";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.StoredProcedure;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ID_Station", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, "ID_Station", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ID_Visit", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, "ID_Visit", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@syncedEntry", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, "syncedEntry", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@ -4856,8 +4857,8 @@ namespace syncEdosLocal.DataSet1TableAdapters {
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isAlarmCleared", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, "isAlarmCleared", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isManualExit", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, "isManualExit", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ID_Station_Return", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, "ID_Station_Return", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ENTRY_EPD_CLOCK", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 4, 0, "ENTRY_EPD_CLOCK", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EXIT_EPD_CLOCK", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 4, 0, "EXIT_EPD_CLOCK", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ENTRY_EPD_CLOCK", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 0, "ENTRY_EPD_CLOCK", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EXIT_EPD_CLOCK", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 0, "EXIT_EPD_CLOCK", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TIME_LOST", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, "TIME_LOST", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
@ -4902,8 +4903,8 @@ namespace syncEdosLocal.DataSet1TableAdapters {
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isAlarmCleared", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, "isAlarmCleared", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isManualExit", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, "isManualExit", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ID_Station_Return", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, "ID_Station_Return", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ENTRY_EPD_CLOCK", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 4, 0, "ENTRY_EPD_CLOCK", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EXIT_EPD_CLOCK", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 4, 0, "EXIT_EPD_CLOCK", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ENTRY_EPD_CLOCK", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 0, "ENTRY_EPD_CLOCK", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EXIT_EPD_CLOCK", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 0, "EXIT_EPD_CLOCK", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TIME_LOST", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, "TIME_LOST", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}

15
syncEdosLocal/DataSet1.xsd
View file

@ -20,9 +20,10 @@
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="true">
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>export.VisitsUpdate</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ID_Station" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="ID_Station" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ID_Visit" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="ID_Visit" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@syncedEntry" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="syncedEntry" SourceColumnNullMapping="false" SourceVersion="Current" />
@ -127,8 +128,8 @@
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@isAlarmCleared" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="isAlarmCleared" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@isManualExit" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="isManualExit" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ID_Station_Return" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="ID_Station_Return" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="numeric" DbType="Decimal" Direction="Input" ParameterName="@ENTRY_EPD_CLOCK" Precision="4" ProviderType="Decimal" Scale="0" Size="5" SourceColumn="ENTRY_EPD_CLOCK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="numeric" DbType="Decimal" Direction="Input" ParameterName="@EXIT_EPD_CLOCK" Precision="4" ProviderType="Decimal" Scale="0" Size="5" SourceColumn="EXIT_EPD_CLOCK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="numeric" DbType="Decimal" Direction="Input" ParameterName="@ENTRY_EPD_CLOCK" Precision="10" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="ENTRY_EPD_CLOCK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="numeric" DbType="Decimal" Direction="Input" ParameterName="@EXIT_EPD_CLOCK" Precision="10" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="EXIT_EPD_CLOCK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@TIME_LOST" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="TIME_LOST" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
@ -186,8 +187,8 @@
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@isAlarmCleared" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="isAlarmCleared" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@isManualExit" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="isManualExit" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ID_Station_Return" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="ID_Station_Return" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="numeric" DbType="Decimal" Direction="Input" ParameterName="@ENTRY_EPD_CLOCK" Precision="4" ProviderType="Decimal" Scale="0" Size="5" SourceColumn="ENTRY_EPD_CLOCK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="numeric" DbType="Decimal" Direction="Input" ParameterName="@EXIT_EPD_CLOCK" Precision="4" ProviderType="Decimal" Scale="0" Size="5" SourceColumn="EXIT_EPD_CLOCK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="numeric" DbType="Decimal" Direction="Input" ParameterName="@ENTRY_EPD_CLOCK" Precision="10" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="ENTRY_EPD_CLOCK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="numeric" DbType="Decimal" Direction="Input" ParameterName="@EXIT_EPD_CLOCK" Precision="10" ProviderType="Decimal" Scale="0" Size="9" SourceColumn="EXIT_EPD_CLOCK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@TIME_LOST" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="TIME_LOST" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
@ -251,7 +252,7 @@
<xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DataSet1" msprop:Generator_UserDSName="DataSet1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="LocalVisits" msprop:Generator_TableClassName="LocalVisitsDataTable" msprop:Generator_TableVarName="tableLocalVisits" msprop:Generator_RowChangedName="LocalVisitsRowChanged" msprop:Generator_TablePropName="LocalVisits" msprop:Generator_RowDeletingName="LocalVisitsRowDeleting" msprop:Generator_RowChangingName="LocalVisitsRowChanging" msprop:Generator_RowEvHandlerName="LocalVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="LocalVisitsRowDeleted" msprop:Generator_RowClassName="LocalVisitsRow" msprop:Generator_UserTableName="LocalVisits" msprop:Generator_RowEvArgName="LocalVisitsRowChangeEvent">
<xs:element name="LocalVisits" msprop:Generator_TableClassName="LocalVisitsDataTable" msprop:Generator_TableVarName="tableLocalVisits" msprop:Generator_TablePropName="LocalVisits" msprop:Generator_RowDeletingName="LocalVisitsRowDeleting" msprop:Generator_RowChangingName="LocalVisitsRowChanging" msprop:Generator_RowEvHandlerName="LocalVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="LocalVisitsRowDeleted" msprop:Generator_UserTableName="LocalVisits" msprop:Generator_RowChangedName="LocalVisitsRowChanged" msprop:Generator_RowEvArgName="LocalVisitsRowChangeEvent" msprop:Generator_RowClassName="LocalVisitsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="ID_Station" msprop:Generator_ColumnVarNameInTable="columnID_Station" msprop:Generator_ColumnPropNameInRow="ID_Station" msprop:Generator_ColumnPropNameInTable="ID_StationColumn" msprop:Generator_UserColumnName="ID_Station" type="xs:int" />
@ -301,7 +302,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="CentralVisits" msprop:Generator_TableClassName="CentralVisitsDataTable" msprop:Generator_TableVarName="tableCentralVisits" msprop:Generator_RowChangedName="CentralVisitsRowChanged" msprop:Generator_TablePropName="CentralVisits" msprop:Generator_RowDeletingName="CentralVisitsRowDeleting" msprop:Generator_RowChangingName="CentralVisitsRowChanging" msprop:Generator_RowEvHandlerName="CentralVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="CentralVisitsRowDeleted" msprop:Generator_RowClassName="CentralVisitsRow" msprop:Generator_UserTableName="CentralVisits" msprop:Generator_RowEvArgName="CentralVisitsRowChangeEvent">
<xs:element name="CentralVisits" msprop:Generator_TableClassName="CentralVisitsDataTable" msprop:Generator_TableVarName="tableCentralVisits" msprop:Generator_TablePropName="CentralVisits" msprop:Generator_RowDeletingName="CentralVisitsRowDeleting" msprop:Generator_RowChangingName="CentralVisitsRowChanging" msprop:Generator_RowEvHandlerName="CentralVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="CentralVisitsRowDeleted" msprop:Generator_UserTableName="CentralVisits" msprop:Generator_RowChangedName="CentralVisitsRowChanged" msprop:Generator_RowEvArgName="CentralVisitsRowChangeEvent" msprop:Generator_RowClassName="CentralVisitsRow">
<xs:complexType>
<xs:sequence>
<xs:element name="ID_Station" msprop:Generator_ColumnVarNameInTable="columnID_Station" msprop:Generator_ColumnPropNameInRow="ID_Station" msprop:Generator_ColumnPropNameInTable="ID_StationColumn" msprop:Generator_UserColumnName="ID_Station" type="xs:int" />

4
syncEdosLocal/DataSet1.xss
View file

@ -6,8 +6,8 @@
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:LocalVisits" ZOrder="1" X="365" Y="23" Height="365" Width="241" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:CentralVisits" ZOrder="2" X="627" Y="23" Height="365" Width="273" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:LocalVisits" ZOrder="1" X="367" Y="21" Height="365" Width="241" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:CentralVisits" ZOrder="2" X="630" Y="19" Height="365" Width="273" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
</Shapes>
<Connectors />
</DiagramLayout>

11
syncEdosLocal/Program.cs
View file

@ -185,7 +185,6 @@ namespace syncEdosLocal
spLog = new spl("SynceDosLocal");
Bulker = new LSWLib.Bulker(spLog, true);
messages = Bulker.messages;
messages.AppendLine(spLog.GetStartInfoString());
try
{
@ -224,7 +223,7 @@ namespace syncEdosLocal
m.Subject = "SynceDosLocal " + (error ? "Error" : "No errors") + (warning ? " Warnings" : "");
m.IsBodyHtml = true;
m.Body = Bulker.htmlLog.ToString();
using (var mc = new System.Net.Mail.SmtpClient(smtpServer)) mc.Send(m);
using (var mc = new System.Net.Mail.SmtpClient(smtpServer)) { mc.Port = 26; mc.Send(m); }
}
spLog.CloseSplunkLog();
}
@ -252,12 +251,14 @@ namespace syncEdosLocal
if (cr == null)
{
VisitsNew++; copyrow(lr, ds.CentralVisits);
if ((lr.VisitStatus & 1) > 0) lr.syncedEntry = true;
if ((lr.VisitStatus & 2) > 0) lr.syncedExit = true;
}
else switch (cr.VisitStatus)
{
case 3: lr.syncedEntry = lr.syncedExit = true; VisitsSkipped++; break;
case 1: if ((lr.VisitStatus & 2) == 2) { copyExit(lr, cr); lr.syncedExit = true; VisitsAddedExits++; } break;
case 2: if ((lr.VisitStatus & 1) == 1) { copyEntry(lr, cr); lr.syncedEntry = true; VisitsAddedEntries++; } break;
case 1: if ((lr.VisitStatus & 2) == 2) { copyExit(lr, cr); lr.syncedEntry=lr.syncedExit = true; VisitsAddedExits++; } break;
case 2: if ((lr.VisitStatus & 1) == 1) { copyEntry(lr, cr); lr.syncedEntry=lr.syncedExit= true; VisitsAddedEntries++; } break;
}
}
ta.Update(ds.LocalVisits);
@ -313,6 +314,7 @@ namespace syncEdosLocal
cr["operatingStatus"] = lr["operatingStatus"];
cr["isAlarm"] = lr["isAlarm"];
cr["isAlarmCleared"] = lr["isAlarmCleared"];
cr["ENTRY_EPD_CLOCK"] = lr["ENTRY_EPD_CLOCK"];
cr["EXIT_EPD_CLOCK"] = lr["EXIT_EPD_CLOCK"];
cr["TIME_LOST"] = lr["TIME_LOST"];
}
@ -328,5 +330,4 @@ namespace syncEdosLocal
spLog.Connection_InfoMessageLog(e, ref messages);
}
}
}