Spedi-Suche, timas-Aktengang, Bugfix Prüfung ZE-Eintrag

This commit is contained in:
2023-11-22 13:52:17 +01:00
parent 0e2de41544
commit 792521238e
13 changed files with 266 additions and 104 deletions

View File

@@ -71,19 +71,17 @@ Public Class SQL
If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
Try
Return My.MySettings.Default.AsfinagConnectionString
Return My.MySettings.Default.AsfinagConnectionStringDEV
Catch ex As Exception
'Return "Data Source=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;"
Return "Data Source=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;"
End Try
Else
Try
Return My.MySettings.Default.AsfinagConnectionString 'nach Prod-Start austauschen!
Return My.MySettings.Default.AsfinagConnectionStringPROD
Catch ex As Exception
' Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
Return "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;"
End Try
End If
@@ -118,7 +116,7 @@ Public Class SQL
Public Shared Function GetAsfinagConnectionString(TESTSYSTEM) As String
If TESTSYSTEM Then
Return My.MySettings.Default.AsfinagConnectionString()
Return My.MySettings.Default.AsfinagConnectionStringDEV()
Else
Try
Return My.MySettings.Default.FMZOLL_PRODConnectionString

View File

@@ -34,6 +34,8 @@ Partial Class frmMitarbeitersuche
Me.lblStatusZE = New System.Windows.Forms.Label()
Me.Label13 = New System.Windows.Forms.Label()
Me.pnlZeiten = New System.Windows.Forms.Panel()
Me.btnAkten = New System.Windows.Forms.Button()
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
Me.Button2 = New System.Windows.Forms.Button()
Me.Label12 = New System.Windows.Forms.Label()
Me.Label9 = New System.Windows.Forms.Label()
@@ -86,6 +88,7 @@ Partial Class frmMitarbeitersuche
Me.pnl.SuspendLayout()
Me.Panel2.SuspendLayout()
Me.pnlZeiten.SuspendLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnlWohnadresse.SuspendLayout()
CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
Me.pnlMotto.SuspendLayout()
@@ -203,9 +206,9 @@ Partial Class frmMitarbeitersuche
Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.Panel2.Controls.Add(Me.lblStatusZE)
Me.Panel2.Controls.Add(Me.Label13)
Me.Panel2.Location = New System.Drawing.Point(590, 402)
Me.Panel2.Location = New System.Drawing.Point(624, 402)
Me.Panel2.Name = "Panel2"
Me.Panel2.Size = New System.Drawing.Size(185, 66)
Me.Panel2.Size = New System.Drawing.Size(151, 66)
Me.Panel2.TabIndex = 128
'
'lblStatusZE
@@ -215,7 +218,7 @@ Partial Class frmMitarbeitersuche
Me.lblStatusZE.ForeColor = System.Drawing.Color.White
Me.lblStatusZE.Location = New System.Drawing.Point(7, 17)
Me.lblStatusZE.Name = "lblStatusZE"
Me.lblStatusZE.Size = New System.Drawing.Size(174, 25)
Me.lblStatusZE.Size = New System.Drawing.Size(140, 25)
Me.lblStatusZE.TabIndex = 12
Me.lblStatusZE.Text = "OFFLINE"
Me.lblStatusZE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -237,6 +240,8 @@ Partial Class frmMitarbeitersuche
Me.pnlZeiten.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.pnlZeiten.BackColor = System.Drawing.Color.Cornsilk
Me.pnlZeiten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.pnlZeiten.Controls.Add(Me.btnAkten)
Me.pnlZeiten.Controls.Add(Me.PictureBox5)
Me.pnlZeiten.Controls.Add(Me.Button2)
Me.pnlZeiten.Controls.Add(Me.Label12)
Me.pnlZeiten.Controls.Add(Me.Label9)
@@ -247,9 +252,35 @@ Partial Class frmMitarbeitersuche
Me.pnlZeiten.Controls.Add(Me.cbxHomeoffice)
Me.pnlZeiten.Location = New System.Drawing.Point(0, 402)
Me.pnlZeiten.Name = "pnlZeiten"
Me.pnlZeiten.Size = New System.Drawing.Size(591, 66)
Me.pnlZeiten.Size = New System.Drawing.Size(624, 66)
Me.pnlZeiten.TabIndex = 22
'
'btnAkten
'
Me.btnAkten.BackColor = System.Drawing.Color.White
Me.btnAkten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.btnAkten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnAkten.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.file_small
Me.btnAkten.ImageAlign = System.Drawing.ContentAlignment.TopLeft
Me.btnAkten.Location = New System.Drawing.Point(535, 15)
Me.btnAkten.Name = "btnAkten"
Me.btnAkten.Size = New System.Drawing.Size(85, 46)
Me.btnAkten.TabIndex = 130
Me.btnAkten.Text = " AKTEN"
Me.btnAkten.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnAkten.UseVisualStyleBackColor = False
Me.btnAkten.Visible = False
'
'PictureBox5
'
Me.PictureBox5.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.blue_question_mark_hi
Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox5.Location = New System.Drawing.Point(86, 1)
Me.PictureBox5.Name = "PictureBox5"
Me.PictureBox5.Size = New System.Drawing.Size(18, 19)
Me.PictureBox5.TabIndex = 129
Me.PictureBox5.TabStop = False
'
'Button2
'
Me.Button2.BackColor = System.Drawing.Color.White
@@ -257,9 +288,9 @@ Partial Class frmMitarbeitersuche
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.parcel_small1
Me.Button2.ImageAlign = System.Drawing.ContentAlignment.TopLeft
Me.Button2.Location = New System.Drawing.Point(495, 15)
Me.Button2.Location = New System.Drawing.Point(457, 15)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(90, 46)
Me.Button2.Size = New System.Drawing.Size(77, 46)
Me.Button2.TabIndex = 128
Me.Button2.Text = "POST"
Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -283,7 +314,7 @@ Partial Class frmMitarbeitersuche
Me.Label9.AutoSize = True
Me.Label9.BackColor = System.Drawing.Color.Transparent
Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
Me.Label9.Location = New System.Drawing.Point(10, 2)
Me.Label9.Location = New System.Drawing.Point(9, 2)
Me.Label9.Name = "Label9"
Me.Label9.Size = New System.Drawing.Size(71, 13)
Me.Label9.TabIndex = 30
@@ -297,9 +328,9 @@ Partial Class frmMitarbeitersuche
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.zeiterfassung_s
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopLeft
Me.Button1.Location = New System.Drawing.Point(9, 17)
Me.Button1.Location = New System.Drawing.Point(12, 21)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(123, 45)
Me.Button1.Size = New System.Drawing.Size(120, 41)
Me.Button1.TabIndex = 126
Me.Button1.Text = "Zeiterfassung" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Online"
Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -312,9 +343,9 @@ Partial Class frmMitarbeitersuche
Me.btnZEGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnZEGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
Me.btnZEGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
Me.btnZEGehen.Location = New System.Drawing.Point(382, 16)
Me.btnZEGehen.Location = New System.Drawing.Point(364, 16)
Me.btnZEGehen.Name = "btnZEGehen"
Me.btnZEGehen.Size = New System.Drawing.Size(107, 45)
Me.btnZEGehen.Size = New System.Drawing.Size(90, 45)
Me.btnZEGehen.TabIndex = 124
Me.btnZEGehen.Text = "GEHEN"
Me.btnZEGehen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -327,7 +358,7 @@ Partial Class frmMitarbeitersuche
Me.btnZEKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnZEKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
Me.btnZEKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
Me.btnZEKommen.Location = New System.Drawing.Point(270, 16)
Me.btnZEKommen.Location = New System.Drawing.Point(252, 16)
Me.btnZEKommen.Name = "btnZEKommen"
Me.btnZEKommen.Size = New System.Drawing.Size(106, 45)
Me.btnZEKommen.TabIndex = 123
@@ -347,7 +378,7 @@ Partial Class frmMitarbeitersuche
'
Me.cbxHomeoffice.AutoSize = True
Me.cbxHomeoffice.ForeColor = System.Drawing.Color.Black
Me.cbxHomeoffice.Location = New System.Drawing.Point(270, 1)
Me.cbxHomeoffice.Location = New System.Drawing.Point(255, 1)
Me.cbxHomeoffice.Name = "cbxHomeoffice"
Me.cbxHomeoffice.Size = New System.Drawing.Size(80, 17)
Me.cbxHomeoffice.TabIndex = 125
@@ -791,6 +822,7 @@ Partial Class frmMitarbeitersuche
Me.Panel2.PerformLayout()
Me.pnlZeiten.ResumeLayout(False)
Me.pnlZeiten.PerformLayout()
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
Me.pnlWohnadresse.ResumeLayout(False)
CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
Me.pnlMotto.ResumeLayout(False)
@@ -860,4 +892,6 @@ Partial Class frmMitarbeitersuche
Friend WithEvents lblStatusZE As Windows.Forms.Label
Friend WithEvents Label13 As Windows.Forms.Label
Friend WithEvents Button2 As Windows.Forms.Button
Friend WithEvents PictureBox5 As Windows.Forms.PictureBox
Friend WithEvents btnAkten As Windows.Forms.Button
End Class

