diff --git a/MigrationBackup/dfc72ea0/eDosStation/eDosStation.csproj b/MigrationBackup/dfc72ea0/eDosStation/eDosStation.csproj new file mode 100644 index 0000000..4b1d33e --- /dev/null +++ b/MigrationBackup/dfc72ea0/eDosStation/eDosStation.csproj @@ -0,0 +1,470 @@ + + + + + + Debug + AnyCPU + {9B12FDB8-0FD9-4C1E-A904-6FC74C35D50F} + WinExe + eDosStation + eDosStation + v4.8 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + true + false + + + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + false + false + 5 + 1.0.0.5 + false + false + + + x86 + true + full + false + bin\Debug\ + TRACE;DEBUG;noSimulateEPD,noDummyData + prompt + 4 + true + + + x86 + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + true + + + 857150B64EF7D3E679C8CBDE425D2A0B5E58FFAA + + + + + + + false + + + false + + + + + mk2-epd-bg.ico + + + false + + + eDosStation.snk + + + LocalIntranet + + + http://timestamp.digicert.com + + + + app.manifest + + + + ..\packages\LSWLib2.4.4.6\lib\net48\LSWLib.dll + + + + + + + + ..\packages\System.Data.OleDb.10.0.11\lib\net462\System.Data.OleDb.dll + + + + ..\packages\System.Data.SqlClient.4.9.1\lib\net462\System.Data.SqlClient.dll + + + ..\packages\System.Diagnostics.EventLog.10.0.11\lib\net462\System.Diagnostics.EventLog.dll + + + + + + + + + + ..\packages\System.Net.NetworkInformation.4.3.0\lib\net46\System.Net.NetworkInformation.dll + True + True + + + + + + + + ..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll + + + ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll + + + + + + + + + + + + + + + + 4.0 + + + False + ..\..\ToegangApplicaties\lib\RCWF\2025.4.1111.48\Telerik.Licensing.Runtime.dll + + + ..\lib\RCWPF\2026.3.812.462\Telerik.Windows.Controls.dll + True + + + ..\lib\RCWPF\2026.3.812.462\Telerik.Windows.Controls.Data.dll + True + + + ..\lib\RCWPF\2026.3.812.462\Telerik.Windows.Controls.GridView.dll + True + + + ..\lib\RCWPF\2026.3.812.462\Telerik.Windows.Controls.Input.dll + True + + + ..\lib\RCWPF\2026.3.812.462\Telerik.Windows.Controls.Navigation.dll + True + + + ..\lib\RCWPF\2026.3.812.462\Telerik.Windows.Data.dll + True + + + False + + + + + + + + + MSBuild:Compile + Designer + + + About.xaml + + + + AskPwd.xaml + + + + + DataSet1.xsd + + + True + True + DataSet1.xsd + + + + + + DosimeterDisplay.xaml + + + DosimeterReturnSummary.xaml + + + EntryBadge.xaml + + + EpdExit.xaml + + + + InstMessage.xaml + + + + MainWindow2.xaml + + + + Settings.xaml + + + HPHToolbox.xaml + + + ShowEPDDose.xaml + + + + + + + TimeColor.xaml + + + + + UserInfo.xaml + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + + + MSBuild:Compile + Designer + Always + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + App.config + true + + + + App.config + true + + + DataSet1.xsd + + + Designer + MSDataSetGenerator + DataSet1.Designer.cs + + + DataSet1.xsd + + + + Always + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + Designer + true + + + + + + + + + Always + + + Always + + + PreserveNewest + + + Always + + + Always + + + + Always + + + + + + + + + + + + Always + + + Always + + + + + + False + Microsoft .NET Framework 4.7.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + {f1f47b79-9930-48b0-8dde-56e2c4bed2a2} + EpdBaseClr + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + c:\l\sign.cmd $(TargetPath) + + + + + echo %25date%25 %25time%25 > "$(ProjectDir)\Resources\BuildDate.txt" + + + \ No newline at end of file diff --git a/eDosStation/packages.config b/MigrationBackup/dfc72ea0/eDosStation/packages.config similarity index 95% rename from eDosStation/packages.config rename to MigrationBackup/dfc72ea0/eDosStation/packages.config index d86e305..35f6b8e 100644 --- a/eDosStation/packages.config +++ b/MigrationBackup/dfc72ea0/eDosStation/packages.config @@ -1,23 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eDosStation.sln b/eDosStation.sln index 523a4d1..895403b 100644 --- a/eDosStation.sln +++ b/eDosStation.sln @@ -17,8 +17,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eDosPrep", "eDosPrep\eDosPr EndProject Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "eDosLocal", "eDosLocal\eDosLocal.sqlproj", "{3A150025-D770-4521-BA21-16843B2D5359}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LSWDevices", "..\LSWShared\LSWDevices\LSWDevices.vcxproj", "{DD7E3ADD-D2DF-4755-80F3-853C49809CE6}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -163,26 +161,6 @@ Global {3A150025-D770-4521-BA21-16843B2D5359}.Release|x86.ActiveCfg = Release|Any CPU {3A150025-D770-4521-BA21-16843B2D5359}.Release|x86.Build.0 = Release|Any CPU {3A150025-D770-4521-BA21-16843B2D5359}.Release|x86.Deploy.0 = Release|Any CPU - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Debug|Any CPU.ActiveCfg = Debug|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Debug|Any CPU.Build.0 = Debug|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Debug|ARM.ActiveCfg = Debug|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Debug|ARM.Build.0 = Debug|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Debug|ARM64.ActiveCfg = Debug|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Debug|ARM64.Build.0 = Debug|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Debug|x64.ActiveCfg = Debug|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Debug|x64.Build.0 = Debug|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Debug|x86.ActiveCfg = Debug|Win32 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Debug|x86.Build.0 = Debug|Win32 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Release|Any CPU.ActiveCfg = Release|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Release|Any CPU.Build.0 = Release|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Release|ARM.ActiveCfg = Release|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Release|ARM.Build.0 = Release|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Release|ARM64.ActiveCfg = Release|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Release|ARM64.Build.0 = Release|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Release|x64.ActiveCfg = Release|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Release|x64.Build.0 = Release|x64 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Release|x86.ActiveCfg = Release|Win32 - {DD7E3ADD-D2DF-4755-80F3-853C49809CE6}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/eDosStation/App.xaml.cs b/eDosStation/App.xaml.cs index 8be06bb..2e04b81 100644 --- a/eDosStation/App.xaml.cs +++ b/eDosStation/App.xaml.cs @@ -50,10 +50,12 @@ namespace eDosStation //var pth2 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Reader2.dll"); //moduleHandle = LoadLibraryEx(pth2, IntPtr.Zero, 0); //moduleHandle = LoadLibraryEx(pth1, IntPtr.Zero, 0); - + + + splunkLog = new cspl(Environment.MachineName, hourlyLog: true); - using (var h = new LSWDevices.LSWDevicesHelper()) + using (var h = new LSWDevices.LSWDevicesHelper()) { eDosPort = h.eDosPort; elatecPort = h.ElatecPort; diff --git a/eDosStation/MainWindow.xaml b/eDosStation/MainWindow.xaml index 151d787..e385f0b 100644 --- a/eDosStation/MainWindow.xaml +++ b/eDosStation/MainWindow.xaml @@ -66,7 +66,7 @@ - + diff --git a/eDosStation/Resources/BuildDate.txt b/eDosStation/Resources/BuildDate.txt index 7abe737..794269b 100644 --- a/eDosStation/Resources/BuildDate.txt +++ b/eDosStation/Resources/BuildDate.txt @@ -1 +1 @@ -17/08/2026 12:11:45,32 +25/08/2026 17:47:14,95 diff --git a/eDosStation/eDosStation.csproj b/eDosStation/eDosStation.csproj index c68f3a8..1b6b2b7 100644 --- a/eDosStation/eDosStation.csproj +++ b/eDosStation/eDosStation.csproj @@ -1,6 +1,5 @@  - Debug @@ -91,24 +90,12 @@ app.manifest - - ..\packages\LSWLib2.4.4.6\lib\net48\LSWLib.dll - - - ..\packages\System.Data.OleDb.10.0.11\lib\net462\System.Data.OleDb.dll - - - ..\packages\System.Data.SqlClient.4.9.1\lib\net462\System.Data.SqlClient.dll - - - ..\packages\System.Diagnostics.EventLog.10.0.11\lib\net462\System.Diagnostics.EventLog.dll - @@ -116,22 +103,11 @@ - - ..\packages\System.Net.NetworkInformation.4.3.0\lib\net46\System.Net.NetworkInformation.dll - True - True - - - ..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll - - - ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - @@ -376,7 +352,6 @@ Always - SettingsSingleFileGenerator Settings.Designer.cs @@ -442,30 +417,26 @@ - - {dd7e3add-d2df-4755-80f3-853c49809ce6} - LSWDevices - {f1f47b79-9930-48b0-8dde-56e2c4bed2a2} EpdBaseClr - + + + 1.3.9 + + + 2.1.1 + + + 4.4.6 + + - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - c:\l\sign.cmd $(TargetPath) - - echo %25date%25 %25time%25 > "$(ProjectDir)\Resources\BuildDate.txt" diff --git a/eDosStation_Report.htm b/eDosStation_Report.htm deleted file mode 100644 index d08bac1..0000000 --- a/eDosStation_Report.htm +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - Telerik UI for WPF Upgrade Wizard Log - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- Processed: 6 - Succeeded: 5 - Info: 1 - Warnings: 0 - Failed: 0 -
-
 ProjectTitleDetailsResult
InfoSolution SetupRemoved unused distribution2022.1.222.45Info
SuccessSolution SetupCopied referenced assemblies to solutionC:\Program Files (x86)\Progress\Telerik UI for WPF R2 2022\Binaries\WPF45Success
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2022.2.621.45\Telerik.Windows.Controls.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2022.2.621.45\Telerik.Windows.Controls.GridView.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2022.2.621.45\Telerik.Windows.Controls.Input.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2022.2.621.45\Telerik.Windows.Data.dllSuccess
-
- - diff --git a/eDosStation_Report_2023.05.23_10.26.03.htm b/eDosStation_Report_2023.05.23_10.26.03.htm deleted file mode 100644 index 7dc0226..0000000 --- a/eDosStation_Report_2023.05.23_10.26.03.htm +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - Telerik UI for WPF Upgrade Wizard Log - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- Processed: 6 - Succeeded: 5 - Info: 1 - Warnings: 0 - Failed: 0 -
-
 ProjectTitleDetailsResult
InfoSolution SetupRemoved unused distribution2022.2.621.45Info
SuccessSolution SetupCopied referenced assemblies to solutionC:\Program Files (x86)\Progress\Telerik UI for WPF R1 2023\Binaries\WPF45Success
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2023.1.315.45\Telerik.Windows.Controls.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2023.1.315.45\Telerik.Windows.Controls.GridView.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2023.1.315.45\Telerik.Windows.Controls.Input.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2023.1.315.45\Telerik.Windows.Data.dllSuccess
-
- - diff --git a/eDosStation_Report_2023.10.23_02.01.35.htm b/eDosStation_Report_2023.10.23_02.01.35.htm deleted file mode 100644 index 9e8d324..0000000 --- a/eDosStation_Report_2023.10.23_02.01.35.htm +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - Telerik UI for WPF Upgrade Wizard Log - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- Processed: 6 - Succeeded: 5 - Info: 1 - Warnings: 0 - Failed: 0 -
-
 ProjectTitleDetailsResult
InfoSolution SetupRemoved unused distribution2023.1.315.45Info
SuccessSolution SetupCopied referenced assemblies to solutionC:\Program Files (x86)\Progress\Telerik UI for WPF R2 2023\Binaries\WPF45Success
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2023.2.718.45\Telerik.Windows.Controls.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2023.2.718.45\Telerik.Windows.Controls.GridView.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2023.2.718.45\Telerik.Windows.Controls.Input.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2023.2.718.45\Telerik.Windows.Data.dllSuccess
-
- - diff --git a/eDosStation_Report_2025.01.09_11.33.48.htm b/eDosStation_Report_2025.01.09_11.33.48.htm deleted file mode 100644 index 41a67f0..0000000 --- a/eDosStation_Report_2025.01.09_11.33.48.htm +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - Telerik UI for WPF Upgrade Wizard Log - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- Processed: 9 - Succeeded: 8 - Info: 1 - Warnings: 0 - Failed: 0 -
-
 ProjectTitleDetailsResult
SuccesseDosStationBackupCreate backup D:\l\src\cs2025\eDosStation\eDosStation_Backup_2025.01.09_11.33.03.Success
InfoSolution SetupRemoved unused distribution2023.2.718.45Info
SuccessSolution SetupCopied referenced assemblies to solutionC:\Program Files (x86)\Progress\Telerik UI for WPF 2024 Q4\Binaries\WPF462Success
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2024.4.1213.462\Telerik.Windows.Controls.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2024.4.1213.462\Telerik.Windows.Controls.Data.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2024.4.1213.462\Telerik.Windows.Controls.GridView.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2024.4.1213.462\Telerik.Windows.Controls.Input.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2024.4.1213.462\Telerik.Windows.Controls.Navigation.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2024.4.1213.462\Telerik.Windows.Data.dllSuccess
-
- - diff --git a/eDosStation_Report_2025.02.04_07.47.15.htm b/eDosStation_Report_2025.02.04_07.47.15.htm deleted file mode 100644 index 674dcdb..0000000 --- a/eDosStation_Report_2025.02.04_07.47.15.htm +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - Telerik UI for WPF Upgrade Wizard Log - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
- -
- Processed: 1 - Succeeded: 1 - Info: 0 - Warnings: 0 - Failed: 0 -
-
 ProjectTitleDetailsResult
SuccesseDosStationBackupCreate backup D:\l\src\cs2025\eDosStation\eDosStation_Backup_2025.02.04_07.47.06.Success
-
- - diff --git a/eDosStation_Report_2025.02.19_01.15.05.htm b/eDosStation_Report_2025.02.19_01.15.05.htm deleted file mode 100644 index ee8a18b..0000000 --- a/eDosStation_Report_2025.02.19_01.15.05.htm +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - Telerik UI for WPF Upgrade Wizard Log - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- Processed: 10 - Succeeded: 9 - Info: 1 - Warnings: 0 - Failed: 0 -
-
 ProjectTitleDetailsResult
SuccesseDosStationBackupCreate backup D:\l\src\cs2025\eDosStation\eDosStation_Backup_2025.02.19_01.14.34.Success
InfoSolution SetupRemoved unused distribution2024.4.1213.462Info
SuccessSolution SetupCopied referenced assemblies to solutionC:\Program Files (x86)\Progress\Telerik UI for WPF 2025 Q1\Binaries\WPF462Success
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.1.211.462\Telerik.Windows.Controls.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.1.211.462\Telerik.Licensing.Runtime.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.1.211.462\Telerik.Windows.Controls.Data.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.1.211.462\Telerik.Windows.Controls.GridView.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.1.211.462\Telerik.Windows.Controls.Input.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.1.211.462\Telerik.Windows.Controls.Navigation.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.1.211.462\Telerik.Windows.Data.dllSuccess
-
- - diff --git a/eDosStation_Report_2025.02.19_02.31.33.htm b/eDosStation_Report_2025.02.19_02.31.33.htm deleted file mode 100644 index c18f6af..0000000 --- a/eDosStation_Report_2025.02.19_02.31.33.htm +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - Telerik UI for WPF Upgrade Wizard Log - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
- -
- Processed: 1 - Succeeded: 1 - Info: 0 - Warnings: 0 - Failed: 0 -
-
 ProjectTitleDetailsResult
SuccesseDosStationBackupCreate backup D:\l\src\cs2025\eDosStation\eDosStation_Backup_2025.02.19_02.31.32.Success
-
- - diff --git a/eDosStation_Report_2025.08.27_08.41.51.htm b/eDosStation_Report_2025.08.27_08.41.51.htm deleted file mode 100644 index 7d327e0..0000000 --- a/eDosStation_Report_2025.08.27_08.41.51.htm +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - Telerik UI for WPF Upgrade Wizard Log - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- Processed: 9 - Succeeded: 8 - Info: 1 - Warnings: 0 - Failed: 0 -
-
 ProjectTitleDetailsResult
InfoSolution SetupRemoved unused distribution2025.1.211.462Info
SuccessSolution SetupCopied referenced assemblies to solutionC:\Program Files (x86)\Progress\Telerik UI for WPF 2025 Q3\Binaries\WPF462Success
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.3.813.462\Telerik.Windows.Controls.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.3.813.462\Telerik.Licensing.Runtime.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.3.813.462\Telerik.Windows.Controls.Data.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.3.813.462\Telerik.Windows.Controls.GridView.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.3.813.462\Telerik.Windows.Controls.Input.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.3.813.462\Telerik.Windows.Controls.Navigation.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs2025\eDosStation\lib\RCWPF\2025.3.813.462\Telerik.Windows.Data.dllSuccess
-
- - diff --git a/eDosStation_Report_2026.07.27_12.20.38.htm b/eDosStation_Report_2026.07.27_12.20.38.htm deleted file mode 100644 index e9ad3ff..0000000 --- a/eDosStation_Report_2026.07.27_12.20.38.htm +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - Telerik UI for WPF Upgrade Wizard Log - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- Processed: 8 - Succeeded: 7 - Info: 1 - Warnings: 0 - Failed: 0 -
-
 ProjectTitleDetailsResult
InfoSolution SetupRemoved unused distribution2025.4.1111.462Info
SuccessSolution SetupCopied referenced assemblies to solutionC:\Program Files (x86)\Progress\Telerik UI for WPF 2026 Q2\Binaries\WPF462Success
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.2.701.462\Telerik.Windows.Controls.dllSuccess
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.2.701.462\Telerik.Windows.Controls.Data.dllSuccess
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.2.701.462\Telerik.Windows.Controls.GridView.dllSuccess
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.2.701.462\Telerik.Windows.Controls.Input.dllSuccess
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.2.701.462\Telerik.Windows.Controls.Navigation.dllSuccess
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.2.701.462\Telerik.Windows.Data.dllSuccess
-
- - diff --git a/eDosStation_Report_2026.08.17_11.38.47.htm b/eDosStation_Report_2026.08.17_11.38.47.htm deleted file mode 100644 index 592a3fb..0000000 --- a/eDosStation_Report_2026.08.17_11.38.47.htm +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - Telerik UI for WPF Upgrade Wizard Log - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- Processed: 8 - Succeeded: 7 - Info: 1 - Warnings: 0 - Failed: 0 -
-
 ProjectTitleDetailsResult
