neu
This commit is contained in:
@@ -80,6 +80,9 @@
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Accessibility" />
|
||||
<Reference Include="atapi, Version=1.5.0.0, Culture=neutral, PublicKeyToken=6148c7b92dc86471, processorArchitecture=x86">
|
||||
<HintPath>..\packages\ATAPI.2018.3.9\lib\net46\atapi.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="BouncyCastle.Crypto, Version=1.8.4.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath>
|
||||
@@ -170,6 +173,9 @@
|
||||
<HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.5\lib\net40-client\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="ITapi3">
|
||||
<HintPath>..\..\..\dll\TAPI\ITapi3.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="itextsharp">
|
||||
<HintPath>..\..\..\dll\itextsharp.dll</HintPath>
|
||||
</Reference>
|
||||
|
||||
@@ -56,6 +56,86 @@
|
||||
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
|
||||
<assemblyIdentity name="GrapeCity.ActiveReports.Core.Document.Drawing.Gc" publicKeyToken="cc4967777c49a3ff" culture="neutral" />
|
||||
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.1.4.0" newVersion="2.1.4.0" />
|
||||
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
|
||||
<assemblyIdentity name="GrapeCity.ActiveReports.Core.Document" publicKeyToken="cc4967777c49a3ff" culture="neutral" />
|
||||
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.1.4.0" newVersion="2.1.4.0" />
|
||||
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
|
||||
<assemblyIdentity name="GrapeCity.ActiveReports.Core.Document.Drawing.Gdi" publicKeyToken="cc4967777c49a3ff" culture="neutral" />
|
||||
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.1.4.0" newVersion="2.1.4.0" />
|
||||
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
|
||||
<assemblyIdentity name="GrapeCity.ActiveReports.Core.Rendering" publicKeyToken="cc4967777c49a3ff" culture="neutral" />
|
||||
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.3.5.0" newVersion="2.3.5.0" />
|
||||
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
|
||||
<assemblyIdentity name="GrapeCity.ActiveReports" publicKeyToken="cc4967777c49a3ff" culture="neutral" />
|
||||
|
||||
<bindingRedirect oldVersion="0.0.0.0-15.2.4.0" newVersion="15.2.4.0" />
|
||||
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
|
||||
<assemblyIdentity name="GrapeCity.ActiveReports.Core.Drawing.Gc" publicKeyToken="cc4967777c49a3ff" culture="neutral" />
|
||||
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.3.5.0" newVersion="2.3.5.0" />
|
||||
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
|
||||
<assemblyIdentity name="GrapeCity.ActiveReports.Document" publicKeyToken="cc4967777c49a3ff" culture="neutral" />
|
||||
|
||||
<bindingRedirect oldVersion="0.0.0.0-15.2.4.0" newVersion="15.2.4.0" />
|
||||
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
|
||||
<assemblyIdentity name="GrapeCity.ActiveReports.Core.Rdl" publicKeyToken="cc4967777c49a3ff" culture="neutral" />
|
||||
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.3.5.0" newVersion="2.3.5.0" />
|
||||
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
|
||||
<assemblyIdentity name="GrapeCity.ActiveReports.Core.Drawing.Gdi" publicKeyToken="cc4967777c49a3ff" culture="neutral" />
|
||||
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.3.5.0" newVersion="2.3.5.0" />
|
||||
|
||||
</dependentAssembly>
|
||||
|
||||
<dependentAssembly>
|
||||
|
||||
<assemblyIdentity name="GrapeCity.ActiveReports.Win" publicKeyToken="cc4967777c49a3ff" culture="neutral" />
|
||||
|
||||
<bindingRedirect oldVersion="0.0.0.0-15.2.4.0" newVersion="15.2.4.0" />
|
||||
|
||||
</dependentAssembly>
|
||||
|
||||
</assemblyBinding>
|
||||
|
||||
</runtime>
|
||||
|
||||
@@ -433,7 +433,7 @@ Public Class frmDienstplanVariabel
|
||||
If usrCntlZeitenAendern1.txtPause.Text.Contains(",") And Not usrCntlZeitenAendern1.txtPause.Text.Contains(",5") Then Throw New Exception
|
||||
|
||||
If Not IsNumeric(usrCntlZeitenAendern1.txtPause.Text) Then Throw New Exception
|
||||
If usrCntlZeitenAendern1.txtPause.Text > 3 Or usrCntlZeitenAendern1.txtPause.Text < 0 Then MsgBox("Die Pause darf nicht größer als 3 Stunden sein!") : Throw New Exception
|
||||
If usrCntlZeitenAendern1.txtPause.Text > 3 Or usrCntlZeitenAendern1.txtPause.Text < 0 Then MsgBox("Die Pause darf nicht größer als 3 Stunden und nicht kleiner als 0 sein!") : Throw New Exception
|
||||
|
||||
|
||||
If usrCntlZeitenAendern1.cbxChangeForWo.Checked Then 'für ganze Woche
|
||||
|
||||
@@ -369,7 +369,7 @@ Public Class usrCntlDienstplan
|
||||
|
||||
AddHandler rpt.Detail.Format, Sub()
|
||||
|
||||
If Not IsDBNull(rpt.Fields.Item("dstetr_datum").Value) Then
|
||||
If Not IsDBNull(rpt.Fields.Item("dstetr_datum").Value) AndAlso rpt.Fields.Item("dstetr_datum").Value <> "" AndAlso IsDate(rpt.Fields.Item("dstetr_datum").Value) Then
|
||||
'MsgBox(rpt.Fields.Item("dstetr_datum").Value)
|
||||
datumKW = CDate(rpt.Fields.Item("dstetr_datum").Value).ToShortDateString
|
||||
End If
|
||||
@@ -487,6 +487,7 @@ Public Class usrCntlDienstplan
|
||||
' rpt.txtSumWoStunden.Text = CDbl(sumUeStd).ToString("N2")
|
||||
|
||||
'Zuerst den montag der aktueellen Woche lt. Datum ermitteln:
|
||||
MsgBox(cPF.DateToWeek(datumKW))
|
||||
Dim datumMO As Date = cPF.GetWeekStartDate(cPF.DateToWeek(datumKW).Substring(4, 2), cPF.DateToWeek(datumKW).Substring(0, 4))
|
||||
|
||||
'Aktuelle Woche und Jahr anhand des Montages ermitteln:
|
||||
@@ -499,7 +500,7 @@ Public Class usrCntlDienstplan
|
||||
' MsgBox(sollStd)
|
||||
|
||||
If groupKW Then
|
||||
Dim sollStd As Double = cPF.getWochenstunden(STD_LIST, MA_DST.dstma_wochenStunden, datumMO, SCHICHT, MA_DST.dstma_mitId, MA_DST.dstma_muster, MA_DST.dstma_WEStdRegelAZ, MA_DST.dstma_arbvh, niederlassung, MA_DST.dstma_TzFeiertageStd)
|
||||
Dim sollStd As Double = cPF.getWochenstunden(STD_LIST, MA_DST.dstma_wochenStunden, datumMO, SCHICHT, MA_DST.dstma_mitId, MA_DST.dstma_muster, MA_DST.dstma_WEStdRegelAZ, MA_DST.dstma_arbvh, niederlassung, MA_DST.dstma_TzFeiertageStd, MA_DST.dstma_4wo)
|
||||
Dim tatStd As Double = SQLDienst.getDstStunden(MA_DST.dstma_id, datumMO, datumMO.AddDays(6), niederlassung)
|
||||
|
||||
rpt.txtSumWoStunden.Text = CDbl(tatStd).ToString("N2")
|
||||
|
||||
@@ -94,7 +94,7 @@ Public Class usrcntlDienstplanStunden
|
||||
|
||||
'MsgBox(ma.dstma_wochenStunden)
|
||||
'hier wird berechnet, wie viele Stunden tatsächlich zu arbeiten sind (abzgl. Feiertage)
|
||||
Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r.Cells("dstma_id").Value, ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd)
|
||||
Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r.Cells("dstma_id").Value, ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd, ma.dstma_4wo)
|
||||
|
||||
'Hier wird berechnet wie viele Std tastächlich gearbeitet wurden:
|
||||
Dim tatStd As Double = SQLDienst.getDstStunden(r.Cells("dstma_id").Value, datum_montag, datum_montag.AddDays(6), niederlassung)
|
||||
|
||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.0.1.4")>
|
||||
<Assembly: AssemblyFileVersion("1.0.1.4")>
|
||||
<Assembly: AssemblyVersion("1.0.1.5")>
|
||||
<Assembly: AssemblyFileVersion("1.0.1.5")>
|
||||
|
||||
29
UID/My Project/Resources.Designer.vb
generated
29
UID/My Project/Resources.Designer.vb
generated
@@ -110,6 +110,15 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property asda2sdas1das() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("asda2sdas1das", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Byte[].
|
||||
'''</summary>
|
||||
@@ -140,6 +149,15 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property bbvn6() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("bbvn6", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Byte[].
|
||||
'''</summary>
|
||||
@@ -316,15 +334,6 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property fähggh3j2gh6j2gh62jgh6j2hg6jghjghj() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("fähggh3j2gh6j2gh62jgh6j2hg6jghjghj", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
'''</summary>
|
||||
@@ -655,7 +664,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die 2.0.4 ähnelt.
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die 2.0.6 ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property Version() As String
|
||||
Get
|
||||
|
||||
@@ -188,7 +188,7 @@
|
||||
<value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
|
||||
</data>
|
||||
<data name="Version" xml:space="preserve">
|
||||
<value>2.0.4</value>
|
||||
<value>2.0.6</value>
|
||||
</data>
|
||||
<data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@@ -301,7 +301,10 @@
|
||||
<data name="personGray_w" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="fähggh3j2gh6j2gh62jgh6j2hg6jghjghj" xml:space="preserve">
|
||||
<data name="asda2sdas1das" xml:space="preserve">
|
||||
<value />
|
||||
</data>
|
||||
<data name="bbvn6" xml:space="preserve">
|
||||
<value />
|
||||
</data>
|
||||
</root>
|
||||
@@ -0,0 +1,2 @@
|
||||
GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
|
||||
GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
|
||||
|
||||
@@ -910,7 +910,7 @@ Public Class cProgramFunctions
|
||||
|
||||
Dim SQLDienst As New cDienstplan
|
||||
|
||||
Public Function getWochenstunden(STD_LIST As List(Of cDienstMitarbAbweichendeWochenstunden), Wochenstunden As Double, datum As Date, SCHICHT As String, dstma_id As Integer, dstma_muster As Boolean, dstma_WEStdRegelAZ As Boolean, dstma_arbvh As String, niederlassung As String, StdFeiertag As Object) As Double
|
||||
Public Function getWochenstunden(STD_LIST As List(Of cDienstMitarbAbweichendeWochenstunden), Wochenstunden As Double, datum As Date, SCHICHT As String, dstma_id As Integer, dstma_muster As Boolean, dstma_WEStdRegelAZ As Boolean, dstma_arbvh As String, niederlassung As String, StdFeiertag As Object, schicht4wo As Boolean) As Double
|
||||
getWochenstunden = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(STD_LIST, dstma_id, datum, Wochenstunden, If(StdFeiertag, -1))
|
||||
|
||||
Dim UrlStd As Double = 8
|
||||
@@ -924,26 +924,31 @@ Public Class cProgramFunctions
|
||||
|
||||
If dstma_muster Then 'Wenn Muster, dann muss Feiertag bei VZ und TZ berüchsichtigt werden....
|
||||
If (woTag <> "SA" And woTag <> "SO") Or dstma_WEStdRegelAZ Then ' ... aber nur wenn Wochendende teil der Regel-Arbeitszeit ist.
|
||||
Dim tz As cDienstTeilzeit = SQLDienst.getDienstTeilzeitBySchicht(dstma_id, SCHICHT, woTag)
|
||||
Dim tz As cDienstTeilzeit = SQLDienst.getDienstTeilzeitBySchicht(dstma_id, SCHICHT, woTag, schicht4wo)
|
||||
If tz IsNot Nothing Then ' EVtl gibt es den WoTag Nicht
|
||||
'Wochenstunden -= getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, (FT.isFeiertag(datum) Or woTag = "SO"))
|
||||
|
||||
If datum.ToString("dd.MM.") = "31.12." Or datum.ToString("dd.MM.") = "24.12." Then 'Weihnachten und Silvester ist ist nur 1/2 Tag!!!
|
||||
getWochenstunden -= UrlStd / 2
|
||||
Else
|
||||
|
||||
|
||||
If dstma_arbvh = "VZ" Then
|
||||
getWochenstunden -= UrlStd 'bei vollzeit mit Muster werden 8 Std abgezogen
|
||||
Else
|
||||
If getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, False) > 0 Then 'Wenn an deisem Tag Stunden angefallen wären (lt. Muster)
|
||||
getWochenstunden -= UrlStd
|
||||
' getWochenstunden -= getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, False)
|
||||
' If IsNumeric(tz.dsttz_pause) Then getWochenstunden += tz.dsttz_pause
|
||||
If StdFeiertag IsNot Nothing Then
|
||||
getWochenstunden -= UrlStd ' wurde oben schon angepasst.
|
||||
Else
|
||||
|
||||
'gibt es keine deinierten Std.für einen Feiertag, werden die Stunden nach Mustereinteilung berechnet:
|
||||
If getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, False) > 0 Then 'Wenn an deisem Tag Stunden angefallen wären (lt. Muster)
|
||||
Dim getWochenstundenTAG = getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, False)
|
||||
If IsNumeric(tz.dsttz_pause) Then getWochenstundenTAG += tz.dsttz_pause
|
||||
getWochenstunden -= getWochenstundenTAG
|
||||
End If
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
End If
|
||||
Else
|
||||
@@ -1036,16 +1041,17 @@ Public Class cProgramFunctions
|
||||
|
||||
' Prüfen, ob Datum zur ersten Woche des Folgejahres gehört
|
||||
If dDate >= dNextYear Then
|
||||
' Rückgabe: KW 1 des Folgejahres
|
||||
Return dDate.Year + 1 & "01"
|
||||
' Rückgabe: KW 1 des Folgejahres
|
||||
Return (dDate.Year + 1) & "01"
|
||||
ElseIf dDate < dThisYear Then
|
||||
' Falls das Datum noch zu einer KW aus dem letzten Jahr zählt
|
||||
Return dDate.Year - 1 & DatePart(DateInterval.WeekOfYear,
|
||||
New Date(dDate.Year - 1, 12, 28), FirstDayOfWeek.Monday,
|
||||
FirstWeekOfYear.FirstFourDays)
|
||||
Else
|
||||
|
||||
' KW = Differenz zum ersten Tag der ersten Woche
|
||||
Return dDate.Year & Format$(dDate.Subtract(dThisYear).Days \ 7 + 1, "00")
|
||||
Return dDate.Year.ToString & Format$(dDate.Subtract(dThisYear).Days \ 7 + 1, "00").ToString
|
||||
End If
|
||||
End Function
|
||||
|
||||
@@ -1079,7 +1085,7 @@ Public Class cProgramFunctions
|
||||
If IsNumeric(ma.dstma_wochenStunden) Then Wochenstunden = ma.dstma_wochenStunden
|
||||
' MsgBox(Wochenstunden)
|
||||
|
||||
Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r("dstma_id"), ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd)
|
||||
Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r("dstma_id"), ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd, ma.dstma_4wo)
|
||||
Dim tatStd As Double = SQLDienst.getDstStunden(r("dstma_id"), datum_montag, datum_montag.AddDays(6), niederlassung)
|
||||
|
||||
' : ANDERES ERG"""""!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
@@ -2888,12 +2888,21 @@ Public Class cDienstplan
|
||||
Return Nothing
|
||||
End Function
|
||||
|
||||
Public Function getDienstTeilzeitBySchicht(id, schicht, woTag) As cDienstTeilzeit
|
||||
Public Function getDienstTeilzeitBySchicht(id, schicht, woTag, schicht4wo) As cDienstTeilzeit
|
||||
Try
|
||||
If schicht4wo Then
|
||||
|
||||
Else '2Wochen-Wechsel
|
||||
If schicht.ToString.StartsWith("BLAU") Then schicht = "BLAU%"
|
||||
If schicht.ToString.StartsWith("ROT") Then schicht = "ROT%"
|
||||
End If
|
||||
|
||||
|
||||
Dim d As New cDienstTeilzeit
|
||||
|
||||
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
|
||||
Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDienstTeilzeit WHERE dsttz_maId=@dsttz_maId AND dsttz_dienstplan=@dsttz_dienstplan AND dsttz_woTag=dsttz_woTag", conn)
|
||||
|
||||
Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDienstTeilzeit WHERE dsttz_maId=@dsttz_maId AND dsttz_dienstplan LIKE @dsttz_dienstplan AND dsttz_woTag=dsttz_woTag", conn)
|
||||
cmd.Parameters.AddWithValue("@dsttz_maId", id)
|
||||
cmd.Parameters.AddWithValue("@dsttz_dienstplan", schicht)
|
||||
cmd.Parameters.AddWithValue("@dsttz_woTag", woTag)
|
||||
@@ -3993,6 +4002,10 @@ Public Class cDienstplan
|
||||
s += cPF.getDiff(von, bis, niederlassung, (FT.isFeiertag(datum, cDienstSettings.getLand(niederlassung)) Or woTag = "SO"))
|
||||
If IsNumeric(dr.Item("dstetr_pause")) Then
|
||||
s -= CDbl(dr.Item("dstetr_pause"))
|
||||
|
||||
'Wenn Feiertag oder Sonntag, werden die Stunden (von-bis) doppelt gerechent, also müssen die Pausenstunden doppelt abgezoben werden:
|
||||
If (FT.isFeiertag(datum, cDienstSettings.getLand(niederlassung)) Or woTag = "SO") Then s -= CDbl(dr.Item("dstetr_pause"))
|
||||
|
||||
End If
|
||||
Else
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="ATAPI" version="2018.3.9" targetFramework="net47" />
|
||||
<package id="Gcef.Data.DataEngine" version="3.0.2" targetFramework="net47" />
|
||||
<package id="Gcef.Data.ExpressionInfo" version="3.0.2" targetFramework="net47" />
|
||||
<package id="Gcef.Data.VBFunctionLib" version="3.0.2" targetFramework="net47" />
|
||||
|
||||
132
UID/usrctlProcedures.Designer.vb
generated
132
UID/usrctlProcedures.Designer.vb
generated
@@ -109,6 +109,9 @@ Partial Class usrctlProcedures
|
||||
Me.Button29 = New System.Windows.Forms.Button()
|
||||
Me.Button28 = New System.Windows.Forms.Button()
|
||||
Me.Button30 = New System.Windows.Forms.Button()
|
||||
Me.Button31 = New System.Windows.Forms.Button()
|
||||
Me.Button32 = New System.Windows.Forms.Button()
|
||||
Me.lblStatus = New System.Windows.Forms.Label()
|
||||
Me.TabControl1.SuspendLayout()
|
||||
Me.TabPage1.SuspendLayout()
|
||||
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@@ -121,7 +124,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
Me.TabControl1.Controls.Add(Me.TabPage1)
|
||||
Me.TabControl1.Controls.Add(Me.TabPage2)
|
||||
Me.TabControl1.Location = New System.Drawing.Point(3, 313)
|
||||
Me.TabControl1.Location = New System.Drawing.Point(7, 407)
|
||||
Me.TabControl1.Name = "TabControl1"
|
||||
Me.TabControl1.SelectedIndex = 0
|
||||
Me.TabControl1.Size = New System.Drawing.Size(609, 187)
|
||||
@@ -491,7 +494,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button18
|
||||
'
|
||||
Me.Button18.Location = New System.Drawing.Point(55, 88)
|
||||
Me.Button18.Location = New System.Drawing.Point(59, 183)
|
||||
Me.Button18.Name = "Button18"
|
||||
Me.Button18.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button18.TabIndex = 15
|
||||
@@ -500,7 +503,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'TextBox1
|
||||
'
|
||||
Me.TextBox1.Location = New System.Drawing.Point(109, 62)
|
||||
Me.TextBox1.Location = New System.Drawing.Point(113, 157)
|
||||
Me.TextBox1.Name = "TextBox1"
|
||||
Me.TextBox1.Size = New System.Drawing.Size(91, 20)
|
||||
Me.TextBox1.TabIndex = 16
|
||||
@@ -509,7 +512,7 @@ Partial Class usrctlProcedures
|
||||
'lblAnzahl
|
||||
'
|
||||
Me.lblAnzahl.AutoSize = True
|
||||
Me.lblAnzahl.Location = New System.Drawing.Point(61, 65)
|
||||
Me.lblAnzahl.Location = New System.Drawing.Point(65, 160)
|
||||
Me.lblAnzahl.Name = "lblAnzahl"
|
||||
Me.lblAnzahl.Size = New System.Drawing.Size(42, 13)
|
||||
Me.lblAnzahl.TabIndex = 17
|
||||
@@ -517,7 +520,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Label3
|
||||
'
|
||||
Me.Label3.Location = New System.Drawing.Point(55, 140)
|
||||
Me.Label3.Location = New System.Drawing.Point(59, 235)
|
||||
Me.Label3.Name = "Label3"
|
||||
Me.Label3.Size = New System.Drawing.Size(145, 13)
|
||||
Me.Label3.TabIndex = 18
|
||||
@@ -526,7 +529,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Label4
|
||||
'
|
||||
Me.Label4.Location = New System.Drawing.Point(55, 153)
|
||||
Me.Label4.Location = New System.Drawing.Point(59, 248)
|
||||
Me.Label4.Name = "Label4"
|
||||
Me.Label4.Size = New System.Drawing.Size(145, 13)
|
||||
Me.Label4.TabIndex = 19
|
||||
@@ -535,7 +538,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button19
|
||||
'
|
||||
Me.Button19.Location = New System.Drawing.Point(219, 91)
|
||||
Me.Button19.Location = New System.Drawing.Point(223, 186)
|
||||
Me.Button19.Name = "Button19"
|
||||
Me.Button19.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button19.TabIndex = 20
|
||||
@@ -544,7 +547,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Label5
|
||||
'
|
||||
Me.Label5.Location = New System.Drawing.Point(216, 143)
|
||||
Me.Label5.Location = New System.Drawing.Point(220, 238)
|
||||
Me.Label5.Name = "Label5"
|
||||
Me.Label5.Size = New System.Drawing.Size(145, 13)
|
||||
Me.Label5.TabIndex = 21
|
||||
@@ -556,7 +559,7 @@ Partial Class usrctlProcedures
|
||||
Me.cbxTESTSYSTEMATLAS.AutoSize = True
|
||||
Me.cbxTESTSYSTEMATLAS.Checked = True
|
||||
Me.cbxTESTSYSTEMATLAS.CheckState = System.Windows.Forms.CheckState.Checked
|
||||
Me.cbxTESTSYSTEMATLAS.Location = New System.Drawing.Point(219, 65)
|
||||
Me.cbxTESTSYSTEMATLAS.Location = New System.Drawing.Point(223, 160)
|
||||
Me.cbxTESTSYSTEMATLAS.Name = "cbxTESTSYSTEMATLAS"
|
||||
Me.cbxTESTSYSTEMATLAS.Size = New System.Drawing.Size(98, 17)
|
||||
Me.cbxTESTSYSTEMATLAS.TabIndex = 22
|
||||
@@ -568,7 +571,7 @@ Partial Class usrctlProcedures
|
||||
Me.CheckBox1.AutoSize = True
|
||||
Me.CheckBox1.Checked = True
|
||||
Me.CheckBox1.CheckState = System.Windows.Forms.CheckState.Checked
|
||||
Me.CheckBox1.Location = New System.Drawing.Point(58, 39)
|
||||
Me.CheckBox1.Location = New System.Drawing.Point(62, 134)
|
||||
Me.CheckBox1.Name = "CheckBox1"
|
||||
Me.CheckBox1.Size = New System.Drawing.Size(98, 17)
|
||||
Me.CheckBox1.TabIndex = 23
|
||||
@@ -590,7 +593,7 @@ Partial Class usrctlProcedures
|
||||
Me.CheckBox2.AutoSize = True
|
||||
Me.CheckBox2.Checked = True
|
||||
Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked
|
||||
Me.CheckBox2.Location = New System.Drawing.Point(389, 39)
|
||||
Me.CheckBox2.Location = New System.Drawing.Point(393, 134)
|
||||
Me.CheckBox2.Name = "CheckBox2"
|
||||
Me.CheckBox2.Size = New System.Drawing.Size(98, 17)
|
||||
Me.CheckBox2.TabIndex = 26
|
||||
@@ -599,7 +602,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Label6
|
||||
'
|
||||
Me.Label6.Location = New System.Drawing.Point(386, 140)
|
||||
Me.Label6.Location = New System.Drawing.Point(390, 235)
|
||||
Me.Label6.Name = "Label6"
|
||||
Me.Label6.Size = New System.Drawing.Size(145, 13)
|
||||
Me.Label6.TabIndex = 25
|
||||
@@ -608,7 +611,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button20
|
||||
'
|
||||
Me.Button20.Location = New System.Drawing.Point(389, 88)
|
||||
Me.Button20.Location = New System.Drawing.Point(393, 183)
|
||||
Me.Button20.Name = "Button20"
|
||||
Me.Button20.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button20.TabIndex = 24
|
||||
@@ -618,7 +621,7 @@ Partial Class usrctlProcedures
|
||||
'Label7
|
||||
'
|
||||
Me.Label7.AutoSize = True
|
||||
Me.Label7.Location = New System.Drawing.Point(392, 68)
|
||||
Me.Label7.Location = New System.Drawing.Point(396, 163)
|
||||
Me.Label7.Name = "Label7"
|
||||
Me.Label7.Size = New System.Drawing.Size(39, 13)
|
||||
Me.Label7.TabIndex = 28
|
||||
@@ -626,7 +629,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'TextBox3
|
||||
'
|
||||
Me.TextBox3.Location = New System.Drawing.Point(440, 65)
|
||||
Me.TextBox3.Location = New System.Drawing.Point(444, 160)
|
||||
Me.TextBox3.Name = "TextBox3"
|
||||
Me.TextBox3.Size = New System.Drawing.Size(91, 20)
|
||||
Me.TextBox3.TabIndex = 27
|
||||
@@ -634,7 +637,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'btn
|
||||
'
|
||||
Me.btn.Location = New System.Drawing.Point(165, 236)
|
||||
Me.btn.Location = New System.Drawing.Point(169, 330)
|
||||
Me.btn.Name = "btn"
|
||||
Me.btn.Size = New System.Drawing.Size(140, 23)
|
||||
Me.btn.TabIndex = 29
|
||||
@@ -643,7 +646,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'TextBox4
|
||||
'
|
||||
Me.TextBox4.Location = New System.Drawing.Point(68, 238)
|
||||
Me.TextBox4.Location = New System.Drawing.Point(72, 332)
|
||||
Me.TextBox4.Name = "TextBox4"
|
||||
Me.TextBox4.Size = New System.Drawing.Size(91, 20)
|
||||
Me.TextBox4.TabIndex = 30
|
||||
@@ -652,7 +655,7 @@ Partial Class usrctlProcedures
|
||||
'Label8
|
||||
'
|
||||
Me.Label8.AutoSize = True
|
||||
Me.Label8.Location = New System.Drawing.Point(37, 241)
|
||||
Me.Label8.Location = New System.Drawing.Point(41, 335)
|
||||
Me.Label8.Name = "Label8"
|
||||
Me.Label8.Size = New System.Drawing.Size(25, 13)
|
||||
Me.Label8.TabIndex = 31
|
||||
@@ -660,7 +663,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'TextBox5
|
||||
'
|
||||
Me.TextBox5.Location = New System.Drawing.Point(68, 264)
|
||||
Me.TextBox5.Location = New System.Drawing.Point(72, 358)
|
||||
Me.TextBox5.Name = "TextBox5"
|
||||
Me.TextBox5.Size = New System.Drawing.Size(91, 20)
|
||||
Me.TextBox5.TabIndex = 32
|
||||
@@ -668,7 +671,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'TextBox6
|
||||
'
|
||||
Me.TextBox6.Location = New System.Drawing.Point(165, 265)
|
||||
Me.TextBox6.Location = New System.Drawing.Point(169, 359)
|
||||
Me.TextBox6.Name = "TextBox6"
|
||||
Me.TextBox6.Size = New System.Drawing.Size(48, 20)
|
||||
Me.TextBox6.TabIndex = 33
|
||||
@@ -676,7 +679,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'TextBox7
|
||||
'
|
||||
Me.TextBox7.Location = New System.Drawing.Point(219, 265)
|
||||
Me.TextBox7.Location = New System.Drawing.Point(223, 359)
|
||||
Me.TextBox7.Name = "TextBox7"
|
||||
Me.TextBox7.Size = New System.Drawing.Size(48, 20)
|
||||
Me.TextBox7.TabIndex = 34
|
||||
@@ -684,7 +687,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button21
|
||||
'
|
||||
Me.Button21.Location = New System.Drawing.Point(219, 173)
|
||||
Me.Button21.Location = New System.Drawing.Point(223, 268)
|
||||
Me.Button21.Name = "Button21"
|
||||
Me.Button21.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button21.TabIndex = 35
|
||||
@@ -694,7 +697,7 @@ Partial Class usrctlProcedures
|
||||
'Label9
|
||||
'
|
||||
Me.Label9.AutoSize = True
|
||||
Me.Label9.Location = New System.Drawing.Point(225, 159)
|
||||
Me.Label9.Location = New System.Drawing.Point(229, 254)
|
||||
Me.Label9.Name = "Label9"
|
||||
Me.Label9.Size = New System.Drawing.Size(42, 13)
|
||||
Me.Label9.TabIndex = 37
|
||||
@@ -702,7 +705,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'TextBox8
|
||||
'
|
||||
Me.TextBox8.Location = New System.Drawing.Point(273, 156)
|
||||
Me.TextBox8.Location = New System.Drawing.Point(277, 251)
|
||||
Me.TextBox8.Name = "TextBox8"
|
||||
Me.TextBox8.Size = New System.Drawing.Size(91, 20)
|
||||
Me.TextBox8.TabIndex = 36
|
||||
@@ -710,7 +713,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'txt
|
||||
'
|
||||
Me.txt.Location = New System.Drawing.Point(343, 238)
|
||||
Me.txt.Location = New System.Drawing.Point(347, 332)
|
||||
Me.txt.Multiline = True
|
||||
Me.txt.Name = "txt"
|
||||
Me.txt.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
|
||||
@@ -719,7 +722,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'TextBox9
|
||||
'
|
||||
Me.TextBox9.Location = New System.Drawing.Point(468, 238)
|
||||
Me.TextBox9.Location = New System.Drawing.Point(472, 332)
|
||||
Me.TextBox9.Multiline = True
|
||||
Me.TextBox9.Name = "TextBox9"
|
||||
Me.TextBox9.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
|
||||
@@ -728,7 +731,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button22
|
||||
'
|
||||
Me.Button22.Location = New System.Drawing.Point(364, 173)
|
||||
Me.Button22.Location = New System.Drawing.Point(368, 268)
|
||||
Me.Button22.Name = "Button22"
|
||||
Me.Button22.Size = New System.Drawing.Size(154, 49)
|
||||
Me.Button22.TabIndex = 40
|
||||
@@ -737,7 +740,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button23
|
||||
'
|
||||
Me.Button23.Location = New System.Drawing.Point(618, 344)
|
||||
Me.Button23.Location = New System.Drawing.Point(622, 438)
|
||||
Me.Button23.Name = "Button23"
|
||||
Me.Button23.Size = New System.Drawing.Size(75, 23)
|
||||
Me.Button23.TabIndex = 41
|
||||
@@ -745,7 +748,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button24
|
||||
'
|
||||
Me.Button24.Location = New System.Drawing.Point(583, 50)
|
||||
Me.Button24.Location = New System.Drawing.Point(587, 144)
|
||||
Me.Button24.Name = "Button24"
|
||||
Me.Button24.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button24.TabIndex = 42
|
||||
@@ -757,7 +760,7 @@ Partial Class usrctlProcedures
|
||||
Me.CheckBox3.AutoSize = True
|
||||
Me.CheckBox3.Checked = True
|
||||
Me.CheckBox3.CheckState = System.Windows.Forms.CheckState.Checked
|
||||
Me.CheckBox3.Location = New System.Drawing.Point(583, 24)
|
||||
Me.CheckBox3.Location = New System.Drawing.Point(587, 118)
|
||||
Me.CheckBox3.Name = "CheckBox3"
|
||||
Me.CheckBox3.Size = New System.Drawing.Size(98, 17)
|
||||
Me.CheckBox3.TabIndex = 43
|
||||
@@ -766,7 +769,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button25
|
||||
'
|
||||
Me.Button25.Location = New System.Drawing.Point(583, 102)
|
||||
Me.Button25.Location = New System.Drawing.Point(587, 196)
|
||||
Me.Button25.Name = "Button25"
|
||||
Me.Button25.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button25.TabIndex = 44
|
||||
@@ -775,7 +778,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Label10
|
||||
'
|
||||
Me.Label10.Location = New System.Drawing.Point(579, 154)
|
||||
Me.Label10.Location = New System.Drawing.Point(583, 248)
|
||||
Me.Label10.Name = "Label10"
|
||||
Me.Label10.Size = New System.Drawing.Size(145, 13)
|
||||
Me.Label10.TabIndex = 45
|
||||
@@ -784,7 +787,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'TextBox10
|
||||
'
|
||||
Me.TextBox10.Location = New System.Drawing.Point(690, 335)
|
||||
Me.TextBox10.Location = New System.Drawing.Point(694, 429)
|
||||
Me.TextBox10.Multiline = True
|
||||
Me.TextBox10.Name = "TextBox10"
|
||||
Me.TextBox10.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
|
||||
@@ -793,7 +796,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'TextBox11
|
||||
'
|
||||
Me.TextBox11.Location = New System.Drawing.Point(820, 335)
|
||||
Me.TextBox11.Location = New System.Drawing.Point(824, 429)
|
||||
Me.TextBox11.Multiline = True
|
||||
Me.TextBox11.Name = "TextBox11"
|
||||
Me.TextBox11.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
|
||||
@@ -802,7 +805,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'TextBox12
|
||||
'
|
||||
Me.TextBox12.Location = New System.Drawing.Point(690, 450)
|
||||
Me.TextBox12.Location = New System.Drawing.Point(694, 544)
|
||||
Me.TextBox12.Multiline = True
|
||||
Me.TextBox12.Name = "TextBox12"
|
||||
Me.TextBox12.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
|
||||
@@ -812,7 +815,7 @@ Partial Class usrctlProcedures
|
||||
'Label11
|
||||
'
|
||||
Me.Label11.AutoSize = True
|
||||
Me.Label11.Location = New System.Drawing.Point(687, 319)
|
||||
Me.Label11.Location = New System.Drawing.Point(691, 413)
|
||||
Me.Label11.Name = "Label11"
|
||||
Me.Label11.Size = New System.Drawing.Size(94, 13)
|
||||
Me.Label11.TabIndex = 28
|
||||
@@ -821,7 +824,7 @@ Partial Class usrctlProcedures
|
||||
'Label12
|
||||
'
|
||||
Me.Label12.AutoSize = True
|
||||
Me.Label12.Location = New System.Drawing.Point(817, 319)
|
||||
Me.Label12.Location = New System.Drawing.Point(821, 413)
|
||||
Me.Label12.Name = "Label12"
|
||||
Me.Label12.Size = New System.Drawing.Size(96, 13)
|
||||
Me.Label12.TabIndex = 28
|
||||
@@ -830,7 +833,7 @@ Partial Class usrctlProcedures
|
||||
'Label13
|
||||
'
|
||||
Me.Label13.AutoSize = True
|
||||
Me.Label13.Location = New System.Drawing.Point(687, 434)
|
||||
Me.Label13.Location = New System.Drawing.Point(691, 528)
|
||||
Me.Label13.Name = "Label13"
|
||||
Me.Label13.Size = New System.Drawing.Size(119, 13)
|
||||
Me.Label13.TabIndex = 28
|
||||
@@ -838,7 +841,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button26
|
||||
'
|
||||
Me.Button26.Location = New System.Drawing.Point(755, 104)
|
||||
Me.Button26.Location = New System.Drawing.Point(759, 198)
|
||||
Me.Button26.Name = "Button26"
|
||||
Me.Button26.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button26.TabIndex = 54
|
||||
@@ -847,7 +850,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button27
|
||||
'
|
||||
Me.Button27.Location = New System.Drawing.Point(756, 50)
|
||||
Me.Button27.Location = New System.Drawing.Point(760, 144)
|
||||
Me.Button27.Name = "Button27"
|
||||
Me.Button27.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button27.TabIndex = 50
|
||||
@@ -859,7 +862,7 @@ Partial Class usrctlProcedures
|
||||
Me.CheckBox4.AutoSize = True
|
||||
Me.CheckBox4.Checked = True
|
||||
Me.CheckBox4.CheckState = System.Windows.Forms.CheckState.Checked
|
||||
Me.CheckBox4.Location = New System.Drawing.Point(756, 24)
|
||||
Me.CheckBox4.Location = New System.Drawing.Point(760, 118)
|
||||
Me.CheckBox4.Name = "CheckBox4"
|
||||
Me.CheckBox4.Size = New System.Drawing.Size(98, 17)
|
||||
Me.CheckBox4.TabIndex = 51
|
||||
@@ -868,7 +871,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Label14
|
||||
'
|
||||
Me.Label14.Location = New System.Drawing.Point(756, 156)
|
||||
Me.Label14.Location = New System.Drawing.Point(760, 250)
|
||||
Me.Label14.Name = "Label14"
|
||||
Me.Label14.Size = New System.Drawing.Size(145, 13)
|
||||
Me.Label14.TabIndex = 53
|
||||
@@ -877,7 +880,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Label15
|
||||
'
|
||||
Me.Label15.Location = New System.Drawing.Point(756, 254)
|
||||
Me.Label15.Location = New System.Drawing.Point(760, 348)
|
||||
Me.Label15.Name = "Label15"
|
||||
Me.Label15.Size = New System.Drawing.Size(145, 13)
|
||||
Me.Label15.TabIndex = 57
|
||||
@@ -889,7 +892,7 @@ Partial Class usrctlProcedures
|
||||
Me.CheckBox5.AutoSize = True
|
||||
Me.CheckBox5.Checked = True
|
||||
Me.CheckBox5.CheckState = System.Windows.Forms.CheckState.Checked
|
||||
Me.CheckBox5.Location = New System.Drawing.Point(756, 179)
|
||||
Me.CheckBox5.Location = New System.Drawing.Point(760, 273)
|
||||
Me.CheckBox5.Name = "CheckBox5"
|
||||
Me.CheckBox5.Size = New System.Drawing.Size(98, 17)
|
||||
Me.CheckBox5.TabIndex = 56
|
||||
@@ -898,7 +901,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button29
|
||||
'
|
||||
Me.Button29.Location = New System.Drawing.Point(755, 202)
|
||||
Me.Button29.Location = New System.Drawing.Point(759, 296)
|
||||
Me.Button29.Name = "Button29"
|
||||
Me.Button29.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button29.TabIndex = 58
|
||||
@@ -907,7 +910,7 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button28
|
||||
'
|
||||
Me.Button28.Location = New System.Drawing.Point(598, 258)
|
||||
Me.Button28.Location = New System.Drawing.Point(602, 352)
|
||||
Me.Button28.Name = "Button28"
|
||||
Me.Button28.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button28.TabIndex = 59
|
||||
@@ -916,17 +919,47 @@ Partial Class usrctlProcedures
|
||||
'
|
||||
'Button30
|
||||
'
|
||||
Me.Button30.Location = New System.Drawing.Point(579, 179)
|
||||
Me.Button30.Location = New System.Drawing.Point(583, 273)
|
||||
Me.Button30.Name = "Button30"
|
||||
Me.Button30.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button30.TabIndex = 60
|
||||
Me.Button30.Text = "GOOGLE"
|
||||
Me.Button30.UseVisualStyleBackColor = True
|
||||
'
|
||||
'Button31
|
||||
'
|
||||
Me.Button31.Location = New System.Drawing.Point(68, 29)
|
||||
Me.Button31.Name = "Button31"
|
||||
Me.Button31.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button31.TabIndex = 61
|
||||
Me.Button31.Text = "TAPI"
|
||||
Me.Button31.UseVisualStyleBackColor = True
|
||||
'
|
||||
'Button32
|
||||
'
|
||||
Me.Button32.Location = New System.Drawing.Point(232, 29)
|
||||
Me.Button32.Name = "Button32"
|
||||
Me.Button32.Size = New System.Drawing.Size(145, 49)
|
||||
Me.Button32.TabIndex = 62
|
||||
Me.Button32.Text = "TAPI"
|
||||
Me.Button32.UseVisualStyleBackColor = True
|
||||
'
|
||||
'lblStatus
|
||||
'
|
||||
Me.lblStatus.AutoSize = True
|
||||
Me.lblStatus.Location = New System.Drawing.Point(110, 81)
|
||||
Me.lblStatus.Name = "lblStatus"
|
||||
Me.lblStatus.Size = New System.Drawing.Size(39, 13)
|
||||
Me.lblStatus.TabIndex = 63
|
||||
Me.lblStatus.Text = "Zeilen:"
|
||||
'
|
||||
'usrctlProcedures
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.Controls.Add(Me.lblStatus)
|
||||
Me.Controls.Add(Me.Button32)
|
||||
Me.Controls.Add(Me.Button31)
|
||||
Me.Controls.Add(Me.Button30)
|
||||
Me.Controls.Add(Me.Button28)
|
||||
Me.Controls.Add(Me.Label15)
|
||||
@@ -975,7 +1008,7 @@ Partial Class usrctlProcedures
|
||||
Me.Controls.Add(Me.TabControl1)
|
||||
Me.Controls.Add(Me.Button26)
|
||||
Me.Name = "usrctlProcedures"
|
||||
Me.Size = New System.Drawing.Size(931, 546)
|
||||
Me.Size = New System.Drawing.Size(931, 724)
|
||||
Me.TabControl1.ResumeLayout(False)
|
||||
Me.TabPage1.ResumeLayout(False)
|
||||
Me.TabPage1.PerformLayout()
|
||||
@@ -1076,4 +1109,7 @@ Partial Class usrctlProcedures
|
||||
Friend WithEvents Button29 As Button
|
||||
Friend WithEvents Button28 As Button
|
||||
Friend WithEvents Button30 As Button
|
||||
Friend WithEvents Button31 As Button
|
||||
Friend WithEvents Button32 As Button
|
||||
Friend WithEvents lblStatus As Label
|
||||
End Class
|
||||
|
||||
@@ -123,4 +123,10 @@
|
||||
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@@ -15,10 +15,193 @@ Imports System.Text
|
||||
Imports System.Xml.Serialization
|
||||
Imports System.Xml
|
||||
Imports System.Data.OleDb
|
||||
|
||||
'Imports Microsoft.Office.Interop
|
||||
|
||||
Public Class usrctlProcedures
|
||||
|
||||
|
||||
|
||||
|
||||
'Private hwAddress As TAddress = Nothing
|
||||
'Private mediaTypes As Integer
|
||||
|
||||
'Private WithEvents tapiCls As TTapi
|
||||
'Private Const mediaAudio = JulMar.Tapi3.TAPIMEDIATYPES.AUDIO
|
||||
'Private Const mediaData = JulMar.Tapi3.TAPIMEDIATYPES.DATAMODEM
|
||||
'Private Const mediaVideo = JulMar.Tapi3.TAPIMEDIATYPES.VIDEO
|
||||
'Private Const mediaFax = JulMar.Tapi3.TAPIMEDIATYPES.G3FAX
|
||||
'Private Const mediaMultitrack = JulMar.Tapi3.TAPIMEDIATYPES.MULTITRACK
|
||||
|
||||
'Private offeringCall As Boolean = False
|
||||
'Private connectedCall As Boolean = False
|
||||
'Private inProgressCall As Boolean = False
|
||||
|
||||
'Private incomingCall As TCall
|
||||
|
||||
'Public Sub New()
|
||||
|
||||
' tapiCls = New TTapi
|
||||
' tapiCls.Initialize()
|
||||
|
||||
' 'Discover all hardware addresses
|
||||
' 'Make "And" function to discover different media devices
|
||||
|
||||
' For Each address In tapiCls.Addresses
|
||||
' If address.State = ADDRESS_STATE.AS_INSERVICE Then
|
||||
' mediaTypes = address.MediaTypes
|
||||
|
||||
' 'We discover and select the audio device usually to be a modem
|
||||
' If (mediaTypes And mediaAudio) = mediaAudio Then
|
||||
|
||||
' hwAddress = address
|
||||
' hwAddress.Open(mediaAudio)
|
||||
' 'This will show the name of the audio devices discovered
|
||||
' 'MsgBox(hwAddress.AddressName.ToString)
|
||||
|
||||
' End If
|
||||
|
||||
' End If
|
||||
' Next
|
||||
|
||||
' 'If an hardware has not been found
|
||||
' If hwAddress Is Nothing Then
|
||||
|
||||
' 'Hardware address not found
|
||||
|
||||
' End If
|
||||
|
||||
'End Sub
|
||||
|
||||
'Public Sub openLine()
|
||||
' 'Put modem wake up to listem to the line
|
||||
' Try
|
||||
' If hwAddress.State = ADDRESS_STATE.AS_INSERVICE Then
|
||||
' hwAddress.Open(mediaAudio)
|
||||
' End If
|
||||
|
||||
' Catch ex As Exception
|
||||
' 'Manage the exception
|
||||
' End Try
|
||||
|
||||
'End Sub
|
||||
|
||||
'Public Sub closeLine()
|
||||
' 'Put modem shut down
|
||||
' Try
|
||||
' If hwAddress.State = ADDRESS_STATE.AS_INSERVICE Then
|
||||
' hwAddress.Close()
|
||||
' End If
|
||||
|
||||
' Catch ex As Exception
|
||||
|
||||
' 'Manage the exception
|
||||
' End Try
|
||||
|
||||
'End Sub
|
||||
|
||||
'Public Sub answerCall()
|
||||
' If offeringCall = True Then
|
||||
' incomingCall.Answer()
|
||||
' End If
|
||||
'End Sub
|
||||
|
||||
'Public Sub hungup()
|
||||
' If connectedCall = True Then
|
||||
' incomingCall.Disconnect(DISCONNECT_CODE.DC_REJECTED)
|
||||
' End If
|
||||
'End Sub
|
||||
|
||||
'Private Sub tapiCallNotification_Event(ByVal sender As Object,
|
||||
' ByVal e As TapiCallNotificationEventArgs) Handles tapiCls.TE_CALLNOTIFICATION
|
||||
' 'MsgBox("Call notification")
|
||||
|
||||
' Select Case e.Event
|
||||
' Case CALL_NOTIFICATION_EVENT.CNE_MONITOR
|
||||
' 'Choose you action
|
||||
' Case CALL_NOTIFICATION_EVENT.CNE_OWNER
|
||||
' 'Choose you action
|
||||
' End Select
|
||||
'End Sub
|
||||
|
||||
'Private Sub tapiInfoChange_Event(ByVal sender As Object,
|
||||
' ByVal e As TapiCallInfoChangeEventArgs) Handles tapiCls.TE_CALLINFOCHANGE
|
||||
' Dim callerNumber As String = ""
|
||||
|
||||
' Try
|
||||
|
||||
' callerNumber = e.Call.CallInfo(CALLINFO_STRING.CIS_CALLERIDNUMBER).ToString
|
||||
|
||||
' If callerNumber.Length = 0 Then
|
||||
' 'Hidden number
|
||||
|
||||
' Else
|
||||
' 'Clear number
|
||||
|
||||
' End If
|
||||
|
||||
' Catch ex As Exception
|
||||
|
||||
' 'Manage the exception
|
||||
|
||||
' End Try
|
||||
|
||||
|
||||
'End Sub
|
||||
|
||||
'Private Sub tapiGeneral_Event(ByVal sender As Object,
|
||||
' ByVal e As TapiCallStateEventArgs) Handles tapiCls.TE_CALLSTATE
|
||||
|
||||
' ' MsgBox(e.State.ToString)
|
||||
|
||||
' Select Case e.State
|
||||
|
||||
' Case CALL_STATE.CS_UNKNOWN
|
||||
|
||||
' Case CALL_STATE.CS_OFFERING
|
||||
' 'When a call is coming in during the ring tone
|
||||
' offeringCall = True
|
||||
|
||||
' Case CALL_STATE.CS_CONNECTED
|
||||
' 'When a call is answered
|
||||
' connectedCall = True
|
||||
' offeringCall = False
|
||||
|
||||
' Case CALL_STATE.CS_HOLD
|
||||
' Case CALL_STATE.CS_IDLE
|
||||
' Case CALL_STATE.CS_INPROGRESS
|
||||
' Case CALL_STATE.CS_QUEUED
|
||||
' Case CALL_STATE.CS_DISCONNECTED
|
||||
' 'When a call is in conversation or closed
|
||||
' connectedCall = False
|
||||
' End Select
|
||||
|
||||
'End Sub
|
||||
|
||||
'Private Sub tapiGenerate_Event(ByVal sender As Object,
|
||||
' ByVal e As TapiDigitGenerationEventArgs) Handles tapiCls.TE_GENERATEEVENT
|
||||
' ' MsgBox("GENERATE")
|
||||
'End Sub
|
||||
|
||||
'Private Sub tapiSpecific_Event(ByVal sender As Object,
|
||||
' ByVal e As TapiAddressDeviceSpecificEventArgs) Handles tapiCls.TE_ADDRESSDEVSPECIFIC
|
||||
' ' MsgBox("SPECIFIC EVENTS")
|
||||
'End Sub
|
||||
|
||||
'Private Sub tapiObject_Event(ByVal sender As Object,
|
||||
' ByVal e As TapiObjectEventArgs) Handles tapiCls.TE_TAPIOBJECT
|
||||
' 'MsgBox("tapi object")
|
||||
'End Sub
|
||||
|
||||
'Private Sub tapiPhone_Event(ByVal sender As Object,
|
||||
' ByVal e As TapiPhoneEventArgs) Handles tapiCls.TE_PHONEEVENT
|
||||
' 'MsgBox("Phone events")
|
||||
'End Sub
|
||||
'Private Sub tapiDigit_Event(ByVal sender As Object,
|
||||
' ByVal e As TapiDigitDetectionEventArgs) Handles tapiCls.TE_DIGITEVENT
|
||||
' 'MsgBox("Digit detection events")
|
||||
'End Sub
|
||||
|
||||
|
||||
'Inherits UserControl
|
||||
'Public Sub New()
|
||||
' InitializeComponent()
|
||||
@@ -3259,6 +3442,7 @@ Public Class usrctlProcedures
|
||||
VERAG_PROG_ALLGEMEIN.cGoogleAPI.test()
|
||||
End Sub
|
||||
|
||||
|
||||
'Private Sub Button26_Click(sender As Object, e As EventArgs)
|
||||
' For Each d In System.IO.Directory.GetDirectories("\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019")
|
||||
' Dim fi As New FileInfo(d)
|
||||
|
||||
Reference in New Issue
Block a user