View File

@@ -1,4 +1,5 @@
Imports System.ComponentModel
Imports System.Diagnostics.Eventing.Reader
Imports System.Drawing
Imports System.Net
Imports System.Threading
@@ -183,11 +184,9 @@ Public Class frmMitarbeitersuche
End If
End If
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZE_POSTGANG", "SDL") Then Button2.Visible = True
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZE_POSTGANG", "SDL") Then
Button2.Visible = True
End If
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZE_AKTENGANG", "SDL") Then btnAkten.Visible = True
End If
End Sub
@@ -298,12 +297,14 @@ Public Class frmMitarbeitersuche
End If
End Sub
Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnZEKommen.Click, btnZEGehen.Click, Button2.Click
Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnZEKommen.Click, btnZEGehen.Click, Button2.Click, btnAkten.Click
Dim art As String
If sender Is btnZEKommen Then
art = "in"
ElseIf sender Is btnZEGehen Then
art = "out"
ElseIf sender Is btnAkten Then
art = "akten"
Else
art = "post"
End If
@@ -333,8 +334,31 @@ Public Class frmMitarbeitersuche
initTimasData()
End If
ElseIf art = "akten" Then
Dim aktengang As DateTime = Now().AddMinutes(-10)
Dim askPost As MsgBoxResult = MsgBox("Aktengang für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " eintragen?" & vbNewLine & aktengang.ToString(), vbYesNo)
If askPost = vbYes Then
Dim info
Dim timestp = aktengang
Else
Dim timeEntryExisting As Boolean = False
Dim isOnline = timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, Nothing, timeEntryExisting)
If Not timeEntryExisting AndAlso Not isOnline Then
timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "in", 10) 'Start 10 Aktengang
timestp = timestp.AddMinutes(10)
timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "out", 10) 'Ende 10 Aktengang
timestp = timestp.AddMinutes(1)
timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "in", 0) ' Start
End If
MsgBox(info)
Thread.Sleep(2000) 'warten bis Eintrag in Timas-DB
requestDone = False
initTimasData()
End If
Else
'normales kommen/gehen
Dim a As MsgBoxResult = MsgBox(IIf(cbxHomeoffice.Checked, "Homeoffice", "Büro") & vbNewLine & sender.text & " für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & vbNewLine & Now.ToString(), vbYesNo)
@@ -369,8 +393,9 @@ Public Class frmMitarbeitersuche
Dim isServiceRunning As Boolean = True
timas.getTimeSaldo(MA.mit_timasId, lblTimasSaldo.Text, isServiceRunning)
If Not isServiceRunning Then
MsgBox("Abfragefehler!")
Exit Sub
'Abfrage konnte nicht durchgeführt werden.
MsgBox("Abfragefehler am Timas-Server!")
'Exit Sub
End If
lblStatusZE.Visible = True
Dim checkEntry As Boolean = timas.getTimeEntries(MA.mit_timasId, dtZeiten,, requestDone)
@@ -383,6 +408,7 @@ Public Class frmMitarbeitersuche
btnZEGehen.Enabled = True
btnZEKommen.Enabled = False
btnAkten.Enabled = False
Else
' PictureBox9.Image = VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_red
lblStatusZE.Text = "OFFLINE"
@@ -390,13 +416,16 @@ Public Class frmMitarbeitersuche
btnZEGehen.Enabled = False
btnZEKommen.Enabled = True
btnAkten.Enabled = True
End If
Else
'Request wurde nicht verarbeitet -> Verbindungsfehler
lblStatusZE.Text = "Verbindungsfehler"
lblStatusZE.Text = "Serverfehler"
lblStatusZE.BackColor = Color.Gray
btnZEGehen.Enabled = False
btnZEKommen.Enabled = False
Button2.Enabled = False
btnAkten.Enabled = False
End If
@@ -418,4 +447,9 @@ Public Class frmMitarbeitersuche
Process.Start(webAddress)
End Sub
Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click
Dim webAddress As String = "https://wiki.verag.ag/de/software/zeiterfassung/zeiterfassung"
Process.Start(webAddress)
End Sub
End Class

View File

@@ -100,6 +100,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property blue_question_mark_hi() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("blue-question-mark-hi", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
@@ -150,6 +160,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property file_small() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("file_small", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

View File

@@ -127,25 +127,12 @@
<data name="personGray_m" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\personGray_m.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pdf_gray" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pdf_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ze_gehen" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ze_gehen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="house" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\house.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="house1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="today" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="zeiterfassung_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zeiterfassung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="seal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\seal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -158,8 +145,8 @@
<data name="pfeil_links" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pfeil_links.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Atilla" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Atilla.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Verag_Spedition_GMBH_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Verag-Spedition-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="seal2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\seal2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -179,8 +166,8 @@
<data name="seal3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\seal3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pfeil_unten" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Aviso" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\aviso.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="people" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\people.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -188,9 +175,6 @@
<data name="Unisped_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Unisped_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pfeil_unten" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ZwAbEinfuegen" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -799,6 +783,9 @@
<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>
</data>
<data name="zwiterfassung" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zwiterfassung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ok" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ok.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -808,11 +795,8 @@
<data name="picboxRotateRight_Enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\picboxRotateRight_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ambar_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="IMEX-LOGO_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="fremdSped" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fremdSped.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ZwAbEinfuegen_white" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -861,7 +845,7 @@
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAA9UFJREFUeF7s/QmYZNld
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDwAACw8BkvkDpQAA9UFJREFUeF7s/QmYZNld
nomHultbSy01EpbagISaEmJraGQQi5DYbBpJ7HiMwTPGbmMe/DfGM5jHeDyMZzDW2EaAV+FhbIyFWYVY
1GAQFkJIIEtdudSelVWZWZVZuVXua+VSXV0d/++7HbcUGX0yKzMj4t5zbrzv87xPRp6M5d577jn392VE
3Fur1+uIiIiIiIiIxzbYiIiIiIiIiHhYg42IiIiIiIiIhzXYiIiIiIiIiHhYg42IiIiIiIiIhzXYiIiI
@@ -1974,8 +1958,14 @@
FgIAAAAAAAC0SrAQAAAAAAAAoFWChQAAAAAAAACt0ej5/x9oWtk/vf5fAAAAAElFTkSuQmCC
</value>
</data>
<data name="Aviso" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\aviso.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="IMEX-LOGO_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="house1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pdf_gray" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pdf_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Verag_Customs_Service_GMBH_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Verag-Customs-Service-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1989,23 +1979,29 @@
<data name="picboxZoomIn_Enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\picboxZoomIn_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="house" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\house.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<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="sicherheit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sicherheit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="err" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\err.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="weiblich" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\weiblich.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="männlich" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\männlich.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Verag-AG-Logopng" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FrontOfficeSUB_Horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="zeiterfassung_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zeiterfassung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="parcel_small1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\parcel_small1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="person" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -2013,8 +2009,8 @@
<data name="uhr_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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 name="zeiterfassung_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zeiterfassung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="android-note1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\android-note1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -2022,17 +2018,17 @@
<data name="pfeil_rechts" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Atilla" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Atilla.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ze_kommen" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ze_kommen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="zwiterfassung" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zwiterfassung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TiMaS-Paket-Time" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\TiMaS-Paket-Time.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="fremdSped" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fremdSped.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="easteregg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\easteregg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -2052,25 +2048,22 @@
<data name="cake" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cake.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="männlich" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\männlich.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="blue-question-mark-hi" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\blue-question-mark-hi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Verag_Spedition_GMBH_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Verag-Spedition-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ambar_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="stift" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sicherheit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sicherheit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="today" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="people" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\people.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="pfeil_unten" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="parcel_small1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\parcel_small1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="err" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\err.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="file_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\file_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

View File

@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Public NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -373,9 +373,9 @@ Namespace My
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString), _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false"& _
";User ID=AppUser;Password=yp/THDd?xM+pZ$;")> _
Public ReadOnly Property AsfinagConnectionString() As String
Public ReadOnly Property AsfinagConnectionStringDEV() As String
Get
Return CType(Me("AsfinagConnectionString"),String)
Return CType(Me("AsfinagConnectionStringDEV"),String)
End Get
End Property
@@ -391,6 +391,18 @@ Namespace My
Me("EZOLL_UNISPEDConnectionString") = value
End Set
End Property
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString), _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ASFINAG;Integrated Security="& _
"false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max P"& _
"ool Size=200")> _
Public ReadOnly Property AsfinagConnectionStringPROD() As String
Get
Return CType(Me("AsfinagConnectionStringPROD"),String)
End Get
End Property
End Class
End Namespace