InfoSolution SetupRemoved unused distribution2026.2.701.462Info
SuccessSolution SetupCopied referenced assemblies to solutionC:\Program Files (x86)\Progress\Telerik UI for WPF 2026 Q3\Binaries\WPF462Success
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.3.812.462\Telerik.Windows.Controls.dllSuccess
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.3.812.462\Telerik.Windows.Controls.Data.dllSuccess
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.3.812.462\Telerik.Windows.Controls.GridView.dllSuccess
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.3.812.462\Telerik.Windows.Controls.Input.dllSuccess
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.3.812.462\Telerik.Windows.Controls.Navigation.dllSuccess
SuccesseDosStationAssembly ReferenceC:\l\src\eDosStation\lib\RCWPF\2026.3.812.462\Telerik.Windows.Data.dllSuccess
-
- - diff --git a/git b/git new file mode 100644 index 0000000..e69de29 diff --git a/scripts/DeployPSModules.ps1 b/scripts/DeployPSModules.ps1 new file mode 100644 index 0000000..d7b6b70 --- /dev/null +++ b/scripts/DeployPSModules.ps1 @@ -0,0 +1,228 @@ +echo "start Powershell as admin" +Set-ExecutionPolicy -ExecutionPolicy unrestricted + + + +$SourcePath = "C:\software\OfflineModules" + +if (Test-Path -Path $SourcePath) { + Write-Host "Bronmap gevonden, kopiëren start..." -ForegroundColor Green + Copy-Item -Path "$SourcePath\*" -Destination "$env:ProgramFiles\WindowsPowerShell\Modules" -Recurse -Force +} else { + Write-Warning "Fout: De map $SourcePath bestaat niet!" +} + + + + +exit + +# SIG # Begin signature block +# MIImpAYJKoZIhvcNAQcCoIImlTCCJpECAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCCJA2MB/1pJ1g33 +# UOqxVMXgvBfUjEkg/kEpXkl2q7g6P6CCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG +# SIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAK +# BgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNV +# BAMTDVNDS0NFTiBJQ1QgQ0EwHhcNMTgwNTI0MDYxMTAwWhcNMzAwNjAxMTIwMDAw +# WjBPMSEwHwYDVQQDExhWYW5kZW5icm91Y2tlIEx1YyBDUzIwMjExKjAoBgkqhkiG +# 9w0BCQEWG2x1Yy52YW5kZW5icm91Y2tlQHNja2Nlbi5iZTCCASIwDQYJKoZIhvcN +# AQEBBQADggEPADCCAQoCggEBAPRbMPSAdMsURs6M9TChuXZWe1LSQlVXYVHPGRln +# QeF719tgHS1Ern70aW0PuvCECkzUTbGHw3o+bF+vj1UZWw82oOEZGannAoTyG1CI +# xdOMc85Mdmy+Kb++9Ivxa6i4ahfpNDHE0F58TomaNyDY0dtRUDEMZw/A0AMkFmdg +# 9BOnqrYeeLB0O/86ZkzUklRifi/Wa3ti1LV4U7fR6S4bMm7dZBh46IU2G3/oBdlN +# YAtC3DNol+bnrcBvF+ccGwG5kVxEZg8TtpEMj00hnI+rNPjI4Ar6mE83XKak1X5/ +# xddZppx9ldJaiVujyOqy0cONhiN/vsWPdZU37LQbG1OydGUCAwEAAaOCAYowggGG +# MAkGA1UdEwQCMAAwHQYDVR0OBBYEFN+1bIhLi6eWlLbzynleh97QuIFlMB8GA1Ud +# IwQYMBaAFPApFPVqIRSSVlQTpD3VrfAhOsV4MAsGA1UdDwQEAwIHgDAfBgNVHSUE +# GDAWBggrBgEFBQcDAwYKKwYBBAGCNwIBFTA6BgNVHREEMzAxgRtsdWMudmFuZGVu +# YnJvdWNrZUBzY2tjZW4uYmWBEmx2YW5kZW5iQHNja2Nlbi5iZTA1BgNVHRIELjAs +# hipodHRwOi8vY3JsLnNja2Nlbi5iZS9TQ0tDRU4lMjBJQ1QlMjBDQS5jcnQwOwYD +# VR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5zY2tjZW4uYmUvU0NLQ0VOJTIwSUNU +# JTIwQ0EuY3JsMD4GCSsGAQQBgjcVBwQxMC8GJysGAQQBgjcVCISMvCGCyP13gqGT +# IoSXlEaExpIugQGC1IQhgfrIaQIBZAIBCDAbBgkrBgEEAYI3FQoEDjAMMAoGCCsG +# AQUFBwMDMA0GCSqGSIb3DQEBCwUAA4ICAQBGH87fu9sNbcCPVQCdJ9jP4jT59WTZ +# m6s5BquO10UL9i7UAEmdd0yfCHW3myNUigR6O+Oc6Wa74HbUhAk+nEimHxzP5KcN +# nKE6lwqsIOf49J5G+2HRmTgW9tewsr39ZiB3NE5s04fHEA0I45zs8wsgyp4Mlr5v +# 3AfzYB7gxh0Hxdm+ion7PXvbKhAyI3F7pQTYauilmLAkHnoXD6T+Osp04wR9m1+H +# NGqLMKYyVOSdu0UnmGuqHBxpMD7hAJ8LCi5yR6t6s4BNCczwhzUpo6ZgrtLmKCac +# DmZ6SJMqsGFwan/GxnLSvw5QpVXUVJidDfTflMeJrfWhDOEt7jx9oQWQ249uzxlq +# JMVfBt1YZDq4gr76yjK6VY7F6540ECog4auPte4NoiT5UPdE3QHSD/82/cdLoVuh +# ELR4p4bfJ7PONT7x8iZzI8BoASh9SKJBh06mcmyJosOkc77Wv3ykqal7R+/LQi9g +# eJwku6Ti0XIy9UFGBbUD4m18e5cKdqDzyIHwAne0JR0ZEILPzITWviFuSXKqGP0b +# kSbGgpl+LuaCHcKAv+1FQBc2oWW0yPdxCUYpwo9QfTTh0qYXABQAbibOw7VKTnRL +# sS92m9pb6wn9tYyNfMu6r7EXCuxJNDbYpKbxeadfY0arCzlOT6mpC6lzBqfgKyN+ +# VWoy9rmdzhjEjjCCBnIwggRaoAMCAQICEzgAAAACbukOrXYB5dcAAAAAAAIwDQYJ +# KoZIhvcNAQELBQAwZzELMAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdlcnBlbjEM +# MAoGA1UEBxMDTW9sMQ8wDQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lDVDEXMBUG +# A1UEAxMOU0NLQ0VOIFJvb3QgQ0EwHhcNMTcwNjIzMTEzOTM0WhcNMzIwNjIzMTE0 +# OTM0WjBmMQswCQYDVQQGEwJCRTESMBAGA1UECBMJQW50d2VycGVuMQwwCgYDVQQH +# EwNNb2wxDzANBgNVBAoTBlNDS0NFTjEMMAoGA1UECxMDSUNUMRYwFAYDVQQDEw1T +# Q0tDRU4gSUNUIENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsW1u +# J8gCKQwjdhAhr6eJJNXw+wffi5p2RB48uzTaQh2Y89P+75NFhk7qeOW0tVwacxYk +# ubMvgNqasA9RslymREsxLfloMCidRPSQj8o0KE2cfLYojYre1TChFxc0PZobibZ7 +# BTsU2v75GQjnsEEMmxzwJLAjSU2mFVKJKjrKs4Xt/q6j3w0fdrRz0ba8zSMbTHO2 +# K8Cd1Rq3GQDLPythJyDxzo6YRE7TFOFcXGrIpFXvmy1XPc/ItiHwTocOmQ1msF+4 +# 6W0gfWtbFLt8bC/CnuE2ZQPnAmpq3lOUu8cOq/2eqhihAeAli5McYepaK+qr1JtL +# NfgTSkkFFw27c5cPXwFCCE0ryJdN+qN4Xdk3J2iz0hayEJ4sGaimdJTXv/OTmSxx +# KGMnPYV+BTvk/PDJnGjWQqOryf0PWgmwVQ1KAowaPjBAXJOEotzNnzW0/FKtvgJY +# Lk3xFs3sJJ6EG6D02wB2RNszNGM66tyqqx/Z3651xwzgkYYR1ETdmddcqL6/3a+H +# ifS5K99N+q7rX/Rp31AUlNsb53xhh43NWUAg5Tzrb9J54mBR6Z/MafmTVHcK2nK6 +# RRYaUfxs/WuE2+OzX7MdG/URi1lVuOu7hp7AKnSjcLnOcBG7lkSK1Q1pCuACYMkv +# Cl+7keio376akUfumX3HqEVgK8ttZiRgiVHR7Q0CAwEAAaOCARYwggESMBAGCSsG +# AQQBgjcVAQQDAgEAMB0GA1UdDgQWBBTwKRT1aiEUklZUE6Q91a3wITrFeDAZBgkr +# BgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw +# AwEB/zAfBgNVHSMEGDAWgBRSvxsquCggUTGvI6e+I5TG0fkUMDA8BgNVHR8ENTAz +# MDGgL6AthitodHRwOi8vY3JsLnNja2Nlbi5iZS9TQ0tDRU4lMjBSb290JTIwQ0Eu +# Y3JsMEcGCCsGAQUFBwEBBDswOTA3BggrBgEFBQcwAoYraHR0cDovL2NybC5zY2tj +# ZW4uYmUvU0NLQ0VOJTIwUm9vdCUyMENBLmNydDANBgkqhkiG9w0BAQsFAAOCAgEA +# hsQ1eNAeFzKKGY9KW0VMGrLUbtccjHoeKlGdVn+yhS9xhSaIFgm00IPVO5zh9jKt +# gCA3o81TqY0w1WoRK1U8t89On5RZYVy39pDyu+oBlHgul9KOuJbIKLgh0VgEPvY3 +# vM0h0bLdxIrnlIxchVxgs5y/h/wLKmXLjsg+AuYzsJ4+9GAD5SsdFGp2jiKPf9aw +# 6zG67an2yTqtvPfeoRpkMWO+Mx39CWWwfU3MaQySlAx0/JzZcqWzk6QFgN1h89wS +# BHD0mMFdnahEth5y9QhPkLydPniibF5VZ59gbUVlpFFz8VddmBtx9xfe5aIYEjkj +# 35HmEW/FN7qwnJP3dCljzFiqSueKqiFIN3punjHbMUoAxJnibx11Xz4pFm5mdk8v +# 95r+sncH8SFK/P5nUjjEYIBRInZiovl7C8KfI1RD9lXJDPdw5yVfkCpkCr/rYNNM +# BHfDYZ+G1NEu9WzE2NrknC4H4qoNJLmMjVPTswcIT780iOvFZRf1ql+0e2TKUHCO +# kZ+plXtl3H6MimrNk6B/ZQAy4mETNH6ceaoudV7X5Y7HzbTwSXCSw6GCiQMdYXgs +# Fp+lioorEmFZhVc2PTs+oUXbMi8IUaCyKEm6tMZHJ+PGU1YBE8Szyj5nI1SUhb+a +# HunRGlhgXPb4bnEdZVaMruxFM0UbriGwmkOEv9cPVpAxghnEMIIZwAIBATBrMGYx +# CzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAKBgNVBAcTA01vbDEP +# MA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVNDS0NFTiBJ +# Q1QgQ0ECAR8wDQYJYIZIAWUDBAIBBQCggbAwGQYJKoZIhvcNAQkDMQwGCisGAQQB +# gjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkE +# MSIEINCmLdSRNh3mEhCGnVT7Lio9C21IOZPQrV9tqSC9p668MEQGCisGAQQBgjcC +# AQwxNjA0oDKAMABJAG4AdABlAGcAcgBpAHQAeQAgACYAIABBAHUAdABoAGUAbgB0 +# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQDMhFXrAfFc3OddL++fyPhFz1Co +# FGRO3rO+ouNXZXOIpFK/3ZQB23WUBFC8WCrZWsOflJQ8NK6WxxVGZMX4tJ30SaHR +# rpB2lTQG1PuEMXktpWMNz8MNNN9iwrRyLrxmZIi06mhKUYBg96v+D86HREAHtyuz +# ksd2mBt5FE3H0/+ZupeXe/+xTmOImkknbA8+j06uycb5VD1LNvlrcV1OvY5+djox +# CqkN1/FVgiXVJF+wGOknjJQ0EW8PiUQ2XAt58FuZz4SmPOHkJemC+gC2Sw6crSjh +# yAHQxCLy5oaC3KemDctPXFX9wIo4qWdb0hX3J/wMI5Mt6jelNVeINcnAMxgPoYIX +# dzCCF3MGCisGAQQBgjcDAwExghdjMIIXXwYJKoZIhvcNAQcCoIIXUDCCF0wCAQMx +# DzANBglghkgBZQMEAgEFADB4BgsqhkiG9w0BCRABBKBpBGcwZQIBAQYJYIZIAYb9 +# bAcBMDEwDQYJYIZIAWUDBAIBBQAEICbE7gg1Faj2fbphgFqcZX6jw/JpE9VS6EbP +# rVJlbRXgAhEAnonutmZYUvElnaAcD6f9tBgPMjAyNjAyMDUwOTQ2NTJaoIITOjCC +# Bu0wggTVoAMCAQICEAqA7xhLjfEFgtHEdqeVdGgwDQYJKoZIhvcNAQELBQAwaTEL +# MAkGA1UEBhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMUEwPwYDVQQDEzhE +# aWdpQ2VydCBUcnVzdGVkIEc0IFRpbWVTdGFtcGluZyBSU0E0MDk2IFNIQTI1NiAy +# MDI1IENBMTAeFw0yNTA2MDQwMDAwMDBaFw0zNjA5MDMyMzU5NTlaMGMxCzAJBgNV +# BAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNl +# cnQgU0hBMjU2IFJTQTQwOTYgVGltZXN0YW1wIFJlc3BvbmRlciAyMDI1IDEwggIi +# MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDQRqwtEsae0OquYFazK1e6b1H/ +# hnAKAd/KN8wZQjBjMqiZ3xTWcfsLwOvRxUwXcGx8AUjni6bz52fGTfr6PHRNv6T7 +# zsf1Y/E3IU8kgNkeECqVQ+3bzWYesFtkepErvUSbf+EIYLkrLKd6qJnuzK8Vcn0D +# vbDMemQFoxQ2Dsw4vEjoT1FpS54dNApZfKY61HAldytxNM89PZXUP/5wWWURK+If +# xiOg8W9lKMqzdIo7VA1R0V3Zp3DjjANwqAf4lEkTlCDQ0/fKJLKLkzGBTpx6EYev +# vOi7XOc4zyh1uSqgr6UnbksIcFJqLbkIXIPbcNmA98Oskkkrvt6lPAw/p4oDSRZr +# eiwB7x9ykrjS6GS3NR39iTTFS+ENTqW8m6THuOmHHjQNC3zbJ6nJ6SXiLSvw4Smz +# 8U07hqF+8CTXaETkVWz0dVVZw7knh1WZXOLHgDvundrAtuvz0D3T+dYaNcwafsVC +# GZKUhQPL1naFKBy1p6llN3QgshRta6Eq4B40h5avMcpi54wm0i2ePZD5pPIssosz +# QyF4//3DoK2O65Uck5Wggn8O2klETsJ7u8xEehGifgJYi+6I03UuT1j7FnrqVrOz +# aQoVJOeeStPeldYRNMmSF3voIgMFtNGh86w3ISHNm0IaadCKCkUe2LnwJKa8TIlw +# CUNVwppwn4D3/Pt5pwIDAQABo4IBlTCCAZEwDAYDVR0TAQH/BAIwADAdBgNVHQ4E +# FgQU5Dv88jHt/f3X85FxYxlQQ89hjOgwHwYDVR0jBBgwFoAU729TSunkBnx6yuKQ +# VvYv1Ensy04wDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMI +# MIGVBggrBgEFBQcBAQSBiDCBhTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGln +# aWNlcnQuY29tMF0GCCsGAQUFBzAChlFodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5j +# b20vRGlnaUNlcnRUcnVzdGVkRzRUaW1lU3RhbXBpbmdSU0E0MDk2U0hBMjU2MjAy +# NUNBMS5jcnQwXwYDVR0fBFgwVjBUoFKgUIZOaHR0cDovL2NybDMuZGlnaWNlcnQu +# Y29tL0RpZ2lDZXJ0VHJ1c3RlZEc0VGltZVN0YW1waW5nUlNBNDA5NlNIQTI1NjIw +# MjVDQTEuY3JsMCAGA1UdIAQZMBcwCAYGZ4EMAQQCMAsGCWCGSAGG/WwHATANBgkq +# hkiG9w0BAQsFAAOCAgEAZSqt8RwnBLmuYEHs0QhEnmNAciH45PYiT9s1i6UKtW+F +# ERp8FgXRGQ/YAavXzWjZhY+hIfP2JkQ38U+wtJPBVBajYfrbIYG+Dui4I4PCvHpQ +# uPqFgqp1PzC/ZRX4pvP/ciZmUnthfAEP1HShTrY+2DE5qjzvZs7JIIgt0GCFD9kt +# x0LxxtRQ7vllKluHWiKk6FxRPyUPxAAYH2Vy1lNM4kzekd8oEARzFAWgeW3az2xe +# jEWLNN4eKGxDJ8WDl/FQUSntbjZ80FU3i54tpx5F/0Kr15zW/mJAxZMVBrTE2oi0 +# fcI8VMbtoRAmaaslNXdCG1+lqvP4FbrQ6IwSBXkZagHLhFU9HCrG/syTRLLhAezu +# /3Lr00GrJzPQFnCEH1Y58678IgmfORBPC1JKkYaEt2OdDh4GmO0/5cHelAK2/gTl +# QJINqDr6JfwyYHXSd+V08X1JUPvB4ILfJdmL+66Gp3CSBXG6IwXMZUXBhtCyIaeh +# r0XkBoDIGMUG1dUtwq1qmcwbdUfcSYCn+OwncVUXf53VJUNOaMWMts0VlRYxe5nK +# +At+DI96HAlXHAL5SlfYxJ7La54i71McVWRP66bW+yERNpbJCjyCYG2j+bdpxo/1 +# Cy4uPcU3AWVPGrbn5PhDBf3Froguzzhk++ami+r3Qrx5bIbY3TVzgiFI7Gq3zWcw +# gga0MIIEnKADAgECAhANx6xXBf8hmS5AQyIMOkmGMA0GCSqGSIb3DQEBCwUAMGIx +# CzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3 +# dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IFRydXN0ZWQgUm9vdCBH +# NDAeFw0yNTA1MDcwMDAwMDBaFw0zODAxMTQyMzU5NTlaMGkxCzAJBgNVBAYTAlVT +# MRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjFBMD8GA1UEAxM4RGlnaUNlcnQgVHJ1 +# c3RlZCBHNCBUaW1lU3RhbXBpbmcgUlNBNDA5NiBTSEEyNTYgMjAyNSBDQTEwggIi +# MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC0eDHTCphBcr48RsAcrHXbo0Zo +# dLRRF51NrY0NlLWZloMsVO1DahGPNRcybEKq+RuwOnPhof6pvF4uGjwjqNjfEvUi +# 6wuim5bap+0lgloM2zX4kftn5B1IpYzTqpyFQ/4Bt0mAxAHeHYNnQxqXmRinvuNg +# xVBdJkf77S2uPoCj7GH8BLuxBG5AvftBdsOECS1UkxBvMgEdgkFiDNYiOTx4OtiF +# cMSkqTtF2hfQz3zQSku2Ws3IfDReb6e3mmdglTcaarps0wjUjsZvkgFkriK9tUKJ +# m/s80FiocSk1VYLZlDwFt+cVFBURJg6zMUjZa/zbCclF83bRVFLeGkuAhHiGPMvS +# GmhgaTzVyhYn4p0+8y9oHRaQT/aofEnS5xLrfxnGpTXiUOeSLsJygoLPp66bkDX1 +# ZlAeSpQl92QOMeRxykvq6gbylsXQskBBBnGy3tW/AMOMCZIVNSaz7BX8VtYGqLt9 +# MmeOreGPRdtBx3yGOP+rx3rKWDEJlIqLXvJWnY0v5ydPpOjL6s36czwzsucuoKs7 +# Yk/ehb//Wx+5kMqIMRvUBDx6z1ev+7psNOdgJMoiwOrUG2ZdSoQbU2rMkpLiQ6bG +# RinZbI4OLu9BMIFm1UUl9VnePs6BaaeEWvjJSjNm2qA+sdFUeEY0qVjPKOWug/G6 +# X5uAiynM7Bu2ayBjUwIDAQABo4IBXTCCAVkwEgYDVR0TAQH/BAgwBgEB/wIBADAd +# BgNVHQ4EFgQU729TSunkBnx6yuKQVvYv1Ensy04wHwYDVR0jBBgwFoAU7NfjgtJx +# XWRM3y5nP+e6mK4cD08wDgYDVR0PAQH/BAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUF +# BwMIMHcGCCsGAQUFBwEBBGswaTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGln +# aWNlcnQuY29tMEEGCCsGAQUFBzAChjVodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5j +# b20vRGlnaUNlcnRUcnVzdGVkUm9vdEc0LmNydDBDBgNVHR8EPDA6MDigNqA0hjJo +# dHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkUm9vdEc0LmNy +# bDAgBgNVHSAEGTAXMAgGBmeBDAEEAjALBglghkgBhv1sBwEwDQYJKoZIhvcNAQEL +# BQADggIBABfO+xaAHP4HPRF2cTC9vgvItTSmf83Qh8WIGjB/T8ObXAZz8OjuhUxj +# aaFdleMM0lBryPTQM2qEJPe36zwbSI/mS83afsl3YTj+IQhQE7jU/kXjjytJgnn0 +# hvrV6hqWGd3rLAUt6vJy9lMDPjTLxLgXf9r5nWMQwr8Myb9rEVKChHyfpzee5kH0 +# F8HABBgr0UdqirZ7bowe9Vj2AIMD8liyrukZ2iA/wdG2th9y1IsA0QF8dTXqvcnT +# mpfeQh35k5zOCPmSNq1UH410ANVko43+Cdmu4y81hjajV/gxdEkMx1NKU4uHQcKf +# ZxAvBAKqMVuqte69M9J6A47OvgRaPs+2ykgcGV00TYr2Lr3ty9qIijanrUR3anzE +# wlvzZiiyfTPjLbnFRsjsYg39OlV8cipDoq7+qNNjqFzeGxcytL5TTLL4ZaoBdqbh +# OhZ3ZRDUphPvSRmMThi0vw9vODRzW6AxnJll38F0cuJG7uEBYTptMSbhdhGQDpOX +# gpIUsWTjd6xpR6oaQf/DJbg3s6KCLPAlZ66RzIg9sC+NJpud/v4+7RWsWCiKi9EO +# LLHfMR2ZyJ/+xhCx9yHbxtl5TPau1j/1MIDpMPx0LckTetiSuEtQvLsNz3Qbp7wG +# WqbIiOWCnb5WqxL3/BAPvIXKUjPSxyZsq8WhbaM2tszWkPZPubdcMIIFjTCCBHWg +# AwIBAgIQDpsYjvnQLefv21DiCEAYWjANBgkqhkiG9w0BAQwFADBlMQswCQYDVQQG +# EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl +# cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcN +# MjIwODAxMDAwMDAwWhcNMzExMTA5MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEVMBMG +# A1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw +# HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp +# pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+ +# n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYykt +# zuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw +# 2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jHtrHEtWoYOAMQjdjUN6Qu +# BX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6MUSaM0C/CNdaSaTC +# 5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtmmnTK +# 3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3 +# IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEP +# lAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98 +# THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4KJpn15GkvmB0t9dmpsh3l +# GwIDAQABo4IBOjCCATYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7NfjgtJx +# XWRM3y5nP+e6mK4cD08wHwYDVR0jBBgwFoAUReuir/SSy4IxLVGLp6chnfNtyA8w +# DgYDVR0PAQH/BAQDAgGGMHkGCCsGAQUFBwEBBG0wazAkBggrBgEFBQcwAYYYaHR0 +# cDovL29jc3AuZGlnaWNlcnQuY29tMEMGCCsGAQUFBzAChjdodHRwOi8vY2FjZXJ0 +# cy5kaWdpY2VydC5jb20vRGlnaUNlcnRBc3N1cmVkSURSb290Q0EuY3J0MEUGA1Ud +# HwQ+MDwwOqA4oDaGNGh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEFz +# c3VyZWRJRFJvb3RDQS5jcmwwEQYDVR0gBAowCDAGBgRVHSAAMA0GCSqGSIb3DQEB +# DAUAA4IBAQBwoL9DXFXnOF+go3QbPbYW1/e/Vwe9mqyhhyzshV6pGrsi+IcaaVQi +# 7aSId229GhT0E0p6Ly23OO/0/4C5+KH38nLeJLxSA8hO0Cre+i1Wz/n096wwepqL +# sl7Uz9FDRJtDIeuWcqFItJnLnU+nBgMTdydE1Od/6Fmo8L8vC6bp8jQ87PcDx4eo +# 0kxAGTVGamlUsLihVo7spNU96LHc/RzY9HdaXFSMb++hUD38dglohJ9vytsgjTVg +# HAIDyyCwrFigDkBjxZgiwbJZ9VVrzyerbHbObyMt9H5xaiNrIv8SuFQtJ37YOtnw +# toeW/VvRXKwYw02fc7cBqZ9Xql4o4rmUMYIDfDCCA3gCAQEwfTBpMQswCQYDVQQG +# EwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xQTA/BgNVBAMTOERpZ2lDZXJ0 +# IFRydXN0ZWQgRzQgVGltZVN0YW1waW5nIFJTQTQwOTYgU0hBMjU2IDIwMjUgQ0Ex +# AhAKgO8YS43xBYLRxHanlXRoMA0GCWCGSAFlAwQCAQUAoIHRMBoGCSqGSIb3DQEJ +# AzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjYwMjA1MDk0NjUyWjAr +# BgsqhkiG9w0BCRACDDEcMBowGDAWBBTdYjCshgotMGvaOLFoeVIwB/tBfjAvBgkq +# hkiG9w0BCQQxIgQgUFtpboN0qGPi//ipQ00UflrBkqWH3O8LLrOthuRQWt8wNwYL +# KoZIhvcNAQkQAi8xKDAmMCQwIgQgSqA/oizXXITFXJOPgo5na5yuyrM/420mmqM0 +# 8UYRCjMwDQYJKoZIhvcNAQEBBQAEggIAreUnW5bppL2bd9PCn2w12J9brhE3KLLV +# tlJFcTxSTvd1sOFNAyM8YNcnXiXkS9sNVnzB74SQXIah0ozIgAn/sReG/4dfcV4C +# ZCg49Q9XmCVZvqZv62vTfSo9WcuqBKv6B49cC1jezwaV+TYScpn3Ki5mQmApZBhU +# 8dqg5mlDXoAK5dkJe4tI7vajeMSMwuSSGTcqRhGyPJnrjYOb85SbmIrqPgQpi49Z +# etIrQPZHKnKwwN4cKAbI3WINbGSUVF0ZfU2AKW7h/CjK4SMB2f5zmrNqdnmBM3Xy +# IVevAk+v9Uah5PqRm0xAUbMJvMKjNDKDhSyFP0eBC5fNytUucGPnwW4hyyqREzWm +# GBg4v+ZXHgIoNKYQ9jCXic4TxLoNCTVAmAdKU8Fibj+TMEd0GrhkfQ0OoV8O2EMM +# 1K3LtXJ/OslJhGrzlONFhKiFXIfyjcb1uSjsX58uHJw/PX/VSOG8CLxZ1PiKQNA9 +# bLTk7zkP6Kijk6pRvYHVx1rYXmq6lw6BTLNjcMfDOsfIaSKZ+HfDQmaP45VrNivj +# 4tRDGTx1cfoybRqlPvXScagLeRQWx5BfTOn/lnaptr8ZXDh4j7ju4n3ormKF0xPX +# 66vv8fcVZZmyU/Rlcmqam3mOJyBRgLWHbFEHUzQfkbopvuTDHjkJX3ytj7eKZi03 +# k/eo60iusKE= +# SIG # End signature block diff --git a/scripts/LogFolderClean.exe b/scripts/LogFolderClean.exe new file mode 100644 index 0000000..4e68830 Binary files /dev/null and b/scripts/LogFolderClean.exe differ diff --git a/scripts/LogFolderClean.exe.config b/scripts/LogFolderClean.exe.config new file mode 100644 index 0000000..119328b --- /dev/null +++ b/scripts/LogFolderClean.exe.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scripts/TWN4_xCx480_EDOS100_Edos_Badge_Reader.bix b/scripts/TWN4_xCx480_EDOS100_Edos_Badge_Reader.bix new file mode 100644 index 0000000..781bdba Binary files /dev/null and b/scripts/TWN4_xCx480_EDOS100_Edos_Badge_Reader.bix differ diff --git a/scripts/UpdateLocal.sql b/scripts/UpdateLocal.sql new file mode 100644 index 0000000..5beac36 --- /dev/null +++ b/scripts/UpdateLocal.sql @@ -0,0 +1,531 @@ +USE [eDosLocal]; +GO +SET ANSI_NULLS ON; +GO +SET QUOTED_IDENTIFIER ON; +GO + +IF NOT EXISTS (SELECT * FROM sys.columns WHERE OBJECT_ID=OBJECT_ID('dbo.visit') AND name='eDosBatteryWarning') +begin +ALTER TABLE [dbo].[Visit] ADD eDosBatteryWarning BIT null; +ALTER TABLE [dbo].[Visit] ADD eDosDose07Warning BIT null; +ALTER TABLE [dbo].[Visit] ADD eDosDose07Alarm BIT null; +ALTER TABLE [dbo].[Visit] ADD eDosRate07Warning BIT null; +ALTER TABLE [dbo].[Visit] ADD eDosRate07Alarm BIT null; +ALTER TABLE [dbo].[Visit] ADD eDosDose10Warning BIT null; +ALTER TABLE [dbo].[Visit] ADD eDosDose10Alarm BIT null; +ALTER TABLE [dbo].[Visit] ADD eDosRate10Warning BIT null; +ALTER TABLE [dbo].[Visit] ADD eDosRate10Alarm BIT null; +END + + +IF NOT EXISTS (SELECT * FROM [sys].[columns] WHERE [object_id] = OBJECT_ID('dbo.visit') AND [name] = 'isFault') +BEGIN + ALTER TABLE [dbo].[Visit] ADD [isFault] BIT NULL; +END; + +GO +IF OBJECT_ID('dbo.PersonAlarms') IS NULL BEGIN + CREATE TABLE [dbo].[PersonAlarms] ([PersID] INT NOT NULL, + [VisitTime] DATETIME NOT NULL, + [ID_Station] INT NOT NULL, + [ID_Visit] INT NOT NULL, + PRIMARY KEY NONCLUSTERED([PersID], [VisitTime])); +END; +GO +ALTER PROCEDURE [dbo].[VisitExit] @EPDVisitID INT, + @HP07 FLOAT, + @HP10 FLOAT, + @HP07Peak FLOAT, + @HP10Peak FLOAT, + @HP07PeakTime DATETIME = NULL, + @HP10PeakTime DATETIME = NULL, + @HP07Total FLOAT, + @HP10Total FLOAT, + @K1 INT, + @K2 INT, + @K3 INT, + @K4 INT, + @K5 INT = NULL, + @K6 INT = NULL, + @SG INT, + @BC INT, + @FB INT, + @HG INT, + @QualityData INT, + @alarmStatus INT, + @otherAlarms INT, + @errorStatus INT, + @operatingStatus INT, + @ENTRY_EPD_CLOCK DECIMAL(10, 0) NULL, + @EXIT_EPD_CLOCK DECIMAL(10, 0) NULL, + @PersID INT = NULL, + @eDosBatteryWarning BIT = NULL, + @eDosDose07Warning BIT = NULL, + @eDosDose07Alarm BIT = NULL, + @eDosRate07Warning BIT = NULL, + @eDosRate07Alarm BIT = NULL, + @eDosDose10Warning BIT = NULL, + @eDosDose10Alarm BIT = NULL, + @eDosRate10Warning BIT = NULL, + @eDosRate10Alarm BIT = NULL, + @isAlarm BIT = NULL, + @isFault BIT = NULL +AS BEGIN + DECLARE + @ID_Visit INT, + @ID_Station INT, + @ID_Station_Return INT; + + SET @ID_Station = @EPDVisitID % 100; + SET @ID_Visit = @EPDVisitID / 100; + + IF @isAlarm IS NULL + SET @isAlarm = CASE WHEN ISNULL(@alarmStatus, 0) <> 0 + OR (ISNULL(@otherAlarms, 0) & 0x7f) <> 0 --bit 7=battery low + OR ISNULL(@eDosDose07Warning, 0) <> 0 + OR ISNULL(@eDosRate07Warning, 0) <> 0 + OR ISNULL(@eDosDose10Warning, 0) <> 0 + OR ISNULL(@eDosRate10Warning, 0) <> 0 + OR ISNULL(@eDosDose07Alarm, 0) <> 0 + OR ISNULL(@eDosRate07Alarm, 0) <> 0 + OR ISNULL(@eDosDose10Alarm, 0) <> 0 + OR ISNULL(@eDosRate10Alarm, 0) <> 0 THEN 1 ELSE 0 END; + + DECLARE @Now DATETIME = GETDATE(); + + IF @ID_Station_Return IS NULL + SELECT + @ID_Station_Return = [ID_Station] + FROM [dbo].[StationSettings] + WHERE [PCNr] = HOST_NAME(); + + DECLARE @isComplete BIT = 1; + + IF NOT EXISTS (SELECT + * + FROM [dbo].[Visit] + WHERE [ID_Visit] = @ID_Visit + AND [ID_Station] = @ID_Station)BEGIN + SET @isComplete = 0; + + INSERT [dbo].[Visit]([ID_Station], [ID_Visit], [Inst_CODE], [isManualExit], [isDeleted], [ID_Station_Return], [isComplete], [ENTRY_EPD_CLOCK], [PersID]) + VALUES(@ID_Station, @ID_Visit, 0, 0, 0, @ID_Station_Return, 0, @ENTRY_EPD_CLOCK, @PersID); + END; + + UPDATE + [dbo].[Visit] + SET + [Hp07Dose] = @HP07, + [Hp10Dose] = @HP10, + [isComplete] = @isComplete, + [ReturnTime] = @Now, + [Hp07Peak] = @HP07Peak, + [Hp10Peak] = @HP10Peak, + [Hp07Time] = @HP07PeakTime, + [Hp10Time] = @HP10PeakTime, + [Hp07Total] = @HP07Total, + [Hp10Total] = @HP10Total, + [K1] = @K1, + [K2] = @K2, + [K3] = @K3, + [K4] = @K4, + [K5] = @K5, + [K6] = @K6, + [SG] = @SG, + [BC] = @BC, + [FB] = @FB, + [HG] = @HG, + [QualityData] = @QualityData, + [alarmStatus] = @alarmStatus, + [otherAlarms] = @otherAlarms, + [errorStatus] = @errorStatus, + [operatingStatus] = @operatingStatus, + --[D1] = @D1, [D2] = @D2, [D3] = @D3, [D4] = @D4, + [isAlarm] = @isAlarm, + [isManualExit] = 0, + [ID_Station_Return] = @ID_Station_Return, + [ENTRY_EPD_CLOCK] = @ENTRY_EPD_CLOCK, + [EXIT_EPD_CLOCK] = @EXIT_EPD_CLOCK, + [PersID] = CASE WHEN [PersID] IS NULL THEN @PersID ELSE [PersID] END, + [eDosBatteryWarning] = @eDosBatteryWarning, + [eDosDose07Warning] = @eDosDose07Warning, + [eDosDose07Alarm] = @eDosDose07Alarm, + [eDosRate07Warning] = @eDosRate07Warning, + [eDosRate07Alarm] = @eDosRate07Alarm, + [eDosDose10Warning] = @eDosDose10Warning, + [eDosDose10Alarm] = @eDosDose10Alarm, + [eDosRate10Warning] = @eDosRate10Warning, + [eDosRate10Alarm] = @eDosRate10Alarm, + [isFault] = @isFault + WHERE [ID_Visit] = @ID_Visit + AND [ID_Station] = @ID_Station; + + -- local- >PersonInfoSnapshot + IF @isAlarm = 1 BEGIN + IF @PersID IS NULL + SELECT + @PersID = [PersID] + FROM [dbo].[Visit] + WHERE [ID_Visit] = @ID_Visit + AND [ID_Station] = @ID_Station; + + UPDATE + [dbo].[PersonInfoSnapshot] + SET + [VisitIDLocked] = @ID_Visit * 100 + @ID_Station + WHERE [PersID] = @PersID; + + IF NOT EXISTS (SELECT + * + FROM [dbo].[PersonAlarms] + WHERE [PersID] = @PersID + AND [VisitTime] = @Now) + INSERT [dbo].[PersonAlarms]([PersID], [VisitTime], [ID_Station], [ID_Visit]) + VALUES(@PersID, @Now, @ID_Station, @ID_Visit); + END; +END; + +GO +ALTER PROCEDURE [export].[VisitsSelect] +AS +SELECT + [ID_Station], + [ID_Visit], + [Inst_CODE], + [PersID], + [ID_Task], + [EntryTime], + [ReturnTime], + [Hp10Dose], + [Hp07Dose], + [Hp10Total], + [Hp07Total], + [Hp10Peak], + [Hp07Peak], + [Hp10Time], + [Hp07Time], + [ID_EPD], + [QualityData], + [K1], + [K2], + [K3], + [K4], + [K5], + [K6], + [SG], + [BC], + [FB], + [HG], + [alarmStatus], + [otherAlarms], + [errorStatus], + [operatingStatus], + [isBG], + [isComplete], + [isDeleted], + [isAlarm], + [isAlarmCleared], + [isManualExit], + [ID_Station_Return], + [ENTRY_EPD_CLOCK], + [EXIT_EPD_CLOCK], + [TIME_LOST], + [VisitStatus] = CONVERT(TINYINT, CASE WHEN [EntryTime] IS NOT NULL + AND [ReturnTime] IS NOT NULL THEN 3 + WHEN [EntryTime] IS NOT NULL THEN 1 + WHEN [ReturnTime] IS NOT NULL THEN 2 ELSE 0 END), + [syncedEntry], + [syncedExit], + [epdType], + [epdID], + [eDosBatteryWarning], + [eDosDose07Warning], + [eDosDose07Alarm], + [eDosRate07Warning], + [eDosRate07Alarm], + [eDosDose10Warning], + [eDosDose10Alarm], + [eDosRate10Warning], + [eDosRate10Alarm] +FROM [dbo].[Visit] +WHERE([syncedEntry] = 0 OR [syncedExit] = 0); +GO +IF NOT EXISTS (SELECT * FROM sys.columns WHERE object_id=OBJECT_ID('[dbo].[StationSettings]') AND name='RestartComFirst') +begin +ALTER TABLE [dbo].[StationSettings] ADD [RestartComFirst] BIT; +ALTER TABLE [dbo].[StationSettings] ADD [OnlyMK2] BIT; +END +GO +IF NOT EXISTS (SELECT * FROM sys.columns WHERE object_id=OBJECT_ID('[dbo].[StationSettings]') AND name='AllowMultipleEPD') +ALTER TABLE [dbo].[StationSettings] ADD AllowMultipleEPD BIT NULL; +IF NOT EXISTS (SELECT * FROM sys.columns WHERE object_id=OBJECT_ID('[dbo].[StationSettings]') AND name='EPDRetries') +ALTER TABLE [dbo].[StationSettings] ADD EPDRetries INT NULL; +IF EXISTS (SELECT * FROM sys.columns WHERE object_id=OBJECT_ID('[dbo].[StationSettings]') AND name='EPDRetries' AND [system_type_id]<>56) +ALTER TABLE [dbo].[StationSettings] ALTER COLUMN [EPDREtries] int +GO +ALTER PROCEDURE [dbo].[StationSettingsSelect] AS +SELECT + [ID_Station], + [PCNr], + [ComPort], + [Inst_CODE1], + [Inst_CODE2], + [Inst_Name1], + [Inst_Name2], + [TestCSN], + [Reader], + [useTestButtons] = ISNULL([useTestButtons], 0), + [useBeep] = ISNULL([useBeep], 22), + [checkUser] = ISNULL([checkUser], 0), + [EPDTimeout] = ISNULL([EPDTimeout], 10000), + [EPDRetries] = ISNULL([EPDREtries], 1), + [RestartCom] = ISNULL([RestartCom], 0), + [RestartComFirst] = ISNULL([RestartComFirst], 0), + [OnlyMK2] = ISNULL([OnlyMK2], 0), + [AllowMultipleEPD] = ISNULL([AllowMultipleEPD], 0) +FROM [dbo].[StationSettings] +WHERE [PCNr] = HOST_NAME(); +GO +ALTER PROCEDURE [dbo].[StationSettingsUpdate] @ComPort INT = NULL, + @Inst_CODE1 INT = NULL, + @Inst_CODE2 INT = NULL, + @Inst_Name1 VARCHAR(50) = NULL, + @Inst_Name2 VARCHAR(50) = NULL, + @TestCSN VARCHAR(50) = NULL, + @Reader VARCHAR(70) = NULL, + @useTestButtons BIT = 0, + @useBeep TINYINT = 22, + @checkUser BIT = 0, + @EPDTimeout INT = 10000, + @EPDRetries INT = 1, + @RestartCom BIT = 0, + @RestartComFirst BIT = 0, + @OnlyMK2 BIT = 0, + @AllowMultipleEPD BIT = 0 +AS +IF NOT EXISTS (SELECT * FROM [dbo].[StationSettings] WHERE [PCNr] = HOST_NAME()) + INSERT [dbo].[StationSettings]([PCNr], [ComPort], [Inst_CODE1], [Inst_CODE2], [Inst_Name1], [Inst_Name2], [TestCSN], [Reader], [useTestButtons], [useBeep], [checkUser], [EPDREtries], [RestartCom], [RestartComFirst], [OnlyMK2], [AllowMultipleEPD]) + VALUES(HOST_NAME(), @ComPort, @Inst_CODE1, @Inst_CODE2, @Inst_Name1, @Inst_Name2, @TestCSN, @Reader, @useTestButtons, @useBeep, @checkUser, @EPDRetries, @RestartCom, @RestartComFirst, @OnlyMK2, @AllowMultipleEPD); +ELSE + UPDATE + [dbo].[StationSettings] + SET + [ComPort] = @ComPort, + [Inst_CODE1] = @Inst_CODE1, + [Inst_CODE2] = @Inst_CODE2, + [Inst_Name1] = @Inst_Name1, + [Inst_Name2] = @Inst_Name2, + [TestCSN] = @TestCSN, + [Reader] = @Reader, + [useTestButtons] = @useTestButtons, + [useBeep] = @useBeep, + [checkUser] = @checkUser, + [EPDTimeout] = @EPDTimeout, + [EPDREtries] = @EPDRetries, + [RestartCom] = @RestartCom, + [RestartComFirst] = @RestartComFirst, + [OnlyMK2] = @OnlyMK2, + [AllowMultipleEPD]=@AllowMultipleEPD + WHERE [PCNr] = HOST_NAME(); +go + + +CREATE OR ALTER PROCEDURE [dbo].[VisitInfo] @EPDVisitID INT = 51905, + @hasExited BIT = 0 OUT, + @isManualExit BIT = 0 OUT, + @name VARCHAR(100) = NULL OUT +AS +--DECLARE @EPDVisitID INT= 51905 +BEGIN + SET NOCOUNT ON; + + DECLARE + @ID_Visit INT, + @ID_Station INT, + @PersID INT; + + SET @ID_Station = @EPDVisitID % 100; + SET @ID_Visit = @EPDVisitID / 100; + SET @hasExited = 0; + SET @isManualExit = 0; + + SELECT + @hasExited = CONVERT(BIT, CASE WHEN [ReturnTime] IS NOT NULL OR [isManualExit] = 1 THEN 1 ELSE 0 END), + @isManualExit = ISNULL([isManualExit], 0), + @PersID = @PersID + FROM [dbo].[Visit] + WHERE [ID_Visit] = @ID_Visit + AND [ID_Station] = @ID_Station; + + SET NOCOUNT OFF; + + SELECT [hasExited] = @hasExited; + + SELECT + @name = ISNULL([name] + ' ' + ISNULL([callingname], [firstname]), '?') + FROM [dbo].[PersonAll] + WHERE [persid] = @PersID; + + RETURN CASE WHEN ISNULL(@hasExited, 0) = 1 THEN 1 ELSE 0 END + CASE WHEN ISNULL(@isManualExit, 0) = 1 THEN 2 ELSE 0 END; +END; + +GO + +GRANT EXECUTE ON [dbo].[VisitInfo] TO [eDosStation]; +GO + +--2024-09-06 + +IF NOT EXISTS (SELECT * FROM sys.columns WHERE object_id=OBJECT_ID('[dbo].[Visit]') AND name='InitError') +ALTER TABLE [dbo].[Visit] ADD InitError INT + +go +CREATE OR ALTER PROCEDURE [dbo].[VisitInitConfirm] + @ID_Station INT NULL, + @ID_Visit INT, + @InitError INT +as +UPDATE [dbo].[Visit] SET InitError=@InitError WHERE ID_Station=@ID_Station AND ID_Visit=@ID_Visit; +go +GRANT EXECUTE ON [dbo].[VisitInitConfirm] TO [eDosStation]; +GO +ALTER TABLE DBO.PersonInfoSnapshot ADD Info XML; +GO +IF OBJECT_ID('[dbo].[LocalEPD]') IS NULL BEGIN +CREATE TABLE [dbo].[LocalEPD] ( [ID_STATION] INT NOT NULL , [EPD_InternalID] VARCHAR(8) NOT NULL, [ID_EPD] INT NOT NULL, [LastUsed] DATETIME null, PRIMARY KEY([ID_STATION],[EPD_InternalID]) ) +end +GO +CREATE OR ALTER PROCEDURE [dbo].[VisitInit] @PersID INT, + @ID_Task INT, + @Inst_CODE INT, + @EPD_InternalID INT, + @isBG BIT, + @EPDVisitID INT = NULL OUTPUT, + @ID_Station INT NULL, + @ID_Visit INT, + @ENTRY_EPD_CLOCK DECIMAL(10, 0) NULL, + @epdType TINYINT = NULL, + @InitError INT = 0 +AS +--Local !! +DECLARE @ID_EPD INT ; +DECLARE @now DATETIME = GETDATE() ; + +IF @ID_Station IS NULL + SELECT + @ID_Station = [ID_Station] + FROM [dbo].[StationSettings] + WHERE [PCNr] = HOST_NAME() ; + +SELECT + @ID_EPD = [ID_EPD] +FROM [dbo].[EPD] +WHERE [EPD_InternalID] = @EPD_InternalID ; + +IF @ID_EPD IS NULL BEGIN + INSERT [dbo].[EPD]([EPD_InternalID], [EPD_sn], [EPDType]) + VALUES(@EPD_InternalID, CONVERT(VARCHAR(8), @EPD_InternalID), CASE WHEN @epdType IS NOT NULL + THEN @epdType + WHEN @isBG = 0 + THEN 2 + ELSE 0 + END) ; + + SET @ID_EPD = SCOPE_IDENTITY() ; +END ; + +IF NOT EXISTS + ( + SELECT + * + FROM [dbo].[LocalEPD] + WHERE [ID_Station] = @ID_Station + AND [EPD_InternalID] = @EPD_InternalID + ) + INSERT [dbo].[LocalEPD]([ID_EPD], [ID_Station], [EPD_InternalID], LastUsed) + VALUES(@ID_EPD, @ID_Station, CONVERT(VARCHAR(8), @EPD_InternalID), @now) ; +ELSE + UPDATE + [dbo].[LocalEPD] + SET + [LastUsed] = @now + WHERE [ID_Station] = @ID_Station + AND [EPD_InternalID] = @EPD_InternalID ; + + + + +INSERT [dbo].[Visit]([ID_Station], [PersID], [Inst_CODE], [ID_Visit], [ID_Task], [EntryTime], [ID_EPD], [isBG], [isComplete], [isDeleted], [isAlarmCleared], [isAlarm], [isManualExit], [ENTRY_EPD_CLOCK], [EXIT_EPD_CLOCK], [epdType], [epdID], [InitError] ) +VALUES(@ID_Station, @PersID, @Inst_CODE, @ID_Visit, @ID_Task, @now, @ID_EPD, @isBG, 0, 0, 0, 0, 0, @ENTRY_EPD_CLOCK, @ENTRY_EPD_CLOCK, @epdType, @EPD_InternalID, @InitError ) ; + +SET @EPDVisitID = @ID_Visit * 100+@ID_Station ; + +GO +USE [eDosLocal] +GO +/****** Object: StoredProcedure [dbo].[GetPersonInfo] Script Date: 9/11/2024 10:10:40 AM ******/ +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO + +IF NOT EXISTS (SELECT * FROM sys.columns WHERE OBJECT_ID=OBJECT_ID('dbo.[PersonInfoSnapshot]') AND name='eDosAgent') +BEGIN + ALTER TABLE [dbo].[PersonInfoSnapshot] ADD [eDosAgent] BIT NULL; +END; +GO +CREATE OR ALTER PROCEDURE [dbo].[GetPersonInfo] @CSN CHAR(14) =NULL, @PersID INT=NULL, @AllowMultipleEPD BIT=0, @CheckUser BIT=1 +AS BEGIN + --DECLARE @PersID INT=12103, @CSN CHAR(14) =null, @AllowMultipleEPD BIT=0, @CheckUser bit=1; + SET NOCOUNT ON; + DECLARE @lid_station INT, @lid_visit INT; + IF @PersID IS NULL + SELECT @PersID=[PersID] + FROM [dbo].[PersonInfoSnapshot] + WHERE [CSN]=@CSN COLLATE SQL_Latin1_General_CP850_BIN; + SET NOCOUNT OFF; + SELECT TOP(1)@lid_station=[ID_Station], @lid_visit=[ID_Visit] + FROM [dbo].[Visit] + WHERE [PersID]=@PersID AND [ReturnTime] IS NULL AND [EntryTime]>DATEADD(YEAR, -1, GETDATE())AND([InitError] IS NULL OR [InitError]=0); + SELECT [a].[PersID], [a].[Type], [a].[CSN], [a].[FirstName], [a].[LastName], [a].[NickName], [AccessAllow]=CONVERT(BIT, CASE WHEN @AllowMultipleEPD=1 AND [a].[hasEPD]=1 THEN 0 ELSE [a].[AccessAllow] END), [a].[Language], [a].[MarginHP10_M], [a].[MarginHP10_Y], [a].[Margin], [a].[VisitIDLocked], [a].[ID_CommentToPerson], [a].[Comment], [a].[Deleted], [ReasonNoAccess]=CASE WHEN @AllowMultipleEPD=1 AND [a].[hasEPD]=1 THEN 'EPD not returned' + WHEN ISNULL([VisitIDLocked], 0)>0 THEN 'Locked because of alarm' ELSE [a].[ReasonNoAccess] END, [a].[Dose_52W_microSv], [a].[hasEPD], [activeStation]=@lid_station, [activeVisit]=@lid_visit, [a].[isAgent], [a].[eDosAgent] + FROM(SELECT [p].[PersID], [p].[Type], [p].[CSN], [p].[FirstName], [p].[LastName], [p].[NickName], [AccessAllow]=CASE WHEN @CheckUser=0 THEN 1 ELSE [p].[AccessAllow] END, [p].[Language], [p].[MarginHP10_M], [p].[MarginHP10_Y], [p].[Margin], [p].[VisitIDLocked], [p].[ID_CommentToPerson], [p].[Comment], [p].[Deleted], [p].[ReasonNoAccess], [p].[Dose_52W_microSv], [hasEPD]=CONVERT(BIT, CASE WHEN @lid_visit IS NOT NULL THEN 1 ELSE 0 END), [isAgent]=CONVERT(BIT, CASE WHEN [p].[isAgent] IS NULL THEN 0 ELSE [p].[isAgent] END), [eDosAgent]=CONVERT(BIT, ISNULL(p.edosAgent, 0)) + FROM [dbo].[PersonInfoSnapshot] [p] + WHERE [p].[PersID]=@PersID) [a]; +END; +GO +CREATE OR ALTER PROCEDURE [dbo].[GetPersonOverview] @PersID INT = NULL +AS +SELECT [p].[PersID], + [p].[Type], + [p].[FirstName], + [p].[LastName], + [p].[NickName], + [AccessAllow] = [p].[AccessAllow], + [p].[Language], + [p].[MarginHP10_M], + [p].[MarginHP10_Y], + [p].[Margin], + [p].[VisitIDLocked], + [p].[ID_CommentToPerson], + [p].[Comment], + [p].[Deleted], + [p].[ReasonNoAccess], + [p].[Dose_52W_microSv], + [isAgent] = CONVERT ( BIT, + CASE + WHEN [p].[isAgent] IS NULL THEN + 0 + ELSE + [p].[isAgent] + END + ), + [info], + [eDosAgent] = CONVERT (BIT, ISNULL ([p].[eDosAgent], 0)) +FROM [dbo].[PersonInfoSnapshot] [p] +WHERE [p].[PersID] = @PersID; +GO + +GRANT EXECUTE ON [GetPersonOverview] TO [edosstation]; +GO diff --git a/scripts/Updates.sql b/scripts/Updates.sql new file mode 100644 index 0000000..d4c7c1e --- /dev/null +++ b/scripts/Updates.sql @@ -0,0 +1,404 @@ +USE [eDosLocal]; +GO + +/****** Object: StoredProcedure [dbo].[GetPersonInfo] Script Date: 8/03/2022 15:53:18 ******/ +SET ANSI_NULLS ON; +GO + +SET QUOTED_IDENTIFIER ON; +GO + +USE [eDosLocal]; +GO + +/****** Object: StoredProcedure [dbo].[GetPersonInfo] Script Date: 19/04/2022 13:08:50 ******/ +SET ANSI_NULLS ON; +GO + +SET QUOTED_IDENTIFIER ON; +GO +IF NOT EXISTS (SELECT * FROM sys.columns WHERE object_id=OBJECT_ID('[dbo].[PersonInfoSnapshot]') AND name='isAgent') +ALTER TABLE [dbo].[PersonInfoSnapshot] ADD isAgent BIT NULL; +GO +--2022-08-24 ChirpRate +IF NOT EXISTS (SELECT * FROM sys.columns WHERE object_id=OBJECT_ID('[dbo].[TaskInfoSnapshot]') AND name='ChirpRate') +ALTER TABLE [dbo].[TaskInfoSnapshot] ADD ChirpRate REAL NULL; +GO + +ALTER PROCEDURE [dbo].[GetPersonInfo] @CSN CHAR(14) = NULL, + @PersID INT = NULL, + @AllowMultipleEPD BIT = 0 +AS BEGIN + --DECLARE @PersID INT = 12103, @CSN CHAR(14) = null,@AllowMultipleEPD BIT = 0; + SET NOCOUNT ON; + + DECLARE + @lid_station INT, + @lid_visit INT; + + IF @PersID IS NULL + SELECT + @PersID = [PersID] + FROM [dbo].[PersonInfoSnapshot] + WHERE [CSN] = @CSN COLLATE SQL_Latin1_General_CP850_BIN; + + SET NOCOUNT OFF; + + SELECT TOP(1) + @lid_station = [ID_Station], + @lid_visit = [ID_Visit] + FROM [dbo].[Visit] + WHERE [PersID] = @PersID + AND [ReturnTime] IS NULL + AND [EntryTime] > DATEADD(YEAR, -1, GETDATE()); + + SELECT + [a].[PersID], + [a].[Type], + [a].[CSN], + [a].[FirstName], + [a].[LastName], + [a].[NickName], + [AccessAllow] = CONVERT(BIT, CASE WHEN @AllowMultipleEPD = 1 + AND [a].[hasEPD] = 1 THEN 0 ELSE [a].[AccessAllow] END), + [a].[Language], + [a].[MarginHP10_M], + [a].[MarginHP10_Y], + [a].[Margin], + [a].[VisitIDLocked], + [a].[ID_CommentToPerson], + [a].[Comment], + [a].[Deleted], + [ReasonNoAccess] = CASE WHEN @AllowMultipleEPD = 1 + AND [a].[hasEPD] = 1 THEN 'EPD not returned' + WHEN ISNULL([VisitIDLocked], 0) > 0 THEN 'Locked because of alarm' ELSE [a].[ReasonNoAccess] END, + [a].[Dose_52W_microSv], + [a].[hasEPD], + [activeStation] = @lid_station, + [activeVisit] = @lid_visit, + [a].[isAgent] + FROM(SELECT + [p].[PersID], + [p].[Type], + [p].[CSN], + [p].[FirstName], + [p].[LastName], + [p].[NickName], + [p].[AccessAllow], + [p].[Language], + [p].[MarginHP10_M], + [p].[MarginHP10_Y], + [p].[Margin], + [p].[VisitIDLocked], + [p].[ID_CommentToPerson], + [p].[Comment], + [p].[Deleted], + [p].[ReasonNoAccess], + [p].[Dose_52W_microSv], + [hasEPD] = CONVERT(BIT, CASE WHEN @lid_visit IS NOT NULL THEN 1 ELSE 0 END), + [isAgent] = CONVERT(BIT, CASE WHEN [p].[isAgent] IS NULL THEN 0 ELSE [p].[isAgent] END) + FROM [dbo].[PersonInfoSnapshot] [p] + WHERE [p].[PersID] = @PersID) [a]; +END; + + +go + +---- Luc 2022-03-25 +USE [eDosLocal] +go +IF SCHEMA_ID('syncloc') IS NULL +BEGIN + exec('CREATE SCHEMA [syncLoc]') +END + +GO +IF OBJECT_ID ('[syncLoc].[compareVisit]') IS NULL +BEGIN + CREATE TABLE [syncLoc].[compareVisit]( + [ID_Station] [INT] NOT NULL, + [ID_Visit] [INT] NOT NULL, + [Inst_CODE] [INT] NOT NULL, + [PersID] [INT] NULL, + [ID_Task] [INT] NULL, + [EntryTime] [DATETIME] NULL, + [ReturnTime] [DATETIME] NULL, + [Hp10Dose] [FLOAT] NULL, + [Hp07Dose] [FLOAT] NULL, + [Hp10Total] [FLOAT] NULL, + [Hp07Total] [FLOAT] NULL, + [Hp10Peak] [FLOAT] NULL, + [Hp07Peak] [FLOAT] NULL, + [Hp10Time] [DATETIME] NULL, + [Hp07Time] [DATETIME] NULL, + [ID_EPD] [INT] NULL, + [QualityData] [INT] NULL, + [K1] [INT] NULL, + [K2] [INT] NULL, + [K3] [INT] NULL, + [K4] [INT] NULL, + [K5] [INT] NULL, + [K6] [INT] NULL, + [SG] [INT] NULL, + [BC] [INT] NULL, + [FB] [INT] NULL, + [HG] [INT] NULL, + [alarmStatus] [INT] NULL, + [otherAlarms] [INT] NULL, + [errorStatus] [INT] NULL, + [operatingStatus] [INT] NULL, + [isBG] [BIT] NULL, + [isComplete] [BIT] NOT NULL, + [isDeleted] [BIT] NOT NULL, + [isAlarm] [BIT] NOT NULL, + [isAlarmCleared] [BIT] NOT NULL, + [isManualExit] [BIT] NOT NULL, + [ID_Station_Return] [INT] NULL, + [ENTRY_EPD_CLOCK] [NUMERIC](10, 0) NULL, + [EXIT_EPD_CLOCK] [NUMERIC](10, 0) NULL, + [TIME_LOST] [INT] NULL, + [epdID] [INT] NULL, + [eDosBatteryWarning] [BIT] NULL, + [eDosDose07Warning] [BIT] NULL, + [eDosDose07Alarm] [BIT] NULL, + [eDosRate07Warning] [BIT] NULL, + [eDosRate07Alarm] [BIT] NULL, + [eDosDose10Warning] [BIT] NULL, + [eDosDose10Alarm] [BIT] NULL, + [eDosRate10Warning] [BIT] NULL, + [eDosRate10Alarm] [BIT] NULL, + CONSTRAINT [PK_compareVisit] PRIMARY KEY CLUSTERED +( + [ID_Station] ASC, + [ID_Visit] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY]; + + GRANT ALTER, + INSERT, + UPDATE, + DELETE, + SELECT + ON [syncLoc].[compareVisit] + TO [edosStation]; +END; +GO + +IF NOT EXISTS (SELECT + * + FROM [sys].[columns] + WHERE [object_id] = OBJECT_ID('[syncLoc].[compareVisit]') + AND [name] = 'eDosBatteryWarning')BEGIN + ALTER TABLE [syncLoc].[compareVisit] ADD [eDosBatteryWarning] BIT NULL; + + ALTER TABLE [syncLoc].[compareVisit] ADD [eDosDose07Warning] BIT NULL; + + ALTER TABLE [syncLoc].[compareVisit] ADD [eDosDose07Alarm] BIT NULL; + + ALTER TABLE [syncLoc].[compareVisit] ADD [eDosRate07Warning] BIT NULL; + + ALTER TABLE [syncLoc].[compareVisit] ADD [eDosRate07Alarm] BIT NULL; + + ALTER TABLE [syncLoc].[compareVisit] ADD [eDosDose10Warning] BIT NULL; + + ALTER TABLE [syncLoc].[compareVisit] ADD [eDosDose10Alarm] BIT NULL; + + ALTER TABLE [syncLoc].[compareVisit] ADD [eDosRate10Warning] BIT NULL; + + ALTER TABLE [syncLoc].[compareVisit] ADD [eDosRate10Alarm] BIT NULL; +END; +GO + +ALTER PROCEDURE [syncLoc].[UpdateRemoteReturns] @ID_LocalStation INT = NULL, + @pcnr VARCHAR(20) = NULL +AS BEGIN + -- Luc 2022-03-25 + --DECLARE @ID_LocalStation INT = 9; + --DECLARE @pcnr VARCHAR(20); + IF @pcnr = 'EDOS-SCH' SET @pcnr = 'EDOS-WSCH'; + ELSE IF @pcnr = 'DESKTOP-CCDL4A3' SET @pcnr = 'EDOS-LNK'; + ELSE IF @pcnr = 'EDOS-ZZZ' SET @pcnr = 'EDOS-LSCH'; + + IF @ID_LocalStation IS NULL BEGIN + IF @pcnr IS NULL SET @pcnr = @@serverName; + + IF @pcnr = 'EDOS-SCH' SET @pcnr = 'EDOS-WSCH'; + ELSE IF @pcnr = 'DESKTOP-CCDL4A3' SET @pcnr = 'EDOS-LNK'; + ELSE IF @pcnr = 'EDOS-ZZZ' SET @pcnr = 'EDOS-LSCH'; + + SELECT + @ID_LocalStation = [ID_Station] + FROM [dbo].[StationSettings] + WHERE [PCNr] = @pcnr; + END; + + SELECT + @ID_LocalStation, + [PCNr] + FROM [dbo].[StationSettings] + WHERE [ID_Station] = @ID_LocalStation; + + TRUNCATE TABLE [syncLoc].[compareVisit]; + + INSERT [syncLoc].[compareVisit]([ID_Station], [ID_Visit], [Inst_CODE], [PersID], [ID_Task], [EntryTime], [ReturnTime], [Hp10Dose], [Hp07Dose], [Hp10Total], [Hp07Total], [Hp10Peak], [Hp07Peak], [Hp10Time], [Hp07Time], [ID_EPD], [QualityData], [K1], [K2], [K3], [K4], [K5], [K6], [SG], [BC], [FB], [HG], [alarmStatus], [otherAlarms], [errorStatus], [operatingStatus], [isBG], [isComplete], [isDeleted], [isAlarm], [isAlarmCleared], [isManualExit], [ID_Station_Return], [ENTRY_EPD_CLOCK], [EXIT_EPD_CLOCK], [TIME_LOST], [epdID], [eDosBatteryWarning], [eDosDose07Warning], [eDosDose07Alarm], [eDosRate07Warning], [eDosRate07Alarm], [eDosDose10Warning], [eDosDose10Alarm], [eDosRate10Warning], [eDosRate10Alarm]) + SELECT + [v].[ID_Station], + [v].[ID_Visit], + [v].[Inst_CODE], + [v].[PersID], + [v].[ID_Task], + [v].[EntryTime], + [v].[ReturnTime], + [v].[Hp10Dose], + [v].[Hp07Dose], + [v].[Hp10Total], + [v].[Hp07Total], + [v].[Hp10Peak], + [v].[Hp07Peak], + [v].[Hp10Time], + [v].[Hp07Time], + [v].[ID_EPD], + [v].[QualityData], + [v].[K1], + [v].[K2], + [v].[K3], + [v].[K4], + [v].[K5], + [v].[K6], + [v].[SG], + [v].[BC], + [v].[FB], + [v].[HG], + [v].[alarmStatus], + [v].[otherAlarms], + [v].[errorStatus], + [v].[operatingStatus], + [v].[isBG], + [v].[isComplete], + [v].[isDeleted], + [v].[isAlarm], + [v].[isAlarmCleared], + [v].[isManualExit], + [v].[ID_Station_Return], + [v].[ENTRY_EPD_CLOCK], + [v].[EXIT_EPD_CLOCK], + [v].[TIME_LOST], + [v].[epdID], + [v].[eDosBatteryWarning], + [v].[eDosDose07Warning], + [v].[eDosDose07Alarm], + [v].[eDosRate07Warning], + [v].[eDosRate07Alarm], + [v].[eDosDose10Warning], + [v].[eDosDose10Alarm], + [v].[eDosRate10Warning], + [v].[eDosRate10Alarm] + FROM [EDOS].[edos].[dbo].[Visit] [v] + INNER JOIN(SELECT + [ID_Visit] + FROM [dbo].[Visit] + WHERE [ID_Station] = @ID_LocalStation + AND [ReturnTime] IS NULL) [i] ON [i].[ID_Visit] = [v].[ID_Visit] + WHERE [v].[ID_Station] = @ID_LocalStation + AND [v].[ReturnTime] IS NOT NULL; + + UPDATE + [dbo].[Visit] + SET + [ReturnTime] = [c].[ReturnTime], + [Hp10Dose] = [c].[Hp10Dose], + [Hp07Dose] = [c].[Hp07Dose], + [Hp10Total] = [c].[Hp10Total], + [Hp07Total] = [c].[Hp07Total], + [Hp10Peak] = [c].[Hp10Peak], + [Hp07Peak] = [c].[Hp07Peak], + [Hp10Time] = [c].[Hp10Time], + [Hp07Time] = [c].[Hp07Time], + [QualityData] = [c].[QualityData], + [K1] = [c].[K1], + [K2] = [c].[K2], + [K3] = [c].[K3], + [K4] = [c].[K4], + [K5] = [c].[K5], + [K6] = [c].[K6], + [SG] = [c].[SG], + [BC] = [c].[BC], + [FB] = [c].[FB], + [HG] = [c].[HG], + [alarmStatus] = [c].[alarmStatus], + [otherAlarms] = [c].[otherAlarms], + [errorStatus] = [c].[errorStatus], + [operatingStatus] = [c].[operatingStatus], + [isComplete] = [c].[isComplete], + [isDeleted] = [c].[isDeleted], + [isAlarm] = [c].[isAlarm], + [isAlarmCleared] = [c].[isAlarmCleared], + [isManualExit] = CASE WHEN [v].[isManualExit] IS NULL + OR [c].[isManualExit] = 1 THEN [c].[isManualExit] ELSE [v].[isManualExit] END, + [ID_Station_Return] = ISNULL([c].[ID_Station_Return], [v].[ID_Station_Return]), + [EXIT_EPD_CLOCK] = [c].[EXIT_EPD_CLOCK], + [eDosBatteryWarning] = CASE WHEN [v].[eDosBatteryWarning] IS NULL + OR [c].[eDosBatteryWarning] = 1 THEN [c].[eDosBatteryWarning] ELSE [v].[eDosBatteryWarning] END, + [eDosDose07Warning] = CASE WHEN [v].[eDosDose07Warning] IS NULL + OR [c].[eDosDose07Warning] = 1 THEN [c].[eDosDose07Warning] ELSE [v].[eDosDose07Warning] END, + [eDosDose07Alarm] = CASE WHEN [v].[eDosDose07Alarm] IS NULL + OR [c].[eDosDose07Alarm] = 1 THEN [c].[eDosDose07Alarm] ELSE [v].[eDosDose07Alarm] END, + [eDosRate07Warning] = CASE WHEN [v].[eDosRate07Warning] IS NULL + OR [c].[eDosRate07Warning] = 1 THEN [c].[eDosRate07Warning] ELSE [v].[eDosRate07Warning] END, + [eDosRate07Alarm] = CASE WHEN [v].[eDosRate07Alarm] IS NULL + OR [c].[eDosRate07Alarm] = 1 THEN [c].[eDosRate07Alarm] ELSE [v].[eDosRate07Alarm] END, + [eDosDose10Warning] = CASE WHEN [v].[eDosDose10Warning] IS NULL + OR [c].[eDosDose10Warning] = 1 THEN [c].[eDosDose10Warning] ELSE [v].[eDosDose10Warning] END, + [eDosDose10Alarm] = CASE WHEN [v].[eDosDose10Alarm] IS NULL + OR [c].[eDosDose10Alarm] = 1 THEN [c].[eDosDose10Alarm] ELSE [v].[eDosDose10Alarm] END, + [eDosRate10Warning] = CASE WHEN [v].[eDosRate10Warning] IS NULL + OR [c].[eDosRate10Warning] = 1 THEN [c].[eDosRate10Warning] ELSE [v].[eDosRate10Warning] END, + [eDosRate10Alarm] = CASE WHEN [v].[eDosRate10Alarm] IS NULL + OR [c].[eDosRate10Alarm] = 1 THEN [c].[eDosRate10Alarm] ELSE [v].[eDosRate10Alarm] END + FROM [dbo].[Visit] [v] + INNER JOIN [syncLoc].[compareVisit] [c] ON [c].[ID_Station] = [v].[ID_Station] + AND [c].[ID_Visit] = [v].[ID_Visit] + WHERE [v].[ReturnTime] IS NULL + AND [v].[isComplete] = 0; +END; +GO +GRANT EXECUTE ON [syncLoc].[UpdateRemoteReturns] TO [eDosStation]; +GO +--2022-08-24 ChirpRate +ALTER PROCEDURE [dbo].[GetTaskInfo] @ID_Task INT = NULL, @WorkerDosisMargin FLOAT = NULL AS + +--DECLARE @ID_Task INT =5,@WorkerDosisMargin FLOAT=10 +SELECT + [t].[ID_Task], + [t].[Inst_CODE], + [t].[TaskType_CODE], + [t].[Task_Name], + [t].[TaskDescription], + [t].[EPDRad], + [t].[ID_AlarmEPD], + [t].[TaskDateStart], + [t].[TaskDateEnd], + [t].[TaskEnable], + [t].[ID_FNGainANGain], + [t].[Hp10Dose1], + [t].[Hp10Dose2], + [t].[Hp07Dose], + [t].[HP10Rate1ON], + [t].[HP10Rate1OFF], + [t].[HP10Rate2ON], + [t].[HP10Rate2OFF], + [t].[HP07RateON], + [t].[HP07RateOFF], + [t].[FNGain_ANGainValue], + [t].[InstallationActivity], + [t].[Description], + [t].[Inst_CODE], + [t].[MinWorkerDosisMargin], + [MarginExceeded] = CONVERT(BIT, CASE WHEN @WorkerDosisMargin IS NULL + OR [t].[MinWorkerDosisMargin] > @WorkerDosisMargin THEN 1 ELSE 0 END), + [ChirpRate] = CONVERT(REAL,ISNULL([t].[ChirpRate],0.0)) +FROM [dbo].[TaskInfoSnapshot] [t] +WHERE @ID_Task IS NULL + OR [t].[ID_Task] = @ID_Task; + +go diff --git a/scripts/Upgrader.ps1 b/scripts/Upgrader.ps1 index cd6c1cf..d4b27b0 100644 --- a/scripts/Upgrader.ps1 +++ b/scripts/Upgrader.ps1 @@ -21,6 +21,15 @@ Import-Certificate -FilePath "c:\software\sckca.cer" -CertStoreLocation Cert:\Lo Import-Certificate -FilePath "c:\software\ictinteremediate.cer" -CertStoreLocation Cert:\LocalMachine\Ca Import-Certificate -FilePath "c:\software\signertrust.cer" -CertStoreLocation Cert:\LocalMachine\TrustedPublisher +$SourcePath = "C:\software\OfflineModules" + +if (Test-Path -Path $SourcePath) { + Write-Host "Bronmap gevonden, kopiëren start..." -ForegroundColor Green + Copy-Item -Path "$SourcePath\*" -Destination "$env:ProgramFiles\WindowsPowerShell\Modules" -Recurse -Force +} else { + Write-Warning "Fout: De map $SourcePath bestaat niet!" +} + Start-ScheduledTask -TaskName $taskname @@ -28,203 +37,211 @@ Start-ScheduledTask -TaskName $taskname exit # SIG # Begin signature block -# MIIlPAYJKoZIhvcNAQcCoIIlLTCCJSkCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB -# gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR -# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUtRVTh7pvQAmc9/k17SmKvWNa -# 9qCggh9wMIIFjTCCBHWgAwIBAgIQDpsYjvnQLefv21DiCEAYWjANBgkqhkiG9w0B -# AQwFADBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYD -# VQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVk -# IElEIFJvb3QgQ0EwHhcNMjIwODAxMDAwMDAwWhcNMzExMTA5MjM1OTU5WjBiMQsw -# CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu -# ZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQw -# ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz -# 7MKnJS7JIT3yithZwuEppz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS -# 5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7 -# bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfI -# SKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jH -# trHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14 -# Ztk6MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2 -# h4mXaXpI8OCiEhtmmnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt -# 6zPZxd9LBADMfRyVw4/3IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPR -# iQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ER -# ElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4K -# Jpn15GkvmB0t9dmpsh3lGwIDAQABo4IBOjCCATYwDwYDVR0TAQH/BAUwAwEB/zAd -# BgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wHwYDVR0jBBgwFoAUReuir/SS -# y4IxLVGLp6chnfNtyA8wDgYDVR0PAQH/BAQDAgGGMHkGCCsGAQUFBwEBBG0wazAk -# BggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEMGCCsGAQUFBzAC -# hjdodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRBc3N1cmVkSURS -# b290Q0EuY3J0MEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9jcmwzLmRpZ2ljZXJ0 -# LmNvbS9EaWdpQ2VydEFzc3VyZWRJRFJvb3RDQS5jcmwwEQYDVR0gBAowCDAGBgRV -# HSAAMA0GCSqGSIb3DQEBDAUAA4IBAQBwoL9DXFXnOF+go3QbPbYW1/e/Vwe9mqyh -# hyzshV6pGrsi+IcaaVQi7aSId229GhT0E0p6Ly23OO/0/4C5+KH38nLeJLxSA8hO -# 0Cre+i1Wz/n096wwepqLsl7Uz9FDRJtDIeuWcqFItJnLnU+nBgMTdydE1Od/6Fmo -# 8L8vC6bp8jQ87PcDx4eo0kxAGTVGamlUsLihVo7spNU96LHc/RzY9HdaXFSMb++h -# UD38dglohJ9vytsgjTVgHAIDyyCwrFigDkBjxZgiwbJZ9VVrzyerbHbObyMt9H5x -# aiNrIv8SuFQtJ37YOtnwtoeW/VvRXKwYw02fc7cBqZ9Xql4o4rmUMIIFvDCCA6Sg -# AwIBAgIBHzANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJCRTESMBAGA1UECBMJ -# QW50d2VycGVuMQwwCgYDVQQHEwNNb2wxDzANBgNVBAoTBlNDS0NFTjEMMAoGA1UE -# CxMDSUNUMRYwFAYDVQQDEw1TQ0tDRU4gSUNUIENBMB4XDTE4MDUyNDA2MTEwMFoX -# DTMwMDYwMTEyMDAwMFowTzEhMB8GA1UEAxMYVmFuZGVuYnJvdWNrZSBMdWMgQ1My -# MDIxMSowKAYJKoZIhvcNAQkBFhtsdWMudmFuZGVuYnJvdWNrZUBzY2tjZW4uYmUw -# ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0WzD0gHTLFEbOjPUwobl2 -# VntS0kJVV2FRzxkZZ0Hhe9fbYB0tRK5+9GltD7rwhApM1E2xh8N6Pmxfr49VGVsP -# NqDhGRmp5wKE8htQiMXTjHPOTHZsvim/vvSL8WuouGoX6TQxxNBefE6Jmjcg2NHb -# UVAxDGcPwNADJBZnYPQTp6q2HniwdDv/OmZM1JJUYn4v1mt7YtS1eFO30ekuGzJu -# 3WQYeOiFNht/6AXZTWALQtwzaJfm563AbxfnHBsBuZFcRGYPE7aRDI9NIZyPqzT4 -# yOAK+phPN1ympNV+f8XXWaacfZXSWolbo8jqstHDjYYjf77Fj3WVN+y0GxtTsnRl -# AgMBAAGjggGKMIIBhjAJBgNVHRMEAjAAMB0GA1UdDgQWBBTftWyIS4unlpS288p5 -# Xofe0LiBZTAfBgNVHSMEGDAWgBTwKRT1aiEUklZUE6Q91a3wITrFeDALBgNVHQ8E -# BAMCB4AwHwYDVR0lBBgwFgYIKwYBBQUHAwMGCisGAQQBgjcCARUwOgYDVR0RBDMw -# MYEbbHVjLnZhbmRlbmJyb3Vja2VAc2NrY2VuLmJlgRJsdmFuZGVuYkBzY2tjZW4u -# YmUwNQYDVR0SBC4wLIYqaHR0cDovL2NybC5zY2tjZW4uYmUvU0NLQ0VOJTIwSUNU -# JTIwQ0EuY3J0MDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmwuc2NrY2VuLmJl -# L1NDS0NFTiUyMElDVCUyMENBLmNybDA+BgkrBgEEAYI3FQcEMTAvBicrBgEEAYI3 -# FQiEjLwhgsj9d4KhkyKEl5RGhMaSLoEBgtSEIYH6yGkCAWQCAQgwGwYJKwYBBAGC -# NxUKBA4wDDAKBggrBgEFBQcDAzANBgkqhkiG9w0BAQsFAAOCAgEARh/O37vbDW3A -# j1UAnSfYz+I0+fVk2ZurOQarjtdFC/Yu1ABJnXdMnwh1t5sjVIoEejvjnOlmu+B2 -# 1IQJPpxIph8cz+SnDZyhOpcKrCDn+PSeRvth0Zk4FvbXsLK9/WYgdzRObNOHxxAN -# COOc7PMLIMqeDJa+b9wH82Ae4MYdB8XZvoqJ+z172yoQMiNxe6UE2GropZiwJB56 -# Fw+k/jrKdOMEfZtfhzRqizCmMlTknbtFJ5hrqhwcaTA+4QCfCwouckererOATQnM -# 8Ic1KaOmYK7S5igmnA5mekiTKrBhcGp/xsZy0r8OUKVV1FSYnQ3035THia31oQzh -# Le48faEFkNuPbs8ZaiTFXwbdWGQ6uIK++soyulWOxeueNBAqIOGrj7XuDaIk+VD3 -# RN0B0g//Nv3HS6FboRC0eKeG3yezzjU+8fImcyPAaAEofUiiQYdOpnJsiaLDpHO+ -# 1r98pKmpe0fvy0IvYHicJLuk4tFyMvVBRgW1A+JtfHuXCnag88iB8AJ3tCUdGRCC -# z8yE1r4hbklyqhj9G5EmxoKZfi7mgh3CgL/tRUAXNqFltMj3cQlGKcKPUH004dKm -# FwAUAG4mzsO1Sk50S7EvdpvaW+sJ/bWMjXzLuq+xFwrsSTQ22KSm8XmnX2NGqws5 -# Tk+pqQupcwan4CsjflVqMva5nc4YxI4wggZyMIIEWqADAgECAhM4AAAAAm7pDq12 -# AeXXAAAAAAACMA0GCSqGSIb3DQEBCwUAMGcxCzAJBgNVBAYTAkJFMRIwEAYDVQQI -# EwlBbnR3ZXJwZW4xDDAKBgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYD -# VQQLEwNJQ1QxFzAVBgNVBAMTDlNDS0NFTiBSb290IENBMB4XDTE3MDYyMzExMzkz -# NFoXDTMyMDYyMzExNDkzNFowZjELMAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdl -# cnBlbjEMMAoGA1UEBxMDTW9sMQ8wDQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lD -# VDEWMBQGA1UEAxMNU0NLQ0VOIElDVCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP -# ADCCAgoCggIBALFtbifIAikMI3YQIa+niSTV8PsH34uadkQePLs02kIdmPPT/u+T -# RYZO6njltLVcGnMWJLmzL4DamrAPUbJcpkRLMS35aDAonUT0kI/KNChNnHy2KI2K -# 3tUwoRcXND2aG4m2ewU7FNr++RkI57BBDJsc8CSwI0lNphVSiSo6yrOF7f6uo98N -# H3a0c9G2vM0jG0xztivAndUatxkAyz8rYScg8c6OmERO0xThXFxqyKRV75stVz3P -# yLYh8E6HDpkNZrBfuOltIH1rWxS7fGwvwp7hNmUD5wJqat5TlLvHDqv9nqoYoQHg -# JYuTHGHqWivqq9SbSzX4E0pJBRcNu3OXD18BQghNK8iXTfqjeF3ZNydos9IWshCe -# LBmopnSU17/zk5kscShjJz2FfgU75PzwyZxo1kKjq8n9D1oJsFUNSgKMGj4wQFyT -# hKLczZ81tPxSrb4CWC5N8RbN7CSehBug9NsAdkTbMzRjOurcqqsf2d+udccM4JGG -# EdRE3ZnXXKi+v92vh4n0uSvfTfqu61/0ad9QFJTbG+d8YYeNzVlAIOU862/SeeJg -# UemfzGn5k1R3CtpyukUWGlH8bP1rhNvjs1+zHRv1EYtZVbjru4aewCp0o3C5znAR -# u5ZEitUNaQrgAmDJLwpfu5HoqN++mpFH7pl9x6hFYCvLbWYkYIlR0e0NAgMBAAGj -# ggEWMIIBEjAQBgkrBgEEAYI3FQEEAwIBADAdBgNVHQ4EFgQU8CkU9WohFJJWVBOk -# PdWt8CE6xXgwGQYJKwYBBAGCNxQCBAweCgBTAHUAYgBDAEEwCwYDVR0PBAQDAgGG -# MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUr8bKrgoIFExryOnviOUxtH5 -# FDAwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5zY2tjZW4uYmUvU0NLQ0VO -# JTIwUm9vdCUyMENBLmNybDBHBggrBgEFBQcBAQQ7MDkwNwYIKwYBBQUHMAKGK2h0 -# dHA6Ly9jcmwuc2NrY2VuLmJlL1NDS0NFTiUyMFJvb3QlMjBDQS5jcnQwDQYJKoZI -# hvcNAQELBQADggIBAIbENXjQHhcyihmPSltFTBqy1G7XHIx6HipRnVZ/soUvcYUm -# iBYJtNCD1Tuc4fYyrYAgN6PNU6mNMNVqEStVPLfPTp+UWWFct/aQ8rvqAZR4LpfS -# jriWyCi4IdFYBD72N7zNIdGy3cSK55SMXIVcYLOcv4f8Cyply47IPgLmM7CePvRg -# A+UrHRRqdo4ij3/WsOsxuu2p9sk6rbz33qEaZDFjvjMd/QllsH1NzGkMkpQMdPyc -# 2XKls5OkBYDdYfPcEgRw9JjBXZ2oRLYecvUIT5C8nT54omxeVWefYG1FZaRRc/FX -# XZgbcfcX3uWiGBI5I9+R5hFvxTe6sJyT93QpY8xYqkrniqohSDd6bp4x2zFKAMSZ -# 4m8ddV8+KRZuZnZPL/ea/rJ3B/EhSvz+Z1I4xGCAUSJ2YqL5ewvCnyNUQ/ZVyQz3 -# cOclX5AqZAq/62DTTAR3w2GfhtTRLvVsxNja5JwuB+KqDSS5jI1T07MHCE+/NIjr -# xWUX9apftHtkylBwjpGfqZV7Zdx+jIpqzZOgf2UAMuJhEzR+nHmqLnVe1+WOx820 -# 8ElwksOhgokDHWF4LBafpYqKKxJhWYVXNj07PqFF2zIvCFGgsihJurTGRyfjxlNW -# ARPEs8o+ZyNUlIW/mh7p0RpYYFz2+G5xHWVWjK7sRTNFG64hsJpDhL/XD1aQMIIG -# tDCCBJygAwIBAgIQDcesVwX/IZkuQEMiDDpJhjANBgkqhkiG9w0BAQsFADBiMQsw -# CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu -# ZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQw -# HhcNMjUwNTA3MDAwMDAwWhcNMzgwMTE0MjM1OTU5WjBpMQswCQYDVQQGEwJVUzEX -# MBUGA1UEChMORGlnaUNlcnQsIEluYy4xQTA/BgNVBAMTOERpZ2lDZXJ0IFRydXN0 -# ZWQgRzQgVGltZVN0YW1waW5nIFJTQTQwOTYgU0hBMjU2IDIwMjUgQ0ExMIICIjAN -# BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtHgx0wqYQXK+PEbAHKx126NGaHS0 -# URedTa2NDZS1mZaDLFTtQ2oRjzUXMmxCqvkbsDpz4aH+qbxeLho8I6jY3xL1IusL -# opuW2qftJYJaDNs1+JH7Z+QdSKWM06qchUP+AbdJgMQB3h2DZ0Mal5kYp77jYMVQ -# XSZH++0trj6Ao+xh/AS7sQRuQL37QXbDhAktVJMQbzIBHYJBYgzWIjk8eDrYhXDE -# pKk7RdoX0M980EpLtlrNyHw0Xm+nt5pnYJU3Gmq6bNMI1I7Gb5IBZK4ivbVCiZv7 -# PNBYqHEpNVWC2ZQ8BbfnFRQVESYOszFI2Wv82wnJRfN20VRS3hpLgIR4hjzL0hpo -# YGk81coWJ+KdPvMvaB0WkE/2qHxJ0ucS638ZxqU14lDnki7CcoKCz6eum5A19WZQ -# HkqUJfdkDjHkccpL6uoG8pbF0LJAQQZxst7VvwDDjAmSFTUms+wV/FbWBqi7fTJn -# jq3hj0XbQcd8hjj/q8d6ylgxCZSKi17yVp2NL+cnT6Toy+rN+nM8M7LnLqCrO2JP -# 3oW//1sfuZDKiDEb1AQ8es9Xr/u6bDTnYCTKIsDq1BtmXUqEG1NqzJKS4kOmxkYp -# 2WyODi7vQTCBZtVFJfVZ3j7OgWmnhFr4yUozZtqgPrHRVHhGNKlYzyjlroPxul+b -# gIspzOwbtmsgY1MCAwEAAaOCAV0wggFZMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYD -# VR0OBBYEFO9vU0rp5AZ8esrikFb2L9RJ7MtOMB8GA1UdIwQYMBaAFOzX44LScV1k -# TN8uZz/nupiuHA9PMA4GA1UdDwEB/wQEAwIBhjATBgNVHSUEDDAKBggrBgEFBQcD -# CDB3BggrBgEFBQcBAQRrMGkwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2lj -# ZXJ0LmNvbTBBBggrBgEFBQcwAoY1aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29t -# L0RpZ2lDZXJ0VHJ1c3RlZFJvb3RHNC5jcnQwQwYDVR0fBDwwOjA4oDagNIYyaHR0 -# cDovL2NybDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VHJ1c3RlZFJvb3RHNC5jcmww -# IAYDVR0gBBkwFzAIBgZngQwBBAIwCwYJYIZIAYb9bAcBMA0GCSqGSIb3DQEBCwUA -# A4ICAQAXzvsWgBz+Bz0RdnEwvb4LyLU0pn/N0IfFiBowf0/Dm1wGc/Do7oVMY2mh -# XZXjDNJQa8j00DNqhCT3t+s8G0iP5kvN2n7Jd2E4/iEIUBO41P5F448rSYJ59Ib6 -# 1eoalhnd6ywFLerycvZTAz40y8S4F3/a+Z1jEMK/DMm/axFSgoR8n6c3nuZB9BfB -# wAQYK9FHaoq2e26MHvVY9gCDA/JYsq7pGdogP8HRtrYfctSLANEBfHU16r3J05qX -# 3kId+ZOczgj5kjatVB+NdADVZKON/gnZruMvNYY2o1f4MXRJDMdTSlOLh0HCn2cQ -# LwQCqjFbqrXuvTPSegOOzr4EWj7PtspIHBldNE2K9i697cvaiIo2p61Ed2p8xMJb -# 82Yosn0z4y25xUbI7GIN/TpVfHIqQ6Ku/qjTY6hc3hsXMrS+U0yy+GWqAXam4ToW -# d2UQ1KYT70kZjE4YtL8Pbzg0c1ugMZyZZd/BdHLiRu7hAWE6bTEm4XYRkA6Tl4KS -# FLFk43esaUeqGkH/wyW4N7OigizwJWeukcyIPbAvjSabnf7+Pu0VrFgoiovRDiyx -# 3zEdmcif/sYQsfch28bZeUz2rtY/9TCA6TD8dC3JE3rYkrhLULy7Dc90G6e8Blqm -# yIjlgp2+VqsS9/wQD7yFylIz0scmbKvFoW2jNrbM1pD2T7m3XDCCBu0wggTVoAMC -# AQICEAqA7xhLjfEFgtHEdqeVdGgwDQYJKoZIhvcNAQELBQAwaTELMAkGA1UEBhMC -# VVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMUEwPwYDVQQDEzhEaWdpQ2VydCBU -# cnVzdGVkIEc0IFRpbWVTdGFtcGluZyBSU0E0MDk2IFNIQTI1NiAyMDI1IENBMTAe -# Fw0yNTA2MDQwMDAwMDBaFw0zNjA5MDMyMzU5NTlaMGMxCzAJBgNVBAYTAlVTMRcw -# FQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgU0hBMjU2 -# IFJTQTQwOTYgVGltZXN0YW1wIFJlc3BvbmRlciAyMDI1IDEwggIiMA0GCSqGSIb3 -# DQEBAQUAA4ICDwAwggIKAoICAQDQRqwtEsae0OquYFazK1e6b1H/hnAKAd/KN8wZ -# QjBjMqiZ3xTWcfsLwOvRxUwXcGx8AUjni6bz52fGTfr6PHRNv6T7zsf1Y/E3IU8k -# gNkeECqVQ+3bzWYesFtkepErvUSbf+EIYLkrLKd6qJnuzK8Vcn0DvbDMemQFoxQ2 -# Dsw4vEjoT1FpS54dNApZfKY61HAldytxNM89PZXUP/5wWWURK+IfxiOg8W9lKMqz -# dIo7VA1R0V3Zp3DjjANwqAf4lEkTlCDQ0/fKJLKLkzGBTpx6EYevvOi7XOc4zyh1 -# uSqgr6UnbksIcFJqLbkIXIPbcNmA98Oskkkrvt6lPAw/p4oDSRZreiwB7x9ykrjS -# 6GS3NR39iTTFS+ENTqW8m6THuOmHHjQNC3zbJ6nJ6SXiLSvw4Smz8U07hqF+8CTX -# aETkVWz0dVVZw7knh1WZXOLHgDvundrAtuvz0D3T+dYaNcwafsVCGZKUhQPL1naF -# KBy1p6llN3QgshRta6Eq4B40h5avMcpi54wm0i2ePZD5pPIssoszQyF4//3DoK2O -# 65Uck5Wggn8O2klETsJ7u8xEehGifgJYi+6I03UuT1j7FnrqVrOzaQoVJOeeStPe -# ldYRNMmSF3voIgMFtNGh86w3ISHNm0IaadCKCkUe2LnwJKa8TIlwCUNVwppwn4D3 -# /Pt5pwIDAQABo4IBlTCCAZEwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU5Dv88jHt -# /f3X85FxYxlQQ89hjOgwHwYDVR0jBBgwFoAU729TSunkBnx6yuKQVvYv1Ensy04w -# DgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMIMIGVBggrBgEF -# BQcBAQSBiDCBhTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29t -# MF0GCCsGAQUFBzAChlFodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNl -# cnRUcnVzdGVkRzRUaW1lU3RhbXBpbmdSU0E0MDk2U0hBMjU2MjAyNUNBMS5jcnQw -# XwYDVR0fBFgwVjBUoFKgUIZOaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL0RpZ2lD -# ZXJ0VHJ1c3RlZEc0VGltZVN0YW1waW5nUlNBNDA5NlNIQTI1NjIwMjVDQTEuY3Js -# MCAGA1UdIAQZMBcwCAYGZ4EMAQQCMAsGCWCGSAGG/WwHATANBgkqhkiG9w0BAQsF -# AAOCAgEAZSqt8RwnBLmuYEHs0QhEnmNAciH45PYiT9s1i6UKtW+FERp8FgXRGQ/Y -# AavXzWjZhY+hIfP2JkQ38U+wtJPBVBajYfrbIYG+Dui4I4PCvHpQuPqFgqp1PzC/ -# ZRX4pvP/ciZmUnthfAEP1HShTrY+2DE5qjzvZs7JIIgt0GCFD9ktx0LxxtRQ7vll -# KluHWiKk6FxRPyUPxAAYH2Vy1lNM4kzekd8oEARzFAWgeW3az2xejEWLNN4eKGxD -# J8WDl/FQUSntbjZ80FU3i54tpx5F/0Kr15zW/mJAxZMVBrTE2oi0fcI8VMbtoRAm -# aaslNXdCG1+lqvP4FbrQ6IwSBXkZagHLhFU9HCrG/syTRLLhAezu/3Lr00GrJzPQ -# FnCEH1Y58678IgmfORBPC1JKkYaEt2OdDh4GmO0/5cHelAK2/gTlQJINqDr6Jfwy -# YHXSd+V08X1JUPvB4ILfJdmL+66Gp3CSBXG6IwXMZUXBhtCyIaehr0XkBoDIGMUG -# 1dUtwq1qmcwbdUfcSYCn+OwncVUXf53VJUNOaMWMts0VlRYxe5nK+At+DI96HAlX -# HAL5SlfYxJ7La54i71McVWRP66bW+yERNpbJCjyCYG2j+bdpxo/1Cy4uPcU3AWVP -# Grbn5PhDBf3Froguzzhk++ami+r3Qrx5bIbY3TVzgiFI7Gq3zWcxggU2MIIFMgIB -# ATBrMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAKBgNVBAcT -# A01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVND -# S0NFTiBJQ1QgQ0ECAR8wCQYFKw4DAhoFAKB4MBgGCisGAQQBgjcCAQwxCjAIoAKA -# AKECgAAwGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcCAQQwHAYKKwYBBAGCNwIBCzEO -# MAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYEFAQdzmdkbBZSiWEkdsJRgFH6 -# vc6RMA0GCSqGSIb3DQEBAQUABIIBAPEaFBMOudQfPwqwpZ6b+F2PIewGVL/kwsCW -# VeW4W4+cALRqhWPYJxmho/IaQZPgT0T3h8sjDDu/2ZTUGYWG2Sa1xgn6sgnB1emh -# 0GklWJ7kcOr6qjzqJXi9l6FWeIGTnjiwkp2nNF/7CEzu9qc4ngg4gI4UuZ2AOb16 -# pXn1VNOYEimfBx4yWI7nosdmjkLvnmwckSTX603DQ7jcPMeqIDACadH8qU29yvyZ -# XMsjtIrr187VrDpqFN2IWcXBM2QTrtiLPeBzrxf7Ck3sDv+F98ZHfiHU5X3jg9MB -# lErnnG/0QoI1zuGdaATp/OReE1Bx2omY1G+qnO0Sd4gtC5nbHKWhggMmMIIDIgYJ -# KoZIhvcNAQkGMYIDEzCCAw8CAQEwfTBpMQswCQYDVQQGEwJVUzEXMBUGA1UEChMO -# RGlnaUNlcnQsIEluYy4xQTA/BgNVBAMTOERpZ2lDZXJ0IFRydXN0ZWQgRzQgVGlt -# ZVN0YW1waW5nIFJTQTQwOTYgU0hBMjU2IDIwMjUgQ0ExAhAKgO8YS43xBYLRxHan -# lXRoMA0GCWCGSAFlAwQCAQUAoGkwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc -# BgkqhkiG9w0BCQUxDxcNMjYwMTA3MTM1NDM3WjAvBgkqhkiG9w0BCQQxIgQg242b -# sSYHEg7n8/npIqaySSjzHTonfBxWr51+AvIYHlswDQYJKoZIhvcNAQEBBQAEggIA -# MW+vUkrKHzzNur6PkxRNgr9VCBYzuMtxcsZasMnHBifwko4p3XfJeDoDmHXZyzjF -# qEt7PVvbvHp4CpTKNGQWbcX2ba0nWDy9YpnE1zzvMKNFXzk3ZQbA21XPFi2VrpJY -# UoQkEAfOvPX81sHgjfgCf4WWQQSx1zH3PNgEGn/aaYPSYzmHskIXvrgS6VIb33yW -# Kzl54z9ujOQTmw5ZIE8rllaqlfZGGanii/euEu/PZ30sT36CTWh9MJWk2CbX7T8N -# Hl9z+AOIY0MtX8jFl9fJZxHdMRtahxzj1BiUDNxUDvAWFLu3w7ExNJo4zWno2pSw -# 645s5yo3/XA02uF1K79O4v8/bfrAe1ZQIDIdtPATlH7zFlZpXylZ+mW7q4CP0YHx -# LLt8u/nrdicIXQmIl/3x+9Bt4GOzdwp/LzjpFPWXGA09dLc0UW+5O/wn2+ThgAfZ -# iHZ21dgUIbeHDQ42ECAWmPrlyp+sNIRFhFEfspHf1ixinDN3h0TOEnSAgSk3XD0I -# azf3lC9lQe9LoGDfT9gDepi1HQ3mZseMdEr+k7flQmSNv57iu9dD1nbSdmss6BWt -# obMorX5URzFuUnhOCM4g0zJuGpuIffAL4Ow4u7UU7bxVmPAfwVBgtT3SvQrElQOv -# sBIKF23Yk287kTo3xRsUBtOFH3BfbUadONfjG39uHEk= +# MIImpAYJKoZIhvcNAQcCoIImlTCCJpECAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBOScG177DVwwy3 +# b/0s74/nYVBfoa9OI4AdIt4yzJ6gDqCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG +# SIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAK +# BgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNV +# BAMTDVNDS0NFTiBJQ1QgQ0EwHhcNMTgwNTI0MDYxMTAwWhcNMzAwNjAxMTIwMDAw +# WjBPMSEwHwYDVQQDExhWYW5kZW5icm91Y2tlIEx1YyBDUzIwMjExKjAoBgkqhkiG +# 9w0BCQEWG2x1Yy52YW5kZW5icm91Y2tlQHNja2Nlbi5iZTCCASIwDQYJKoZIhvcN +# AQEBBQADggEPADCCAQoCggEBAPRbMPSAdMsURs6M9TChuXZWe1LSQlVXYVHPGRln +# QeF719tgHS1Ern70aW0PuvCECkzUTbGHw3o+bF+vj1UZWw82oOEZGannAoTyG1CI +# xdOMc85Mdmy+Kb++9Ivxa6i4ahfpNDHE0F58TomaNyDY0dtRUDEMZw/A0AMkFmdg +# 9BOnqrYeeLB0O/86ZkzUklRifi/Wa3ti1LV4U7fR6S4bMm7dZBh46IU2G3/oBdlN +# YAtC3DNol+bnrcBvF+ccGwG5kVxEZg8TtpEMj00hnI+rNPjI4Ar6mE83XKak1X5/ +# xddZppx9ldJaiVujyOqy0cONhiN/vsWPdZU37LQbG1OydGUCAwEAAaOCAYowggGG +# MAkGA1UdEwQCMAAwHQYDVR0OBBYEFN+1bIhLi6eWlLbzynleh97QuIFlMB8GA1Ud +# IwQYMBaAFPApFPVqIRSSVlQTpD3VrfAhOsV4MAsGA1UdDwQEAwIHgDAfBgNVHSUE +# GDAWBggrBgEFBQcDAwYKKwYBBAGCNwIBFTA6BgNVHREEMzAxgRtsdWMudmFuZGVu +# YnJvdWNrZUBzY2tjZW4uYmWBEmx2YW5kZW5iQHNja2Nlbi5iZTA1BgNVHRIELjAs +# hipodHRwOi8vY3JsLnNja2Nlbi5iZS9TQ0tDRU4lMjBJQ1QlMjBDQS5jcnQwOwYD +# VR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5zY2tjZW4uYmUvU0NLQ0VOJTIwSUNU +# JTIwQ0EuY3JsMD4GCSsGAQQBgjcVBwQxMC8GJysGAQQBgjcVCISMvCGCyP13gqGT +# IoSXlEaExpIugQGC1IQhgfrIaQIBZAIBCDAbBgkrBgEEAYI3FQoEDjAMMAoGCCsG +# AQUFBwMDMA0GCSqGSIb3DQEBCwUAA4ICAQBGH87fu9sNbcCPVQCdJ9jP4jT59WTZ +# m6s5BquO10UL9i7UAEmdd0yfCHW3myNUigR6O+Oc6Wa74HbUhAk+nEimHxzP5KcN +# nKE6lwqsIOf49J5G+2HRmTgW9tewsr39ZiB3NE5s04fHEA0I45zs8wsgyp4Mlr5v +# 3AfzYB7gxh0Hxdm+ion7PXvbKhAyI3F7pQTYauilmLAkHnoXD6T+Osp04wR9m1+H +# NGqLMKYyVOSdu0UnmGuqHBxpMD7hAJ8LCi5yR6t6s4BNCczwhzUpo6ZgrtLmKCac +# DmZ6SJMqsGFwan/GxnLSvw5QpVXUVJidDfTflMeJrfWhDOEt7jx9oQWQ249uzxlq +# JMVfBt1YZDq4gr76yjK6VY7F6540ECog4auPte4NoiT5UPdE3QHSD/82/cdLoVuh +# ELR4p4bfJ7PONT7x8iZzI8BoASh9SKJBh06mcmyJosOkc77Wv3ykqal7R+/LQi9g +# eJwku6Ti0XIy9UFGBbUD4m18e5cKdqDzyIHwAne0JR0ZEILPzITWviFuSXKqGP0b +# kSbGgpl+LuaCHcKAv+1FQBc2oWW0yPdxCUYpwo9QfTTh0qYXABQAbibOw7VKTnRL +# sS92m9pb6wn9tYyNfMu6r7EXCuxJNDbYpKbxeadfY0arCzlOT6mpC6lzBqfgKyN+ +# VWoy9rmdzhjEjjCCBnIwggRaoAMCAQICEzgAAAACbukOrXYB5dcAAAAAAAIwDQYJ +# KoZIhvcNAQELBQAwZzELMAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdlcnBlbjEM +# MAoGA1UEBxMDTW9sMQ8wDQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lDVDEXMBUG +# A1UEAxMOU0NLQ0VOIFJvb3QgQ0EwHhcNMTcwNjIzMTEzOTM0WhcNMzIwNjIzMTE0 +# OTM0WjBmMQswCQYDVQQGEwJCRTESMBAGA1UECBMJQW50d2VycGVuMQwwCgYDVQQH +# EwNNb2wxDzANBgNVBAoTBlNDS0NFTjEMMAoGA1UECxMDSUNUMRYwFAYDVQQDEw1T +# Q0tDRU4gSUNUIENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsW1u +# J8gCKQwjdhAhr6eJJNXw+wffi5p2RB48uzTaQh2Y89P+75NFhk7qeOW0tVwacxYk +# ubMvgNqasA9RslymREsxLfloMCidRPSQj8o0KE2cfLYojYre1TChFxc0PZobibZ7 +# BTsU2v75GQjnsEEMmxzwJLAjSU2mFVKJKjrKs4Xt/q6j3w0fdrRz0ba8zSMbTHO2 +# K8Cd1Rq3GQDLPythJyDxzo6YRE7TFOFcXGrIpFXvmy1XPc/ItiHwTocOmQ1msF+4 +# 6W0gfWtbFLt8bC/CnuE2ZQPnAmpq3lOUu8cOq/2eqhihAeAli5McYepaK+qr1JtL +# NfgTSkkFFw27c5cPXwFCCE0ryJdN+qN4Xdk3J2iz0hayEJ4sGaimdJTXv/OTmSxx +# KGMnPYV+BTvk/PDJnGjWQqOryf0PWgmwVQ1KAowaPjBAXJOEotzNnzW0/FKtvgJY +# Lk3xFs3sJJ6EG6D02wB2RNszNGM66tyqqx/Z3651xwzgkYYR1ETdmddcqL6/3a+H +# ifS5K99N+q7rX/Rp31AUlNsb53xhh43NWUAg5Tzrb9J54mBR6Z/MafmTVHcK2nK6 +# RRYaUfxs/WuE2+OzX7MdG/URi1lVuOu7hp7AKnSjcLnOcBG7lkSK1Q1pCuACYMkv +# Cl+7keio376akUfumX3HqEVgK8ttZiRgiVHR7Q0CAwEAAaOCARYwggESMBAGCSsG +# AQQBgjcVAQQDAgEAMB0GA1UdDgQWBBTwKRT1aiEUklZUE6Q91a3wITrFeDAZBgkr +# BgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw +# AwEB/zAfBgNVHSMEGDAWgBRSvxsquCggUTGvI6e+I5TG0fkUMDA8BgNVHR8ENTAz +# MDGgL6AthitodHRwOi8vY3JsLnNja2Nlbi5iZS9TQ0tDRU4lMjBSb290JTIwQ0Eu +# Y3JsMEcGCCsGAQUFBwEBBDswOTA3BggrBgEFBQcwAoYraHR0cDovL2NybC5zY2tj +# ZW4uYmUvU0NLQ0VOJTIwUm9vdCUyMENBLmNydDANBgkqhkiG9w0BAQsFAAOCAgEA +# hsQ1eNAeFzKKGY9KW0VMGrLUbtccjHoeKlGdVn+yhS9xhSaIFgm00IPVO5zh9jKt +# gCA3o81TqY0w1WoRK1U8t89On5RZYVy39pDyu+oBlHgul9KOuJbIKLgh0VgEPvY3 +# vM0h0bLdxIrnlIxchVxgs5y/h/wLKmXLjsg+AuYzsJ4+9GAD5SsdFGp2jiKPf9aw +# 6zG67an2yTqtvPfeoRpkMWO+Mx39CWWwfU3MaQySlAx0/JzZcqWzk6QFgN1h89wS +# BHD0mMFdnahEth5y9QhPkLydPniibF5VZ59gbUVlpFFz8VddmBtx9xfe5aIYEjkj +# 35HmEW/FN7qwnJP3dCljzFiqSueKqiFIN3punjHbMUoAxJnibx11Xz4pFm5mdk8v +# 95r+sncH8SFK/P5nUjjEYIBRInZiovl7C8KfI1RD9lXJDPdw5yVfkCpkCr/rYNNM +# BHfDYZ+G1NEu9WzE2NrknC4H4qoNJLmMjVPTswcIT780iOvFZRf1ql+0e2TKUHCO +# kZ+plXtl3H6MimrNk6B/ZQAy4mETNH6ceaoudV7X5Y7HzbTwSXCSw6GCiQMdYXgs +# Fp+lioorEmFZhVc2PTs+oUXbMi8IUaCyKEm6tMZHJ+PGU1YBE8Szyj5nI1SUhb+a +# HunRGlhgXPb4bnEdZVaMruxFM0UbriGwmkOEv9cPVpAxghnEMIIZwAIBATBrMGYx +# CzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAKBgNVBAcTA01vbDEP +# MA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVNDS0NFTiBJ +# Q1QgQ0ECAR8wDQYJYIZIAWUDBAIBBQCggbAwGQYJKoZIhvcNAQkDMQwGCisGAQQB +# gjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkE +# MSIEIDMWPB5w3NRergKWT3y2A5OABYWsRPNSv7Hd8g5WyJV6MEQGCisGAQQBgjcC +# AQwxNjA0oDKAMABJAG4AdABlAGcAcgBpAHQAeQAgACYAIABBAHUAdABoAGUAbgB0 +# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQAwjcunSf5/Xqh/Fk4yHtMzGycJ +# 4UbsZRkFFVKraWtRkw+4aHMyuDJQ87TP2dnLGe5C6nGmCxFUSgLRauIDwMm1lV1B +# V8DmVbh2P22H8RITDl8AVddq0FKG1bm1rvslaTFvP6X/ohYoMtCg7lG7UYmXw16J +# 15+3jG70kAjBHE7SLOu1fRevQJBIgRR5tURvkDw3J5vqTgU5e10rIEvOXk2e0e+w +# Vwnh1/BWhaHneAuEpXr8igfLZV6UrGFFPQrRCA6nsq2SZnvHo+vVtbcrj6WxPjGW +# MrBcfz78IBX9CJE8gCBiUZSPUU4mkRkUlljkatai3FD9DFVoD55xOzTPmvyGoYIX +# dzCCF3MGCisGAQQBgjcDAwExghdjMIIXXwYJKoZIhvcNAQcCoIIXUDCCF0wCAQMx +# DzANBglghkgBZQMEAgEFADB4BgsqhkiG9w0BCRABBKBpBGcwZQIBAQYJYIZIAYb9 +# bAcBMDEwDQYJYIZIAWUDBAIBBQAEIHRH+2nsrMPwh5xxgTf6URi1kDUted6an73B +# R1MNPo2HAhEA39dPBubUOQXsk88cPaQ2UBgPMjAyNjAyMDUwOTQ2NTJaoIITOjCC +# Bu0wggTVoAMCAQICEAqA7xhLjfEFgtHEdqeVdGgwDQYJKoZIhvcNAQELBQAwaTEL +# MAkGA1UEBhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMUEwPwYDVQQDEzhE +# aWdpQ2VydCBUcnVzdGVkIEc0IFRpbWVTdGFtcGluZyBSU0E0MDk2IFNIQTI1NiAy +# MDI1IENBMTAeFw0yNTA2MDQwMDAwMDBaFw0zNjA5MDMyMzU5NTlaMGMxCzAJBgNV +# BAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNl +# cnQgU0hBMjU2IFJTQTQwOTYgVGltZXN0YW1wIFJlc3BvbmRlciAyMDI1IDEwggIi +# MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDQRqwtEsae0OquYFazK1e6b1H/ +# hnAKAd/KN8wZQjBjMqiZ3xTWcfsLwOvRxUwXcGx8AUjni6bz52fGTfr6PHRNv6T7 +# zsf1Y/E3IU8kgNkeECqVQ+3bzWYesFtkepErvUSbf+EIYLkrLKd6qJnuzK8Vcn0D +# vbDMemQFoxQ2Dsw4vEjoT1FpS54dNApZfKY61HAldytxNM89PZXUP/5wWWURK+If +# xiOg8W9lKMqzdIo7VA1R0V3Zp3DjjANwqAf4lEkTlCDQ0/fKJLKLkzGBTpx6EYev +# vOi7XOc4zyh1uSqgr6UnbksIcFJqLbkIXIPbcNmA98Oskkkrvt6lPAw/p4oDSRZr +# eiwB7x9ykrjS6GS3NR39iTTFS+ENTqW8m6THuOmHHjQNC3zbJ6nJ6SXiLSvw4Smz +# 8U07hqF+8CTXaETkVWz0dVVZw7knh1WZXOLHgDvundrAtuvz0D3T+dYaNcwafsVC +# GZKUhQPL1naFKBy1p6llN3QgshRta6Eq4B40h5avMcpi54wm0i2ePZD5pPIssosz +# QyF4//3DoK2O65Uck5Wggn8O2klETsJ7u8xEehGifgJYi+6I03UuT1j7FnrqVrOz +# aQoVJOeeStPeldYRNMmSF3voIgMFtNGh86w3ISHNm0IaadCKCkUe2LnwJKa8TIlw +# CUNVwppwn4D3/Pt5pwIDAQABo4IBlTCCAZEwDAYDVR0TAQH/BAIwADAdBgNVHQ4E +# FgQU5Dv88jHt/f3X85FxYxlQQ89hjOgwHwYDVR0jBBgwFoAU729TSunkBnx6yuKQ +# VvYv1Ensy04wDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMI +# MIGVBggrBgEFBQcBAQSBiDCBhTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGln +# aWNlcnQuY29tMF0GCCsGAQUFBzAChlFodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5j +# b20vRGlnaUNlcnRUcnVzdGVkRzRUaW1lU3RhbXBpbmdSU0E0MDk2U0hBMjU2MjAy +# NUNBMS5jcnQwXwYDVR0fBFgwVjBUoFKgUIZOaHR0cDovL2NybDMuZGlnaWNlcnQu +# Y29tL0RpZ2lDZXJ0VHJ1c3RlZEc0VGltZVN0YW1waW5nUlNBNDA5NlNIQTI1NjIw +# MjVDQTEuY3JsMCAGA1UdIAQZMBcwCAYGZ4EMAQQCMAsGCWCGSAGG/WwHATANBgkq +# hkiG9w0BAQsFAAOCAgEAZSqt8RwnBLmuYEHs0QhEnmNAciH45PYiT9s1i6UKtW+F +# ERp8FgXRGQ/YAavXzWjZhY+hIfP2JkQ38U+wtJPBVBajYfrbIYG+Dui4I4PCvHpQ +# uPqFgqp1PzC/ZRX4pvP/ciZmUnthfAEP1HShTrY+2DE5qjzvZs7JIIgt0GCFD9kt +# x0LxxtRQ7vllKluHWiKk6FxRPyUPxAAYH2Vy1lNM4kzekd8oEARzFAWgeW3az2xe +# jEWLNN4eKGxDJ8WDl/FQUSntbjZ80FU3i54tpx5F/0Kr15zW/mJAxZMVBrTE2oi0 +# fcI8VMbtoRAmaaslNXdCG1+lqvP4FbrQ6IwSBXkZagHLhFU9HCrG/syTRLLhAezu +# /3Lr00GrJzPQFnCEH1Y58678IgmfORBPC1JKkYaEt2OdDh4GmO0/5cHelAK2/gTl +# QJINqDr6JfwyYHXSd+V08X1JUPvB4ILfJdmL+66Gp3CSBXG6IwXMZUXBhtCyIaeh +# r0XkBoDIGMUG1dUtwq1qmcwbdUfcSYCn+OwncVUXf53VJUNOaMWMts0VlRYxe5nK +# +At+DI96HAlXHAL5SlfYxJ7La54i71McVWRP66bW+yERNpbJCjyCYG2j+bdpxo/1 +# Cy4uPcU3AWVPGrbn5PhDBf3Froguzzhk++ami+r3Qrx5bIbY3TVzgiFI7Gq3zWcw +# gga0MIIEnKADAgECAhANx6xXBf8hmS5AQyIMOkmGMA0GCSqGSIb3DQEBCwUAMGIx +# CzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3 +# dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IFRydXN0ZWQgUm9vdCBH +# NDAeFw0yNTA1MDcwMDAwMDBaFw0zODAxMTQyMzU5NTlaMGkxCzAJBgNVBAYTAlVT +# MRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjFBMD8GA1UEAxM4RGlnaUNlcnQgVHJ1 +# c3RlZCBHNCBUaW1lU3RhbXBpbmcgUlNBNDA5NiBTSEEyNTYgMjAyNSBDQTEwggIi +# MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC0eDHTCphBcr48RsAcrHXbo0Zo +# dLRRF51NrY0NlLWZloMsVO1DahGPNRcybEKq+RuwOnPhof6pvF4uGjwjqNjfEvUi +# 6wuim5bap+0lgloM2zX4kftn5B1IpYzTqpyFQ/4Bt0mAxAHeHYNnQxqXmRinvuNg +# xVBdJkf77S2uPoCj7GH8BLuxBG5AvftBdsOECS1UkxBvMgEdgkFiDNYiOTx4OtiF +# cMSkqTtF2hfQz3zQSku2Ws3IfDReb6e3mmdglTcaarps0wjUjsZvkgFkriK9tUKJ +# m/s80FiocSk1VYLZlDwFt+cVFBURJg6zMUjZa/zbCclF83bRVFLeGkuAhHiGPMvS +# GmhgaTzVyhYn4p0+8y9oHRaQT/aofEnS5xLrfxnGpTXiUOeSLsJygoLPp66bkDX1 +# ZlAeSpQl92QOMeRxykvq6gbylsXQskBBBnGy3tW/AMOMCZIVNSaz7BX8VtYGqLt9 +# MmeOreGPRdtBx3yGOP+rx3rKWDEJlIqLXvJWnY0v5ydPpOjL6s36czwzsucuoKs7 +# Yk/ehb//Wx+5kMqIMRvUBDx6z1ev+7psNOdgJMoiwOrUG2ZdSoQbU2rMkpLiQ6bG +# RinZbI4OLu9BMIFm1UUl9VnePs6BaaeEWvjJSjNm2qA+sdFUeEY0qVjPKOWug/G6 +# X5uAiynM7Bu2ayBjUwIDAQABo4IBXTCCAVkwEgYDVR0TAQH/BAgwBgEB/wIBADAd +# BgNVHQ4EFgQU729TSunkBnx6yuKQVvYv1Ensy04wHwYDVR0jBBgwFoAU7NfjgtJx +# XWRM3y5nP+e6mK4cD08wDgYDVR0PAQH/BAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUF +# BwMIMHcGCCsGAQUFBwEBBGswaTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGln +# aWNlcnQuY29tMEEGCCsGAQUFBzAChjVodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5j +# b20vRGlnaUNlcnRUcnVzdGVkUm9vdEc0LmNydDBDBgNVHR8EPDA6MDigNqA0hjJo +# dHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkUm9vdEc0LmNy +# bDAgBgNVHSAEGTAXMAgGBmeBDAEEAjALBglghkgBhv1sBwEwDQYJKoZIhvcNAQEL +# BQADggIBABfO+xaAHP4HPRF2cTC9vgvItTSmf83Qh8WIGjB/T8ObXAZz8OjuhUxj +# aaFdleMM0lBryPTQM2qEJPe36zwbSI/mS83afsl3YTj+IQhQE7jU/kXjjytJgnn0 +# hvrV6hqWGd3rLAUt6vJy9lMDPjTLxLgXf9r5nWMQwr8Myb9rEVKChHyfpzee5kH0 +# F8HABBgr0UdqirZ7bowe9Vj2AIMD8liyrukZ2iA/wdG2th9y1IsA0QF8dTXqvcnT +# mpfeQh35k5zOCPmSNq1UH410ANVko43+Cdmu4y81hjajV/gxdEkMx1NKU4uHQcKf +# ZxAvBAKqMVuqte69M9J6A47OvgRaPs+2ykgcGV00TYr2Lr3ty9qIijanrUR3anzE +# wlvzZiiyfTPjLbnFRsjsYg39OlV8cipDoq7+qNNjqFzeGxcytL5TTLL4ZaoBdqbh +# OhZ3ZRDUphPvSRmMThi0vw9vODRzW6AxnJll38F0cuJG7uEBYTptMSbhdhGQDpOX +# gpIUsWTjd6xpR6oaQf/DJbg3s6KCLPAlZ66RzIg9sC+NJpud/v4+7RWsWCiKi9EO +# LLHfMR2ZyJ/+xhCx9yHbxtl5TPau1j/1MIDpMPx0LckTetiSuEtQvLsNz3Qbp7wG +# WqbIiOWCnb5WqxL3/BAPvIXKUjPSxyZsq8WhbaM2tszWkPZPubdcMIIFjTCCBHWg +# AwIBAgIQDpsYjvnQLefv21DiCEAYWjANBgkqhkiG9w0BAQwFADBlMQswCQYDVQQG +# EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl +# cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcN +# MjIwODAxMDAwMDAwWhcNMzExMTA5MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEVMBMG +# A1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw +# HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp +# pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+ +# n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYykt +# zuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw +# 2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jHtrHEtWoYOAMQjdjUN6Qu +# BX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6MUSaM0C/CNdaSaTC +# 5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtmmnTK +# 3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3 +# IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEP +# lAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98 +# THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4KJpn15GkvmB0t9dmpsh3l +# GwIDAQABo4IBOjCCATYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7NfjgtJx +# XWRM3y5nP+e6mK4cD08wHwYDVR0jBBgwFoAUReuir/SSy4IxLVGLp6chnfNtyA8w +# DgYDVR0PAQH/BAQDAgGGMHkGCCsGAQUFBwEBBG0wazAkBggrBgEFBQcwAYYYaHR0 +# cDovL29jc3AuZGlnaWNlcnQuY29tMEMGCCsGAQUFBzAChjdodHRwOi8vY2FjZXJ0 +# cy5kaWdpY2VydC5jb20vRGlnaUNlcnRBc3N1cmVkSURSb290Q0EuY3J0MEUGA1Ud +# HwQ+MDwwOqA4oDaGNGh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEFz +# c3VyZWRJRFJvb3RDQS5jcmwwEQYDVR0gBAowCDAGBgRVHSAAMA0GCSqGSIb3DQEB +# DAUAA4IBAQBwoL9DXFXnOF+go3QbPbYW1/e/Vwe9mqyhhyzshV6pGrsi+IcaaVQi +# 7aSId229GhT0E0p6Ly23OO/0/4C5+KH38nLeJLxSA8hO0Cre+i1Wz/n096wwepqL +# sl7Uz9FDRJtDIeuWcqFItJnLnU+nBgMTdydE1Od/6Fmo8L8vC6bp8jQ87PcDx4eo +# 0kxAGTVGamlUsLihVo7spNU96LHc/RzY9HdaXFSMb++hUD38dglohJ9vytsgjTVg +# HAIDyyCwrFigDkBjxZgiwbJZ9VVrzyerbHbObyMt9H5xaiNrIv8SuFQtJ37YOtnw +# toeW/VvRXKwYw02fc7cBqZ9Xql4o4rmUMYIDfDCCA3gCAQEwfTBpMQswCQYDVQQG +# EwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xQTA/BgNVBAMTOERpZ2lDZXJ0 +# IFRydXN0ZWQgRzQgVGltZVN0YW1waW5nIFJTQTQwOTYgU0hBMjU2IDIwMjUgQ0Ex +# AhAKgO8YS43xBYLRxHanlXRoMA0GCWCGSAFlAwQCAQUAoIHRMBoGCSqGSIb3DQEJ +# AzENBgsqhkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjYwMjA1MDk0NjUyWjAr +# BgsqhkiG9w0BCRACDDEcMBowGDAWBBTdYjCshgotMGvaOLFoeVIwB/tBfjAvBgkq +# hkiG9w0BCQQxIgQgKEGXO1vjLP2kUFHIPE+JatJrvCLVUgi/Xs27uDCd6lkwNwYL +# KoZIhvcNAQkQAi8xKDAmMCQwIgQgSqA/oizXXITFXJOPgo5na5yuyrM/420mmqM0 +# 8UYRCjMwDQYJKoZIhvcNAQEBBQAEggIAtyuXWDxFHyQSVx2HEemwzEnzuSh9IiAf +# sSKWhC0wUjQhOIk2kwvDnirwE3o2Co6tDC44UOUmlMr5ZKqPUgyBTxdvWBJ24t97 +# 9ZOPKM3vyyzLWI/wL0yG11InNMhja4i+jz0hplsN8hQObBhtAhUyO88B/asaHHxR +# RZHObxkUEQ3kltLrjOirqiQ2sHf9SwZZ1xmSDG/TrhkHyDixjB4D8mIUsJ2JfInz +# rhJ3kCtdSX/c5k8H++sbI1gtdmkZV+EeZHh31SuBQ6LCYxypB0EXv+8e/jkIXvMv +# ujUXBwD6Fnc+2TjLxzQwlUy3gx7wfqC9H1/OxLHZ4LzND4mjrq2yzM91aTKp2Hay +# zqjd5uCk+UK1Uqc1Jq3FMx85u33AGg4/Ay46rMQU1/IqUTt5Pdd9g//rJomZywg/ +# 87X5DUA61KyQyPsneb6a7kasPpjuB7Dz7HOPYfJ8i+nZcJ8rHevc2OJU1NES3giT +# 8oTBnNbxO27nwh5ZJAm3NBB8gvjD/ACaIoQXYOGgg+Q5cymAkdeLmUnGxKI1tDdC +# SpX9CB9VrPraajcRQe6m/p1CNVDZptJvv0HC9KEAM+kjzvh/Jl7RROOlTlXjYVv5 +# IbvFdhX2BQSDWffIEQIjarj5htnxvLHy4UQtmcC5r/S+eQFEvx59fJCXiQg+5/Pu +# HedfzqKTJEo= # SIG # End signature block diff --git a/eDosStation.zip b/scripts/VC_redist.x64.exe similarity index 54% rename from eDosStation.zip rename to scripts/VC_redist.x64.exe index 35d5466..be4e202 100644 Binary files a/eDosStation.zip and b/scripts/VC_redist.x64.exe differ diff --git a/scripts/VC_redist.x86.exe b/scripts/VC_redist.x86.exe new file mode 100644 index 0000000..7f80cba Binary files /dev/null and b/scripts/VC_redist.x86.exe differ diff --git a/scripts/copyZipAndSqlDAQ6468.cmd b/scripts/copyZipAndSqlDAQ6468.cmd new file mode 100644 index 0000000..e38efef --- /dev/null +++ b/scripts/copyZipAndSqlDAQ6468.cmd @@ -0,0 +1,4 @@ + +scp *.zip Updates.sql Upgrader.ps1 *.cer hphmonitor@192.168.113.119:c:/software + + diff --git a/scripts/copyZipAndSql_CleanInstall.cmd b/scripts/copyZipAndSql_CleanInstall.cmd new file mode 100644 index 0000000..1f6e63b --- /dev/null +++ b/scripts/copyZipAndSql_CleanInstall.cmd @@ -0,0 +1,3 @@ +scp *.zip Updates.sql updateLocal.sql edosstationmaster.sql edosstationname.sql Upgrader.ps1 *.cer *.pub authorized_keys edosstation.sql installatie.ps1 installatie2.ps1 LogFolderClean.* edos-%1:c:/software + + diff --git a/scripts/eDosSync.zip b/scripts/eDosSync.zip new file mode 100644 index 0000000..f302724 Binary files /dev/null and b/scripts/eDosSync.zip differ diff --git a/scripts/epd_reader.cat b/scripts/epd_reader.cat new file mode 100644 index 0000000..1ab27ad Binary files /dev/null and b/scripts/epd_reader.cat differ diff --git a/scripts/epd_reader.inf b/scripts/epd_reader.inf new file mode 100644 index 0000000..8a98cda --- /dev/null +++ b/scripts/epd_reader.inf @@ -0,0 +1,94 @@ +; Windows 2000, XP, Vista, 7 and 8 (x32 and x64) setup file for Atmel CDC Devices +; Copyright (c) 2000-2013 ATMEL, Inc. + +[Version] +Signature = "$Windows NT$" +Class = Ports +ClassGuid = {4D36E978-E325-11CE-BFC1-08002BE10318} +Provider = %Manufacturer% +CatalogFile = epd_reader.cat +DriverVer = 04/20/2016,1.0.0.023 + +;---------------------------------------------------------- +; Targets 0x0EBB +;---------------------------------------------------------- +[Manufacturer] +%Manufacturer%=DeviceList, NTAMD64, NTIA64, NT + +[DeviceList] +%THERMO_EPD_READER_CDC%=DriverInstall, USB\VID_0EBB&PID_0340&MI_00 + + +[DeviceList.NTAMD64] +%THERMO_EPD_READER_CDC%=DriverInstall.NTamd64, USB\VID_0EBB&PID_0340&MI_00 + + +[DeviceList.NT] +%THERMO_EPD_READER_CDC%=DriverInstall.NT, USB\VID_0EBB&PID_0340&MI_00 + +;---------------------------------------------------------- +; Windows 2000, XP, Vista, Windows 7, Windows 8 - 32bit +;---------------------------------------------------------- +[Reader_Install.NTx86] + + +[DestinationDirs] +FakeModemCopyFileSection=12 +DefaultDestDir=12 + + +[DriverInstall.NT] +include=mdmcpq.inf +CopyFiles=FakeModemCopyFileSection +AddReg=DriverInstall.NT.AddReg + +[DriverInstall.NT.AddReg] +HKR,,DevLoader,,*ntkern +HKR,,NTMPDriver,,usbser.sys +HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" + +[DriverInstall.NT.Services] +AddService = usbser, 0x00000002, DriverService.NT + +[DriverService.NT] +DisplayName = %Serial.SvcDesc% +ServiceType = 1 ; SERVICE_KERNEL_DRIVER +StartType = 3 ; SERVICE_DEMAND_START +ErrorControl = 1 ; SERVICE_ERROR_NORMAL +ServiceBinary = %12%\usbser.sys + +;---------------------------------------------------------- +; Windows XP, Vista, Windows 7, Windows 8 - 64bit +;---------------------------------------------------------- + +[DriverInstall.NTamd64] +include=mdmcpq.inf +CopyFiles=FakeModemCopyFileSection +AddReg=DriverInstall.NTamd64.AddReg + + + +[DriverInstall.NTamd64.AddReg] +HKR,,DevLoader,,*ntkern +HKR,,NTMPDriver,,usbser.sys +HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" + +[DriverInstall.NTamd64.Services] +AddService=usbser, 0x00000002, DriverService.NTamd64 + +[DriverService.NTamd64] +DisplayName=%Serial.SvcDesc% +ServiceType=1 +StartType=3 +ErrorControl=1 +ServiceBinary=%12%\usbser.sys + +;---------------------------------------------------------- +; String +;---------------------------------------------------------- + +[Strings] +Manufacturer = "Thermo Fisher Scientific" +THERMO_EPD_READER_CDC = "EPD Reader" +Serial.SvcDesc = "USB Serial emulation driver" + diff --git a/scripts/flash.exe b/scripts/flash.exe new file mode 100644 index 0000000..768d2b1 Binary files /dev/null and b/scripts/flash.exe differ diff --git a/x.zip b/x.zip deleted file mode 100644 index 15cb0ec..0000000 Binary files a/x.zip and /dev/null differ