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

Async waiter

Browse source
This commit is contained in:
Luc Vandenbroucke 2021-04-26 10:35:23 +02:00
parent 6f299aa7d6
commit 5873c927ab
5 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eDosStation/App.config
View file

@ -9,10 +9,8 @@
<add name="eDosStation.Properties.Settings.localConnectionString"
connectionString="Data Source=eDosLocal;Initial Catalog=eDosLocal;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation"
providerName="System.Data.SqlClient" />
<add name="eDosConnectionString"
connectionString="Data Source=eDos;Initial Catalog=eDos;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation"
<add name="eDosConnectionString" connectionString="Data Source=eDos;Initial Catalog=eDos;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation"
providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>

8
eDosStation/DataInterface.cs
View file

@ -106,6 +106,7 @@ namespace eDosStation
ConCentralStr = System.Configuration.ConfigurationManager.ConnectionStrings["eDosConnectionString"].ConnectionString;
localConnection = new SqlConnection(currentConStr);
NextIDCommand = new SqlCommand("SELECT NEXT VALUE FOR VisitSequence as VisitID", localConnection);
isLocal = true;
MakeCommands();
bool rv= checkCon(false);
@ -261,9 +262,8 @@ namespace eDosStation
public void FillComment()
{
if (dtCOE == null) dtCOE = new DataSet1.CommentOnEventDataTable();
using (var dt = new DataSet1TableAdapters.CommentOnEventTableAdapter())
using (var dt = CommentTA())
{
dt.Connection.ConnectionString = currentConStr;
dt.Fill(dtCOE);
}
}
@ -275,9 +275,9 @@ namespace eDosStation
public void FillTaskInfo(User _User, DataSet1 dataSet1)
{
using (var dataSet1GetTaskInfoTableAdapter = new eDosStation.DataSet1TableAdapters.GetTaskInfoTableAdapter())
using (var dataSet1GetTaskInfoTableAdapter = TaskInfoTa()) // new eDosStation.DataSet1TableAdapters.GetTaskInfoTableAdapter())
{
dataSet1GetTaskInfoTableAdapter.Connection.ConnectionString = currentConStr;
//dataSet1GetTaskInfoTableAdapter.Connection.ConnectionString = currentConStr;
dataSet1GetTaskInfoTableAdapter.Fill(dataSet1.GetTaskInfo, null, _User.Margin);
}
}

4
eDosStation/EntryBadge.xaml.cs
View file

@ -43,10 +43,10 @@ namespace eDosStation
public EntryBadge(EpdBaseClr.Epd2 curEP, Station curStation)
{
InitializeComponent();
dataInterface = curStation.dataInterface;
ep = curEP;
thisStation = curStation;
InitializeComponent();
_User = null;
}
private bool LoadDoses()
@ -533,7 +533,7 @@ namespace eDosStation
}
private void Window_Loaded(object sender, RoutedEventArgs e)
{
dataInterface.checkCon();
// dataInterface.checkCon();
EpdFound = false;
initialising = true;
tbEntry.IsSelected = true;

4
eDosStation/Properties/Settings.Designer.cs generated
View file

@ -110,8 +110,8 @@ namespace eDosStation.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=HPHDB;Initial Catalog=eDosLocal;User ID=eDosStation;Password=Infopla+" +
"8;TrustServerCertificate=True;Application Name=eDosStation")]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=eDosLocal;Initial Catalog=eDosLocal;User ID=eDosStation;Password=Info" +
"pla+8;TrustServerCertificate=True;Application Name=eDosStation")]
public string localConnectionString {
get {
return ((string)(this["localConnectionString"]));

4
eDosStation/Properties/Settings.settings
View file

@ -26,10 +26,10 @@
<Setting Name="localConnectionString" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;ConnectionString&gt;Data Source=HPHDB;Initial Catalog=eDosLocal;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation&lt;/ConnectionString&gt;
&lt;ConnectionString&gt;Data Source=eDosLocal;Initial Catalog=eDosLocal;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=HPHDB;Initial Catalog=eDosLocal;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation</Value>
<Value Profile="(Default)">Data Source=eDosLocal;Initial Catalog=eDosLocal;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation</Value>
</Setting>
</Settings>
</SettingsFile>