View File

@@ -166,7 +166,7 @@
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=DEVELOPER\DEVSQL;Initial Catalog=Parkzeit;Integrated Security=false;User ID=sa;Password=BmWr501956;</Value>
</Setting>
<Setting Name="AsfinagConnectionString" Type="(Connection string)" Scope="Application">
<Setting Name="AsfinagConnectionStringDEV" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;&lt;/ConnectionString&gt;
@@ -176,5 +176,12 @@
<Setting Name="EZOLL_UNISPEDConnectionString" Type="System.String" Scope="User">
<Value Profile="(Default)">Data Source=srv04.unisu.at;Initial Catalog=ezoll;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</Value>
</Setting>
<Setting Name="AsfinagConnectionStringPROD" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200&lt;/ConnectionString&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200</Value>
</Setting>
</Settings>
</SettingsFile>

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@@ -49,7 +49,7 @@ Public Class cTimasAPI
End Function
Public Sub getTimeSaldo(maid As Integer, ByRef info As String, Optional isEndpointRunning As Boolean = True)
Public Sub getTimeSaldo(maid As Integer, ByRef info As String, ByRef Optional isEndpointRunning As Boolean = True)
Try
Dim returnText As String = ""
Dim failureText As String = ""
@@ -119,7 +119,7 @@ Public Class cTimasAPI
End Sub
Public Function getTimeEntries(ByVal maid As Integer, ByRef dtZeiten As DataTable, Optional ByRef entryExistingToday As Boolean = True, Optional ByRef requestDone As Boolean = False, Optional isEndpointRunning As Boolean = True) As Boolean
Public Function getTimeEntries(ByVal maid As Integer, ByRef dtZeiten As DataTable, Optional ByRef entryExistingToday As Boolean = True, Optional ByRef requestDone As Boolean = False, Optional ByRef isEndpointRunning As Boolean = True) As Boolean
Try
Dim isPresent = False
@@ -156,7 +156,7 @@ Public Class cTimasAPI
If (rest.ResponseStatusCode <> 200) Then
Debug.WriteLine(rest.ResponseHeader)
'rest.ResponseStatusCode & " " & rest.ResponseStatusText
Debug.WriteLine(rest.ResponseStatusCode & " " & rest.ResponseStatusText)
Return isPresent
End If

View File

@@ -1354,6 +1354,21 @@
<ItemGroup>
<None Include="Resources\err.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\blue-question-mark-hi.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\files_small.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\files_small1.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\files_small2.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\file_small.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<ProjectExtensions />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.